Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/xrc/xh_menu.h b/include/wx/xrc/xh_menu.h
index 79ad952ee31e33762843606a8cb32824ef341555..7a241d1a5b66c03cfd0391a31edc4d944d003f79 100644 (file)
--- a/include/wx/xrc/xh_menu.h
+++ b/include/wx/xrc/xh_menu.h
@@ -11,14 +11,15 @@
 #ifndef _WX_XH_MENU_H_
 #define _WX_XH_MENU_H_
 
 #ifndef _WX_XH_MENU_H_
 #define _WX_XH_MENU_H_
 

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

 #pragma interface "xh_menu.h"
 #endif
 
 #include "wx/xrc/xmlres.h"
 
 #pragma interface "xh_menu.h"
 #endif
 
 #include "wx/xrc/xmlres.h"
 

-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler

 {
 {

+DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)

 public:
     wxMenuXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxMenuXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -28,8 +29,9 @@ private:
     bool m_insideMenu;
 };
 
     bool m_insideMenu;
 };
 

-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler

 {
 {

+    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)

     public:
         wxMenuBarXmlHandler();
         virtual wxObject *DoCreateResource();
     public:
         wxMenuBarXmlHandler();
         virtual wxObject *DoCreateResource();