added missing wxCMPFUNC_CONVs (patch 820862)

[wxWidgets.git] / src / mac / app.cpp

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 9b891f5fa448ea8a0396d3c47b7367fb2a7a12c2..a8ca3cdb669a24720efbe41514235b953acb7a9d 100644 (file)
--- 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))
 {
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {

- /*   wxWindow* win = GetTopWindow() ;
+       wxWindow* win = GetTopWindow() ;

     if ( win )
     {
         win->Close(TRUE ) ;
     }
     if ( win )
     {
         win->Close(TRUE ) ;
     }

-    else
- */
+       else

     {
         ExitMainLoop() ;
     }
     {
         ExitMainLoop() ;
     }


@@ -600,7 +599,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #endif
 
 #endif
 #endif
 
 #endif

-    wxMacSetupConverters() ;

 
     s_macCursorRgn = ::NewRgn() ;
 
 
     s_macCursorRgn = ::NewRgn() ;
 


@@ -702,7 +700,6 @@ void wxApp::CleanUp()
     //   __wxterminate in Mach-O shared libraries
     wxStAppResource::CloseSharedLibraryResource();
 #endif
     //   __wxterminate in Mach-O shared libraries
     wxStAppResource::CloseSharedLibraryResource();
 #endif

-    wxMacCleanupConverters() ;

 
     UMACleanupToolbox() ;
     if (s_macCursorRgn) {
 
     UMACleanupToolbox() ;
     if (s_macCursorRgn) {


@@ -1013,14 +1010,6 @@ wxApp::wxApp()
 #endif
 }
 
 #endif
 }
 

-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
-}
-

 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;


@@ -1051,9 +1040,11 @@ bool wxApp::Pending()
 }
 
 // Dispatch a message.
 }
 
 // Dispatch a message.

-void wxApp::Dispatch()
+bool wxApp::Dispatch()

 {
     MacDoOneEvent() ;
 {
     MacDoOneEvent() ;

+
+    return true;

 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)