X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d16477fd754fb9d6a80e2eccffa0c587a8077e85..3931863650d4f4d126cac1992323df5fc39833dd:/src/mac/app.cpp?ds=sidebyside diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 9b891f5fa4..a8ca3cdb66 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -219,13 +219,12 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply)) { - /* wxWindow* win = GetTopWindow() ; + wxWindow* win = GetTopWindow() ; if ( win ) { win->Close(TRUE ) ; } - else - */ + else { ExitMainLoop() ; } @@ -600,7 +599,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) #endif #endif - wxMacSetupConverters() ; s_macCursorRgn = ::NewRgn() ; @@ -702,7 +700,6 @@ void wxApp::CleanUp() // __wxterminate in Mach-O shared libraries wxStAppResource::CloseSharedLibraryResource(); #endif - wxMacCleanupConverters() ; UMACleanupToolbox() ; if (s_macCursorRgn) { @@ -1013,14 +1010,6 @@ wxApp::wxApp() #endif } -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; -} - int wxApp::MainLoop() { m_keepGoing = TRUE; @@ -1051,9 +1040,11 @@ bool wxApp::Pending() } // Dispatch a message. -void wxApp::Dispatch() +bool wxApp::Dispatch() { MacDoOneEvent() ; + + return true; } void wxApp::OnIdle(wxIdleEvent& event)