key/char event changes for inline editing (japanese/hirgana etc)

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index af9f64ef31d8a15a30233dfd98245711b28f9e2d..49c9ce465520218315d99232543c396451eb5209 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -65,27 +65,16 @@
 
 extern wxList wxPendingDelete;
 
 
 extern wxList wxPendingDelete;
 

-// set wxMAC_USE_RAEL to 1 if RunApplicationEventLoop should be used
-// if 0 the lower level CarbonEventLoop will be used
-// on the long run RAEL should replace the low level event loop
-// we will have to clean up event handling to make sure we don't
-// miss handling of things like pending events etc
-// perhaps we will also have to pipe events through an ueber-event-handler
-// to make sure we have one place to do all these house-keeping functions
-
-#define wxMAC_USE_RAEL 0
-

 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;

-#endif // wxUSE_THREADS
+#endif

 
 // statics for implementation
 
 // statics for implementation

-

 static bool s_inYield = false;
 static bool s_inYield = false;

-

 static bool s_inReceiveEvent = false ;
 static EventTime sleepTime = kEventDurationNoWait ;
 
 static bool s_inReceiveEvent = false ;
 static EventTime sleepTime = kEventDurationNoWait ;
 

+

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)


@@ -94,9 +83,8 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-const short    kMacMinHeap = (29 * 1024) ;

 // platform specific static variables
 // platform specific static variables

-
+const short kMacMinHeap = (29 * 1024) ;

 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 


@@ -106,15 +94,14 @@ int       wxApp::s_lastMouseDown = 0 ;
 long      wxApp::sm_lastMessageTime = 0;
 long      wxApp::s_lastModifiers = 0 ;
 
 long      wxApp::sm_lastMessageTime = 0;
 long      wxApp::s_lastModifiers = 0 ;
 

-

 bool      wxApp::s_macSupportPCMenuShortcuts = true ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
 wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
 
 bool      wxApp::s_macSupportPCMenuShortcuts = true ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
 wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
 

-// Normally we're not a plugin
-bool      wxApp::sm_isEmbedded = false;
+bool      wxApp::sm_isEmbedded = false; // Normally we're not a plugin
+

 //----------------------------------------------------------------------
 // Core Apple Event Support
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // Core Apple Event Support
 //----------------------------------------------------------------------


@@ -161,6 +148,7 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     long itemsInList;
     OSErr err;
     short i;
     long itemsInList;
     OSErr err;
     short i;

+

     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
     if (err != noErr)
         return err;
     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
     if (err != noErr)
         return err;


@@ -174,17 +162,19 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 

+    wxString fName ;
+    FSRef theRef ;
+

     for (i = 1; i <= itemsInList; i++)
     {
     for (i = 1; i <= itemsInList; i++)
     {

-        wxString fName ;
-
-        FSRef theRef ;
-        AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType,
-        (Ptr) & theRef, sizeof(theRef), &actualSize);
+        AEGetNthPtr(
+            &docList, i, typeFSRef, &keywd, &returnedType,
+            (Ptr)&theRef, sizeof(theRef), &actualSize);

         fName = wxMacFSRefToPath( &theRef ) ;
 
         MacOpenFile(fName);
     }
         fName = wxMacFSRefToPath( &theRef ) ;
 
         MacOpenFile(fName);
     }

+

     return noErr;
 }
 
     return noErr;
 }
 


@@ -199,6 +189,7 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
     long itemsInList;
     OSErr err;
     short i;
     long itemsInList;
     OSErr err;
     short i;

+

     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
     if (err != noErr)
         return err;
     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
     if (err != noErr)
         return err;


@@ -212,16 +203,19 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 

-    for (i = 1; i <= itemsInList; i++) {
-        wxString fName ;
+    wxString fName ;
+    FSRef theRef ;

 
 

-        FSRef theRef ;
-        AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType,
-        (Ptr) & theRef, sizeof(theRef), &actualSize);
+    for (i = 1; i <= itemsInList; i++)
+    {
+        AEGetNthPtr(
+            &docList, i, typeFSRef, &keywd, &returnedType,
+            (Ptr)&theRef, sizeof(theRef), &actualSize);

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

+

     return noErr;
 }
 
     return noErr;
 }
 


@@ -248,6 +242,7 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
     {
         ExitMainLoop() ;
     }
     {
         ExitMainLoop() ;
     }

+

     return noErr ;
 }
 
     return noErr ;
 }
 


@@ -256,11 +251,10 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
     MacReopenApp() ;
 short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
     MacReopenApp() ;

+

     return noErr ;
 }
 
     return noErr ;
 }
 

-
-

 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------


@@ -287,7 +281,7 @@ void wxApp::MacPrintFile(const wxString & fileName )
         if ( doc )
         {
             wxView* view = doc->GetFirstView() ;
         if ( doc )
         {
             wxView* view = doc->GetFirstView() ;

-            if( view )
+            if ( view )

             {
                 wxPrintout *printout = view->OnCreatePrintout();
                 if (printout)
             {
                 wxPrintout *printout = view->OnCreatePrintout();
                 if (printout)


@@ -297,6 +291,7 @@ void wxApp::MacPrintFile(const wxString & fileName )
                     delete printout;
                 }
             }
                     delete printout;
                 }
             }

+

             if (doc->Close())
             {
                 doc->DeleteAllViews();
             if (doc->Close())
             {
                 doc->DeleteAllViews();


@@ -333,7 +328,7 @@ void wxApp::MacReopenApp()
         while (node)
         {
             wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
         while (node)
         {
             wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();

-            if ( win->IsIconized() == false )
+            if ( !win->IsIconized() )

             {
                 firstIconized = NULL ;
                 break ;
             {
                 firstIconized = NULL ;
                 break ;


@@ -343,8 +338,10 @@ void wxApp::MacReopenApp()
                 if ( firstIconized == NULL )
                     firstIconized = win ;
             }
                 if ( firstIconized == NULL )
                     firstIconized = win ;
             }

+

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

+

         if ( firstIconized )
             firstIconized->Iconize( false ) ;
     }
         if ( firstIconized )
             firstIconized->Iconize( false ) ;
     }


@@ -377,35 +374,37 @@ int wxMacCommandToId( UInt32 macCommandId )
 {
     int wxid = 0 ;
     
 {
     int wxid = 0 ;
     

-    if ( macCommandId == kHICommandPreferences || macCommandId == kHICommandQuit || macCommandId == kHICommandAbout  )
-    {
-        switch ( macCommandId )
-        {
-            case kHICommandPreferences :
-                wxid = wxApp::s_macPreferencesMenuItemId ;
-                break ;
-            case kHICommandQuit :
-                wxid = wxApp::s_macExitMenuItemId ;
-                break ;
-            case kHICommandAbout :
-                wxid = wxApp::s_macAboutMenuItemId ;
-                break ;
-        }
-    }
-    else
+    switch ( macCommandId )

     {
     {

-        for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i )
-        {
-            if ( gCommandIds[i].macId == macCommandId )
+        case kHICommandPreferences :
+            wxid = wxApp::s_macPreferencesMenuItemId ;
+            break ;
+
+        case kHICommandQuit :
+            wxid = wxApp::s_macExitMenuItemId ;
+            break ;
+
+        case kHICommandAbout :
+            wxid = wxApp::s_macAboutMenuItemId ;
+            break ;
+
+        default :

             {
             {

-                wxid = gCommandIds[i].wxId ;
-                break ;
+                for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i )
+                {
+                    if ( gCommandIds[i].macId == macCommandId )
+                    {
+                        wxid = gCommandIds[i].wxId ;
+                        break ;
+                    }
+                }

             }
             }

-        }
+            break ;

     }
     }

+

     if ( wxid == 0 )
         wxid = (int) macCommandId ;
     if ( wxid == 0 )
         wxid = (int) macCommandId ;

-    
+

     return wxid ;
 }
 
     return wxid ;
 }
 


@@ -430,9 +429,10 @@ UInt32 wxIdToMacCommand( int wxId )
             }
         }
     }
             }
         }
     }

+

     if ( macId == 0 )
         macId = (int) wxId ;
     if ( macId == 0 )
         macId = (int) wxId ;

-    
+

     return macId ;
 }
 
     return macId ;
 }
 


@@ -440,17 +440,15 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;
 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;

-    
+

     // for 'standard' commands which don't have a wx-menu
     // for 'standard' commands which don't have a wx-menu

-    if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout  )
+    if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout )

     {
         id = wxMacCommandToId( command.commandID ) ;
     {
         id = wxMacCommandToId( command.commandID ) ;

-        
+

         wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
         if ( mbar )
         wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
         if ( mbar )

-        {

             item = mbar->FindItem( id , &itemMenu ) ;
             item = mbar->FindItem( id , &itemMenu ) ;

-        }

     }
     else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {
     }
     else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {


@@ -461,32 +459,28 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
         if ( mh == NULL )
         {
             if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
         if ( mh == NULL )
         {
             if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )

-            {

                 mh = NULL ;
                 mh = NULL ;

-            }

         }
         }

-        
-        // is it part of the application or the help menu, then look for the id directly
+
+        // is it part of the application or the Help menu, then look for the id directly

         if ( ( GetMenuHandle( kwxMacAppleMenuId ) != NULL && command.menu.menuRef == GetMenuHandle( kwxMacAppleMenuId ) ) ||
              ( mh != NULL && command.menu.menuRef == mh ) )
         {
             wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
             if ( mbar )
         if ( ( GetMenuHandle( kwxMacAppleMenuId ) != NULL && command.menu.menuRef == GetMenuHandle( kwxMacAppleMenuId ) ) ||
              ( mh != NULL && command.menu.menuRef == mh ) )
         {
             wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
             if ( mbar )

-            {

                 item = mbar->FindItem( id , &itemMenu ) ;
                 item = mbar->FindItem( id , &itemMenu ) ;

-            }

         }
         else
         {
             UInt32 refCon ;
         }
         else
         {
             UInt32 refCon ;

+

             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
             if ( itemMenu != NULL )
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
             if ( itemMenu != NULL )

-            {

                 item = (wxMenuItem*) refCon ;
                 item = (wxMenuItem*) refCon ;

-            }

         }
     }
         }
     }

+

     return itemMenu ;
 }
 
     return itemMenu ;
 }
 


@@ -533,14 +527,17 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d
             case kEventMenuOpening:
                 type = wxEVT_MENU_OPEN;
                 break;
             case kEventMenuOpening:
                 type = wxEVT_MENU_OPEN;
                 break;

+

             case kEventMenuClosed:
                 type = wxEVT_MENU_CLOSE;
                 break;
             case kEventMenuClosed:
                 type = wxEVT_MENU_CLOSE;
                 break;

+

             case kEventMenuTargetItem:
                 cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
                 if (cmd != 0)
                     type = wxEVT_MENU_HIGHLIGHT;
                 break;
             case kEventMenuTargetItem:
                 cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
                 if (cmd != 0)
                     type = wxEVT_MENU_HIGHLIGHT;
                 break;

+

             default:
                 wxFAIL_MSG(wxT("Unexpected menu event kind"));
                 break;
             default:
                 wxFAIL_MSG(wxT("Unexpected menu event kind"));
                 break;


@@ -585,7 +582,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     {
         wxASSERT( itemMenu != NULL ) ;
         
     {
         wxASSERT( itemMenu != NULL ) ;
         

-        switch( cEvent.GetKind() )
+        switch ( cEvent.GetKind() )

         {
             case kEventProcessCommand :
             {
         {
             case kEventProcessCommand :
             {


@@ -596,6 +593,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                     result = noErr ;
             }
             break ;
                     result = noErr ;
             }
             break ;

+

         case kEventCommandUpdateStatus:
             {
                 wxUpdateUIEvent event(id);
         case kEventCommandUpdateStatus:
             {
                 wxUpdateUIEvent event(id);


@@ -610,8 +608,8 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                         processed = handler->ProcessEvent(event);
                 }
                 
                         processed = handler->ProcessEvent(event);
                 }
                 

-                // Try the window the menu was popped up from (and up through the
-                // hierarchy)
+                // Try the window the menu was popped up from
+                // (and up through the hierarchy)

                 if ( !processed )
                 {
                     const wxMenuBase *menu = itemMenu;
                 if ( !processed )
                 {
                     const wxMenuBase *menu = itemMenu;


@@ -642,6 +640,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                 }
             }
             break ;
                 }
             }
             break ;

+

         default :
             break ;
         }
         default :
             break ;
         }


@@ -655,22 +654,21 @@ static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef hand
     switch ( GetEventKind( event ) )
     {
         case kEventAppActivated :
     switch ( GetEventKind( event ) )
     {
         case kEventAppActivated :

-            {
-                if ( wxTheApp )
-                    wxTheApp->SetActive( true , NULL ) ;
-                result = noErr ;
-            }
+            if ( wxTheApp )
+                wxTheApp->SetActive( true , NULL ) ;
+            result = noErr ;

             break ;
             break ;

+

         case kEventAppDeactivated :
         case kEventAppDeactivated :

-            {
-                if ( wxTheApp )
-                    wxTheApp->SetActive( false , NULL ) ;
-                result = noErr ;
-            }
+            if ( wxTheApp )
+                wxTheApp->SetActive( false , NULL ) ;
+            result = noErr ;

             break ;
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 


@@ -681,17 +679,20 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
     wxTheApp->MacSetCurrentEvent( event , handler ) ;
 
     OSStatus result = eventNotHandledErr ;
     wxTheApp->MacSetCurrentEvent( event , handler ) ;
 
     OSStatus result = eventNotHandledErr ;

-    switch( GetEventClass( event ) )
+    switch ( GetEventClass( event ) )

     {
         case kEventClassCommand :
             result = wxMacAppCommandEventHandler( handler , event , data ) ;
             break ;
     {
         case kEventClassCommand :
             result = wxMacAppCommandEventHandler( handler , event , data ) ;
             break ;

+

         case kEventClassApplication :
             result = wxMacAppApplicationEventHandler( handler , event , data ) ;
             break ;
         case kEventClassApplication :
             result = wxMacAppApplicationEventHandler( handler , event , data ) ;
             break ;

+

         case kEventClassMenu :
             result = wxMacAppMenuEventHandler( handler , event , data ) ;
             break ;
         case kEventClassMenu :
             result = wxMacAppMenuEventHandler( handler , event , data ) ;
             break ;

+

         case kEventClassMouse :
             {
                 wxMacCarbonEvent cEvent( event ) ;
         case kEventClassMouse :
             {
                 wxMacCarbonEvent cEvent( event ) ;


@@ -705,13 +706,16 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
                     result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
             }
             break ;
                     result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
             }
             break ;

+

         case kEventClassAppleEvent :
             {
                 EventRecord rec ;
         case kEventClassAppleEvent :
             {
                 EventRecord rec ;

+

                 wxMacConvertEventToRecord( event , &rec ) ;
                 result = AEProcessAppleEvent( &rec ) ;
             }
             break ;
                 wxMacConvertEventToRecord( event , &rec ) ;
                 result = AEProcessAppleEvent( &rec ) ;
             }
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }


@@ -739,6 +743,7 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
     wxString assertionStr ;
     wxString exceptionStr ;
     wxString errorStr ;
     wxString assertionStr ;
     wxString exceptionStr ;
     wxString errorStr ;

+

 #if wxUSE_UNICODE
     fileNameStr = wxString(fileName, wxConvLocal);
     assertionStr = wxString(assertionString, wxConvLocal);
 #if wxUSE_UNICODE
     fileNameStr = wxString(fileName, wxConvLocal);
     assertionStr = wxString(assertionString, wxConvLocal);


@@ -762,20 +767,23 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
 #else
 
     wxOnAssert(fileNameStr, lineNumber , assertionStr ,
 #else
 
     wxOnAssert(fileNameStr, lineNumber , assertionStr ,

-        wxString::Format( wxT("%s %s value (%p)") ,exceptionStr, errorStr , value ) ) ;
+        wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ;

 #endif
 }
 
 #endif //__WXDEBUG__
 
 #ifdef __WXMAC_OSX__
 #endif
 }
 
 #endif //__WXDEBUG__
 
 #ifdef __WXMAC_OSX__

-extern "C" {
-   /* m_macEventPosted run loop source callback: */
+extern "C"
+{
+   // m_macEventPosted run loop source callback:

    void macPostedEventCallback(void *unused);
 }
 
    void macPostedEventCallback(void *unused);
 }
 

-void macPostedEventCallback(void *unused) {
-    wxTheApp->ProcessPendingEvents(); }
+void macPostedEventCallback(void *unused)
+{
+    wxTheApp->ProcessPendingEvents();
+}

 #endif
 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 #endif
 
 bool wxApp::Initialize(int& argc, wxChar **argv)


@@ -783,8 +791,9 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // Mac-specific
 
 #ifdef __WXDEBUG__
     // Mac-specific
 
 #ifdef __WXDEBUG__

-    InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
+    InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );

 #endif
 #endif

+

     UMAInitToolbox( 4, sm_isEmbedded ) ;
     SetEventMask( everyEvent ) ;
     UMAShowWatchCursor() ;
     UMAInitToolbox( 4, sm_isEmbedded ) ;
     SetEventMask( everyEvent ) ;
     UMAShowWatchCursor() ;


@@ -867,7 +876,7 @@ AEEventHandlerUPP sQuitHandler = NULL ;
 
 bool wxApp::OnInitGui()
 {
 
 bool wxApp::OnInitGui()
 {

-    if( !wxAppBase::OnInitGui() )
+    if ( !wxAppBase::OnInitGui() )

         return false ;
 
     InstallStandardEventHandler( GetApplicationEventTarget() ) ;
         return false ;
 
     InstallStandardEventHandler( GetApplicationEventTarget() ) ;


@@ -910,9 +919,7 @@ void wxApp::CleanUp()
 
 #ifdef __WXMAC_OSX__
     if (m_macEventPosted)
 
 #ifdef __WXMAC_OSX__
     if (m_macEventPosted)

-    {

         CFRelease(m_macEventPosted);
         CFRelease(m_macEventPosted);

-    }

     m_macEventPosted = NULL;
 #endif
 
     m_macEventPosted = NULL;
 #endif
 


@@ -929,14 +936,11 @@ void wxApp::CleanUp()
 #endif
 
     UMACleanupToolbox() ;
 #endif
 
     UMACleanupToolbox() ;

-    if (s_macCursorRgn) {
+    if (s_macCursorRgn)

         ::DisposeRgn((RgnHandle)s_macCursorRgn);
         ::DisposeRgn((RgnHandle)s_macCursorRgn);

-    }

 
     if (!sm_isEmbedded)
 
     if (!sm_isEmbedded)

-    {

         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );

-    }

 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {


@@ -971,8 +975,9 @@ void wxApp::CleanUp()
 // ref num upon initializing and releasing when terminating, therefore
 // the __wxinitialize and __wxterminate must be used
 
 // ref num upon initializing and releasing when terminating, therefore
 // the __wxinitialize and __wxterminate must be used
 

-extern "C" {
-    void __sinit(void);    /*    (generated by linker)    */
+extern "C"
+{
+    void __sinit(void);    // (generated by linker)

     pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
     pascal void __terminate(void);
 }
     pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
     pascal void __terminate(void);
 }


@@ -991,33 +996,39 @@ pascal void __wxterminate(void)
 
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 {
 
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 {

-    bool converted = ConvertEventRefToEventRecord( event,rec) ;

     OSStatus err = noErr ;
     OSStatus err = noErr ;

+    bool converted = ConvertEventRefToEventRecord( event, rec) ;
+

     if ( !converted )
     {
     if ( !converted )
     {

-        switch( GetEventClass( event ) )
+        switch ( GetEventClass( event ) )

         {
             case kEventClassKeyboard :
             {
                 converted = true ;
         {
             case kEventClassKeyboard :
             {
                 converted = true ;

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

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

+

                     case kEventRawKeyRepeat :
                         rec->what = autoKey ;
                         break ;
                     case kEventRawKeyRepeat :
                         rec->what = autoKey ;
                         break ;

+

                     case kEventRawKeyUp :
                         rec->what = keyUp ;
                         break ;
                     case kEventRawKeyUp :
                         rec->what = keyUp ;
                         break ;

+

                     case kEventRawKeyModifiersChanged :
                         rec->what = nullEvent ;
                         break ;
                     case kEventRawKeyModifiersChanged :
                         rec->what = nullEvent ;
                         break ;

+

                     default :
                         converted = false ;
                         break ;
                 }
                     default :
                         converted = false ;
                         break ;
                 }

+

                 if ( converted )
                 {
                     UInt32 keyCode ;
                 if ( converted )
                 {
                     UInt32 keyCode ;


@@ -1033,19 +1044,23 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
                 }
             }
             break ;
                 }
             }
             break ;

+

             case kEventClassTextInput :
             {
             case kEventClassTextInput :
             {

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

                 {
                     case kEventTextInputUnicodeForKeyEvent :
                         {
                             EventRef rawEvent ;
                 {
                     case kEventTextInputUnicodeForKeyEvent :
                         {
                             EventRef rawEvent ;

-                            err = GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ;
+                            err = GetEventParameter(
+                                event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL,
+                                sizeof(rawEvent), NULL, &rawEvent ) ;

                             converted = true ;
                             converted = true ;

+

                             {
                             {

-                                UInt32 keyCode ;
+                                UInt32 keyCode, modifiers;

                                 unsigned char charCode ;
                                 unsigned char charCode ;

-                                UInt32 modifiers ;
+

                                 GetMouse( &rec->where) ;
                                 rec->what = keyDown ;
                                 err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                                 GetMouse( &rec->where) ;
                                 rec->what = keyDown ;
                                 err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);


@@ -1055,12 +1070,16 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
                                 rec->message = (keyCode << 8 ) + charCode ;
                             }
                        }
                                 rec->message = (keyCode << 8 ) + charCode ;
                             }
                        }

-                        break ;
+                       break ;
+

                     default :
                         break ;
                 }
             }
             break ;
                     default :
                         break ;
                 }
             }
             break ;

+
+            default :
+                break ;

         }
     }
 
         }
     }
 


@@ -1073,50 +1092,12 @@ wxApp::wxApp()
 
     m_macCurrentEvent = NULL ;
     m_macCurrentEventHandlerCallRef = NULL ;
 
     m_macCurrentEvent = NULL ;
     m_macCurrentEventHandlerCallRef = NULL ;

+

 #ifdef __WXMAC_OSX__
     m_macEventPosted = NULL ;
 #endif
 }
 
 #ifdef __WXMAC_OSX__
     m_macEventPosted = NULL ;
 #endif
 }
 

-int wxApp::MainLoop()
-{
-    m_keepGoing = true;
-#if wxMAC_USE_RAEL
-    RunApplicationEventLoop() ;
-#else
-    while (m_keepGoing)
-    {
-        MacDoOneEvent() ;
-    }
-#endif
-    return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
-    m_keepGoing = false;
-#if wxMAC_USE_RAEL
-    QuitApplicationEventLoop() ;
-#endif
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    // without the receive event (with pull param = false ) nothing is ever reported
-    EventRef theEvent;
-    ReceiveNextEvent (0, NULL, kEventDurationNoWait, false, &theEvent);
-    return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ;
-}
-
-// Dispatch a message.
-bool wxApp::Dispatch()
-{
-    MacDoOneEvent() ;
-
-    return true;
-}
-

 void wxApp::OnIdle(wxIdleEvent& event)
 {
     wxAppBase::OnIdle(event);
 void wxApp::OnIdle(wxIdleEvent& event)
 {
     wxAppBase::OnIdle(event);


@@ -1126,7 +1107,7 @@ void wxApp::OnIdle(wxIdleEvent& event)
     // wxPostEvent() functions
     wxMacProcessNotifierAndPendingEvents();
 
     // wxPostEvent() functions
     wxMacProcessNotifierAndPendingEvents();
 

-  if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+  if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())

     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 


@@ -1138,13 +1119,8 @@ void wxApp::WakeUpIdle()
         CFRunLoopSourceSignal(m_macEventPosted);
     }
 #endif
         CFRunLoopSourceSignal(m_macEventPosted);
     }
 #endif

-    wxMacWakeUp() ;
-}

 
 

-void wxApp::Exit()
-{
-    wxApp::CleanUp();
-    ::ExitToShell() ;
+    wxMacWakeUp() ;

 }
 
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))


@@ -1191,7 +1167,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
     EventRef theEvent;
 
     OSStatus status = noErr ;
     EventRef theEvent;
 
     OSStatus status = noErr ;

-    do
+
+    while ( status == noErr )

     {
         s_inReceiveEvent = true ;
         status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ;
     {
         s_inReceiveEvent = true ;
         status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ;


@@ -1212,7 +1189,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
             MacHandleOneEvent( theEvent ) ;
             ReleaseEvent(theEvent);
         }
             MacHandleOneEvent( theEvent ) ;
             ReleaseEvent(theEvent);
         }

-    } while( status == noErr ) ;
+    }

 
     wxMacProcessNotifierAndPendingEvents() ;
     s_inYield = false;
 
     wxMacProcessNotifierAndPendingEvents() ;
     s_inYield = false;


@@ -1225,25 +1202,28 @@ void wxApp::MacDoOneEvent()
     EventRef theEvent;
 
     s_inReceiveEvent = true ;
     EventRef theEvent;
 
     s_inReceiveEvent = true ;

-    OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ;
+    OSStatus status = ReceiveNextEvent(0, NULL, sleepTime, true, &theEvent) ;

     s_inReceiveEvent = false ;
     s_inReceiveEvent = false ;

-    if ( status == eventLoopTimedOutErr )
+
+    switch (status)

     {
     {

-        if ( wxTheApp->ProcessIdle() )
+        case eventLoopTimedOutErr :
+            if ( wxTheApp->ProcessIdle() )
+                sleepTime = kEventDurationNoWait ;
+            else
+                sleepTime = kEventDurationSecond;
+            break;
+
+        case eventLoopQuitErr :
+            // according to QA1061 this may also occur
+            // when a WakeUp Process is executed
+            break;
+
+        default:
+            MacHandleOneEvent( theEvent ) ;
+            ReleaseEvent( theEvent );

             sleepTime = kEventDurationNoWait ;
             sleepTime = kEventDurationNoWait ;

-        else
-            sleepTime = kEventDurationSecond;
-    }
-    else if ( status == eventLoopQuitErr )
-    {
-        // according to QA1061 this may also occur when a WakeUp Process
-        // is executed
-    }
-    else
-    {
-        MacHandleOneEvent( theEvent ) ;
-        ReleaseEvent(theEvent);
-        sleepTime = kEventDurationNoWait ;
+            break;

     }
     // repeaters
 
     }
     // repeaters
 


@@ -1251,7 +1231,8 @@ void wxApp::MacDoOneEvent()
     wxMacProcessNotifierAndPendingEvents() ;
 }
 
     wxMacProcessNotifierAndPendingEvents() ;
 }
 

-/*virtual*/ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
+// virtual
+void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )

 {
     // Override to process unhandled events as you please
 }
 {
     // Override to process unhandled events as you please
 }


@@ -1261,12 +1242,13 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
     EventTargetRef theTarget;
     theTarget = GetEventDispatcherTarget();
     m_macCurrentEvent = evr ;
     EventTargetRef theTarget;
     theTarget = GetEventDispatcherTarget();
     m_macCurrentEvent = evr ;

-    OSStatus status = SendEventToEventTarget ((EventRef) evr , theTarget);
-    if(status == eventNotHandledErr)
-    {
+
+    OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget);
+    if (status == eventNotHandledErr)

         MacHandleUnhandledEvent(evr);
         MacHandleUnhandledEvent(evr);

-    }
+

     wxMacProcessNotifierAndPendingEvents() ;
     wxMacProcessNotifierAndPendingEvents() ;

+

 #if wxUSE_THREADS
     wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 #if wxUSE_THREADS
     wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS


@@ -1315,53 +1297,70 @@ long wxMacTranslateKey(unsigned char key, unsigned char code)
 
         case kFunctionKeyCharCode :
         {
 
         case kFunctionKeyCharCode :
         {

-            switch( code )
+            switch ( code )

             {
                 case 0x7a :
                     retval = WXK_F1 ;
                     break;
             {
                 case 0x7a :
                     retval = WXK_F1 ;
                     break;

+

                 case 0x78 :
                     retval = WXK_F2 ;
                     break;
                 case 0x78 :
                     retval = WXK_F2 ;
                     break;

+

                 case 0x63 :
                     retval = WXK_F3 ;
                     break;
                 case 0x63 :
                     retval = WXK_F3 ;
                     break;

+

                 case 0x76 :
                     retval = WXK_F4 ;
                     break;
                 case 0x76 :
                     retval = WXK_F4 ;
                     break;

+

                 case 0x60 :
                     retval = WXK_F5 ;
                     break;
                 case 0x60 :
                     retval = WXK_F5 ;
                     break;

+

                 case 0x61 :
                     retval = WXK_F6 ;
                     break;
                 case 0x61 :
                     retval = WXK_F6 ;
                     break;

+

                 case 0x62:
                     retval = WXK_F7 ;
                     break;
                 case 0x62:
                     retval = WXK_F7 ;
                     break;

+

                 case 0x64 :
                     retval = WXK_F8 ;
                     break;
                 case 0x64 :
                     retval = WXK_F8 ;
                     break;

+

                 case 0x65 :
                     retval = WXK_F9 ;
                     break;
                 case 0x65 :
                     retval = WXK_F9 ;
                     break;

+

                 case 0x6D :
                     retval = WXK_F10 ;
                     break;
                 case 0x6D :
                     retval = WXK_F10 ;
                     break;

+

                 case 0x67 :
                     retval = WXK_F11 ;
                     break;
                 case 0x67 :
                     retval = WXK_F11 ;
                     break;

+

                 case 0x6F :
                     retval = WXK_F12 ;
                     break;
                 case 0x6F :
                     retval = WXK_F12 ;
                     break;

+

                 case 0x69 :
                     retval = WXK_F13 ;
                     break;
                 case 0x69 :
                     retval = WXK_F13 ;
                     break;

+

                 case 0x6B :
                     retval = WXK_F14 ;
                     break;
                 case 0x6B :
                     retval = WXK_F14 ;
                     break;

+

                 case 0x71 :
                     retval = WXK_F15 ;
                     break;
                 case 0x71 :
                     retval = WXK_F15 ;
                     break;

+
+                default:
+                    break;

             }
         }
         break ;
             }
         }
         break ;


@@ -1440,7 +1439,30 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 #endif
 
 
 #endif
 
 

-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar  )
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+
+    wxPoint pt = wxGetMousePosition();
+    ms.SetX(pt.x);
+    ms.SetY(pt.y);
+
+    UInt32 buttons = GetCurrentButtonState();
+    ms.SetLeftDown( (buttons & 0x01) != 0 );
+    ms.SetMiddleDown( (buttons & 0x04) != 0 );
+    ms.SetRightDown( (buttons & 0x02) != 0 );
+    
+    UInt32 modifiers = GetCurrentKeyModifiers();
+    ms.SetControlDown(modifiers & controlKey);
+    ms.SetShiftDown(modifiers & shiftKey);
+    ms.SetAltDown(modifiers & optionKey);
+    ms.SetMetaDown(modifiers & cmdKey);
+
+    return ms;
+}
+
+
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )

 {
     if ( !focus )
         return false ;
 {
     if ( !focus )
         return false ;


@@ -1458,6 +1480,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);
     }
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);
     }

+

     long keyval = wxMacTranslateKey(keychar, keycode) ;
     long realkeyval = keyval ;
     if ( keyval == keychar )
     long keyval = wxMacTranslateKey(keychar, keycode) ;
     long realkeyval = keyval ;
     if ( keyval == keychar )


@@ -1479,24 +1502,33 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         case 76 :
             keyval = WXK_NUMPAD_ENTER;
             break;
         case 76 :
             keyval = WXK_NUMPAD_ENTER;
             break;

+

         case 81:
             keyval = WXK_NUMPAD_EQUAL;
             break;
         case 81:
             keyval = WXK_NUMPAD_EQUAL;
             break;

+

         case 67:
             keyval = WXK_NUMPAD_MULTIPLY;
             break;
         case 67:
             keyval = WXK_NUMPAD_MULTIPLY;
             break;

+

         case 75:
             keyval = WXK_NUMPAD_DIVIDE;
             break;
         case 75:
             keyval = WXK_NUMPAD_DIVIDE;
             break;

+

         case 78:
             keyval = WXK_NUMPAD_SUBTRACT;
             break;
         case 78:
             keyval = WXK_NUMPAD_SUBTRACT;
             break;

+

         case 69:
             keyval = WXK_NUMPAD_ADD;
             break;
         case 69:
             keyval = WXK_NUMPAD_ADD;
             break;

+

         case 65:
             keyval = WXK_NUMPAD_DECIMAL;
             break;
         case 65:
             keyval = WXK_NUMPAD_DECIMAL;
             break;

+
+        default:
+            break;

         } // end switch
     }
 
         } // end switch
     }
 


@@ -1507,9 +1539,11 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;

+

 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;
 #endif
 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;
 #endif

+

     event.m_rawCode = keymessage;
     event.m_rawFlags = modifiers;
     event.m_x = wherex;
     event.m_rawCode = keymessage;
     event.m_rawFlags = modifiers;
     event.m_x = wherex;


@@ -1533,8 +1567,10 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
                 handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
                 break;
             }
                 handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
                 break;
             }

+

             if (ancestor->IsTopLevel())
                 break;
             if (ancestor->IsTopLevel())
                 break;

+

             ancestor = ancestor->GetParent();
         }
     }
             ancestor = ancestor->GetParent();
         }
     }


@@ -1561,6 +1597,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     {
         event.Skip( false ) ;
         event.SetEventType( wxEVT_CHAR ) ;
     {
         event.Skip( false ) ;
         event.SetEventType( wxEVT_CHAR ) ;

+

         // raw value again
         event.m_keyCode = realkeyval ;
 
         // raw value again
         event.m_keyCode = realkeyval ;
 


@@ -1568,10 +1605,11 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         if ( handled && event.GetSkipped() )
             handled = false ;
     }
         if ( handled && event.GetSkipped() )
             handled = false ;
     }

+

     if ( !handled && (keyval == WXK_TAB) )
     {
         wxWindow* iter = focus->GetParent() ;
     if ( !handled && (keyval == WXK_TAB) )
     {
         wxWindow* iter = focus->GetParent() ;

-        while( iter && !handled )
+        while ( iter && !handled )

         {
             if ( iter->HasFlag( wxTAB_TRAVERSAL ) )
             {
         {
             if ( iter->HasFlag( wxTAB_TRAVERSAL ) )
             {


@@ -1585,69 +1623,70 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
                 if ( handled && new_event.GetSkipped() )
                     handled = false ;
             }
                 if ( handled && new_event.GetSkipped() )
                     handled = false ;
             }

+

             iter = iter->GetParent() ;
         }
     }
             iter = iter->GetParent() ;
         }
     }

+

     // backdoor handler for default return and command escape
     if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
     {
     // backdoor handler for default return and command escape
     if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
     {

-          // if window is not having a focus still testing for default enter or cancel
-          // TODO add the UMA version for ActiveNonFloatingWindow
-          wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
-          if ( focus )
-          {
+        // if window is not having a focus still testing for default enter or cancel
+        // TODO: add the UMA version for ActiveNonFloatingWindow
+        wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
+        if ( focus )
+        {

             if ( keyval == WXK_RETURN )
             {
             if ( keyval == WXK_RETURN )
             {

-                 wxButton *def = wxDynamicCast(focus->GetDefaultItem(),
-                                                       wxButton);
-                 if ( def && def->IsEnabled() )
-                 {
-                     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-                     event.SetEventObject(def);
-                     def->Command(event);
-                     return true ;
-                 }
+                wxButton *def = wxDynamicCast(focus->GetDefaultItem(), wxButton);
+                if ( def && def->IsEnabled() )
+                {
+                    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                    event.SetEventObject(def);
+                    def->Command(event);
+
+                    return true ;
+                }

             }
             }

-            /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */

             else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
             {
             else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
             {

-                  wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-                  new_event.SetEventObject( focus );
-                  handled = focus->GetEventHandler()->ProcessEvent( new_event );
+                // generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs)
+                wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+                new_event.SetEventObject( focus );
+                handled = focus->GetEventHandler()->ProcessEvent( new_event );

             }
             }

-          }
+        }

     }
     }

+

     return handled ;
 }
 
     return handled ;
 }
 

-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 , short wherex , short wherey , wxChar uniChar )

 {
     if ( !focus )
         return false ;
 
 {
     if ( !focus )
         return false ;
 

-    short keycode ;
-    short keychar ;
+    short keycode, keychar ;
+

     keychar = short(keymessage & charCodeMask);
     keycode = short(keymessage & keyCodeMask) >> 8 ;
     keychar = short(keymessage & charCodeMask);
     keycode = short(keymessage & keyCodeMask) >> 8 ;

-    if ( modifiers & ( controlKey|shiftKey|optionKey ) )
+    if ( modifiers & (controlKey | shiftKey | optionKey) )

     {
         // 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;
     {
         // 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|shiftKey|optionKey))) | keycode, &state);
+        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state);

         keychar = short(keyInfo & charCodeMask);
     }
         keychar = short(keyInfo & charCodeMask);
     }

-    long keyval = wxMacTranslateKey(keychar, keycode) ;

 
 

+    long keyval = wxMacTranslateKey(keychar, keycode) ;

     if ( keyval == keychar )
     if ( keyval == keychar )

-    {

         keyval = wxToupper( keyval ) ;
         keyval = wxToupper( keyval ) ;

-    }

 
     // Check for NUMPAD keys
     if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
     {
 
     // Check for NUMPAD keys
     if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
     {

-        keyval = keyval - '0' + WXK_NUMPAD0;
+        keyval = (keyval - '0') + WXK_NUMPAD0;

     }
     else if (keycode >= 67 && keycode <= 81)
     {
     }
     else if (keycode >= 67 && keycode <= 81)
     {


@@ -1656,24 +1695,33 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
         case 76 :
             keyval = WXK_NUMPAD_ENTER;
             break;
         case 76 :
             keyval = WXK_NUMPAD_ENTER;
             break;

+

         case 81:
             keyval = WXK_NUMPAD_EQUAL;
             break;
         case 81:
             keyval = WXK_NUMPAD_EQUAL;
             break;

+

         case 67:
             keyval = WXK_NUMPAD_MULTIPLY;
             break;
         case 67:
             keyval = WXK_NUMPAD_MULTIPLY;
             break;

+

         case 75:
             keyval = WXK_NUMPAD_DIVIDE;
             break;
         case 75:
             keyval = WXK_NUMPAD_DIVIDE;
             break;

+

         case 78:
             keyval = WXK_NUMPAD_SUBTRACT;
             break;
         case 78:
             keyval = WXK_NUMPAD_SUBTRACT;
             break;

+

         case 69:
             keyval = WXK_NUMPAD_ADD;
             break;
         case 69:
             keyval = WXK_NUMPAD_ADD;
             break;

+

         case 65:
             keyval = WXK_NUMPAD_DECIMAL;
             break;
         case 65:
             keyval = WXK_NUMPAD_DECIMAL;
             break;

+
+        default:
+            break;

         } // end switch
     }
 
         } // end switch
     }