tentative fix for BestSize problems (non-native toolbar)

[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 112c6c19e1bf7a0da833384d3851e113a2bc0731..b23e612dc93ae0eb8beecfb04273d5c73d2270d9 100644 (file)
--- a/include/wx/mac/carbon/menu.h
+++ b/include/wx/mac/carbon/menu.h
@@ -153,17 +153,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 ;