rtti informations

[wxWidgets.git] / include / wx / msw / menu.h

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 5d273cd57f63fc014c3233b0dfa6864931f4aa3c..424d98971d8ad4b8ba43f2da1034d806716302f5 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "menu.h"
 #endif
 
@@ -20,7 +20,7 @@
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 
-    WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
+    WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;
@@ -29,6 +29,8 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #endif
 
+#include "wx/arrstr.h"
+
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------
@@ -114,7 +116,7 @@ private:
     wxAcceleratorArray m_accels;
 #endif // wxUSE_ACCEL
 
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu)
 };
 
 // ----------------------------------------------------------------------------
@@ -204,7 +206,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
 };
 
 #endif // _WX_MENU_H_