changed window creation class for dialogs (layering probs under X)

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index d662578090cd44373d2e0356c3c90019370bc91f..ac9d45b2c808b3094b6d904a9c1c831aaa74e497 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/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 )
 {
 
 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 )
 {
     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 )
 {
     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 )
 {
     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) ;
 }
 
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 


@@ -260,7 +260,7 @@ void wxMacConvertFromPCForControls( char * p )
     int len = strlen ( p ) ;
 
     wxMacConvertFromPC( ptr , ptr , len ) ;
     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 != ' ' )
         {
     {
         if ( ptr[i] == '&' && ptr[i]+1 != ' ' )
         {


@@ -953,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"));
 void wxExit()
 {
     wxLogError(_("Fatal error: exiting"));


@@ -1509,11 +1486,11 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
             handled = focus->GetEventHandler()->ProcessEvent( event ) ;
             if ( !handled )
             {
             handled = focus->GetEventHandler()->ProcessEvent( event ) ;
             if ( !handled )
             {

-                #if wxUSE_ACCEL
+#if wxUSE_ACCEL

                 if (!handled)
                 {
                 if (!handled)
                 {

-                    wxWindow *ancestor = focus;

                     /*
                     /*

+                    wxWindow *ancestor = focus;

                     while (ancestor)
                     {
                         int command = ancestor->GetAcceleratorTable()->GetCommand( event );
                     while (ancestor)
                     {
                         int command = ancestor->GetAcceleratorTable()->GetCommand( event );


@@ -1529,7 +1506,7 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
                     }
                     */
                 }
                     }
                     */
                 }

-                #endif // wxUSE_ACCEL
+#endif // wxUSE_ACCEL

             }
             if (!handled)
             {
             }
             if (!handled)
             {