On wxMac, set the common menubar to the MDI parent and don't show it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp
index 77fd22fe946a095e5caf22658d88fe3e66edb75c..936aa65504e33a996fe4f82511a17e9fd2070b40 100644 (file)
--- a/samples/docvwmdi/docview.cpp
+++ b/samples/docvwmdi/docview.cpp
@@ -99,11 +99,16 @@ bool MyApp::OnInit(void)
     menu_bar->Append(edit_menu, _T("&Edit"));
   menu_bar->Append(help_menu, _T("&Help"));
 
     menu_bar->Append(edit_menu, _T("&Edit"));
   menu_bar->Append(help_menu, _T("&Help"));
 

+#ifdef __WXMAC__
+  wxMenuBar::MacSetCommonMenuBar(menu_bar);
+#endif //def __WXMAC__

   //// Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
   frame->Centre(wxBOTH);
   //// Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
   frame->Centre(wxBOTH);

+#ifndef __WXMAC__

   frame->Show(TRUE);
   frame->Show(TRUE);

+#endif //ndef __WXMAC__

 
   SetTopWindow(frame);
   return TRUE;
 
   SetTopWindow(frame);
   return TRUE;