Clear columns on destruction

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

diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h
index 648b7472c0cff4f86fb041f6594323020ab5a71c..265d2757bd2d91c57337667d7eb42bd9d19a320c 100644 (file)
--- a/include/wx/mac/carbon/bmpbuttn.h
+++ b/include/wx/mac/carbon/bmpbuttn.h
@@ -12,17 +12,13 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "bmpbuttn.h"
-#endif
-
 #include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)