merge of wxMac into main repository

[wxWidgets.git] / include / wx / os2 / menuitem.h

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 1d6b8879fe9dd521d5ec2f0fd16df5ddbd76f25e..8436d0d006f103561f4a3417ee9a8f62b8983aa0 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
 public:
     // ctor & dtor
     wxMenuItem( wxMenu*         pParentMenu = NULL
 public:
     // ctor & dtor
     wxMenuItem( wxMenu*         pParentMenu = NULL

-               ,int             nId = ID_SEPARATOR
+               ,int             nId = wxID_SEPARATOR

                ,const wxString& rStrName = ""
                ,const wxString& rWxHelp = ""
                ,bool            bCheckable = FALSE
                ,const wxString& rStrName = ""
                ,const wxString& rWxHelp = ""
                ,bool            bCheckable = FALSE


@@ -73,6 +73,11 @@ public:
     // menu handle depending on what we're
     int GetRealId(void) const;
 
     // menu handle depending on what we're
     int GetRealId(void) const;
 

+    //
+    // All OS/2PM Submenus and menus have one of these
+    //
+    MENUITEM                        m_vMenuData;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem
 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem