X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9eee2db810695ae4417e9935475f268bb68bbac..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/os2/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index d6ae3d84f3..b65a642b8d 100644 --- a/include/wx/os2/bmpbuttn.h +++ b/include/wx/os2/bmpbuttn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbuttn.h +// Name: wx/os2/bmpbuttn.h // Purpose: wxBitmapButton class // Author: David Webster // Modified by: @@ -13,12 +13,13 @@ #define _WX_BMPBUTTN_H_ #include "wx/button.h" +#include "wx/dcclient.h" -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; +WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[]; #define wxDEFAULT_BUTTON_MARGIN 4 -class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase +class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase { public: inline wxBitmapButton() @@ -62,17 +63,9 @@ public: SetBitmapLabel(rBitmap); } -#if WXWIN_COMPATIBILITY - wxBitmap* GetBitmap(void) const - { - return (wxBitmap *)&m_buttonBitmap; - } -#endif - // // Implementation // - virtual void SetDefault(); virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem); private: