Clear columns on destruction

[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 17e5362089cdd3ecd79dec41c7038fb09b0999df..cae55835830d8af2b6873641ba1df67d9f37047d 100644 (file)
--- a/include/wx/mac/carbon/menuitem.h
+++ b/include/wx/mac/carbon/menuitem.h
@@ -17,11 +17,12 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
+#include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
-class WXDLLEXPORT wxMenuItem: public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase
 {
 public:
     // ctor & dtor
@@ -34,7 +35,7 @@ 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);
@@ -53,6 +54,8 @@ 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