streamlining code

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 857a4f34a9c8d3a54699249006389e5aa28d05b7..6f4ef222e9c4fc237837c073cc744ce4e90fd250 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_


@@ -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: