Patch from Hartwig for wxMac implementation

[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 99af92053e3b59d748939397a67c8d0c3574aa6b..a5b087cb5aaea22aed6f3bc07091bbd5551666f2 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
 // 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>
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -16,7 +16,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/setup.h"
+#include "wx/defs.h"
+#include "wx/bitmap.h"

 
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour


@@ -34,10 +35,10 @@ public:
     virtual ~wxMenuItem();
 
     // override base class virtuals
     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; }
 
     virtual void SetBitmap(const wxBitmap& bitmap) ;
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }


@@ -54,7 +55,7 @@ public:
 
 private:
     void UncheckRadio() ;
 
 private:
     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
     // 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