Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

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

diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h
index 854a70d107e077a37dd73e69d9159caed9f7e649..112c6c19e1bf7a0da833384d3851e113a2bc0731 100644 (file)
--- a/include/wx/mac/carbon/menu.h
+++ b/include/wx/mac/carbon/menu.h
@@ -108,7 +108,7 @@ public:
         // unused under MSW
     wxMenuBar(long style);
         // menubar takes ownership of the menus arrays but copies the titles
         // unused under MSW
     wxMenuBar(long style);
         // menubar takes ownership of the menus arrays but copies the titles

-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

     virtual ~wxMenuBar();
 
     // menubar construction
     virtual ~wxMenuBar();
 
     // menubar construction


@@ -124,6 +124,12 @@ public:
     virtual void EnableTop( size_t pos, bool flag );
     virtual void SetLabelTop( size_t pos, const wxString& label );
     virtual wxString GetLabelTop( size_t pos ) const;
     virtual void EnableTop( size_t pos, bool flag );
     virtual void SetLabelTop( size_t pos, const wxString& label );
     virtual wxString GetLabelTop( size_t pos ) const;

+    virtual bool Enable( bool enable = TRUE );
+    // for virtual function hiding
+    virtual void Enable( int itemid, bool enable )
+    {
+        wxMenuBarBase::Enable( itemid, enable );
+    }

 
     // implementation from now on
     WXHMENU Create();
 
     // implementation from now on
     WXHMENU Create();