Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for wxMenuBarManager

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-09-05 01:34:57 +00:00
parent d6c6a32321
commit af367f4640
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cocoa/app.mm
View File

@@ -32,6 +32,7 @@
#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/ObjcPose.h"
#include "wx/cocoa/autorelease.h" #include "wx/cocoa/autorelease.h"
#include "wx/cocoa/mbarman.h"
#if wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
# include "wx/resource.h" # include "wx/resource.h"
@@ -63,6 +64,8 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
- (void)doIdle: (id)data - (void)doIdle: (id)data
{ {
wxASSERT(wxTheApp); wxASSERT(wxTheApp);
wxASSERT(wxMenuBarManager::GetInstance());
wxMenuBarManager::GetInstance()->CocoaInternalIdle();
wxLogDebug("doIdle called"); wxLogDebug("doIdle called");
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
if(wxTheApp->IsInAssert()) if(wxTheApp->IsInAssert())
@@ -168,6 +171,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
void wxApp::CleanUp() void wxApp::CleanUp()
{ {
wxDC::CocoaShutdownTextSystem(); wxDC::CocoaShutdownTextSystem();
wxMenuBarManager::DestroyInstance();
wxAppBase::CleanUp(); wxAppBase::CleanUp();
} }
@@ -220,6 +224,9 @@ bool wxApp::OnInitGui()
// Create the app using the sharedApplication method // Create the app using the sharedApplication method
m_cocoaApp = [NSApplication sharedApplication]; m_cocoaApp = [NSApplication sharedApplication];
wxMenuBarManager::CreateInstance();
wxDC::CocoaInitializeTextSystem(); wxDC::CocoaInitializeTextSystem();
// [ m_cocoaApp setDelegate:m_cocoaApp ]; // [ m_cocoaApp setDelegate:m_cocoaApp ];
#if 0 #if 0