From 5965bc191085af05fc588ed6a7d3ee593298c07d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Oct 2021 22:50:48 +0100 Subject: [PATCH] Remove unused parts of wxMSW wxBitmapButton implementation Nothing here, including the event table for this class using non-existing wxBitmapButton::OnSysColourChanged (which is just the same as wxWindow::OnSysColourChanged, in fact), was needed any longer ever since the changes of a6fd73d33a (implement wxBitmapButton as just a wrapper for wxButton under MSW, 2009-06-15), so simply remove all the unused stuff. --- include/wx/msw/bmpbuttn.h | 1 - src/msw/bmpbuttn.cpp | 21 +-------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h index a083428948..b894bc47f3 100644 --- a/include/wx/msw/bmpbuttn.h +++ b/include/wx/msw/bmpbuttn.h @@ -45,7 +45,6 @@ public: wxWindowID winid, const wxString& name = wxString()); protected: - wxDECLARE_EVENT_TABLE(); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton); }; diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 45eed2db05..093544d159 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -16,29 +16,10 @@ #include "wx/bmpbuttn.h" -#ifndef WX_PRECOMP - #include "wx/log.h" - #include "wx/dcmemory.h" - #include "wx/image.h" -#endif - -#include "wx/msw/private.h" -#include "wx/msw/dc.h" // for wxDCTemp - -#include "wx/msw/uxtheme.h" - -#ifndef ODS_NOFOCUSRECT - #define ODS_NOFOCUSRECT 0x0200 -#endif - // ---------------------------------------------------------------------------- -// macros +// wxBitmapButton implementation // ---------------------------------------------------------------------------- -wxBEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase) - EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged) -wxEND_EVENT_TABLE() - /* TODO PROPERTIES :