X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e92f266ca77ba4501b1663c54eb573023e8989e3..a387938f80a2804f259e7305513231be39620fd2:/include/wx/os2/menuitem.h

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 3aecc077cf..1e9d1d89b8 100644
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -1,26 +1,22 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.h
+// Name:        wx/os2/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
-#ifdef __GNUG__
-#pragma interface "menuitem.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 // an exception to the general rule that a normal header doesn't include other
 // headers - only because ownerdrw.h is not always included and I don't want
@@ -42,36 +38,85 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
 #endif
 {
 public:
+    //
     // ctor & dtor
-    wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR,
-             const wxString& strName = "", const wxString& wxHelp = "",
-             bool bCheckable = FALSE, wxMenu *pSubMenu = NULL);
-    virtual ~wxMenuItem();
+    //
+    wxMenuItem( wxMenu*         pParentMenu = NULL
+               ,int             nId = wxID_SEPARATOR
+               ,const wxString& rStrName = wxEmptyString
+               ,const wxString& rWxHelp = wxEmptyString
+               ,wxItemKind      eKind = wxITEM_NORMAL
+               ,wxMenu*         pSubMenu = NULL
+              );
 
-    // override base class virtuals
-    virtual void SetText(const wxString& strName);
-    virtual wxString GetLabel() const;
-    virtual void SetCheckable(bool checkable);
+    //
+    // Depricated, do not use in new code
+    //
+    wxMenuItem( wxMenu*         pParentMenu
+               ,int             vId
+               ,const wxString& rsText
+               ,const wxString& rsHelp
+               ,bool            bIsCheckable
+               ,wxMenu*         pSubMenu = (wxMenu *)NULL
+              );
+    virtual ~wxMenuItem();
 
-    virtual void Enable(bool bDoEnable = TRUE);
-    virtual void Check(bool bDoCheck = TRUE);
-    virtual bool IsChecked() const;
+    //
+    // Override base class virtuals
+    //
+    virtual void SetText(const wxString& rStrName);
+    virtual void SetCheckable(bool bCheckable);
 
-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry *GetAccel() const;
-#endif // wxUSE_ACCEL
+    virtual void Enable(bool bDoEnable = true);
+    virtual void Check(bool bDoCheck = true);
+    virtual bool IsChecked(void) const;
 
-    // unfortunately needed to resolve ambiguity between
+    //
+    // 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
+    //
+    // 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;
+
+    //
+    // Mark item as belonging to the given radio group
+    //
+    void SetAsRadioGroupStart(void);
+    void SetRadioGroupStart(int nStart);
+    void SetRadioGroupEnd(int nEnd);
+
+    //
+    // All OS/2PM Submenus and menus have one of these
+    //
+    MENUITEM                        m_vMenuData;
 
 private:
+    void Init();
+
+    //
+    // The positions of the first and last items of the radio group this item
+    // belongs to or -1: start is the radio group start and is valid for all
+    // but first radio group items (m_isRadioGroupStart == FALSE), end is valid
+    // only for the first one
+    //
+    union
+    {
+        int m_nStart;
+        int m_nEnd;
+    } m_vRadioGroup;
+
+    //
+    // Does this item start a radio group?
+    //
+    bool                            m_bIsRadioGroupStart;
+
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
-};
+}; // end of CLASS wxMenuItem
 
 #endif  //_MENUITEM_H