Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / osx / menu.h

diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 55796749a14c4e87b59a78c56c5cd9aa3aebfc5e..3ef7699599cf51001792f22558f75257bcc1cc91 100644 (file)
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,8 +32,6 @@ public:
 
     virtual ~wxMenu();
 
-    virtual void Attach(wxMenuBarBase *menubar) ;
-
     virtual void Break();
 
     virtual void SetTitle(const wxString& title);
@@ -77,13 +74,14 @@ private:
     // common part of all ctors
     void Init();
 
-    // common part of Append/Insert (behaves as Append is pos == (size_t)-1)
+    // common part of Do{Append,Insert}(): behaves as Append if pos == -1
     bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1);
 
-    // terminate the current radio group, if any
-    void EndRadioGroup();
+    // Common part of HandleMenu{Opened,Closed}().
+    void DoHandleMenuOpenedOrClosed(wxEventType evtType);
+
 
-    // if TRUE, insert a breal before appending the next item
+    // if TRUE, insert a break before appending the next item
     bool m_doBreak;
 
     // in this menu rearranging of menu items (esp hiding) is allowed
@@ -92,9 +90,6 @@ private:
     // don't trigger native events
     bool m_noEventsMode;
 
-    // the position of the first item in the current radio group or -1
-    int m_startRadioGroup;
-
     wxMenuImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
@@ -127,6 +122,7 @@ public:
     virtual wxMenu *Remove(size_t pos);
 
     virtual void EnableTop( size_t pos, bool flag );
+    virtual bool IsEnabledTop(size_t pos) const;
     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) const;
     virtual bool Enable( bool enable = true );