new capture handling, can be turned off

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 356c2b2ecc511dc36119169c7734aecb9964fb36..7f666b955ee5982a9dc6cead64635e8b51cb7e0b 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -72,7 +72,7 @@ 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
 // 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 
+// 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
 // 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


@@ -85,9 +85,9 @@ extern size_t g_numberOfThreads;
 
 // statics for implementation
 
 
 // statics for implementation
 

-static bool s_inYield = FALSE;
+static bool s_inYield = false;

 
 

-static bool s_inReceiveEvent = FALSE ;
+static bool s_inReceiveEvent = false ;

 static EventTime sleepTime = kEventDurationNoWait ;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 static EventTime sleepTime = kEventDurationNoWait ;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)


@@ -178,7 +178,7 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 

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

     {
         wxString fName ;
 
     {
         wxString fName ;
 


@@ -246,7 +246,7 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
     {
         wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId);
         if (!win->ProcessEvent(exitEvent))
     {
         wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId);
         if (!win->ProcessEvent(exitEvent))

-            win->Close(TRUE ) ;
+            win->Close(true) ;

     }
     else
     {
     }
     else
     {


@@ -297,7 +297,7 @@ void wxApp::MacPrintFile(const wxString & fileName )
                 if (printout)
                 {
                     wxPrinter printer;
                 if (printout)
                 {
                     wxPrinter printer;

-                    printer.Print(view->GetFrame(), printout, TRUE);
+                    printer.Print(view->GetFrame(), printout, true);

                     delete printout;
                 }
             }
                     delete printout;
                 }
             }


@@ -325,10 +325,10 @@ void wxApp::MacReopenApp()
     // if there is no open window -> create a new one
     // if all windows are hidden -> show the first
     // if some windows are not hidden -> do nothing
     // if there is no open window -> create a new one
     // if all windows are hidden -> show the first
     // if some windows are not hidden -> do nothing

-    
+

     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     if ( node == NULL )
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     if ( node == NULL )

-    {  
+    {

         MacNewFile() ;
     }
     else
         MacNewFile() ;
     }
     else


@@ -383,14 +383,14 @@ static const EventTypeSpec eventList[] =
 
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

-{    
+{

     wxMacCarbonEvent cEvent( event ) ;
     MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
     wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
     wxMacCarbonEvent cEvent( event ) ;
     MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
     wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;

-    
+

     if ( menu )
     {
     if ( menu )
     {

-        wxEventType type=0;        
+        wxEventType type=0;

         MenuCommand cmd=0;
         switch (GetEventKind(event))
         {
         MenuCommand cmd=0;
         switch (GetEventKind(event))
         {


@@ -402,7 +402,7 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d
                 break;
             case kEventMenuTargetItem:
                 cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
                 break;
             case kEventMenuTargetItem:
                 cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;

-                if (cmd != 0) 
+                if (cmd != 0)

                     type = wxEVT_MENU_HIGHLIGHT;
                 break;
             default:
                     type = wxEVT_MENU_HIGHLIGHT;
                 break;
             default:


@@ -423,12 +423,12 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d
             else
             {
                 wxWindow *win = menu->GetInvokingWindow();
             else
             {
                 wxWindow *win = menu->GetInvokingWindow();

-                if (win) 
+                if (win)

                     win->GetEventHandler()->ProcessEvent(wxevent);
                 }
             }
     }
                     win->GetEventHandler()->ProcessEvent(wxevent);
                 }
             }
     }

-    
+

     return eventNotHandledErr;
 }
 
     return eventNotHandledErr;
 }
 


@@ -440,14 +440,14 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
 
     wxMacCarbonEvent cEvent( event ) ;
     cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
 
     wxMacCarbonEvent cEvent( event ) ;
     cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;

-        
+

     wxMenuItem* item = NULL ;
     MenuCommand id = command.commandID ;
     // for items we don't really control
     if ( id == kHICommandPreferences )
     {
         id = wxApp::s_macPreferencesMenuItemId ;
     wxMenuItem* item = NULL ;
     MenuCommand id = command.commandID ;
     // for items we don't really control
     if ( id == kHICommandPreferences )
     {
         id = wxApp::s_macPreferencesMenuItemId ;

-        
+

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


@@ -459,7 +459,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     {
         GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ;
     }
     {
         GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ;
     }

-    
+

     if ( item )
     {
        switch( cEvent.GetKind() )
     if ( item )
     {
        switch( cEvent.GetKind() )


@@ -532,7 +532,7 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
         case kEventClassMouse :
             {
                 wxMacCarbonEvent cEvent( event ) ;
         case kEventClassMouse :
             {
                 wxMacCarbonEvent cEvent( event ) ;

-                
+

                 WindowRef window ;
                 Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
                 ::FindWindow(screenMouseLocation, &window);
                 WindowRef window ;
                 Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
                 ::FindWindow(screenMouseLocation, &window);


@@ -567,8 +567,8 @@ WXIMPORT char std::__throws_bad_alloc ;
 
 #if __WXDEBUG__
 
 
 #if __WXDEBUG__
 

-pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, 
-    const char *assertionString, const char *exceptionLabelString, 
+pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,
+    const char *assertionString, const char *exceptionLabelString,

     const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg)
 {
     // flow into assert handling
     const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg)
 {
     // flow into assert handling


@@ -590,10 +590,10 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
 
 #if 1
     // flow into log
 
 #if 1
     // flow into log

-    wxLogDebug( wxT("AssertMacros: %s %s %s file: %s, line: %ld (value %p)\n"), 
-        assertionStr.c_str() , 
-        exceptionStr.c_str() , 
-        errorStr.c_str(), 
+    wxLogDebug( wxT("AssertMacros: %s %s %s file: %s, line: %ld (value %p)\n"),
+        assertionStr.c_str() ,
+        exceptionStr.c_str() ,
+        errorStr.c_str(),

         fileNameStr.c_str(), lineNumber ,
         value ) ;
 #else
         fileNameStr.c_str(), lineNumber ,
         value ) ;
 #else


@@ -675,7 +675,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         CFRelease( url ) ;
         CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ;
         CFRelease( urlParent ) ;
         CFRelease( url ) ;
         CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ;
         CFRelease( urlParent ) ;

-        wxString cwd = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding());       
+        wxString cwd = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding());

         wxSetWorkingDirectory( cwd ) ;
     }
 #endif
         wxSetWorkingDirectory( cwd ) ;
     }
 #endif


@@ -736,7 +736,7 @@ bool wxApp::OnInitGui()
                                sQuitHandler , 0 , FALSE ) ;
     }
 
                                sQuitHandler , 0 , FALSE ) ;
     }
 

-    return TRUE ;
+    return true ;

 }
 
 void wxApp::CleanUp()
 }
 
 void wxApp::CleanUp()


@@ -774,7 +774,7 @@ void wxApp::CleanUp()
     {
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
     }
     {
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
     }

-       
+

     if (!sm_isEmbedded)
     {
         AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments ,
     if (!sm_isEmbedded)
     {
         AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments ,


@@ -787,7 +787,7 @@ void wxApp::CleanUp()
                                sRAppHandler , FALSE ) ;
         AERemoveEventHandler( kCoreEventClass , kAEQuitApplication ,
                                sQuitHandler , FALSE ) ;
                                sRAppHandler , FALSE ) ;
         AERemoveEventHandler( kCoreEventClass , kAEQuitApplication ,
                                sQuitHandler , FALSE ) ;

-                               
+

         DisposeAEEventHandlerUPP( sODocHandler ) ;
         DisposeAEEventHandlerUPP( sOAppHandler ) ;
         DisposeAEEventHandlerUPP( sPDocHandler ) ;
         DisposeAEEventHandlerUPP( sODocHandler ) ;
         DisposeAEEventHandlerUPP( sOAppHandler ) ;
         DisposeAEEventHandlerUPP( sPDocHandler ) ;


@@ -917,7 +917,7 @@ wxApp::wxApp()
 
 int wxApp::MainLoop()
 {
 
 int wxApp::MainLoop()
 {

-    m_keepGoing = TRUE;
+    m_keepGoing = true;

 #if wxMAC_USE_RAEL
     RunApplicationEventLoop() ;
 #else
 #if wxMAC_USE_RAEL
     RunApplicationEventLoop() ;
 #else


@@ -931,7 +931,7 @@ int wxApp::MainLoop()
 
 void wxApp::ExitMainLoop()
 {
 
 void wxApp::ExitMainLoop()
 {

-    m_keepGoing = FALSE;
+    m_keepGoing = false;

 #if wxMAC_USE_RAEL
     QuitApplicationEventLoop() ;
 #endif
 #if wxMAC_USE_RAEL
     QuitApplicationEventLoop() ;
 #endif


@@ -943,7 +943,7 @@ bool wxApp::Pending()
     // without the receive event (with pull param = false ) nothing is ever reported
     EventRef theEvent;
     ReceiveNextEvent (0, NULL, kEventDurationNoWait, false, &theEvent);
     // without the receive event (with pull param = false ) nothing is ever reported
     EventRef theEvent;
     ReceiveNextEvent (0, NULL, kEventDurationNoWait, false, &theEvent);

-    return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ; 
+    return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ;

 }
 
 // Dispatch a message.
 }
 
 // Dispatch a message.


@@ -987,7 +987,7 @@ void wxApp::Exit()
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())

-        GetTopWindow()->Close(TRUE);
+        GetTopWindow()->Close(true);

 }
 
 // Default behaviour: close the application with prompts. The
 }
 
 // Default behaviour: close the application with prompts. The


@@ -997,7 +997,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))

-            event.Veto(TRUE);
+            event.Veto(true);

     }
 }
 
     }
 }
 


@@ -1018,10 +1018,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    s_inYield = TRUE;
+    s_inYield = true;

 
     // by definition yield should handle all non-processed events
 
 
     // by definition yield should handle all non-processed events
 


@@ -1052,9 +1052,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     } while( status == noErr ) ;
 
     wxMacProcessNotifierAndPendingEvents() ;
     } while( status == noErr ) ;
 
     wxMacProcessNotifierAndPendingEvents() ;

-    s_inYield = FALSE;
+    s_inYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxApp::MacDoOneEvent()
 }
 
 void wxApp::MacDoOneEvent()


@@ -1090,7 +1090,7 @@ void wxApp::MacDoOneEvent()
 
 /*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

 }
 
 void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 }
 
 void wxApp::MacHandleOneEvent( WXEVENTREF evr )


@@ -1116,102 +1116,118 @@ long wxMacTranslateKey(unsigned char key, unsigned char code)
     switch (key)
     {
         case kHomeCharCode :
     switch (key)
     {
         case kHomeCharCode :

-                 retval = WXK_HOME;
-          break;
+            retval = WXK_HOME;
+            break;
+

         case kEnterCharCode :
         case kEnterCharCode :

-                 retval = WXK_RETURN;
-          break;
+            retval = WXK_RETURN;
+            break;

         case kEndCharCode :
         case kEndCharCode :

-                 retval = WXK_END;
-          break;
+            retval = WXK_END;
+            break;
+

         case kHelpCharCode :
         case kHelpCharCode :

-                 retval = WXK_HELP;
-          break;
+            retval = WXK_HELP;
+            break;
+

         case kBackspaceCharCode :
         case kBackspaceCharCode :

-                 retval = WXK_BACK;
-          break;
+            retval = WXK_BACK;
+            break;
+

         case kTabCharCode :
         case kTabCharCode :

-                 retval = WXK_TAB;
-          break;
+            retval = WXK_TAB;
+            break;
+

         case kPageUpCharCode :
         case kPageUpCharCode :

-                 retval = WXK_PAGEUP;
-          break;
+            retval = WXK_PAGEUP;
+            break;
+

         case kPageDownCharCode :
         case kPageDownCharCode :

-                 retval = WXK_PAGEDOWN;
-          break;
+            retval = WXK_PAGEDOWN;
+            break;
+

         case kReturnCharCode :
         case kReturnCharCode :

-                 retval = WXK_RETURN;
-          break;
-            case kFunctionKeyCharCode :
+            retval = WXK_RETURN;
+            break;
+
+        case kFunctionKeyCharCode :
+        {
+            switch( code )

             {
             {

-                switch( code )
-                {
-                    case 0x7a :
-                        retval = WXK_F1 ;
-                        break;
-                    case 0x78 :
-                        retval = WXK_F2 ;
-                        break;
-                    case 0x63 :
-                        retval = WXK_F3 ;
-                        break;
-                    case 0x76 :
-                        retval = WXK_F4 ;
-                        break;
-                    case 0x60 :
-                        retval = WXK_F5 ;
-                        break;
-                    case 0x61 :
-                        retval = WXK_F6 ;
-                        break;
-                    case 0x62:
-                        retval = WXK_F7 ;
-                        break;
-                    case 0x64 :
-                        retval = WXK_F8 ;
-                        break;
-                    case 0x65 :
-                        retval = WXK_F9 ;
-                        break;
-                    case 0x6D :
-                        retval = WXK_F10 ;
-                        break;
-                    case 0x67 :
-                        retval = WXK_F11 ;
-                        break;
-                    case 0x6F :
-                        retval = WXK_F12 ;
-                        break;
-                    case 0x69 :
-                        retval = WXK_F13 ;
-                        break;
-                    case 0x6B :
-                        retval = WXK_F14 ;
-                        break;
-                    case 0x71 :
-                        retval = WXK_F15 ;
-                        break;
-                }
+                case 0x7a :
+                    retval = WXK_F1 ;
+                    break;
+                case 0x78 :
+                    retval = WXK_F2 ;
+                    break;
+                case 0x63 :
+                    retval = WXK_F3 ;
+                    break;
+                case 0x76 :
+                    retval = WXK_F4 ;
+                    break;
+                case 0x60 :
+                    retval = WXK_F5 ;
+                    break;
+                case 0x61 :
+                    retval = WXK_F6 ;
+                    break;
+                case 0x62:
+                    retval = WXK_F7 ;
+                    break;
+                case 0x64 :
+                    retval = WXK_F8 ;
+                    break;
+                case 0x65 :
+                    retval = WXK_F9 ;
+                    break;
+                case 0x6D :
+                    retval = WXK_F10 ;
+                    break;
+                case 0x67 :
+                    retval = WXK_F11 ;
+                    break;
+                case 0x6F :
+                    retval = WXK_F12 ;
+                    break;
+                case 0x69 :
+                    retval = WXK_F13 ;
+                    break;
+                case 0x6B :
+                    retval = WXK_F14 ;
+                    break;
+                case 0x71 :
+                    retval = WXK_F15 ;
+                    break;

             }
             }

+        }
+        break ;
+
+        case kEscapeCharCode :
+            retval = WXK_ESCAPE ;

             break ;
             break ;

-            case kEscapeCharCode :
-                retval = WXK_ESCAPE ;
+
+        case kLeftArrowCharCode :
+            retval = WXK_LEFT ;

             break ;
             break ;

-            case kLeftArrowCharCode :
-                retval = WXK_LEFT ;
+
+        case kRightArrowCharCode :
+            retval = WXK_RIGHT ;

             break ;
             break ;

-            case kRightArrowCharCode :
-                retval = WXK_RIGHT ;
+
+        case kUpArrowCharCode :
+            retval = WXK_UP ;

             break ;
             break ;

-            case kUpArrowCharCode :
-                retval = WXK_UP ;
+
+        case kDownArrowCharCode :
+            retval = WXK_DOWN ;

             break ;
             break ;

-            case kDownArrowCharCode :
-                retval = WXK_DOWN ;
+
+        case kDeleteCharCode :
+            retval = WXK_DELETE ;

             break ;
             break ;

-            case kDeleteCharCode :
-                retval = WXK_DELETE ;
-             default:
+
+        default:

             break ;
      } // end switch
 
             break ;
      } // end switch
 


@@ -1252,9 +1268,9 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 //if OS X > 10.2 (i.e. 10.2.x)
 //a known apple bug prevents the system from determining led
 //states with GetKeys... can only determine caps lock led
 //if OS X > 10.2 (i.e. 10.2.x)
 //a known apple bug prevents the system from determining led
 //states with GetKeys... can only determine caps lock led

-   return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key)); 
+     return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key));

 //else
 //else

-//  KeyMapByteArray keymap; 
+//  KeyMapByteArray keymap;

 //  GetKeys((BigEndianLong*)keymap);
 //  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));
 }
 //  GetKeys((BigEndianLong*)keymap);
 //  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));
 }


@@ -1340,35 +1356,34 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     if ( handled && event.GetSkipped() )
         handled = false ;
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     if ( handled && event.GetSkipped() )
         handled = false ;

+
+#if wxUSE_ACCEL

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

-#if wxUSE_ACCEL
-        if (!handled)
+        wxWindow *ancestor = focus;
+        while (ancestor)

         {
         {

-            wxWindow *ancestor = focus;
-            while (ancestor)
+            int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+            if (command != -1)

             {
             {

-                int command = ancestor->GetAcceleratorTable()->GetCommand( event );
-                if (command != -1)
-                {
-                    wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
-                    handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
-                    break;
-                }
-                if (ancestor->IsTopLevel())
-                    break;
-                ancestor = ancestor->GetParent();
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
+                break;

             }
             }

+            if (ancestor->IsTopLevel())
+                break;
+            ancestor = ancestor->GetParent();

         }
         }

-#endif // wxUSE_ACCEL

     }
     }

+#endif // wxUSE_ACCEL
+

     if (!handled)
     {
         wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
 
         if (tlw)
         {
     if (!handled)
     {
         wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
 
         if (tlw)
         {

-            event.Skip( FALSE ) ;
+            event.Skip( false ) ;

             event.SetEventType( wxEVT_CHAR_HOOK );
             // raw value again
             event.m_keyCode = realkeyval ;
             event.SetEventType( wxEVT_CHAR_HOOK );
             // raw value again
             event.m_keyCode = realkeyval ;


@@ -1378,10 +1393,10 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
                 handled = false ;
         }
     }
                 handled = false ;
         }
     }

-    
+

     if ( !handled )
     if ( !handled )

-    {        
-        event.Skip( FALSE ) ;
+    {
+        event.Skip( false ) ;

         event.SetEventType( wxEVT_CHAR ) ;
         // raw value again
         event.m_keyCode = realkeyval ;
         event.SetEventType( wxEVT_CHAR ) ;
         // raw value again
         event.m_keyCode = realkeyval ;


@@ -1428,7 +1443,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
                      event.SetEventObject(def);
                      def->Command(event);
                      return true ;
                      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 ) )
             }
             /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
             else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )