From 6aad0c70377333c38733fc6fedd30c59d620dd68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 3 Nov 2005 01:56:02 +0000 Subject: [PATCH] fixed compilation breakage in 1.24 commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/bmpbuttn.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index e38e567d99..6f912b376b 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -67,7 +67,6 @@ public: // deprecated synonym for SetBitmapLabel() #if WXWIN_COMPATIBILITY_2_6 wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) ); - { SetBitmapLabel(bitmap); } // prevent virtual function hiding virtual void SetLabel(const wxString& label) @@ -94,7 +93,10 @@ protected: }; #if WXWIN_COMPATIBILITY_2_6 - inline void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); } +inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap) +{ + SetBitmapLabel(bitmap); +} #endif // WXWIN_COMPATIBILITY_2_6 #if defined(__WXUNIVERSAL__) -- 2.50.0