merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -154,6 +154,11 @@ private:
    //
    WXHMENU                         m_hMenu;

+    //
+    // The helper variable for creating unique IDs.
+    //
+    static USHORT		    m_nextMenuId;
+
 #if wxUSE_ACCEL
    //
    // The accelerators for our menu items