X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eca370a9cf88259480e9f34afc17347ce603ff37..9ef63a4a59eccce6cd8787f0ed966bfa8365a22e:/include/wx/os2/menuitem.h?ds=sidebyside

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index f9ebaf8659..33a41cef62 100644
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -43,34 +43,39 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
 {
 public:
     // ctor & dtor
-    wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR,
-             const wxString& strName = "", const wxString& wxHelp = "",
-             bool bCheckable = FALSE, wxMenu *pSubMenu = NULL);
+    wxMenuItem( wxMenu*         pParentMenu = NULL
+               ,int             nId = wxID_SEPARATOR
+               ,const wxString& rStrName = ""
+               ,const wxString& rWxHelp = ""
+               ,bool            bCheckable = FALSE
+               ,wxMenu*         pSubMenu = NULL
+              );
     virtual ~wxMenuItem();
 
     // override base class virtuals
-    virtual void SetText(const wxString& strName);
-    virtual void SetCheckable(bool checkable);
+    virtual void SetText(const wxString& rStrName);
+    virtual void SetCheckable(bool bCheckable);
 
     virtual void Enable(bool bDoEnable = TRUE);
     virtual void Check(bool bDoCheck = TRUE);
-    virtual bool IsChecked() const;
-
-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry *GetAccel() const;
-#endif // wxUSE_ACCEL
+    virtual bool IsChecked(void) const;
 
     // unfortunately needed to resolve ambiguity between
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
-    bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); }
+    bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); }
 
     // the id for a popup menu is really its menu handle (as required by
     // ::AppendMenu() API), so this function will return either the id or the
     // menu handle depending on what we're
-    int GetRealId() const;
+    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
 
 #endif  //_MENUITEM_H