Expose the Apple menu so it can be setup manually.

diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 3ef7699599cf51001792f22558f75257bcc1cc91..a751241cec86bbae5a38572576c017444cae38d7 100644 (file)
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -156,6 +156,8 @@ public:
 
 
     static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
 
 
     static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }

+
+    wxMenu* GetAppleMenu() { return m_appleMenu; }

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

diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index 2bf5cede9e763d3240b3f7ccce49acd7b63b6c20..8cd6da4b551108c049c6456e28283103fc9f0124 100644 (file)
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -622,6 +622,7 @@ void wxMenuBar::Init()
     m_appleMenu = new wxMenu();
     m_appleMenu->SetAllowRearrange(false);
 
     m_appleMenu = new wxMenu();
     m_appleMenu->SetAllowRearrange(false);
 

+#if 0

     // Create standard items unless the application explicitly disabled this by
     // setting the corresponding ids to wxID_NONE: although this is not
     // recommended, sometimes these items really don't make sense.
     // Create standard items unless the application explicitly disabled this by
     // setting the corresponding ids to wxID_NONE: although this is not
     // recommended, sometimes these items really don't make sense.


@@ -657,6 +658,7 @@ void wxMenuBar::Init()
     quitLabel = wxString::Format(_("Quit %s"), wxTheApp ? wxTheApp->GetAppDisplayName() : _("Application"));
     m_appleMenu->Append( wxApp::s_macExitMenuItemId, quitLabel + "\tCtrl+Q" );
 #endif // !wxOSX_USE_CARBON
     quitLabel = wxString::Format(_("Quit %s"), wxTheApp ? wxTheApp->GetAppDisplayName() : _("Application"));
     m_appleMenu->Append( wxApp::s_macExitMenuItemId, quitLabel + "\tCtrl+Q" );
 #endif // !wxOSX_USE_CARBON

+#endif

 
     m_rootMenu->AppendSubMenu(m_appleMenu, "\x14") ;
 }
 
     m_rootMenu->AppendSubMenu(m_appleMenu, "\x14") ;
 }


@@ -715,6 +717,7 @@ void wxMenuBar::MacInstallMenuBar()
 
     m_rootMenu->GetPeer()->MakeRoot();
     
 
     m_rootMenu->GetPeer()->MakeRoot();
     

+#if 0

     // hide items in the apple menu that don't exist in the wx menubar
     
     wxMenuItem* appleItem = NULL;
     // hide items in the apple menu that don't exist in the wx menubar
     
     wxMenuItem* appleItem = NULL;


@@ -741,6 +744,7 @@ void wxMenuBar::MacInstallMenuBar()
         else 
             appleItem->SetItemLabel(wxItem->GetItemLabel());
     }
         else 
             appleItem->SetItemLabel(wxItem->GetItemLabel());
     }

+#endif

     
         
 #if 0
     
         
 #if 0