removed mark #pragmas

[wxWidgets.git] / include / wx / mac / combobox.h

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index 5b73bc2b6b45f3d53e3d6951574c793a3de4ea2c..fcdba4fef309f1a1680784f7ea87807ed0719bdd 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "combobox.h"
 #endif
 
 #pragma interface "combobox.h"
 #endif
 


@@ -20,7 +20,6 @@
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 #include "wx/choice.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl
 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxComboBoxBase , public wxControl