X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/univ/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 5d4d725aac..832f199b1a 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 25.08.00 -// RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,7 +11,7 @@ #ifndef _WX_UNIV_BMPBUTTN_H_ #define _WX_UNIV_BMPBUTTN_H_ -class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { public: wxBitmapButton() { } @@ -40,7 +39,7 @@ public: virtual void SetMargins(int x, int y) { - SetImageMargins(x, y); + SetBitmapMargins(x, y); wxBitmapButtonBase::SetMargins(x, y); } @@ -59,8 +58,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: