From 69fd0b38ff6289c37a4e3bace440bf15e93b3732 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 6 Apr 2021 13:46:55 +0100
Subject: [PATCH] Remove a couple of unused OnUpdateUI handlers.
Fixes https://gitlab.com/kicad/code/kicad/issues/5049
---
pcbnew/board_stackup_manager/panel_board_finish_base.cpp | 6 ------
pcbnew/board_stackup_manager/panel_board_finish_base.fbp | 1 -
pcbnew/board_stackup_manager/panel_board_finish_base.h | 4 ----
pcbnew/board_stackup_manager/panel_board_stackup_base.cpp | 2 --
pcbnew/board_stackup_manager/panel_board_stackup_base.fbp | 1 -
pcbnew/board_stackup_manager/panel_board_stackup_base.h | 1 -
6 files changed, 15 deletions(-)
diff --git a/pcbnew/board_stackup_manager/panel_board_finish_base.cpp b/pcbnew/board_stackup_manager/panel_board_finish_base.cpp
index e62c994c73..76f13b88ba 100644
--- a/pcbnew/board_stackup_manager/panel_board_finish_base.cpp
+++ b/pcbnew/board_stackup_manager/panel_board_finish_base.cpp
@@ -59,14 +59,8 @@ PANEL_SETUP_BOARD_FINISH_BASE::PANEL_SETUP_BOARD_FINISH_BASE( wxWindow* parent,
this->SetSizer( bMainSizer );
this->Layout();
bMainSizer->Fit( this );
-
- // Connect Events
- this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_BOARD_FINISH_BASE::OnUpdateUI ) );
}
PANEL_SETUP_BOARD_FINISH_BASE::~PANEL_SETUP_BOARD_FINISH_BASE()
{
- // Disconnect Events
- this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_BOARD_FINISH_BASE::OnUpdateUI ) );
-
}
diff --git a/pcbnew/board_stackup_manager/panel_board_finish_base.fbp b/pcbnew/board_stackup_manager/panel_board_finish_base.fbp
index 36c3b132c0..bb7cd934ba 100644
--- a/pcbnew/board_stackup_manager/panel_board_finish_base.fbp
+++ b/pcbnew/board_stackup_manager/panel_board_finish_base.fbp
@@ -49,7 +49,6 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
- <event name="OnUpdateUI">OnUpdateUI</event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bMainSizer</property>
diff --git a/pcbnew/board_stackup_manager/panel_board_finish_base.h b/pcbnew/board_stackup_manager/panel_board_finish_base.h
index af9c145f9e..26809f6e32 100644
--- a/pcbnew/board_stackup_manager/panel_board_finish_base.h
+++ b/pcbnew/board_stackup_manager/panel_board_finish_base.h
@@ -39,10 +39,6 @@ class PANEL_SETUP_BOARD_FINISH_BASE : public wxPanel
wxStaticText* m_staticTextEdgeConn;
wxChoice* m_choiceEdgeConn;
- // Virtual event handlers, overide them in your derived class
- virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
-
-
public:
PANEL_SETUP_BOARD_FINISH_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
diff --git a/pcbnew/board_stackup_manager/panel_board_stackup_base.cpp b/pcbnew/board_stackup_manager/panel_board_stackup_base.cpp
index 42ac34b427..9c48cb4668 100644
--- a/pcbnew/board_stackup_manager/panel_board_stackup_base.cpp
+++ b/pcbnew/board_stackup_manager/panel_board_stackup_base.cpp
@@ -151,7 +151,6 @@ PANEL_SETUP_BOARD_STACKUP_BASE::PANEL_SETUP_BOARD_STACKUP_BASE( wxWindow* parent
bMainSizer->Fit( this );
// Connect Events
- this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::OnUpdateUI ) );
m_buttonAddDielectricLayer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::onAddDielectricLayer ), NULL, this );
m_buttonRemoveDielectricLayer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::onRemoveDielectricLayer ), NULL, this );
m_buttonRemoveDielectricLayer->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::onRemoveDielUI ), NULL, this );
@@ -162,7 +161,6 @@ PANEL_SETUP_BOARD_STACKUP_BASE::PANEL_SETUP_BOARD_STACKUP_BASE( wxWindow* parent
PANEL_SETUP_BOARD_STACKUP_BASE::~PANEL_SETUP_BOARD_STACKUP_BASE()
{
// Disconnect Events
- this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::OnUpdateUI ) );
m_buttonAddDielectricLayer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::onAddDielectricLayer ), NULL, this );
m_buttonRemoveDielectricLayer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::onRemoveDielectricLayer ), NULL, this );
m_buttonRemoveDielectricLayer->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_SETUP_BOARD_STACKUP_BASE::onRemoveDielUI ), NULL, this );
diff --git a/pcbnew/board_stackup_manager/panel_board_stackup_base.fbp b/pcbnew/board_stackup_manager/panel_board_stackup_base.fbp
index 764b7994e2..b7e93ff42a 100644
--- a/pcbnew/board_stackup_manager/panel_board_stackup_base.fbp
+++ b/pcbnew/board_stackup_manager/panel_board_stackup_base.fbp
@@ -49,7 +49,6 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
- <event name="OnUpdateUI">OnUpdateUI</event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bMainSizer</property>
diff --git a/pcbnew/board_stackup_manager/panel_board_stackup_base.h b/pcbnew/board_stackup_manager/panel_board_stackup_base.h
index d43f4d6876..49334dd7df 100644
--- a/pcbnew/board_stackup_manager/panel_board_stackup_base.h
+++ b/pcbnew/board_stackup_manager/panel_board_stackup_base.h
@@ -60,7 +60,6 @@ class PANEL_SETUP_BOARD_STACKUP_BASE : public wxPanel
wxButton* m_buttonExport;
// Virtual event handlers, overide them in your derived class
- virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
virtual void onAddDielectricLayer( wxCommandEvent& event ) { event.Skip(); }
virtual void onRemoveDielectricLayer( wxCommandEvent& event ) { event.Skip(); }
virtual void onRemoveDielUI( wxUpdateUIEvent& event ) { event.Skip(); }