X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db16e5c3aae30ee4502d3e0d41eed500af365fe9..2a039701a8aebaf8eb7e7cbc408dbb994661975f:/include/wx/os2/bmpbuttn.h diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h index 48c13f2b31..2185eea285 100644 --- a/include/wx/os2/bmpbuttn.h +++ b/include/wx/os2/bmpbuttn.h @@ -13,6 +13,7 @@ #define _WX_BMPBUTTN_H_ #include "wx/button.h" +#include "wx/dcclient.h" WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; @@ -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,13 +63,6 @@ public: SetBitmapLabel(rBitmap); } -#if WXWIN_COMPATIBILITY - wxBitmap* GetBitmap(void) const - { - return (wxBitmap *)&m_buttonBitmap; - } -#endif - // // Implementation //