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

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

diff --git a/include/wx/xrc/xh_scwin.h b/include/wx/xrc/xh_scwin.h
index 1befc4121583889225db0c6f018c731807e92be7..f88f7359e8a62dc977dcaad705129e34482e841b 100644 (file)
--- a/include/wx/xrc/xh_scwin.h
+++ b/include/wx/xrc/xh_scwin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_SCWIN_H_
 #define _WX_XH_SCWIN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "xh_scwin.h"
 #endif
 
@@ -20,8 +20,9 @@
 
 
 
-class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
 {
+DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
 public:
     wxScrolledWindowXmlHandler();
     virtual wxObject *DoCreateResource();