Rename WXTHREAD_XXX_PRIORITY yo wxPRIORITY_XXX.

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

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 171eb0825b9d29afea65ce9e0a1ddfe49d951874..7f394e8a2d068eab52196335498d1279d3213118 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -161,9 +161,13 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     wxArrayString fileNames;
     for (i = 1; i <= itemsInList; i++)
     {
     wxArrayString fileNames;
     for (i = 1; i <= itemsInList; i++)
     {

-        AEGetNthPtr(
+        err = AEGetNthPtr(

             &docList, i, typeFSRef, &keywd, &returnedType,
             (Ptr)&theRef, sizeof(theRef), &actualSize);
             &docList, i, typeFSRef, &keywd, &returnedType,
             (Ptr)&theRef, sizeof(theRef), &actualSize);

+        
+        if ( err != noErr)
+            return err;
+        

         fName = wxMacFSRefToPath( &theRef ) ;
 
         fileNames.Add(fName);
         fName = wxMacFSRefToPath( &theRef ) ;
 
         fileNames.Add(fName);


@@ -229,9 +233,13 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
 
     for (i = 1; i <= itemsInList; i++)
     {
 
     for (i = 1; i <= itemsInList; i++)
     {

-        AEGetNthPtr(
+        err = AEGetNthPtr(

             &docList, i, typeFSRef, &keywd, &returnedType,
             (Ptr)&theRef, sizeof(theRef), &actualSize);
             &docList, i, typeFSRef, &keywd, &returnedType,
             (Ptr)&theRef, sizeof(theRef), &actualSize);

+        
+        if ( err != noErr)
+            return err;
+        

         fName = wxMacFSRefToPath( &theRef ) ;
 
         MacPrintFile(fName);
         fName = wxMacFSRefToPath( &theRef ) ;
 
         MacPrintFile(fName);


@@ -710,22 +718,7 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
             break ;
 #endif
         case kEventClassAppleEvent :
             break ;
 #endif
         case kEventClassAppleEvent :

-            {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-                if ( AEProcessEvent != NULL )
-                {
-                    result = AEProcessEvent(event);
-                }
-#endif
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-                {
-                    EventRecord rec ;
-
-                    wxMacConvertEventToRecord( event , &rec ) ;
-                    result = AEProcessAppleEvent( &rec ) ;
-                }
-#endif
-            }
+            result = AEProcessEvent(event);

             break ;
 
         default :
             break ;
 
         default :


@@ -807,7 +800,37 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         {
             // remove this argument
             --argc;
         {
             // remove this argument
             --argc;

-            memmove(argv + 1, argv + 2, argc * sizeof(char *));
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar*));
+        }
+    }
+
+    /*
+     Cocoa supports -Key value options which set the user defaults key "Key"
+     to the value "value"  Some of them are very handy for debugging like
+     -NSShowAllViews YES.  Cocoa picks these up from the real argv so
+     our removal of them from the wx copy of it does not affect Cocoa's
+     ability to see them.
+     
+     We basically just assume that any "-NS" option and its following
+     argument needs to be removed from argv.  We hope that user code does
+     not expect to see -NS options and indeed it's probably a safe bet
+     since most user code accepting options is probably using the
+     double-dash GNU-style syntax.
+     */
+    for(int i=1; i < argc; ++i)
+    {
+        static const wxChar *ARG_NS = wxT("-NS");
+        if( wxStrncmp(argv[i], ARG_NS, wxStrlen(ARG_NS)) == 0 )
+        {
+            // Only eat this option if it has an argument
+            if( (i + 1) < argc )
+            {
+                memmove(argv + i, argv + i + 2, (argc-i-1)*sizeof(wxChar*));
+                argc -= 2;
+                // drop back one position so the next run through the loop
+                // reprocesses the argument at our current index.
+                --i;
+            }

         }
     }
 
         }
     }
 


@@ -952,98 +975,6 @@ void wxApp::CleanUp()
 // misc initialization stuff
 //----------------------------------------------------------------------
 
 // misc initialization stuff
 //----------------------------------------------------------------------
 

-#if wxOSX_USE_CARBON && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
-{
-    OSStatus err = noErr ;
-    bool converted = ConvertEventRefToEventRecord( event, rec) ;
-
-    if ( !converted )
-    {
-        switch ( GetEventClass( event ) )
-        {
-            case kEventClassKeyboard :
-            {
-                converted = true ;
-                switch ( GetEventKind(event) )
-                {
-                    case kEventRawKeyDown :
-                        rec->what = keyDown ;
-                        break ;
-
-                    case kEventRawKeyRepeat :
-                        rec->what = autoKey ;
-                        break ;
-
-                    case kEventRawKeyUp :
-                        rec->what = keyUp ;
-                        break ;
-
-                    case kEventRawKeyModifiersChanged :
-                        rec->what = nullEvent ;
-                        break ;
-
-                    default :
-                        converted = false ;
-                        break ;
-                }
-
-                if ( converted )
-                {
-                    UInt32 keyCode ;
-                    unsigned char charCode ;
-                    UInt32 modifiers ;
-                    GetMouse( &rec->where) ;
-                    err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
-                    err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
-                    err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
-                    rec->modifiers = modifiers ;
-                    rec->message = (keyCode << 8 ) + charCode ;
-                }
-            }
-            break ;
-
-            case kEventClassTextInput :
-            {
-                switch ( GetEventKind( event ) )
-                {
-                    case kEventTextInputUnicodeForKeyEvent :
-                        {
-                            EventRef rawEvent ;
-                            err = GetEventParameter(
-                                event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL,
-                                sizeof(rawEvent), NULL, &rawEvent ) ;
-                            converted = true ;
-
-                            {
-                                UInt32 keyCode, modifiers;
-                                unsigned char charCode ;
-                                GetMouse( &rec->where) ;
-                                rec->what = keyDown ;
-                                err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
-                                err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
-                                err = GetEventParameter(rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
-                                rec->modifiers = modifiers ;
-                                rec->message = (keyCode << 8 ) + charCode ;
-                            }
-                       }
-                       break ;
-
-                    default :
-                        break ;
-                }
-            }
-            break ;
-
-            default :
-                break ;
-        }
-    }
-
-    return converted ;
-}
-#endif
-

 wxApp::wxApp()
 {
     m_printMode = wxPRINT_WINDOWS;
 wxApp::wxApp()
 {
     m_printMode = wxPRINT_WINDOWS;


@@ -1139,139 +1070,21 @@ void wxApp::MacHandleUnhandledEvent( WXEVENTREF WXUNUSED(evr) )
 
 #if wxOSX_USE_COCOA_OR_CARBON
 
 
 #if wxOSX_USE_COCOA_OR_CARBON
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
-
-// adding forward compatible defines for keys that are different on different keyboard layouts
-// see Inside Mac Volume V
-
-enum {
-    kVK_ANSI_A = 0x00,
-    kVK_ANSI_S = 0x01,
-    kVK_ANSI_D = 0x02,
-    kVK_ANSI_F = 0x03,
-    kVK_ANSI_H = 0x04,
-    kVK_ANSI_G = 0x05,
-    kVK_ANSI_Z = 0x06,
-    kVK_ANSI_X = 0x07,
-    kVK_ANSI_C = 0x08,
-    kVK_ANSI_V = 0x09,
-    kVK_ANSI_B = 0x0B,
-    kVK_ANSI_Q = 0x0C,
-    kVK_ANSI_W = 0x0D,
-    kVK_ANSI_E = 0x0E,
-    kVK_ANSI_R = 0x0F,
-    kVK_ANSI_Y = 0x10,
-    kVK_ANSI_T = 0x11,
-    kVK_ANSI_1 = 0x12,
-    kVK_ANSI_2 = 0x13,
-    kVK_ANSI_3 = 0x14,
-    kVK_ANSI_4 = 0x15,
-    kVK_ANSI_6 = 0x16,
-    kVK_ANSI_5 = 0x17,
-    kVK_ANSI_Equal = 0x18,
-    kVK_ANSI_9 = 0x19,
-    kVK_ANSI_7 = 0x1A,
-    kVK_ANSI_Minus = 0x1B,
-    kVK_ANSI_8 = 0x1C,
-    kVK_ANSI_0 = 0x1D,
-    kVK_ANSI_RightBracket = 0x1E,
-    kVK_ANSI_O = 0x1F,
-    kVK_ANSI_U = 0x20,
-    kVK_ANSI_LeftBracket = 0x21,
-    kVK_ANSI_I = 0x22,
-    kVK_ANSI_P = 0x23,
-    kVK_ANSI_L = 0x25,
-    kVK_ANSI_J = 0x26,
-    kVK_ANSI_Quote = 0x27,
-    kVK_ANSI_K = 0x28,
-    kVK_ANSI_Semicolon = 0x29,
-    kVK_ANSI_Backslash = 0x2A,
-    kVK_ANSI_Comma = 0x2B,
-    kVK_ANSI_Slash = 0x2C,
-    kVK_ANSI_N = 0x2D,
-    kVK_ANSI_M = 0x2E,
-    kVK_ANSI_Period = 0x2F,
-    kVK_ANSI_Grave = 0x32,
-    kVK_ANSI_KeypadDecimal = 0x41,
-    kVK_ANSI_KeypadMultiply = 0x43,
-    kVK_ANSI_KeypadPlus = 0x45,
-    kVK_ANSI_KeypadClear = 0x47,
-    kVK_ANSI_KeypadDivide = 0x4B,
-    kVK_ANSI_KeypadEnter = 0x4C,
-    kVK_ANSI_KeypadMinus = 0x4E,
-    kVK_ANSI_KeypadEquals = 0x51,
-    kVK_ANSI_Keypad0 = 0x52,
-    kVK_ANSI_Keypad1 = 0x53,
-    kVK_ANSI_Keypad2 = 0x54,
-    kVK_ANSI_Keypad3 = 0x55,
-    kVK_ANSI_Keypad4 = 0x56,
-    kVK_ANSI_Keypad5 = 0x57,
-    kVK_ANSI_Keypad6 = 0x58,
-    kVK_ANSI_Keypad7 = 0x59,
-    kVK_ANSI_Keypad8 = 0x5B,
-    kVK_ANSI_Keypad9 = 0x5C
-};
-
-// defines for keys that are the same on all layouts
-
-enum {
-    kVK_Return = 0x24,
-    kVK_Tab = 0x30,
-    kVK_Space = 0x31,
-    kVK_Delete = 0x33,
-    kVK_Escape = 0x35,
-    kVK_Command = 0x37,
-    kVK_Shift = 0x38,
-    kVK_CapsLock = 0x39,
-    kVK_Option = 0x3A,
-    kVK_Control = 0x3B,
-    kVK_RightShift = 0x3C,
-    kVK_RightOption = 0x3D,
-    kVK_RightControl = 0x3E,
-    kVK_Function = 0x3F,
-    kVK_F17 = 0x40,
-    kVK_VolumeUp = 0x48,
-    kVK_VolumeDown = 0x49,
-    kVK_Mute = 0x4A,
-    kVK_F18 = 0x4F,
-    kVK_F19 = 0x50,
-    kVK_F20 = 0x5A,
-    kVK_F5 = 0x60,
-    kVK_F6 = 0x61,
-    kVK_F7 = 0x62,
-    kVK_F3 = 0x63,
-    kVK_F8 = 0x64,
-    kVK_F9 = 0x65,
-    kVK_F11 = 0x67,
-    kVK_F13 = 0x69,
-    kVK_F16 = 0x6A,
-    kVK_F14 = 0x6B,
-    kVK_F10 = 0x6D,
-    kVK_F12 = 0x6F,
-    kVK_F15 = 0x71,
-    kVK_Help = 0x72,
-    kVK_Home = 0x73,
-    kVK_PageUp = 0x74,
-    kVK_ForwardDelete = 0x75,
-    kVK_F4 = 0x76,
-    kVK_End = 0x77,
-    kVK_F2 = 0x78,
-    kVK_PageDown = 0x79,
-    kVK_F1 = 0x7A,
-    kVK_LeftArrow = 0x7B,
-    kVK_RightArrow = 0x7C,
-    kVK_DownArrow = 0x7D,
-    kVK_UpArrow = 0x7E
-};
-
-#endif    
-

 CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
 {
     CGKeyCode keycode;
     
     switch (code)
     {
 CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
 {
     CGKeyCode keycode;
     
     switch (code)
     {

+        // Clang warns about switch values not of the same type as (enumerated)
+        // switch controlling expression. This is generally useful but here we
+        // really want to be able to use letters and digits without making them
+        // part of wxKeyCode enum.
+#ifdef __clang__
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wswitch"
+#endif // __clang__
+

         case 'a': case 'A':   keycode = kVK_ANSI_A; break;
         case 'b': case 'B':   keycode = kVK_ANSI_B; break;
         case 'c': case 'C':   keycode = kVK_ANSI_C; break;
         case 'a': case 'A':   keycode = kVK_ANSI_A; break;
         case 'b': case 'B':   keycode = kVK_ANSI_B; break;
         case 'c': case 'C':   keycode = kVK_ANSI_C; break;


@@ -1309,6 +1122,10 @@ CGKeyCode wxCharCodeWXToOSX(wxKeyCode code)
         case '7':             keycode = kVK_ANSI_7; break;
         case '8':             keycode = kVK_ANSI_8; break;
         case '9':             keycode = kVK_ANSI_9; break;
         case '7':             keycode = kVK_ANSI_7; break;
         case '8':             keycode = kVK_ANSI_8; break;
         case '9':             keycode = kVK_ANSI_9; break;

+
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif // __clang__

             
         case WXK_BACK:        keycode = kVK_Delete; break;
         case WXK_TAB:         keycode = kVK_Tab; break;
             
         case WXK_BACK:        keycode = kVK_Delete; break;
         case WXK_TAB:         keycode = kVK_Tab; break;


@@ -1583,53 +1400,49 @@ wxMouseState wxGetMouseState()
 
 // TODO : once the new key/char handling is tested, move all the code to wxWindow
 
 
 // TODO : once the new key/char handling is tested, move all the code to wxWindow
 

-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )

 {
     if ( !focus )
         return false ;
 
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
 {
     if ( !focus )
         return false ;
 
     wxKeyEvent event(wxEVT_KEY_DOWN) ;

-    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , uniChar ) ;

 
     return focus->OSXHandleKeyEvent(event);
 }
 
 
     return focus->OSXHandleKeyEvent(event);
 }
 

-bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )

 {
     if ( !focus )
         return false ;
 
     wxKeyEvent event( wxEVT_KEY_UP ) ;
 {
     if ( !focus )
         return false ;
 
     wxKeyEvent event( wxEVT_KEY_UP ) ;

-    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , uniChar ) ;

 
     return focus->OSXHandleKeyEvent(event) ;
 }
 
 
     return focus->OSXHandleKeyEvent(event) ;
 }
 

-bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )

 {
     if ( !focus )
         return false ;
     wxKeyEvent event(wxEVT_CHAR) ;
 {
     if ( !focus )
         return false ;
     wxKeyEvent event(wxEVT_CHAR) ;

-    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , uniChar ) ;

 
     bool handled = false ;
 
 #if wxOSX_USE_CARBON
     long keyval = event.m_keyCode ;
 
     bool handled = false ;
 
 #if wxOSX_USE_CARBON
     long keyval = event.m_keyCode ;

-    wxNonOwnedWindow *tlw = focus->MacGetTopLevelWindow() ;

 
 

-    if (tlw)

     {
     {

-        event.SetEventType( wxEVT_CHAR_HOOK );
-        handled = tlw->HandleWindowEvent( event );
-        if ( handled && event.GetSkipped() )
+        wxKeyEvent eventCharHook(wxEVT_CHAR_HOOK, event);
+        handled = focus->HandleWindowEvent( eventCharHook );
+        if ( handled && eventCharHook.IsNextEventAllowed() )

             handled = false ;
     }
 
     if ( !handled )
     {
             handled = false ;
     }
 
     if ( !handled )
     {

-        event.SetEventType( wxEVT_CHAR );
-        event.Skip( false ) ;

         handled = focus->HandleWindowEvent( event ) ;
     }
 
         handled = focus->HandleWindowEvent( event ) ;
     }
 


@@ -1695,7 +1508,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
 }
 
 // This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.
 }
 
 // This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.

-void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar )

 {
 #if wxOSX_USE_COCOA_OR_CARBON
     
 {
 #if wxOSX_USE_COCOA_OR_CARBON
     


@@ -1777,8 +1590,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
 
     event.m_rawCode = keymessage;
     event.m_rawFlags = modifiers;
 
     event.m_rawCode = keymessage;
     event.m_rawFlags = modifiers;

-    event.m_x = wherex;
-    event.m_y = wherey;

     event.SetTimestamp(when);
     event.SetEventObject(focus);
 #else
     event.SetTimestamp(when);
     event.SetEventObject(focus);
 #else


@@ -1787,8 +1598,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     wxUnusedVar(keymessage);
     wxUnusedVar(modifiers);
     wxUnusedVar(when);
     wxUnusedVar(keymessage);
     wxUnusedVar(modifiers);
     wxUnusedVar(when);

-    wxUnusedVar(wherex);
-    wxUnusedVar(wherey);

     wxUnusedVar(uniChar);
 #endif
 }
     wxUnusedVar(uniChar);
 #endif
 }