only define globals when wxUSE_BASE to avoid duplicate definitions in wxBase and...

[wxWidgets.git] / include / wx / xrc / xh_combo.h

diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h
index ddc1c29eb782e7e20c417140261c03e77692aaeb..cf894b87f683801885f3fa0c284f922a744156db 100644 (file)
--- a/include/wx/xrc/xh_combo.h
+++ b/include/wx/xrc/xh_combo.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_COMBO_H_
 #define _WX_XH_COMBO_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "xh_combo.h"
 #endif
 
@@ -19,7 +19,7 @@
 
 #if wxUSE_COMBOBOX
 
-class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
 public: