forward port from 2.8

[wxWidgets.git] / include / wx / mac / carbon / menuitem.h

diff --git a/include/wx/mac/carbon/menuitem.h b/include/wx/mac/carbon/menuitem.h
index 7e78a57f63f3aad4b70cdcd699aae4067e54a41d..4be07df17b40ebc0a699b9a92dd4ad6197acdd5c 100644 (file)
--- a/include/wx/mac/carbon/menuitem.h
+++ b/include/wx/mac/carbon/menuitem.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.h
+// Name:        wx/mac/carbon/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -12,15 +12,12 @@
 #ifndef   _MENUITEM_H
 #define   _MENUITEM_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "menuitem.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/setup.h"
+#include "wx/defs.h"
+#include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
@@ -38,10 +35,10 @@ public:
     virtual ~wxMenuItem();
 
     // override base class virtuals
-    virtual void SetText(const wxString& strName);
+    virtual void SetItemLabel(const wxString& strName);
 
-    virtual void Enable(bool bDoEnable = TRUE);
-    virtual void Check(bool bDoCheck = TRUE);
+    virtual void Enable(bool bDoEnable = true);
+    virtual void Check(bool bDoCheck = true);
 
     virtual void SetBitmap(const wxBitmap& bitmap) ;
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
@@ -57,8 +54,10 @@ public:
     void SetRadioGroupEnd(int end);
 
 private:
+    void DoUpdateItemBitmap( WXHMENU menu, wxUint16 index) ;
+
     void UncheckRadio() ;
-    
+
     // 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