From 501db75a3ca3dae22ed07a27ae7fb5b9ef86b40d Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 31 May 2005 05:13:38 +0000 Subject: [PATCH] adding OS level Window Menu by default git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/menu.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h index 112c6c19e1..b23e612dc9 100644 --- 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); - 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; - wxArrayString m_titles; + wxArrayString m_titles; + static bool s_macAutoWindowMenu ; + static WXHMENU s_macWindowMenuHandle ; private: static wxMenuBar* s_macInstalledMenuBar ;