popup activation scope and l&f

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 2185eea285fa2e602e8880dd2d47383937be5119..b4b4467ac725db6723ffbf367b5f2f3028d79a9e 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -15,7 +15,7 @@
 #include "wx/button.h"
 #include "wx/dcclient.h"
 
 #include "wx/button.h"
 #include "wx/dcclient.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];

 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 


@@ -66,7 +66,6 @@ public:
     //
     // Implementation
     //
     //
     // Implementation
     //

-    virtual void SetDefault();

     virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem);
 
 private:
     virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem);
 
 private: