X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6fd73d33ac80632981dee1c0be669f20ba765b5..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/bmpbuttn.h diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index d9a1b3a727..8837752b00 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -18,10 +18,10 @@ #include "wx/button.h" -// FIXME: right now only wxMSW implements bitmap support in wxButton +// FIXME: right now only wxMSW and wxGTK implement bitmap support in wxButton // itself, this shouldn't be used for the other platforms neither // when all of them do it -#ifdef __WXMSW__ +#if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__) #define wxHAS_BUTTON_BITMAP #endif @@ -52,8 +52,8 @@ public: // deprecated synonym for SetBitmapLabel() #if WXWIN_COMPATIBILITY_2_6 - wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap). - SetBitmapLabel(bitmap); ); + wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), + SetBitmapLabel(bitmap); ) // prevent virtual function hiding virtual void SetLabel(const wxString& label)