Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 2185eea285fa2e602e8880dd2d47383937be5119..b65a642b8d5ef927474dcac85fd4775f0a19d28c 100644 (file)
--- 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:
 // Purpose:     wxBitmapButton class
 // Author:      David Webster
 // Modified by:


@@ -15,11 +15,11 @@
 #include "wx/button.h"
 #include "wx/dcclient.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
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase

 {
 public:
     inline wxBitmapButton()
 {
 public:
     inline wxBitmapButton()


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

-    virtual void SetDefault();

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