Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 8cd0fbe281b0ece16e7df2364842401eb6ba13ed..ac9d45b2c808b3094b6d904a9c1c831aaa74e497 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -106,25 +106,25 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long re
 
 pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon )
 {
-    wxApp* app = (wxApp*) refcon ;
+    // GD: UNUSED wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 
 pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon )
 {
-    wxApp* app = (wxApp*) refcon ;
+    // GD: UNUSED wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 
 pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon )
 {
-    wxApp* app = (wxApp*) refcon ;
+    // GD: UNUSED wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 
 pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon )
 {
-    wxApp* app = (wxApp*) refcon ;
+    // GD: UNUSED wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
@@ -260,7 +260,7 @@ void wxMacConvertFromPCForControls( char * p )
     int len = strlen ( p ) ;
 
     wxMacConvertFromPC( ptr , ptr , len ) ;
-    for ( int i = 0 ; i < strlen ( ptr ) ; i++ )
+    for ( unsigned int i = 0 ; i < strlen ( ptr ) ; i++ )
     {
         if ( ptr[i] == '&' && ptr[i]+1 != ' ' )
         {
@@ -796,7 +796,9 @@ wxApp::wxApp()
   m_topWindow = NULL;
   wxTheApp = this;
 
-  m_wantDebugOutput = TRUE ;
+#if WXWIN_COMPATIBILITY_2_2
+  m_wantDebugOutput = TRUE;
+#endif
 
   argc = 0;
   argv = NULL;
@@ -951,29 +953,6 @@ void wxApp::DeletePendingObjects()
   }
 }
 
-wxIcon
-wxApp::GetStdIcon(int which) const
-{
-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon("wxICON_INFO");
-
-        case wxICON_QUESTION:
-            return wxIcon("wxICON_QUESTION");
-
-        case wxICON_EXCLAMATION:
-            return wxIcon("wxICON_WARNING");
-
-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
-
-        case wxICON_HAND:
-            return wxIcon("wxICON_ERROR");
-    }
-}
-
 void wxExit()
 {
     wxLogError(_("Fatal error: exiting"));
@@ -1507,11 +1486,11 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
             handled = focus->GetEventHandler()->ProcessEvent( event ) ;
             if ( !handled )
             {
-                #if wxUSE_ACCEL
+#if wxUSE_ACCEL
                 if (!handled)
                 {
-                    wxWindow *ancestor = focus;
                     /*
+                    wxWindow *ancestor = focus;
                     while (ancestor)
                     {
                         int command = ancestor->GetAcceleratorTable()->GetCommand( event );
@@ -1527,7 +1506,7 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
                     }
                     */
                 }
-                #endif // wxUSE_ACCEL
+#endif // wxUSE_ACCEL
             }
             if (!handled)
             {