Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compilation breakage in 1.24 commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-11-03 01:56:02 +00:00
parent 1fdc16adf7
commit 6aad0c7037
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/bmpbuttn.h
View File

@@ -67,7 +67,6 @@ public:
// deprecated synonym for SetBitmapLabel() // deprecated synonym for SetBitmapLabel()
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) ); wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) );
{ SetBitmapLabel(bitmap); }
// prevent virtual function hiding // prevent virtual function hiding
virtual void SetLabel(const wxString& label) virtual void SetLabel(const wxString& label)
@@ -94,7 +93,10 @@ protected:
}; };
#if WXWIN_COMPATIBILITY_2_6 #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 #endif // WXWIN_COMPATIBILITY_2_6
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)