Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

[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 3ba54e86a615c3292a3a0520b586eb935e569dfc..52274fb81bfe87cf5f059fe198158c7a0d637210 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #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();
@@ -28,8 +29,9 @@ private:
     bool m_insideMenu;
 };
 
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
+       DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
     public:
         wxMenuBarXmlHandler();
         virtual wxObject *DoCreateResource();