added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

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

diff --git a/include/wx/xrc/xh_gdctl.h b/include/wx/xrc/xh_gdctl.h
index 0893b0ad6d32875c5188def0bb488c365abc577e..32432377a81b1cf0d7599cfd6ef66539c802bad5 100644 (file)
--- a/include/wx/xrc/xh_gdctl.h
+++ b/include/wx/xrc/xh_gdctl.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_GDCTL_H_
 #define _WX_XH_GDCTL_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "xh_gdctl.h"
 #endif
 
@@ -19,7 +19,7 @@
 
 #if wxUSE_DIRDLG
 
-class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
 public: