added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index d6ae3d84f3cee413c9a89ccc57c968236a5f8349..e7e2dfef31babd72fcaad41b1936409bfad0e803 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -13,8 +13,9 @@
 #define _WX_BMPBUTTN_H_
 
 #include "wx/button.h"
+#include "wx/dcclient.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
@@ -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: