Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 857a4f34a9c8d3a54699249006389e5aa28d05b7..b65a642b8d5ef927474dcac85fd4775f0a19d28c 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbuttn.h
+// Name:        wx/os2/bmpbuttn.h
 // Purpose:     wxBitmapButton class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
@@ -15,11 +15,11 @@
 #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()
@@ -66,7 +66,6 @@ public:
     //
     // Implementation
     //
-    virtual void SetDefault();
     virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem);
 
 private: