fix wxTextDataObject::GetDataHere and SetData functions (under wxMSW) so that they...

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

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 27edd94fd06d1a991aae5742cc89b5164b8cce4c..0ac15ef2923ab68560b7ad9a7780dcf783ee09c5 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -19,14 +19,14 @@
 #include "wx/bitmap.h"
 #include "wx/button.h"
 
-extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 // It has different bitmaps for different states (focused/disabled/pressed)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmapButtonBase : public wxButton
+class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton
 {
 public:
     wxBitmapButtonBase()
@@ -89,7 +89,7 @@ protected:
         m_marginY;
 
 
-    DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -110,7 +110,7 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/bmpbuttn.h"
+    #include "wx/osx/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)