X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/univ/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 34c09b3e3e..40de393a9c 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -12,11 +12,7 @@ #ifndef _WX_UNIV_BMPBUTTN_H_ #define _WX_UNIV_BMPBUTTN_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univbmpbuttn.h" -#endif - -class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: wxBitmapButton() { } @@ -44,14 +40,14 @@ public: virtual void SetMargins(int x, int y) { - SetImageMargins(x, y); + SetBitmapMargins(x, y); wxBitmapButtonBase::SetMargins(x, y); } - virtual bool Enable(bool enable = TRUE); + virtual bool Enable(bool enable = true); - virtual bool SetCurrent(bool doit = TRUE); + virtual bool SetCurrent(bool doit = true); virtual void Press(); virtual void Release(); @@ -63,8 +59,8 @@ protected: // called when one of the bitmap is changed by user virtual void OnSetBitmap(); - // set bitmap to the given one if it's ok or to m_bmpNormal and return - // TRUE if the bitmap really changed + // set bitmap to the given one if it's ok or to the normal bitmap and + // return true if the bitmap really changed bool ChangeBitmap(const wxBitmap& bmp); private: