X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/univ/menu.h

diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index 6df7c27f6b..4f1c1c888e 100644
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     05.05.01
 // RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -26,24 +26,10 @@
 class WXDLLEXPORT wxMenuInfo;
 WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
 
-class wxPopupMenuWindow;
-
+class WXDLLEXPORT wxMenuGeometryInfo;
+class WXDLLEXPORT wxPopupMenuWindow;
 class WXDLLEXPORT wxRenderer;
 
-// ----------------------------------------------------------------------------
-// wxMenu helper classes, used in implementation only
-// ----------------------------------------------------------------------------
-
-// used by wxRenderer
-class WXDLLEXPORT wxMenuGeometryInfo
-{
-public:
-    // get the total size of the menu
-    virtual wxSize GetSize() const = 0;
-
-    virtual ~wxMenuGeometryInfo();
-};
-
 // ----------------------------------------------------------------------------
 // wxMenu
 // ----------------------------------------------------------------------------
@@ -129,6 +115,9 @@ private:
     // common part of all ctors
     void Init();
 
+    // terminate the current radio group, if any
+    void EndRadioGroup();
+
     // the exact menu geometry is defined by a struct derived from this one
     // which is opaque and defined by the renderer
     wxMenuGeometryInfo *m_geometry;
@@ -141,9 +130,11 @@ private:
     wxAcceleratorTable m_accelTable;
 #endif // wxUSE_ACCEL
 
-    // it calls out OnDismiss()
-    friend wxPopupMenuWindow;
+    // the position of the first item in the current radio group or -1
+    int m_startRadioGroup;
 
+    // it calls out OnDismiss()
+    friend class wxPopupMenuWindow;
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
@@ -275,7 +266,7 @@ private:
     bool m_shouldShowMenu;
 
     // it calls out ProcessMouseEvent()
-    friend wxPopupMenuWindow;
+    friend class wxPopupMenuWindow;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMenuBar)