Fix for assert in 'dynarray.cpp' by Jaakko Salli.

[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..ee7c1ab7d8af68d1ed7388088de06d4b3a3fc386 100644 (file)
--- a/include/wx/xrc/xh_menu.h
+++ b/include/wx/xrc/xh_menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_menu.h
+// Name:        wx/xrc/xh_menu.h
 // Purpose:     XML resource handler for menus/menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
@@ -11,14 +11,14 @@
 #ifndef _WX_XH_MENU_H_
 #define _WX_XH_MENU_H_
 
-#ifdef __GNUG__
-#pragma interface "xh_menu.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
-class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler
+#if wxUSE_XRC && wxUSE_MENUS
+
+class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
+
 public:
     wxMenuXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -28,13 +28,16 @@ private:
     bool m_insideMenu;
 };
 
-class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
-    public:
-        wxMenuBarXmlHandler();
-        virtual wxObject *DoCreateResource();
-        virtual bool CanHandle(wxXmlNode *node);
+    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
+
+public:
+    wxMenuBarXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_MENUS
 
 #endif // _WX_XH_MENU_H_