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

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

diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h
index 22f53ee93506bc23240cb51a3f4ae8eb652e356e..bbbaa3c80939995a320189a4c1214067589bcb24 100644 (file)
--- a/include/wx/xrc/xh_toolb.h
+++ b/include/wx/xrc/xh_toolb.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_TOOLB_H_
 #define _WX_XH_TOOLB_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "xh_toolb.h"
 #endif
 
@@ -21,8 +21,9 @@
 
 class WXDLLEXPORT wxToolBar;
 
-class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
 {
+DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
 public:
     wxToolBarXmlHandler();
     virtual wxObject *DoCreateResource();