switched to MacOS 8.5+ implementation for submenus

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8da87ab3372861306010bdbf0151832103a0765c..6473c26f070fe53d2d49bd8ca035019d86484b40 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -399,7 +399,7 @@ bool wxApp::Initialize()
     //   __wxinitialize in Mach-O shared libraries
     wxStAppResource::OpenSharedLibraryResource(NULL);
 #endif
     //   __wxinitialize in Mach-O shared libraries
     wxStAppResource::OpenSharedLibraryResource(NULL);
 #endif

-    
+

 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
     AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
                            NewAEEventHandlerUPP(AEHandleODoc) ,
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
     AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
                            NewAEEventHandlerUPP(AEHandleODoc) ,


@@ -496,7 +496,7 @@ bool wxApp::Initialize()
     s_macCursorRgn = ::NewRgn() ;
 
     wxBuffer = new char[BUFSIZ + 512];
     s_macCursorRgn = ::NewRgn() ;
 
     wxBuffer = new char[BUFSIZ + 512];

-  
+

     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES


@@ -506,7 +506,7 @@ bool wxApp::Initialize()
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif

-    
+

     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 


@@ -592,7 +592,7 @@ void wxApp::CleanUp()
         delete wxWinMacControlList ;
     }
     delete wxPendingEvents;
         delete wxWinMacControlList ;
     }
     delete wxPendingEvents;

-    
+

 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.


@@ -635,12 +635,12 @@ void wxApp::CleanUp()
     //   __wxterminate in Mach-O shared libraries
     wxStAppResource::CloseSharedLibraryResource();
 #endif
     //   __wxterminate in Mach-O shared libraries
     wxStAppResource::CloseSharedLibraryResource();
 #endif

-    
+

     UMACleanupToolbox() ;
     if (s_macCursorRgn) {
         ::DisposeRgn((RgnHandle)s_macCursorRgn);
     }
     UMACleanupToolbox() ;
     if (s_macCursorRgn) {
         ::DisposeRgn((RgnHandle)s_macCursorRgn);
     }

-    
+

     #if 0
         TerminateAE() ;
     #endif
     #if 0
         TerminateAE() ;
     #endif


@@ -683,14 +683,14 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
     if ( initBlock != NULL ) {
         const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
         FSSpec *fileSpec = NULL;
     if ( initBlock != NULL ) {
         const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
         FSSpec *fileSpec = NULL;

-        
+

         if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
             fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
         }
         else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
             fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
         }
         if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
             fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
         }
         else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
             fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
         }

-        
+

         if (fileSpec != NULL) {
             gSharedLibraryResource =  FSpOpenResFile(fileSpec, fsRdPerm);
         }
         if (fileSpec != NULL) {
             gSharedLibraryResource =  FSpOpenResFile(fileSpec, fsRdPerm);
         }


@@ -701,12 +701,12 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
         NSSymbol    theSymbol;
         NSModule    theModule;
         const char *theLibPath;
         NSSymbol    theSymbol;
         NSModule    theModule;
         const char *theLibPath;

-        
+

         gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
         if (gSharedLibraryBundle != NULL) {
             // wxWindows has been bundled into a framework
             //   load the framework resources
         gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
         if (gSharedLibraryBundle != NULL) {
             // wxWindows has been bundled into a framework
             //   load the framework resources

-            
+

             gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
         }
         else {
             gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
         }
         else {


@@ -717,7 +717,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
             char  *theExt;
             FSRef  theResRef;
             OSErr  theErr = noErr;
             char  *theExt;
             FSRef  theResRef;
             OSErr  theErr = noErr;

-            
+

             // get the library path
             theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
             theModule = NSModuleForSymbol(theSymbol);
             // get the library path
             theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
             theModule = NSModuleForSymbol(theSymbol);


@@ -735,7 +735,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
                 theExt = strstr(theName, ".dylib");
                 // overwrite extension with ".rsrc"
                 strcpy(theExt, ".rsrc");
                 theExt = strstr(theName, ".dylib");
                 // overwrite extension with ".rsrc"
                 strcpy(theExt, ".rsrc");

-                
+

                 wxLogDebug( theResPath );
 
                 theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);
                 wxLogDebug( theResPath );
 
                 theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);


@@ -743,7 +743,7 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
                     // try in current directory (using name only)
                     theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false);
                 }
                     // try in current directory (using name only)
                     theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false);
                 }

-                
+

                 // free duplicated resource file path
                 free(theResPath);
 
                 // free duplicated resource file path
                 free(theResPath);
 


@@ -776,7 +776,7 @@ void wxStAppResource::CloseSharedLibraryResource()
             CloseResFile(gSharedLibraryResource);
         }
         gSharedLibraryResource = kResFileNotOpened;
             CloseResFile(gSharedLibraryResource);
         }
         gSharedLibraryResource = kResFileNotOpened;

-    }    
+    }

 #endif /* WXMAKINGDLL */
 }
 
 #endif /* WXMAKINGDLL */
 }
 


@@ -860,12 +860,12 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
     if (argc > 1) {
         char theArg[6] = "";
         strncpy(theArg, argv[1], 5);
     if (argc > 1) {
         char theArg[6] = "";
         strncpy(theArg, argv[1], 5);

-        
+

         if (strcmp(theArg, "-psn_") == 0) {
             // assume the argument is always the only one and remove it
             --argc;
         }
         if (strcmp(theArg, "-psn_") == 0) {
             // assume the argument is always the only one and remove it
             --argc;
         }

-    }    
+    }

 #else
     argc = 0 ; // currently we don't support files as parameters
 #endif
 #else
     argc = 0 ; // currently we don't support files as parameters
 #endif


@@ -932,7 +932,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
             case kEventClassKeyboard :
             {
                 converted = true ;
             case kEventClassKeyboard :
             {
                 converted = true ;

-                switch( GetEventKind(event) ) 
+                switch( GetEventKind(event) )

                 {
                     case kEventRawKeyDown :
                         rec->what = keyDown ;
                 {
                     case kEventRawKeyDown :
                         rec->what = keyDown ;


@@ -995,14 +995,14 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
             break ;
         }
     }
             break ;
         }
     }

-    
+

     return converted ;
 }
 
 pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
     return converted ;
 }
 
 pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;

-    
+

     EventRecord rec ;
     switch ( GetEventClass( event ) )
     {
     EventRecord rec ;
     switch ( GetEventClass( event ) )
     {


@@ -1034,20 +1034,20 @@ bool wxApp::OnInit()
 {
     if ( ! wxAppBase::OnInit() )
         return FALSE ;
 {
     if ( ! wxAppBase::OnInit() )
         return FALSE ;

-    
+

 #if 0 // TARGET_CARBON
 #if 0 // TARGET_CARBON

-       static const EventTypeSpec eventList[] = 
+       static const EventTypeSpec eventList[] =

        {
            { kEventClassKeyboard, kEventRawKeyDown } ,
            { kEventClassKeyboard, kEventRawKeyRepeat } ,
            { kEventClassKeyboard, kEventRawKeyUp } ,
            { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
        {
            { kEventClassKeyboard, kEventRawKeyDown } ,
            { kEventClassKeyboard, kEventRawKeyRepeat } ,
            { kEventClassKeyboard, kEventRawKeyUp } ,
            { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,

-           
+

            { kEventClassTextInput , kEventTextInputUnicodeForKeyEvent } ,
        } ;
            { kEventClassTextInput , kEventTextInputUnicodeForKeyEvent } ,
        } ;

-       
+

        InstallApplicationEventHandler(NewEventHandlerUPP(wxMacApplicationEventHandler)
        InstallApplicationEventHandler(NewEventHandlerUPP(wxMacApplicationEventHandler)

-           , WXSIZEOF(eventList), eventList, this, NULL);    
+           , WXSIZEOF(eventList), eventList, this, NULL);

 #endif
     return TRUE ;
 }
 #endif
     return TRUE ;
 }


@@ -1067,7 +1067,6 @@ wxApp::wxApp()
   argv = NULL;
 
   m_printMode = wxPRINT_WINDOWS;
   argv = NULL;
 
   m_printMode = wxPRINT_WINDOWS;

-  m_exitOnFrameDelete = TRUE;

   m_auto3D = TRUE;
 }
 
   m_auto3D = TRUE;
 }
 


@@ -1302,13 +1301,13 @@ void wxApp::MacSuspend( bool convertClipboard )
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-    
+

     s_lastMouseDown = 0 ;
     if( convertClipboard )
     {
         MacConvertPrivateToPublicScrap() ;
     }
     s_lastMouseDown = 0 ;
     if( convertClipboard )
     {
         MacConvertPrivateToPublicScrap() ;
     }

-    
+

     ::HideFloatingWindows() ;
 }
 
     ::HideFloatingWindows() ;
 }
 


@@ -1321,9 +1320,9 @@ void wxApp::MacResume( bool convertClipboard )
     {
         MacConvertPublicToPrivateScrap() ;
     }
     {
         MacConvertPublicToPrivateScrap() ;
     }

-    
+

     ::ShowFloatingWindows() ;
     ::ShowFloatingWindows() ;

-    
+

     // raise modal dialogs in case a non modal window was selected to activate the app
 
     wxNode* node = wxModalDialogs.First();
     // raise modal dialogs in case a non modal window was selected to activate the app
 
     wxNode* node = wxModalDialogs.First();


@@ -1331,7 +1330,7 @@ void wxApp::MacResume( bool convertClipboard )
     {
         wxDialog* dialog = (wxDialog *) node->Data();
         dialog->Raise();
     {
         wxDialog* dialog = (wxDialog *) node->Data();
         dialog->Raise();

-        
+

         node = node->Next();
     }
 }
         node = node->Next();
     }
 }


@@ -1377,6 +1376,21 @@ void wxApp::MacDoOneEvent()
 void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
 {
     EventRecord* ev = (EventRecord*) evr ;
 void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
 {
     EventRecord* ev = (EventRecord*) evr ;

+#if TARGET_CARBON
+    if ( ev->what == mouseDown || ev->what == mouseUp || ev->what == activateEvt ||
+        ev->what == keyDown || ev->what == autoKey || ev->what == keyUp || ev->what == nullEvent )
+    {
+        // in these cases the modifiers are already correctly setup by carbon
+    }
+    else
+    {
+        EventRecord nev ;
+        WaitNextEvent( 0 , &nev , 0 , NULL ) ;
+        ev->modifiers = nev.modifiers ;
+        // KeyModifiers unfortunately don't include btnState...
+//        ev->modifiers = GetCurrentKeyModifiers() ; 
+    }
+#endif

     if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
     {
         wxKeyEvent event(wxEVT_KEY_DOWN);
     if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
     {
         wxKeyEvent event(wxEVT_KEY_DOWN);


@@ -1391,23 +1405,23 @@ void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
         event.m_timeStamp = ev->when;
         wxWindow* focus = wxWindow::FindFocus() ;
         event.SetEventObject(focus);
         event.m_timeStamp = ev->when;
         wxWindow* focus = wxWindow::FindFocus() ;
         event.SetEventObject(focus);

-        
+

         if ( (ev->modifiers ^ s_lastModifiers ) & controlKey )
         {
             event.m_keyCode = WXK_CONTROL ;
         if ( (ev->modifiers ^ s_lastModifiers ) & controlKey )
         {
             event.m_keyCode = WXK_CONTROL ;

-            event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;  
+            event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

             focus->GetEventHandler()->ProcessEvent( event ) ;
         }
         if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey )
         {
             event.m_keyCode = WXK_SHIFT ;
             focus->GetEventHandler()->ProcessEvent( event ) ;
         }
         if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey )
         {
             event.m_keyCode = WXK_SHIFT ;

-            event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;  
+            event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

             focus->GetEventHandler()->ProcessEvent( event ) ;
         }
         if ( (ev->modifiers ^ s_lastModifiers ) & optionKey )
         {
             event.m_keyCode = WXK_ALT ;
             focus->GetEventHandler()->ProcessEvent( event ) ;
         }
         if ( (ev->modifiers ^ s_lastModifiers ) & optionKey )
         {
             event.m_keyCode = WXK_ALT ;

-            event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;  
+            event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

             focus->GetEventHandler()->ProcessEvent( event ) ;
         }
         s_lastModifiers = ev->modifiers ;
             focus->GetEventHandler()->ProcessEvent( event ) ;
         }
         s_lastModifiers = ev->modifiers ;


@@ -1645,7 +1659,7 @@ void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
        {
                window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
                windowPart = inContent ;
        {
                window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
                windowPart = inContent ;

-       } 
+       }

        else
        {
                windowPart = ::FindWindow(ev->where, &window) ;
        else
        {
                windowPart = ::FindWindow(ev->where, &window) ;


@@ -1673,34 +1687,34 @@ long wxMacTranslateKey(unsigned char key, unsigned char code)
     long retval = key ;
     switch (key)
     {
     long retval = key ;
     switch (key)
     {

-        case 0x01 :
+        case kHomeCharCode :

                  retval = WXK_HOME;
           break;
                  retval = WXK_HOME;
           break;

-        case 0x03 :
+        case kEnterCharCode :

                  retval = WXK_RETURN;
           break;
                  retval = WXK_RETURN;
           break;

-        case 0x04 :
+        case kEndCharCode :

                  retval = WXK_END;
           break;
                  retval = WXK_END;
           break;

-        case 0x05 :
+        case kHelpCharCode :

                  retval = WXK_HELP;
           break;
                  retval = WXK_HELP;
           break;

-        case 0x08 :
+        case kBackspaceCharCode :

                  retval = WXK_BACK;
           break;
                  retval = WXK_BACK;
           break;

-        case 0x09 :
+        case kTabCharCode :

                  retval = WXK_TAB;
           break;
                  retval = WXK_TAB;
           break;

-        case 0x0b :
+        case kPageUpCharCode :

                  retval = WXK_PAGEUP;
           break;
                  retval = WXK_PAGEUP;
           break;

-        case 0x0c :
+        case kPageDownCharCode :

                  retval = WXK_PAGEDOWN;
           break;
                  retval = WXK_PAGEDOWN;
           break;

-        case 0x0d :
+        case kReturnCharCode :

                  retval = WXK_RETURN;
           break;
                  retval = WXK_RETURN;
           break;

-            case 0x10 :
+            case kFunctionKeyCharCode :

             {
                 switch( code )
                 {
             {
                 switch( code )
                 {


@@ -1752,22 +1766,22 @@ long wxMacTranslateKey(unsigned char key, unsigned char code)
                 }
             }
             break ;
                 }
             }
             break ;

-            case 0x1b :
+            case kEscapeCharCode :

                 retval = WXK_ESCAPE ;
             break ;
                 retval = WXK_ESCAPE ;
             break ;

-            case 0x1c :
+            case kLeftArrowCharCode :

                 retval = WXK_LEFT ;
             break ;
                 retval = WXK_LEFT ;
             break ;

-            case 0x1d :
+            case kRightArrowCharCode :

                 retval = WXK_RIGHT ;
             break ;
                 retval = WXK_RIGHT ;
             break ;

-            case 0x1e :
+            case kUpArrowCharCode :

                 retval = WXK_UP ;
             break ;
                 retval = WXK_UP ;
             break ;

-            case 0x1f :
+            case kDownArrowCharCode :

                 retval = WXK_DOWN ;
             break ;
                 retval = WXK_DOWN ;
             break ;

-            case 0x7F :
+            case kDeleteCharCode :

                 retval = WXK_DELETE ;
              default:
             break ;
                 retval = WXK_DELETE ;
              default:
             break ;


@@ -1789,32 +1803,45 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
     }
     else
     {
     }
     else
     {

-        short keycode ;
-        short keychar ;
-        keychar = short(ev->message & charCodeMask);
-        keycode = short(ev->message & keyCodeMask) >> 8 ;
-        wxWindow* focus = wxWindow::FindFocus() ;
-        // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
-        if ( (ev->modifiers & controlKey) && keychar >= 0 && keychar < 0x20 )
-        {
-            keychar += 0x40 ;
-        }
-        long keyval = wxMacTranslateKey(keychar, keycode) ;
-
-        if ( MacSendKeyDownEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
+         wxWindow* focus = wxWindow::FindFocus() ;
+ 
+        if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )

         {
             // has not been handled -> perform default
             wxControl* control = wxDynamicCast( focus , wxControl ) ;
             if ( control &&  control->GetMacControl() != NULL )
             {
         {
             // has not been handled -> perform default
             wxControl* control = wxDynamicCast( focus , wxControl ) ;
             if ( control &&  control->GetMacControl() != NULL )
             {

+                short keycode ;
+                short keychar ;
+                keychar = short(ev->message & charCodeMask);
+                keycode = short(ev->message & keyCodeMask) >> 8 ;

                 ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
             }
         }
     }
 }
 
                 ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
             }
         }
     }
 }
 

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

 {
 {

+    if ( !focus )
+        return false ;
+        
+    short keycode ;
+    short keychar ;
+    keychar = short(keymessage & charCodeMask);
+    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    
+    if ( (modifiers & controlKey) )
+    {
+        // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+        // and look at the character after
+        UInt32 state = 0;
+        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~controlKey)) | keycode, &state);
+        keychar = short(keyInfo & charCodeMask);
+        keycode = short(keyInfo & keyCodeMask) >> 8 ;
+    }
+    long keyval = wxMacTranslateKey(keychar, keycode) ;
+

     wxKeyEvent event(wxEVT_KEY_DOWN);
     bool handled = false ;
     event.m_shiftDown = modifiers & shiftKey;
     wxKeyEvent event(wxEVT_KEY_DOWN);
     bool handled = false ;
     event.m_shiftDown = modifiers & shiftKey;


@@ -1856,6 +1883,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers
     {
         event.Skip( FALSE ) ;
         event.SetEventType( wxEVT_CHAR ) ;
     {
         event.Skip( FALSE ) ;
         event.SetEventType( wxEVT_CHAR ) ;

+        // raw value again

         event.m_keyCode = keyval ;
 
         handled = focus->GetEventHandler()->ProcessEvent( event ) ;
         event.m_keyCode = keyval ;
 
         handled = focus->GetEventHandler()->ProcessEvent( event ) ;


@@ -1928,41 +1956,45 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
     }
     else
     {
     }
     else
     {

-        short keycode ;
-        short keychar ;
-        keychar = short(ev->message & charCodeMask);
-        keycode = short(ev->message & keyCodeMask) >> 8 ;
-        // it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
-        if ( (ev->modifiers & controlKey) && keychar >= 0 && keychar < 0x20 )
-        {
-            keychar += 0x40 ;
-        }
-        long keyval = wxMacTranslateKey(keychar, keycode) ;
-
-        wxWindow* focus = wxWindow::FindFocus() ;
-        bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
-        // we don't have to do anything under classic here
+        MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;

     }
 }
 
     }
 }
 

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

 {
 {

-    bool handled = false ;
-    if ( focus )
-    {
-        wxKeyEvent event(wxEVT_KEY_UP);
-        event.m_shiftDown = modifiers & shiftKey;
-        event.m_controlDown = modifiers & controlKey;
-        event.m_altDown = modifiers & optionKey;
-        event.m_metaDown = modifiers & cmdKey;
-        event.m_keyCode = wxToupper(keyval );
-
-        event.m_x = wherex;
-        event.m_y = wherey;
-        event.m_timeStamp = when;
-        event.SetEventObject(focus);
-        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    if ( !focus )
+        return false ;
+
+    short keycode ;
+    short keychar ;
+    keychar = short(keymessage & charCodeMask);
+    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    if ( (modifiers & controlKey) )
+    {
+        // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+        // and look at the character after
+        UInt32 state = 0;
+        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~controlKey)) | keycode, &state);
+        keychar = short(keyInfo & charCodeMask);
+        keycode = short(keyInfo & keyCodeMask) >> 8 ;

     }
     }

+    long keyval = wxMacTranslateKey(keychar, keycode) ;
+
+    bool handled = false ;
+
+    wxKeyEvent event(wxEVT_KEY_UP);
+    event.m_shiftDown = modifiers & shiftKey;
+    event.m_controlDown = modifiers & controlKey;
+    event.m_altDown = modifiers & optionKey;
+    event.m_metaDown = modifiers & cmdKey;
+    event.m_keyCode = wxToupper(keyval );
+
+    event.m_x = wherex;
+    event.m_y = wherey;
+    event.m_timeStamp = when;
+    event.SetEventObject(focus);
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+

     return handled ;
 }
 void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
     return handled ;
 }
 void wxApp::MacHandleActivateEvent( WXEVENTREF evr )


@@ -2088,8 +2120,16 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
 
                 wxWindow* currentMouseWindow = NULL ;
 
 
                 wxWindow* currentMouseWindow = NULL ;
 

-                wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) ,
-                                                 &currentMouseWindow ) ;
+                               if (s_captureWindow )
+                               {
+                                       currentMouseWindow = s_captureWindow ;
+                               }
+                               else
+                               {
+                               wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) ,
+                                                                        &currentMouseWindow ) ;
+                           }
+

                 if ( currentMouseWindow != wxWindow::s_lastMouseWindow )
                 {
                     wxMouseEvent event ;
                 if ( currentMouseWindow != wxWindow::s_lastMouseWindow )
                 {
                     wxMouseEvent event ;


@@ -2108,14 +2148,14 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
                     event.m_y = ev->where.v;
                     event.m_timeStamp = ev->when;
                     event.SetEventObject(this);
                     event.m_y = ev->where.v;
                     event.m_timeStamp = ev->when;
                     event.SetEventObject(this);

-                    
+

                     if ( wxWindow::s_lastMouseWindow )
                     {
                         wxMouseEvent eventleave(event);
                         eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
                         wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
                         eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;
                     if ( wxWindow::s_lastMouseWindow )
                     {
                         wxMouseEvent eventleave(event);
                         eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
                         wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
                         eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;

-                        
+

                         wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
                     }
                     if ( currentMouseWindow )
                         wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
                     }
                     if ( currentMouseWindow )


@@ -2129,41 +2169,44 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
                     wxWindow::s_lastMouseWindow = currentMouseWindow ;
                 }
 
                     wxWindow::s_lastMouseWindow = currentMouseWindow ;
                 }
 

-                short windowPart = ::FindWindow(ev->where, &window);
-
+                short windowPart = inNoWindow ;
+
+                               if ( s_captureWindow )
+                               {
+                                       window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
+                                       windowPart = inContent ;
+                               }
+                               else
+                               {
+                                       windowPart = ::FindWindow(ev->where, &window); 
+                               }
+                               

                 switch (windowPart)
                 {
                 switch (windowPart)
                 {

-                    // fixes for setting the cursor back from dominic mazzoni
-                    case inMenuBar :
-                        UMAShowArrowCursor();
-                        break ;
-                    case inSysWindow :
-                        UMAShowArrowCursor();
-                        break ;
-                    default:
+                    case inContent :

                         {
                         {

-                            // if ( s_lastMouseDown == 0 )
-                            //     ev->modifiers |= btnState ;
-                                
-                            // Calling GetNextEvent with a zero event mask will always
-                            // pass back a null event. However, it fills the EventRecord
-                            // with the state of the modifier keys. This is needed since
-                            // the modifier state returned by WaitForNextEvent often is
-                            // wrong mouse move events. The attempt above to correct this
-                            // didn't always work (under OS X at least).
-            
-                            EventRecord tmp;
-                            ::GetNextEvent(0, &tmp);
-                            ev->modifiers = tmp.modifiers;
-                            

                             wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else
                             wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else

-                                UMAShowArrowCursor();
-
+                            {
+                                if ( wxIsBusy() )
+                                {
+                                }
+                                else
+                                    UMAShowArrowCursor();
+                             }

                         }
                         break;
                         }
                         break;

+                    default :
+                        {
+                            if ( wxIsBusy() )
+                            {
+                            }
+                            else
+                                UMAShowArrowCursor();
+                        }
+                        break ;

                 }
             }
             break ;
                 }
             }
             break ;