X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1d04a42d5a19b18856a41571488fe7006f3d00a..4dc8d4b7c20b87855c0c11efcb3894be5d4bf2b2:/src/cocoa/mbarman.mm

diff --git a/src/cocoa/mbarman.mm b/src/cocoa/mbarman.mm
index f6c52d21be..77fea84ec6 100644
--- a/src/cocoa/mbarman.mm
+++ b/src/cocoa/mbarman.mm
@@ -49,7 +49,7 @@
 @implementation wxMenuBarManagerObserver : NSObject
 - (id)init
 {
-    wxFAIL_MSG("[wxMenuBarManagerObserver -init] should never be called!");
+    wxFAIL_MSG(wxT("[wxMenuBarManagerObserver -init] should never be called!"));
     m_mbarman = NULL;
     return self;
 }
@@ -272,12 +272,12 @@ void wxMenuBarManager::InstallMenuBarForWindow(wxCocoaNSWindow *win)
 {
     wxASSERT(win);
     m_windowCurrent = win;
-    wxMenuBar *menubar = win->GetAppMenuBar();
-    wxLogDebug("Found menubar=%p for window=%p.",menubar,win);
+    wxMenuBar *menubar = win->GetAppMenuBar(win);
+    wxLogTrace(wxTRACE_COCOA,wxT("Found menubar=%p for window=%p."),menubar,win);
     SetMenuBar(menubar);
 }
 
-void wxMenuBarManager::UpdateWindowMenuBar(wxTopLevelWindowNative *win)
+void wxMenuBarManager::UpdateMenuBar()
 {
     if(m_windowCurrent)
         InstallMenuBarForWindow(m_windowCurrent);