X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/879180b655d2f440e55ad094b637f0121b7b4211..309aefbd9c74db66d78b1a4f63ac36ccd67ae23b:/src/cocoa/app.mm diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index f1d604d379..0ac5bca28e 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -37,7 +37,7 @@ bool wxApp::sm_isEmbedded = false; // Normally we're not a plugin // wxNSApplicationObserver singleton. -static wxObjcAutoRefFromAlloc sg_cocoaAppObserver = [[wxNSApplicationObserver alloc] init]; +static wxObjcAutoRefFromAlloc sg_cocoaAppObserver = [[WX_GET_OBJC_CLASS(wxNSApplicationObserver) alloc] init]; // ======================================================================== // wxNSApplicationDelegate @@ -53,6 +53,7 @@ static wxObjcAutoRefFromAlloc sg_cocoaAppObserver = [[ } @end // implementation wxNSApplicationDelegate : NSObject +WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject) // ======================================================================== // wxNSApplicationObserver @@ -90,6 +91,7 @@ static wxObjcAutoRefFromAlloc sg_cocoaAppObserver = [[ } @end // implementation wxNSApplicationObserver : NSObject +WX_IMPLEMENT_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject) // ======================================================================== // wxApp @@ -99,11 +101,6 @@ static wxObjcAutoRefFromAlloc sg_cocoaAppObserver = [[ // wxApp Static member initialization // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxAppBase::OnIdle) -// EVT_END_SESSION(wxApp::OnEndSession) -// EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) -END_EVENT_TABLE() // ---------------------------------------------------------------------------- // wxApp initialization/cleanup @@ -194,7 +191,7 @@ bool wxApp::OnInitGui() if(!sm_isEmbedded) { // Enable response to application delegate messages - m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init]; + m_cocoaAppDelegate = [[WX_GET_OBJC_CLASS(wxNSApplicationDelegate) alloc] init]; [m_cocoaApp setDelegate:m_cocoaAppDelegate]; }