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

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

diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 3e7c246bf711321b39c29599306228cf1872d54b..69dc7e7bcb5900cf0dd0d901d58364e72a1d6cf0 100644 (file)
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/menuitem.h
+// Name:        wx/osx/menuitem.h

 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
 // 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 licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -46,16 +45,32 @@ public:
     virtual void SetBitmap(const wxBitmap& bitmap) ;
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 
     virtual void SetBitmap(const wxBitmap& bitmap) ;
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
 

+
+    // Implementation only from now on.
+

     // update the os specific representation
     void UpdateItemBitmap() ;
     void UpdateItemText() ;
     void UpdateItemStatus() ;
 
     // mark item as belonging to the given radio group
     // update the os specific representation
     void UpdateItemBitmap() ;
     void UpdateItemText() ;
     void UpdateItemStatus() ;
 
     // mark item as belonging to the given radio group

-    void SetAsRadioGroupStart();
+    void SetAsRadioGroupStart(bool start = true);

     void SetRadioGroupStart(int start);
     void SetRadioGroupEnd(int end);
 
     void SetRadioGroupStart(int start);
     void SetRadioGroupEnd(int end);
 

+    // return true if this is the starting item of a radio group
+    bool IsRadioGroupStart() const;
+
+    // get the start of the radio group this item belongs to: should not be
+    // called for the starting radio group item itself because it doesn't have
+    // this information
+    int GetRadioGroupStart() const;
+
+    // get the end of the radio group this item belongs to: should be only
+    // called for the starting radio group item, i.e. if IsRadioGroupStart() is
+    // true
+    int GetRadioGroupEnd() const;
+

     wxMenuItemImpl* GetPeer() { return m_peer; }
 private:
     void UncheckRadio() ;
     wxMenuItemImpl* GetPeer() { return m_peer; }
 private:
     void UncheckRadio() ;


@@ -74,7 +89,6 @@ private:
     bool m_isRadioGroupStart;
 
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
     bool m_isRadioGroupStart;
 
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any

-    void* m_menu ; // the appropriate menu , may also be a system menu

 
     wxMenuItemImpl* m_peer;
 
 
     wxMenuItemImpl* m_peer;