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 52274fb81bfe87cf5f059fe198158c7a0d637210..7a241d1a5b66c03cfd0391a31edc4d944d003f79 100644 (file)
--- a/include/wx/xrc/xh_menu.h
+++ b/include/wx/xrc/xh_menu.h
@@ -11,7 +11,7 @@
 #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
 
 #pragma interface "xh_menu.h"
 #endif
 


@@ -31,7 +31,7 @@ private:
 
 class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {

-       DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)

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