reSWIGed

[wxWidgets.git] / src / cocoa / frame.mm

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index f74bbf4a0a25279e26a0724d796c4a2e5af28762..9e529f118713fe831ff6a366687339581c145d3f 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -59,13 +59,13 @@ wxFrame::~wxFrame()
 void wxFrame::AttachMenuBar(wxMenuBar *mbar)
 {
     wxFrameBase::AttachMenuBar(mbar);
-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();
 }
 
 void wxFrame::DetachMenuBar()
 {
     wxFrameBase::DetachMenuBar();
-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();
 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menubar)
@@ -78,7 +78,14 @@ void wxFrame::SetMenuBar(wxMenuBar *menubar)
 
     wxFrameBase::DetachMenuBar();
     wxFrameBase::AttachMenuBar(menubar);
-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();
+}
+
+wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+    if(GetMenuBar())
+        return GetMenuBar();
+    return wxFrameBase::GetAppMenuBar(win);
 }
 
 wxPoint wxFrame::GetClientAreaOrigin() const