readability cleanup

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index efd5093945b99995030ff5d1217d2bf18df450bd..4bd1eea596e530f47242b3bf7b3be26ce7043166 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "app.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/window.h"
 #include "wx/wxprec.h"
 
 #include "wx/window.h"


@@ -72,7 +68,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,19 +81,17 @@ 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 ;
 
 static EventTime sleepTime = kEventDurationNoWait ;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()

-#endif

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


@@ -180,7 +174,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 ;
 


@@ -248,7 +242,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
     {


@@ -266,19 +260,26 @@ short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 }
 
 
 }
 
 

+

 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------
 
 void wxApp::MacOpenFile(const wxString & fileName )
 {
 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------
 
 void wxApp::MacOpenFile(const wxString & fileName )
 {

+#if wxUSE_DOC_VIEW_ARCHITECTURE

     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
         dm->CreateDocument(fileName , wxDOC_SILENT ) ;
     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
         dm->CreateDocument(fileName , wxDOC_SILENT ) ;

+#endif

 }
 
 }
 

+

 void wxApp::MacPrintFile(const wxString & fileName )
 {
 void wxApp::MacPrintFile(const wxString & fileName )
 {

+#if wxUSE_DOC_VIEW_ARCHITECTURE
+
+#if wxUSE_PRINTING_ARCHITECTURE

     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
     {
     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
     {


@@ -292,7 +293,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;
                 }
             }


@@ -303,8 +304,13 @@ void wxApp::MacPrintFile(const wxString & fileName )
             }
         }
     }
             }
         }
     }

+#endif //print
+
+#endif //docview

 }
 
 }
 

+
+

 void wxApp::MacNewFile()
 {
 }
 void wxApp::MacNewFile()
 {
 }


@@ -315,10 +321,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


@@ -373,14 +379,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))
         {


@@ -392,7 +398,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:


@@ -413,12 +419,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;
 }
 


@@ -430,13 +436,25 @@ 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 ;
     wxMenuItem* item = NULL ;
     MenuCommand id = command.commandID ;

-    // for items we don't really control
-    if ( id == kHICommandPreferences )
+
+    // for 'standard' commands
+    if ( id == kHICommandPreferences || id == kHICommandQuit || id == kHICommandAbout )

     {
     {

-        id = wxApp::s_macPreferencesMenuItemId ;
+        switch ( id )
+        {
+            case kHICommandPreferences :
+                id = wxApp::s_macPreferencesMenuItemId ;
+                break ;
+            case kHICommandQuit :
+                id = wxApp::s_macExitMenuItemId ;
+                break ;
+            case kHICommandAbout :
+                id = wxApp::s_macAboutMenuItemId ;
+                break ;
+        }

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


@@ -447,9 +465,41 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     }
     else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {
     }
     else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
     {

-        GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ;
+        // make sure it is one of our own menus, or of the 'synthetic' apple and help menus , otherwise don't touch
+        MenuItemIndex firstUserHelpMenuItem ;
+        static MenuHandle mh = NULL ;
+        if ( mh == NULL )
+        {
+            if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
+            {
+                mh = NULL ;
+            }
+        }
+
+        // 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 )
+            {
+                wxMenu* menu = NULL ;
+                item = mbar->FindItem( id , &menu ) ;
+            }
+        }
+        else
+        {
+            wxMenu* itsMenu = NULL ;
+            UInt32 refCon ;
+            GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
+            itsMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
+            if ( itsMenu != NULL )
+            {
+                item = (wxMenuItem*) refCon ;
+            }
+        }

     }
     }

-    
+

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


@@ -522,7 +572,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);


@@ -555,10 +605,10 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 

-#if __WXDEBUG__
+#ifdef __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


@@ -580,10 +630,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


@@ -595,11 +645,21 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
 
 #endif //__WXDEBUG__
 
 
 #endif //__WXDEBUG__
 

+#ifdef __WXMAC_OSX__
+extern "C" {
+   /* m_macEventPosted run loop source callback: */
+   void macPostedEventCallback(void *unused);
+}
+
+void macPostedEventCallback(void *unused) {
+    wxTheApp->ProcessPendingEvents(); }
+#endif
+

 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     // Mac-specific
 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     // Mac-specific
 

-#if __WXDEBUG__
+#ifdef __WXDEBUG__

     InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
 #endif
     UMAInitToolbox( 4, sm_isEmbedded ) ;
     InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
 #endif
     UMAInitToolbox( 4, sm_isEmbedded ) ;


@@ -655,18 +715,33 @@ 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
 
     wxMacCreateNotifierTable() ;
 
         wxSetWorkingDirectory( cwd ) ;
     }
 #endif
 
     wxMacCreateNotifierTable() ;
 

+#ifdef __WXMAC_OSX__
+    /* connect posted events to common-mode run loop so that wxPostEvent events
+       are handled even while we're in the menu or on a scrollbar */
+    CFRunLoopSourceContext event_posted_context = {0};
+    event_posted_context.perform = macPostedEventCallback;
+    m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
+#endif
+

     UMAShowArrowCursor() ;
 
     return true;
 }
 
     UMAShowArrowCursor() ;
 
     return true;
 }
 

+AEEventHandlerUPP sODocHandler = NULL ;
+AEEventHandlerUPP sOAppHandler = NULL ;
+AEEventHandlerUPP sPDocHandler = NULL ;
+AEEventHandlerUPP sRAppHandler = NULL ;
+AEEventHandlerUPP sQuitHandler = NULL ;
+

 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )
 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )


@@ -683,29 +758,40 @@ bool wxApp::OnInitGui()
 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {

+        sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ;
+        sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ;
+        sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ;
+        sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ;
+        sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ;
+

         AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
         AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,

-                               NewAEEventHandlerUPP(AEHandleODoc) ,
-                               0 , FALSE ) ;
+                               sODocHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
         AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,

-                               NewAEEventHandlerUPP(AEHandleOApp) ,
-                               0 , FALSE ) ;
+                               sOAppHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
         AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,

-                               NewAEEventHandlerUPP(AEHandlePDoc) ,
-                               0 , FALSE ) ;
+                               sPDocHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,
         AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,

-                               NewAEEventHandlerUPP(AEHandleRApp) ,
-                               0 , FALSE ) ;
+                               sRAppHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
         AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,

-                               NewAEEventHandlerUPP(AEHandleQuit) ,
-                               0 , FALSE ) ;
+                               sQuitHandler , 0 , FALSE ) ;

     }
 
     }
 

-    return TRUE ;
+    return true ;

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

+#if wxUSE_TOOLTIPS

     wxToolTip::RemoveToolTips() ;
     wxToolTip::RemoveToolTips() ;

+#endif
+
+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+    {
+        CFRelease(m_macEventPosted);
+    }
+    m_macEventPosted = NULL;
+#endif

 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();


@@ -724,9 +810,30 @@ void wxApp::CleanUp()
         ::DisposeRgn((RgnHandle)s_macCursorRgn);
     }
 
         ::DisposeRgn((RgnHandle)s_macCursorRgn);
     }
 

-    #if 0
-        TerminateAE() ;
-    #endif
+    if (!sm_isEmbedded)
+    {
+        RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
+    }
+
+    if (!sm_isEmbedded)
+    {
+        AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                               sODocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               sOAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               sPDocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               sRAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               sQuitHandler , FALSE ) ;
+
+        DisposeAEEventHandlerUPP( sODocHandler ) ;
+        DisposeAEEventHandlerUPP( sOAppHandler ) ;
+        DisposeAEEventHandlerUPP( sPDocHandler ) ;
+        DisposeAEEventHandlerUPP( sRAppHandler ) ;
+        DisposeAEEventHandlerUPP( sQuitHandler ) ;
+    }

 
     wxAppBase::CleanUp();
 }
 
     wxAppBase::CleanUp();
 }


@@ -839,15 +946,18 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-  m_printMode = wxPRINT_WINDOWS;
+    m_printMode = wxPRINT_WINDOWS;

 
 

-  m_macCurrentEvent = NULL ;
-  m_macCurrentEventHandlerCallRef = NULL ;
+    m_macCurrentEvent = NULL ;
+    m_macCurrentEventHandlerCallRef = NULL ;
+#ifdef __WXMAC_OSX__
+    m_macEventPosted = NULL ;
+#endif

 }
 
 int wxApp::MainLoop()
 {
 }
 
 int wxApp::MainLoop()
 {

-    m_keepGoing = TRUE;
+    m_keepGoing = true;

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


@@ -861,7 +971,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


@@ -873,7 +983,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.


@@ -899,6 +1009,12 @@ void wxApp::OnIdle(wxIdleEvent& event)
 
 void wxApp::WakeUpIdle()
 {
 
 void wxApp::WakeUpIdle()
 {

+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+    {
+        CFRunLoopSourceSignal(m_macEventPosted);
+    }
+#endif

     wxMacWakeUp() ;
 }
 
     wxMacWakeUp() ;
 }
 


@@ -911,7 +1027,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


@@ -921,7 +1037,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);

     }
 }
 
     }
 }
 


@@ -942,10 +1058,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
 


@@ -976,9 +1092,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()


@@ -1014,7 +1130,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 )


@@ -1040,102 +1156,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
 


@@ -1170,19 +1302,22 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
 #ifndef __DARWIN__
 bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {
 #ifndef __DARWIN__
 bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {

+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
+

 //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));
 }
 #endif
 
 
 //  GetKeys((BigEndianLong*)keymap);
 //  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));
 }
 #endif
 
 

-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
+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 ;


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

-        keycode = short(keyInfo & keyCodeMask) >> 8 ;

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


@@ -1210,6 +1344,39 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         keyval = wxToupper( keyval ) ;
     }
 
         keyval = wxToupper( keyval ) ;
     }
 

+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
+    {
+        keyval = keyval - '0' + WXK_NUMPAD0;
+    }
+    else if (keycode >= 67 && keycode <= 81)
+    {
+        switch (keycode)
+        {
+        case 76 :
+            keyval = WXK_NUMPAD_ENTER;
+            break;
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;
+        } // end switch
+    }
+

     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;


@@ -1217,7 +1384,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
+    event.m_rawCode = keymessage;
+    event.m_rawFlags = modifiers;

     event.m_x = wherex;
     event.m_y = wherey;
     event.SetTimestamp(when);
     event.m_x = wherex;
     event.m_y = wherey;
     event.SetTimestamp(when);


@@ -1225,31 +1396,47 @@ 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)
     {
     if (!handled)
     {

-        event.Skip( FALSE ) ;
+        wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+
+        if (tlw)
+        {
+            event.Skip( false ) ;
+            event.SetEventType( wxEVT_CHAR_HOOK );
+            // raw value again
+            event.m_keyCode = realkeyval ;
+
+            handled = tlw->GetEventHandler()->ProcessEvent( event );
+            if ( handled && event.GetSkipped() )
+                handled = false ;
+        }
+    }
+
+    if ( !handled )
+    {
+        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 ;


@@ -1296,7 +1483,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 ) )


@@ -1310,7 +1497,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     return handled ;
 }
 
     return handled ;
 }
 

-bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
+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 ;


@@ -1326,7 +1513,6 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);

-        keycode = short(keyInfo & keyCodeMask) >> 8 ;

     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
 
     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
 


@@ -1334,6 +1520,40 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     {
         keyval = wxToupper( keyval ) ;
     }
     {
         keyval = wxToupper( keyval ) ;
     }

+
+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
+    {
+        keyval = keyval - '0' + WXK_NUMPAD0;
+    }
+    else if (keycode >= 67 && keycode <= 81)
+    {
+        switch (keycode)
+        {
+        case 76 :
+            keyval = WXK_NUMPAD_ENTER;
+            break;
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;
+        } // end switch
+    }
+

     bool handled = false ;
 
     wxKeyEvent event(wxEVT_KEY_UP);
     bool handled = false ;
 
     wxKeyEvent event(wxEVT_KEY_UP);


@@ -1342,7 +1562,12 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     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

 
 

+    event.m_rawCode = keymessage;
+    event.m_rawFlags = modifiers;

     event.m_x = wherex;
     event.m_y = wherey;
     event.SetTimestamp(when);
     event.m_x = wherex;
     event.m_y = wherey;
     event.SetTimestamp(when);