signned/unsigned fix

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

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 1d6b8879fe9dd521d5ec2f0fd16df5ddbd76f25e..1f0275347cacb9bf9173070f3622fe3e29e519e2 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -42,17 +42,32 @@ class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
 #endif
 {
 public:
 #endif
 {
 public:

+    //

     // ctor & dtor
     // ctor & dtor

+    //

     wxMenuItem( wxMenu*         pParentMenu = NULL
     wxMenuItem( wxMenu*         pParentMenu = NULL

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

                ,const wxString& rStrName = ""
                ,const wxString& rWxHelp = ""
                ,const wxString& rStrName = ""
                ,const wxString& rWxHelp = ""

-               ,bool            bCheckable = FALSE
+               ,wxItemKind      eKind = wxITEM_NORMAL

                ,wxMenu*         pSubMenu = NULL
               );
                ,wxMenu*         pSubMenu = NULL
               );

+
+    //
+    // 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 ~wxMenuItem();
 

-    // override base class virtuals
+    //
+    // Override base class virtuals
+    //

     virtual void SetText(const wxString& rStrName);
     virtual void SetCheckable(bool bCheckable);
 
     virtual void SetText(const wxString& rStrName);
     virtual void SetCheckable(bool bCheckable);
 


@@ -60,20 +75,51 @@ public:
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked(void) const;
 
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked(void) const;
 

-#if wxUSE_ACCEL
-    virtual wxAcceleratorEntry* GetAccel(void) const;
-#endif // wxUSE_ACCEL
-
-    // unfortunately needed to resolve ambiguity between
+    //
+    // Unfortunately needed to resolve ambiguity between

     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()

+    //

     bool IsCheckable(void) 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
     // ::AppendMenu() API), so this function will return either the id or the
     // menu handle depending on what we're

+    //

     int GetRealId(void) 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:
 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
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem