created wxAdvanced library

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

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index 784433f95fcafeb255629ab9924db0aba53035bc..eff0730a0cb821ee9510349fbc0dba7f07853ad8 100644 (file)
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -28,7 +28,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,

-               bool isCheckable = FALSE,
+               wxItemKind kind = wxITEM_NORMAL,

                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 
                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 


@@ -48,6 +48,11 @@ public:
     const wxBitmap& GetBitmap(bool checked = TRUE) const
       { return checked ? m_bmpChecked : m_bmpUnchecked; }
 
     const wxBitmap& GetBitmap(bool checked = TRUE) const
       { return checked ? m_bmpChecked : m_bmpUnchecked; }
 

+    // mark item as belonging to the given radio group
+    void SetAsRadioGroupStart();
+    void SetRadioGroupStart(int start);
+    void SetRadioGroupEnd(int end);
+

     // wxUniv-specific methods for implementation only starting from here
 
     // get the accel index of our label or -1 if none
     // wxUniv-specific methods for implementation only starting from here
 
     // get the accel index of our label or -1 if none


@@ -89,6 +94,19 @@ protected:
     wxBitmap m_bmpChecked,
              m_bmpUnchecked;
 
     wxBitmap m_bmpChecked,
              m_bmpUnchecked;
 

+    // 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 start;
+        int end;
+    } m_radioGroup;
+
+    // does this item start a radio group?
+    bool m_isRadioGroupStart;
+

     // the position of the accelerator in our label, -1 if none
     int m_indexAccel;
 
     // the position of the accelerator in our label, -1 if none
     int m_indexAccel;