]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed compilation breakage in 1.24 commit
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 3 Nov 2005 01:56:02 +0000 (01:56 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 3 Nov 2005 01:56:02 +0000 (01:56 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/bmpbuttn.h

index e38e567d99469d1a6a54e615d883e209f8ed6783..6f912b376b29c0dab067739dd3464045061adb90 100644 (file)
@@ -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__)