listbox cleanup

[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..4430389dec8ad1f3a888b19187d557a6444c1da2 100644 (file)
--- a/include/wx/mac/carbon/menu.h
+++ b/include/wx/mac/carbon/menu.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "menu.h"
-#endif
-

 class WXDLLEXPORT wxFrame;
 
 #include "wx/arrstr.h"
 class WXDLLEXPORT wxFrame;
 
 #include "wx/arrstr.h"


@@ -35,10 +31,6 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);

     virtual void Attach(wxMenuBarBase *menubar) ;
 
     virtual void Break();
     virtual void Attach(wxMenuBarBase *menubar) ;
 
     virtual void Break();


@@ -69,6 +61,11 @@ public:
 
     short MacGetMenuId() { return m_macMenuId ; }
 
 
     short MacGetMenuId() { return m_macMenuId ; }
 

+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();


@@ -108,7 +105,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 +121,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();


@@ -147,17 +150,24 @@ public:
     // call this function to update it (m_menuBarFrame should be !NULL)
     void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL);
 
     // call this function to update it (m_menuBarFrame should be !NULL)
     void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL);
 

-  void MacInstallMenuBar() ;
-  static wxMenuBar* MacGetInstalledMenuBar() { return s_macInstalledMenuBar ; }
-  static void MacSetCommonMenuBar(wxMenuBar* menubar) { s_macCommonMenuBar=menubar; }
-  static wxMenuBar* MacGetCommonMenuBar() { return s_macCommonMenuBar; }
+    static void SetAutoWindowMenu( bool enable ) { s_macAutoWindowMenu = enable ; }
+    static bool GetAutoWindowMenu() { return s_macAutoWindowMenu ; }
+
+    void MacInstallMenuBar() ;
+    static wxMenuBar* MacGetInstalledMenuBar() { return s_macInstalledMenuBar ; }
+    static void MacSetCommonMenuBar(wxMenuBar* menubar) { s_macCommonMenuBar=menubar; }
+    static wxMenuBar* MacGetCommonMenuBar() { return s_macCommonMenuBar; }
+

 
 

+    static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }

 protected:
     // common part of all ctors
     void Init();
     wxWindow        *m_invokingWindow;
 
 protected:
     // common part of all ctors
     void Init();
     wxWindow        *m_invokingWindow;
 

-    wxArrayString m_titles;
+    wxArrayString   m_titles;
+    static bool     s_macAutoWindowMenu ;
+    static WXHMENU  s_macWindowMenuHandle ;

 
 private:
   static wxMenuBar*            s_macInstalledMenuBar ;
 
 private:
   static wxMenuBar*            s_macInstalledMenuBar ;