X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db16e5c3aae30ee4502d3e0d41eed500af365fe9..f2049b683752950d1fe91aec07318e7f2122ff16:/include/wx/os2/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index 48c13f2b31..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() @@ -32,9 +33,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxBU_AUTODRAW -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxButtonNameStr ) { @@ -44,9 +43,7 @@ public: ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -57,9 +54,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxBU_AUTODRAW -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxButtonNameStr ); @@ -68,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: