diff --git a/common/widgets/properties_panel.cpp b/common/widgets/properties_panel.cpp index 97a5803283..eeaee81324 100644 --- a/common/widgets/properties_panel.cpp +++ b/common/widgets/properties_panel.cpp @@ -149,5 +149,5 @@ void PROPERTIES_PANEL::update( const SELECTION& aSelection ) void PROPERTIES_PANEL::onShow( wxShowEvent& aEvent ) { if( aEvent.IsShown() ) - Update(); + UpdateData(); } diff --git a/common/widgets/properties_panel.h b/common/widgets/properties_panel.h index 2d1758b335..79a678e3ac 100644 --- a/common/widgets/properties_panel.h +++ b/common/widgets/properties_panel.h @@ -42,7 +42,7 @@ public: { } - virtual void Update() override = 0; + virtual void UpdateData() = 0; wxPropertyGrid* GetPropertyGrid() { diff --git a/pcbnew/dialogs/pcb_properties_panel.cpp b/pcbnew/dialogs/pcb_properties_panel.cpp index 082f3dfe6d..c9fcadf739 100644 --- a/pcbnew/dialogs/pcb_properties_panel.cpp +++ b/pcbnew/dialogs/pcb_properties_panel.cpp @@ -37,7 +37,7 @@ PCB_PROPERTIES_PANEL::PCB_PROPERTIES_PANEL( wxWindow* aParent, PCB_EDIT_FRAME* a } -void PCB_PROPERTIES_PANEL::Update() +void PCB_PROPERTIES_PANEL::UpdateData() { PCB_SELECTION_TOOL* selectionTool = m_frame->GetToolManager()->GetTool(); const SELECTION& selection = selectionTool->GetSelection(); diff --git a/pcbnew/dialogs/pcb_properties_panel.h b/pcbnew/dialogs/pcb_properties_panel.h index cb867c9133..7022a54fde 100644 --- a/pcbnew/dialogs/pcb_properties_panel.h +++ b/pcbnew/dialogs/pcb_properties_panel.h @@ -37,7 +37,7 @@ public: { } - void Update() override; + void UpdateData() override; protected: wxPGProperty* createPGProperty( const PROPERTY_BASE* aProperty ) const override; diff --git a/pcbnew/pcb_base_edit_frame.cpp b/pcbnew/pcb_base_edit_frame.cpp index e404d3ad0c..74f1533297 100644 --- a/pcbnew/pcb_base_edit_frame.cpp +++ b/pcbnew/pcb_base_edit_frame.cpp @@ -313,6 +313,6 @@ void PCB_BASE_EDIT_FRAME::UpdateProperties() if( !m_propertiesPanel || !m_propertiesPanel->IsShownOnScreen() ) return; - m_propertiesPanel->Update(); + m_propertiesPanel->UpdateData(); }