Loading common/block_commande.cpp +2 −2 Original line number Original line Diff line number Diff line Loading @@ -287,8 +287,8 @@ void AbortBlockCurrentCommand( WinEDA_DrawPanel* Panel, wxDC* DC ) screen->m_BlockLocate.m_State = STATE_NO_BLOCK; screen->m_BlockLocate.m_State = STATE_NO_BLOCK; screen->m_BlockLocate.m_Command = BLOCK_ABORT; screen->m_BlockLocate.m_Command = BLOCK_ABORT; Panel->m_Parent->HandleBlockEnd( DC ); Panel->GetParent()->HandleBlockEnd( DC ); screen->m_BlockLocate.m_Command = BLOCK_IDLE; screen->m_BlockLocate.m_Command = BLOCK_IDLE; Panel->m_Parent->DisplayToolMsg( wxEmptyString ); Panel->GetParent()->DisplayToolMsg( wxEmptyString ); } } common/copy_to_clipboard.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -61,7 +61,7 @@ bool DrawPage( WinEDA_DrawPanel* panel ) BASE_SCREEN* screen = panel->GetScreen(); BASE_SCREEN* screen = panel->GetScreen(); /* scale is the ratio resolution/internal units */ /* scale is the ratio resolution/internal units */ float scale = 82.0 / panel->m_Parent->m_InternalUnits; float scale = 82.0 / panel->GetParent()->m_InternalUnits; if( ActiveScreen->m_BlockLocate.m_Command != BLOCK_IDLE ) if( ActiveScreen->m_BlockLocate.m_Command != BLOCK_IDLE ) { { Loading common/drawpanel.cpp +0 −5 Original line number Original line Diff line number Diff line Loading @@ -103,8 +103,6 @@ WinEDA_DrawPanel::WinEDA_DrawPanel( WinEDA_DrawFrame* parent, int id, WinEDA_DrawPanel::~WinEDA_DrawPanel() WinEDA_DrawPanel::~WinEDA_DrawPanel() { { wxASSERT( wxGetApp().m_EDA_Config != NULL ); wxGetApp().m_EDA_Config->Write( wxT( "AutoPAN" ), m_AutoPAN_Enable ); wxGetApp().m_EDA_Config->Write( wxT( "AutoPAN" ), m_AutoPAN_Enable ); } } Loading @@ -112,9 +110,6 @@ WinEDA_DrawPanel::~WinEDA_DrawPanel() BASE_SCREEN* WinEDA_DrawPanel::GetScreen() BASE_SCREEN* WinEDA_DrawPanel::GetScreen() { { WinEDA_DrawFrame* parentFrame = m_Parent; WinEDA_DrawFrame* parentFrame = m_Parent; wxASSERT( parentFrame ); return parentFrame->GetBaseScreen(); return parentFrame->GetBaseScreen(); } } Loading eeschema/class_sch_component.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -578,7 +578,7 @@ EDA_Rect SCH_COMPONENT::GetBoundaryBox() const } } /* Used if undo / redo command: /* Used in undo / redo command: * swap data between this and copyitem * swap data between this and copyitem */ */ void SCH_COMPONENT::SwapData( SCH_COMPONENT* copyitem ) void SCH_COMPONENT::SwapData( SCH_COMPONENT* copyitem ) Loading eeschema/libeditfrm.h +1 −1 Original line number Original line Diff line number Diff line Loading @@ -102,7 +102,7 @@ public: void SetConvert( int convert ) void SetConvert( int convert ) { { wxASSERT( convert >= 1 ); wxASSERT( convert >= 0 ); m_convert = convert; m_convert = convert; } } Loading Loading
common/block_commande.cpp +2 −2 Original line number Original line Diff line number Diff line Loading @@ -287,8 +287,8 @@ void AbortBlockCurrentCommand( WinEDA_DrawPanel* Panel, wxDC* DC ) screen->m_BlockLocate.m_State = STATE_NO_BLOCK; screen->m_BlockLocate.m_State = STATE_NO_BLOCK; screen->m_BlockLocate.m_Command = BLOCK_ABORT; screen->m_BlockLocate.m_Command = BLOCK_ABORT; Panel->m_Parent->HandleBlockEnd( DC ); Panel->GetParent()->HandleBlockEnd( DC ); screen->m_BlockLocate.m_Command = BLOCK_IDLE; screen->m_BlockLocate.m_Command = BLOCK_IDLE; Panel->m_Parent->DisplayToolMsg( wxEmptyString ); Panel->GetParent()->DisplayToolMsg( wxEmptyString ); } }
common/copy_to_clipboard.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -61,7 +61,7 @@ bool DrawPage( WinEDA_DrawPanel* panel ) BASE_SCREEN* screen = panel->GetScreen(); BASE_SCREEN* screen = panel->GetScreen(); /* scale is the ratio resolution/internal units */ /* scale is the ratio resolution/internal units */ float scale = 82.0 / panel->m_Parent->m_InternalUnits; float scale = 82.0 / panel->GetParent()->m_InternalUnits; if( ActiveScreen->m_BlockLocate.m_Command != BLOCK_IDLE ) if( ActiveScreen->m_BlockLocate.m_Command != BLOCK_IDLE ) { { Loading
common/drawpanel.cpp +0 −5 Original line number Original line Diff line number Diff line Loading @@ -103,8 +103,6 @@ WinEDA_DrawPanel::WinEDA_DrawPanel( WinEDA_DrawFrame* parent, int id, WinEDA_DrawPanel::~WinEDA_DrawPanel() WinEDA_DrawPanel::~WinEDA_DrawPanel() { { wxASSERT( wxGetApp().m_EDA_Config != NULL ); wxGetApp().m_EDA_Config->Write( wxT( "AutoPAN" ), m_AutoPAN_Enable ); wxGetApp().m_EDA_Config->Write( wxT( "AutoPAN" ), m_AutoPAN_Enable ); } } Loading @@ -112,9 +110,6 @@ WinEDA_DrawPanel::~WinEDA_DrawPanel() BASE_SCREEN* WinEDA_DrawPanel::GetScreen() BASE_SCREEN* WinEDA_DrawPanel::GetScreen() { { WinEDA_DrawFrame* parentFrame = m_Parent; WinEDA_DrawFrame* parentFrame = m_Parent; wxASSERT( parentFrame ); return parentFrame->GetBaseScreen(); return parentFrame->GetBaseScreen(); } } Loading
eeschema/class_sch_component.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -578,7 +578,7 @@ EDA_Rect SCH_COMPONENT::GetBoundaryBox() const } } /* Used if undo / redo command: /* Used in undo / redo command: * swap data between this and copyitem * swap data between this and copyitem */ */ void SCH_COMPONENT::SwapData( SCH_COMPONENT* copyitem ) void SCH_COMPONENT::SwapData( SCH_COMPONENT* copyitem ) Loading
eeschema/libeditfrm.h +1 −1 Original line number Original line Diff line number Diff line Loading @@ -102,7 +102,7 @@ public: void SetConvert( int convert ) void SetConvert( int convert ) { { wxASSERT( convert >= 1 ); wxASSERT( convert >= 0 ); m_convert = convert; m_convert = convert; } } Loading