Extract wxFDIOHandler in its own header.

[wxWidgets.git] / include / wx / os2 / bmpbuttn.h

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 48c13f2b31660f556d094f234b19d1dabc486135..6f4ef222e9c4fc237837c073cc744ce4e90fd250 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -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: