process pending wx events before sending idle events

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 914bf892d8e4fe594db4377e1b0d4bf16593789b..d833bb02d7991dd3ae80f69dc13cc3cddf3aa80f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/mac/carbon/app.cpp

 // Purpose:     wxApp
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxApp
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,47 +9,48 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "app.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 

-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/button.h"

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/intl.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
-#include "wx/log.h"
-#include "wx/module.h"
-#include "wx/memory.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/cursor.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
+    #include "wx/textctrl.h"
+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+#endif
+

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

-#include "wx/textctrl.h"
-#include "wx/menu.h"

 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/docview.h"
 #include "wx/filename.h"

+#include "wx/link.h"

 
 #include <string.h>
 
 // mac
 
 #ifndef __DARWIN__
 
 #include <string.h>
 
 // mac
 
 #ifndef __DARWIN__

-  #if __option(profile)
-    #include <profiler.h>
-  #endif
+    #if __option(profile)
+        #include <profiler.h>
+    #endif

 #endif
 
 #endif
 

-#include "apprsrc.h"
+// #include "apprsrc.h"

 
 #include "wx/mac/uma.h"
 #include "wx/mac/macnotfy.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/macnotfy.h"


@@ -67,85 +68,77 @@
 #  include <Devices.h>
 #endif
 
 #  include <Devices.h>
 #endif
 

-extern wxList wxPendingDelete;
-
-#if wxUSE_THREADS
-extern size_t g_numberOfThreads;
-#endif // wxUSE_THREADS
+// Keep linker from discarding wxStockGDIMac
+wxFORCE_LINK_MODULE(gdiobj)

 
 // statics for implementation
 
 // statics for implementation

-
-static bool s_inYield = FALSE;
-
-static bool s_inReceiveEvent = FALSE ;
+static bool s_inYield = 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) ;

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

+static const short kwxMacAppleMenuId = 1 ;

 
 

-const short kwxMacMenuBarResource = 1 ;
-const short kwxMacAppleMenuId = 1 ;
-
-WXHRGN    wxApp::s_macCursorRgn = NULL;

 wxWindow* wxApp::s_captureWindow = NULL ;
 wxWindow* wxApp::s_captureWindow = NULL ;

-int       wxApp::s_lastMouseDown = 0 ;
-long      wxApp::sm_lastMessageTime = 0;

 long      wxApp::s_lastModifiers = 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") ;
 
 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
 //----------------------------------------------------------------------
 

-pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;

 
 

-pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 
 {
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 

-pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 
 {
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 

-pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 
 {
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 

-pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
 {
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 

-pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 
 {
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 

+pascal OSErr AEHandleGURL( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ;
+}
+
+

 // AEODoc Calls MacOpenFile on each of the files passed
 
 short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
 // AEODoc Calls MacOpenFile on each of the files passed
 
 short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))


@@ -155,9 +148,9 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     DescType returnedType;
     Size actualSize;
     long itemsInList;
     DescType returnedType;
     Size actualSize;
     long itemsInList;

-    FSSpec theSpec;

     OSErr err;
     short i;
     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;


@@ -171,12 +164,44 @@ 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++) {
-        AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
-        (Ptr) & theSpec, sizeof(theSpec), &actualSize);
-        wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+    wxString fName ;
+    FSRef theRef ;
+
+    for (i = 1; i <= itemsInList; i++)
+    {
+        AEGetNthPtr(
+            &docList, i, typeFSRef, &keywd, &returnedType,
+            (Ptr)&theRef, sizeof(theRef), &actualSize);
+        fName = wxMacFSRefToPath( &theRef ) ;
+

         MacOpenFile(fName);
     }
         MacOpenFile(fName);
     }

+
+    return noErr;
+}
+
+// AEODoc Calls MacOpenURL on the url passed
+
+short wxApp::MacHandleAEGURL(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
+{
+    DescType returnedType;
+    Size actualSize;
+    char url[255];
+    OSErr err = AEGetParamPtr((AppleEvent *)event, keyDirectObject, typeChar,
+                              &returnedType, url, sizeof(url)-1,
+                              &actualSize);
+    if (err != noErr)
+        return err;
+
+    url[actualSize] = '\0';    // Terminate the C string 
+
+    ProcessSerialNumber PSN ;
+    PSN.highLongOfPSN = 0 ;
+    PSN.lowLongOfPSN = kCurrentProcess ;
+    SetFrontProcess( &PSN ) ;
+
+    MacOpenURL(wxString(url, wxConvUTF8));
+

     return noErr;
 }
 
     return noErr;
 }
 


@@ -189,9 +214,9 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
     DescType returnedType;
     Size actualSize;
     long itemsInList;
     DescType returnedType;
     Size actualSize;
     long itemsInList;

-    FSSpec theSpec;

     OSErr err;
     short i;
     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;


@@ -205,12 +230,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++) {
-        AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
-        (Ptr) & theSpec, sizeof(theSpec), &actualSize);
-        wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+    wxString fName ;
+    FSRef theRef ;
+
+    for (i = 1; i <= itemsInList; i++)
+    {
+        AEGetNthPtr(
+            &docList, i, typeFSRef, &keywd, &returnedType,
+            (Ptr)&theRef, sizeof(theRef), &actualSize);
+        fName = wxMacFSRefToPath( &theRef ) ;
+

         MacPrintFile(fName);
     }
         MacPrintFile(fName);
     }

+

     return noErr;
 }
 
     return noErr;
 }
 


@@ -231,12 +263,13 @@ 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
     {
         ExitMainLoop() ;
     }
     }
     else
     {
         ExitMainLoop() ;
     }

+

     return noErr ;
 }
 
     return noErr ;
 }
 


@@ -245,23 +278,32 @@ 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
 //----------------------------------------------------------------------
 
 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::MacOpenURL(const wxString & url )
+{

 }
 
 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 )
     {


@@ -269,16 +311,17 @@ 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)
                 {
                     wxPrinter printer;
             {
                 wxPrintout *printout = view->OnCreatePrintout();
                 if (printout)
                 {
                     wxPrinter printer;

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

                     delete printout;
                 }
             }
                     delete printout;
                 }
             }

+

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


@@ -286,15 +329,190 @@ void wxApp::MacPrintFile(const wxString & fileName )
             }
         }
     }
             }
         }
     }

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

 }
 
 }
 

+
+

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

-    // eventually check for open docs, if none, call MacNewFile
+    // HIG says :
+    // 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 )
+    {
+        MacNewFile() ;
+    }
+    else
+    {
+        wxTopLevelWindow* firstIconized = NULL ;
+        while (node)
+        {
+            wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
+            if ( !win->IsIconized() )
+            {
+                firstIconized = NULL ;
+                break ;
+            }
+            else
+            {
+                if ( firstIconized == NULL )
+                    firstIconized = win ;
+            }
+
+            node = node->GetNext();
+        }
+
+        if ( firstIconized )
+            firstIconized->Iconize( false ) ;
+    }
+}
+
+//----------------------------------------------------------------------
+// Macintosh CommandID support - converting between native and wx IDs
+//----------------------------------------------------------------------
+
+// if no native match they just return the passed-in id
+
+struct IdPair
+{
+    UInt32 macId ;
+    int wxId ;
+} ;
+
+IdPair gCommandIds [] =
+{
+    { kHICommandCut ,           wxID_CUT } ,
+    { kHICommandCopy ,          wxID_COPY } ,
+    { kHICommandPaste ,         wxID_PASTE } ,
+    { kHICommandSelectAll ,     wxID_SELECTALL } ,
+    { kHICommandClear ,         wxID_CLEAR } ,
+    { kHICommandUndo ,          wxID_UNDO } ,
+    { kHICommandRedo ,          wxID_REDO } ,
+} ;
+
+int wxMacCommandToId( UInt32 macCommandId )
+{
+    int wxid = 0 ;
+
+    switch ( macCommandId )
+    {
+        case kHICommandPreferences :
+            wxid = wxApp::s_macPreferencesMenuItemId ;
+            break ;
+
+        case kHICommandQuit :
+            wxid = wxApp::s_macExitMenuItemId ;
+            break ;
+
+        case kHICommandAbout :
+            wxid = wxApp::s_macAboutMenuItemId ;
+            break ;
+
+        default :
+            {
+                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 ;
+
+    return wxid ;
+}
+
+UInt32 wxIdToMacCommand( int wxId )
+{
+    UInt32 macId = 0 ;
+
+    if ( wxId == wxApp::s_macPreferencesMenuItemId )
+        macId = kHICommandPreferences ;
+    else if (wxId == wxApp::s_macExitMenuItemId)
+        macId = kHICommandQuit ;
+    else if (wxId == wxApp::s_macAboutMenuItemId)
+        macId = kHICommandAbout ;
+    else
+    {
+        for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i )
+        {
+            if ( gCommandIds[i].wxId == wxId )
+            {
+                macId = gCommandIds[i].macId ;
+                break ;
+            }
+        }
+    }
+
+    if ( macId == 0 )
+        macId = (int) wxId ;
+
+    return macId ;
+}
+
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
+{
+    wxMenu* itemMenu = NULL ;
+    int id = 0 ;
+
+    // for 'standard' commands which don't have a wx-menu
+    if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout )
+    {
+        id = wxMacCommandToId( command.commandID ) ;
+
+        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+        if ( mbar )
+            item = mbar->FindItem( id , &itemMenu ) ;
+    }
+    else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
+    {
+        id = wxMacCommandToId( command.commandID ) ;
+        // 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 helpMenuHandle = NULL ;
+        if ( helpMenuHandle == NULL )
+        {
+            if ( UMAGetHelpMenuDontCreate( &helpMenuHandle , &firstUserHelpMenuItem) != noErr )
+                helpMenuHandle = 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 ) ) ||
+             ( helpMenuHandle != NULL && command.menu.menuRef == helpMenuHandle ) || 
+             wxMenuBar::MacGetWindowMenuHMenu() != NULL && command.menu.menuRef == wxMenuBar::MacGetWindowMenuHMenu() )
+        {
+            wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+            if ( mbar )
+                item = mbar->FindItem( id , &itemMenu ) ;
+        }
+        else
+        {
+            URefCon refCon ;
+
+            GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
+            itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
+            if ( itemMenu != NULL )
+                item = (wxMenuItem*) refCon ;
+        }
+    }
+
+    return itemMenu ;

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -327,54 +545,52 @@ static const EventTypeSpec eventList[] =
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {

-    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar();
-    
-    if ( mbar )
+    wxMacCarbonEvent cEvent( event ) ;
+    MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
+    wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
+
+    if ( menu )

     {
     {

-        wxFrame* win = mbar->GetFrame();
-        if ( win )
+        wxEventType type=0;
+        MenuCommand cmd=0;
+        switch (GetEventKind(event))

         {
         {

-            
-            // VZ: we could find the menu from its handle here by examining all
-            //     the menus in the menu bar recursively but knowing that neither
-            //     wxMSW nor wxGTK do it why bother...
- #if 0
-            MenuRef menuRef;
-
-            GetEventParameter(event,
-                              kEventParamDirectObject,
-                              typeMenuRef, NULL,
-                              sizeof(menuRef), NULL,
-                              &menuRef);
- #endif // 0
-
-            wxEventType type=0;        
-            MenuCommand cmd=0;
-            switch (GetEventKind(event))
-            {
-                case kEventMenuOpening:
-                    type = wxEVT_MENU_OPEN;
-                    break;
-                case kEventMenuClosed:
-                    type = wxEVT_MENU_CLOSE;
-                    break;
-                case kEventMenuTargetItem:
-                    type = wxEVT_MENU_HIGHLIGHT;
-                    GetEventParameter(event, kEventParamMenuCommand,
-                                      typeMenuCommand, NULL,
-                                      sizeof(cmd), NULL, &cmd);
-                    if (cmd == 0) return eventNotHandledErr;
-                    break;
-                default:
-                    wxFAIL_MSG(wxT("Unexpected menu event kind"));
-                    break;
-            }
+            case kEventMenuOpening:
+                type = wxEVT_MENU_OPEN;
+                break;
+
+            case kEventMenuClosed:
+                type = wxEVT_MENU_CLOSE;
+                break;

 
 

-            wxMenuEvent wxevent(type, cmd);
-            wxevent.SetEventObject(win);
+            case kEventMenuTargetItem:
+                cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
+                if (cmd != 0)
+                    type = wxEVT_MENU_HIGHLIGHT;
+                break;

 
 

-            (void)win->GetEventHandler()->ProcessEvent(wxevent);
+            default:
+                wxFAIL_MSG(wxT("Unexpected menu event kind"));
+                break;

         }
         }

+
+        if ( type )
+        {
+            wxMenuEvent wxevent(type, cmd, menu);
+            wxevent.SetEventObject(menu);
+
+            wxEvtHandler* handler = menu->GetEventHandler();
+            if (handler && handler->ProcessEvent(wxevent))
+            {
+                // handled
+            }
+            else
+            {
+                wxWindow *win = menu->GetInvokingWindow();
+                if (win)
+                    win->GetEventHandler()->ProcessEvent(wxevent);
+                }
+            }

     }
 
     return eventNotHandledErr;
     }
 
     return eventNotHandledErr;


@@ -386,52 +602,80 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
 
     HICommand command ;
 
 
     HICommand command ;
 

-    GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL,
-        sizeof( HICommand ), NULL, &command );
+    wxMacCarbonEvent cEvent( event ) ;
+    cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;

 
 

-    MenuCommand id = command.commandID ;
-    if ( id == kHICommandPreferences )
-        id = wxApp::s_macPreferencesMenuItemId ;
-
-    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
-    wxMenu* menu = NULL ;

     wxMenuItem* item = NULL ;
     wxMenuItem* item = NULL ;

+    wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ;
+    int id = wxMacCommandToId( command.commandID ) ;

 
 

-    if ( mbar )
+    if ( item )

     {
     {

-        item = mbar->FindItem( id , &menu ) ;
-        // it is not 100 % sure that an menu of id 0 is really ours, safety check
-        if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef )
+        wxASSERT( itemMenu != NULL ) ;
+
+        switch ( cEvent.GetKind() )

         {
         {

-            item = NULL ;
-            menu = NULL ;
-        }
-    }
+            case kEventProcessCommand :
+            {
+                if (item->IsCheckable())
+                    item->Check( !item->IsChecked() ) ;

 
 

-    if ( item == NULL || menu == NULL || mbar == NULL )
-        return result ;
+                if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
+                    result = noErr ;
+            }
+            break ;

 
 

-       switch( GetEventKind( event ) )
-       {
-           case kEventProcessCommand :
-           {
-                if (item->IsCheckable())
+        case kEventCommandUpdateStatus:
+            {
+                wxUpdateUIEvent event(id);
+                event.SetEventObject( itemMenu );
+
+                bool processed = false;
+
+                // Try the menu's event handler

                 {
                 {

-                    item->Check( !item->IsChecked() ) ;
+                    wxEvtHandler *handler = itemMenu->GetEventHandler();
+                    if ( handler )
+                        processed = handler->ProcessEvent(event);
+                }
+
+                // Try the window the menu was popped up from
+                // (and up through the hierarchy)
+                if ( !processed )
+                {
+                    const wxMenuBase *menu = itemMenu;
+                    while ( menu )
+                    {
+                        wxWindow *win = menu->GetInvokingWindow();
+                        if ( win )
+                        {
+                            processed = win->GetEventHandler()->ProcessEvent(event);
+                            break;
+                        }
+
+                        menu = menu->GetParent();
+                    }

                 }
 
                 }
 

-                menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
-                result = noErr ;
+                if ( processed )
+                {
+                    // if anything changed, update the changed attribute
+                    if (event.GetSetText())
+                        itemMenu->SetLabel(id, event.GetText());
+                    if (event.GetSetChecked())
+                        itemMenu->Check(id, event.GetChecked());
+                    if (event.GetSetEnabled())
+                        itemMenu->Enable(id, event.GetEnabled());
+
+                    result = noErr ;
+                }

             }
             }

-               break ;
-        case kEventCommandUpdateStatus:
-            // eventually trigger an updateui round
-            result = noErr ;

             break ;
             break ;

-           default :
-               break ;
-       }

 
 

+        default :
+            break ;
+        }
+    }

     return result ;
 }
 
     return result ;
 }
 


@@ -441,65 +685,83 @@ 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 ;
 }
 
 pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     return result ;
 }
 
 pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {

+    EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+    EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+    wxTheApp->MacSetCurrentEvent( event , handler ) ;
+

     OSStatus result = eventNotHandledErr ;
     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 :
         case kEventClassMouse :

-            result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
+            {
+                wxMacCarbonEvent cEvent( event ) ;
+
+                WindowRef window ;
+                Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
+                ::FindWindow(screenMouseLocation, &window);
+                // only send this event in case it had not already been sent to a tlw, as we get
+                // double events otherwise (in case event.skip) was called
+                if ( window == NULL )
+                    result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
+            }

             break ;
             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 ;
     }
 

+    wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+

     return result ;
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 
     return result ;
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 

-#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
-// we know it's there ;-)
-WXIMPORT char std::__throws_bad_alloc ;
-#endif
+#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


@@ -507,6 +769,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);


@@ -521,36 +784,46 @@ 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
 
     wxOnAssert(fileNameStr, lineNumber , assertionStr ,
         fileNameStr.c_str(), lineNumber ,
         value ) ;
 #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
 }
 

+#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__
-    InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
+#ifdef __WXDEBUG__
+    InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );

 #endif
 #endif

+

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

-#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
-    // open shared library resources from here since we don't have
-    //   __wxinitialize in Mach-O shared libraries
-    wxStAppResource::OpenSharedLibraryResource(NULL);
-#endif
-

 #ifndef __DARWIN__
 #  if __option(profile)
     ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;
 #ifndef __DARWIN__
 #  if __option(profile)
     ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;


@@ -566,8 +839,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
 #endif
 
 
 #endif
 

-    s_macCursorRgn = ::NewRgn() ;
-

     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the


@@ -590,17 +861,49 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

+#if TARGET_API_MAC_OSX
+    // these might be the startup dirs, set them to the 'usual' dir containing the app bundle
+    wxString startupCwd = wxGetCwd() ;
+    if ( startupCwd == wxT("/") || startupCwd.Right(15) == wxT("/Contents/MacOS") )
+    {
+        CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle() ) ;
+        CFURLRef urlParent = CFURLCreateCopyDeletingLastPathComponent( kCFAllocatorDefault , url ) ;
+        CFRelease( url ) ;
+        CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ;
+        CFRelease( urlParent ) ;
+        wxString cwd = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding());
+        wxSetWorkingDirectory( cwd ) ;
+    }
+#endif

 
     wxMacCreateNotifierTable() ;
 
 
     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);
+       // run loop takes ownership
+       CFRelease(m_macEventPosted);
+#endif
+

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

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

 bool wxApp::OnInitGui()
 {
 bool wxApp::OnInitGui()
 {

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

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


@@ -614,29 +917,43 @@ bool wxApp::OnInitGui()
 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {

+        sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ;
+        sGURLHandler = NewAEEventHandlerUPP(AEHandleGURL) ;
+        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( kInternetEventClass, kAEGetURL,
+                               sGURLHandler , 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)
+       {
+               CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
+               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();


@@ -650,20 +967,33 @@ void wxApp::CleanUp()
 #  endif
 #endif
 
 #  endif
 #endif
 

-#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
-    // close shared library resources from here since we don't have
-    //   __wxterminate in Mach-O shared libraries
-    wxStAppResource::CloseSharedLibraryResource();
-#endif
-

     UMACleanupToolbox() ;
     UMACleanupToolbox() ;

-    if (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( kInternetEventClass, kAEGetURL,
+                               sGURLHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               sOAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               sPDocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               sRAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               sQuitHandler , FALSE ) ;
+
+        DisposeAEEventHandlerUPP( sODocHandler ) ;
+        DisposeAEEventHandlerUPP( sGURLHandler ) ;
+        DisposeAEEventHandlerUPP( sOAppHandler ) ;
+        DisposeAEEventHandlerUPP( sPDocHandler ) ;
+        DisposeAEEventHandlerUPP( sRAppHandler ) ;
+        DisposeAEEventHandlerUPP( sQuitHandler ) ;
+    }

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


@@ -672,215 +1002,74 @@ void wxApp::CleanUp()
 // misc initialization stuff
 //----------------------------------------------------------------------
 
 // misc initialization stuff
 //----------------------------------------------------------------------
 

-// extern variable for shared library resource id
-// need to be able to find it with NSLookupAndBindSymbol
-short gSharedLibraryResource = kResFileNotOpened ;
+#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)

 
 

-#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
-CFBundleRef gSharedLibraryBundle = NULL;
-#endif /* WXMAKINGDLL_CORE && __DARWIN__ */
+// for shared libraries we have to manually get the correct resource
+// ref num upon initializing and releasing when terminating, therefore
+// the __wxinitialize and __wxterminate must be used

 
 

-wxStAppResource::wxStAppResource()
+extern "C"

 {
 {

-    m_currentRefNum = CurResFile() ;
-    if ( gSharedLibraryResource != kResFileNotOpened )
-    {
-        UseResFile( gSharedLibraryResource ) ;
-    }
+    void __sinit(void);    // (generated by linker)
+    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+    pascal void __terminate(void);

 }
 
 }
 

-wxStAppResource::~wxStAppResource()
+pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)

 {
 {

-    if ( m_currentRefNum != kResFileNotOpened )
-    {
-        UseResFile( m_currentRefNum ) ;
-    }
+    return __initialize( theInitBlock ) ;

 }
 
 }
 

-void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
+pascal void __wxterminate(void)

 {
 {

-    gSharedLibraryResource = kResFileNotOpened;
+    __terminate() ;
+}

 
 

-#ifdef WXMAKINGDLL_CORE
-    if ( initBlock != NULL ) {
-        const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
-        FSSpec *fileSpec = NULL;
-
-        if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
-            fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
-        }
-        else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
-            fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
-        }
-
-        if (fileSpec != NULL) {
-            gSharedLibraryResource =  FSpOpenResFile(fileSpec, fsRdPerm);
-        }
-    }
-    else {
-#ifdef __DARWIN__
-        // Open the shared library resource file if it is not yet open
-        NSSymbol    theSymbol;
-        NSModule    theModule;
-        const char *theLibPath;
-
-        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
-        if (gSharedLibraryBundle != NULL) {
-            // wxWindows has been bundled into a framework
-            //   load the framework resources
-
-            gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
-        }
-        else {
-            // wxWindows is a simple dynamic shared library
-            //   load the resources from the data fork of a separate resource file
-            wxString theResPath;
-            wxString theName;
-            FSRef  theResRef;
-            OSErr  theErr = noErr;
-
-            // get the library path
-            theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
-            theModule = NSModuleForSymbol(theSymbol);
-            theLibPath = NSLibraryNameForModule(theModule);
-
-            // if we call wxLogDebug from here then, as wxTheApp hasn't been
-            // created yet when we're called from wxApp::Initialize(), wxLog
-            // is going to create a default stderr-based log target instead of
-            // the expected normal GUI one -- don't do it, if we really want
-            // to see this message just use fprintf() here
-#if 0
-            wxLogDebug( wxT("wxMac library installation name is '%s'"),
-                        theLibPath );
-#endif
-
-            // allocate copy to replace .dylib.* extension with .rsrc
-            if (theLibPath != NULL) {
-#if wxUSE_UNICODE
-                theResPath = wxString(theLibPath, wxConvLocal);
-#else
-                theResPath = wxString(theLibPath);
-#endif
-                // replace '_core' with '' in case of multi-lib build
-                theResPath.Replace(wxT("_core"), wxEmptyString);
-                // replace ".dylib" shared library extension with ".rsrc"
-                theResPath.Replace(wxT(".dylib"), wxT(".rsrc"));
-                // Find the begining of the filename
-                theName = theResPath.AfterLast('/');
-
-#if 0
-                wxLogDebug( wxT("wxMac resources file name is '%s'"),
-                            theResPath.mb_str() );
-#endif
-
-                theErr = FSPathMakeRef((UInt8 *) theResPath.mb_str(), &theResRef, false);
-                if (theErr != noErr) {
-                    // try in current directory (using name only)
-                    theErr = FSPathMakeRef((UInt8 *) theName.mb_str(), &theResRef, false);
-                }
-
-                // open the resource file
-                if (theErr == noErr) {
-                    theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm,
-                                                 &gSharedLibraryResource);
-                }
-                if (theErr != noErr) {
-#ifdef __WXDEBUG__
-                    wxLogDebug( wxT("unable to open wxMac resource file '%s'\n"),
-                                theResPath.mb_str() );
-#endif // __WXDEBUG__
-                }
-
-            }
-        }
-#endif /* __DARWIN__ */
-    }
-#endif /* WXMAKINGDLL_CORE */
-}
-
-void wxStAppResource::CloseSharedLibraryResource()
-{
-#ifdef WXMAKINGDLL_CORE
-    // Close the shared library resource file
-    if (gSharedLibraryResource != kResFileNotOpened) {
-#ifdef __DARWIN__
-        if (gSharedLibraryBundle != NULL) {
-            CFBundleCloseBundleResourceMap(gSharedLibraryBundle,
-                                           gSharedLibraryResource);
-            gSharedLibraryBundle = NULL;
-        }
-        else
-#endif /* __DARWIN__ */
-        {
-            CloseResFile(gSharedLibraryResource);
-        }
-        gSharedLibraryResource = kResFileNotOpened;
-    }
-#endif /* WXMAKINGDLL_CORE */
-}
-
-#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
-
-// for shared libraries we have to manually get the correct resource
-// ref num upon initializing and releasing when terminating, therefore
-// the __wxinitialize and __wxterminate must be used
-
-extern "C" {
-    void __sinit(void);    /*    (generated by linker)    */
-    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
-    pascal void __terminate(void);
-}
-
-pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
-{
-    wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ;
-    return __initialize( theInitBlock ) ;
-}
-
-pascal void __wxterminate(void)
-{
-    wxStAppResource::CloseSharedLibraryResource() ;
-    __terminate() ;
-}
-
-#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */
+#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */

 
 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 ;
                     unsigned char charCode ;
                     UInt32 modifiers ;
                 if ( converted )
                 {
                     UInt32 keyCode ;
                     unsigned char charCode ;
                     UInt32 modifiers ;

+#ifndef __LP64__

                     GetMouse( &rec->where) ;
                     GetMouse( &rec->where) ;

-
+#endif

                     err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                     err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
                     err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
                     err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                     err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
                     err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);


@@ -889,20 +1078,26 @@ 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 ;
+#ifndef __LP64__
+

                                 GetMouse( &rec->where) ;
                                 GetMouse( &rec->where) ;

+#endif

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


@@ -911,12 +1106,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 ;

         }
     }
 
         }
     }
 


@@ -925,74 +1124,40 @@ 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 ;

 
 

-int wxApp::MainLoop()
-{
-    m_keepGoing = TRUE;
-
-    while (m_keepGoing)
-    {
-        MacDoOneEvent() ;
-    }
-
-    return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
-      m_keepGoing = FALSE;
-}
-
-// 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;
+#ifdef __WXMAC_OSX__
+    m_macEventPosted = NULL ;
+#endif

 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 {
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 {

-    wxAppBase::OnIdle(event);
-
-    // If they are pending events, we must process them: pending events are
-    // either events to the threads other than main or events posted with
-    // wxPostEvent() functions
-    wxMacProcessNotifierAndPendingEvents();
+    wxMacProcessNotifierEvents();

 
 

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

     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
 void wxApp::WakeUpIdle()
 {
     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
 void wxApp::WakeUpIdle()
 {

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

 
 

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

 }
 
 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


@@ -1002,7 +1167,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);

     }
 }
 
     }
 }
 


@@ -1023,20 +1188,27 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    s_inYield = TRUE;
-

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    YieldToAnyThread() ;
-#endif
+    // Yielding from a non-gui thread needs to bail out, otherwise we end up
+    // possibly sending events in the thread too.
+    if ( !wxThread::IsMain() )
+    {
+        return true;
+    }
+#endif // wxUSE_THREADS
+
+    s_inYield = true;
+

     // by definition yield should handle all non-processed events
 
     EventRef theEvent;
 
     OSStatus status = noErr ;
     // by definition yield should handle all non-processed events
 
     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) ;


@@ -1057,12 +1229,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
             MacHandleOneEvent( theEvent ) ;
             ReleaseEvent(theEvent);
         }
             MacHandleOneEvent( theEvent ) ;
             ReleaseEvent(theEvent);
         }

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

 
     wxMacProcessNotifierAndPendingEvents() ;
 
     wxMacProcessNotifierAndPendingEvents() ;

-    s_inYield = FALSE;
+    s_inYield = false;

 
 

-    return TRUE;
+    return true;

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


@@ -1070,36 +1242,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() )
-            sleepTime = kEventDurationNoWait ;
-        else
-        {
-#if wxUSE_THREADS
-            if (g_numberOfThreads)
-            {
-                sleepTime = kEventDurationNoWait;
-            }
+        case eventLoopTimedOutErr :
+            if ( wxTheApp->ProcessIdle() )
+                sleepTime = kEventDurationNoWait ;

             else
             else

-#endif // wxUSE_THREADS
-            {

                 sleepTime = kEventDurationSecond;
                 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;
+
+        case eventLoopQuitErr :
+            // according to QA1061 this may also occur
+            // when a WakeUp Process is executed
+            break;
+
+        default:
+            MacHandleOneEvent( theEvent ) ;
+            ReleaseEvent( theEvent );
+            sleepTime = kEventDurationNoWait ;
+            break;

     }
     // repeaters
 
     }
     // repeaters
 


@@ -1107,9 +1271,18 @@ 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
+}
+
+CFMutableArrayRef GetAutoReleaseArray()
+{
+    static CFMutableArrayRef array = 0;
+    if ( array == 0)
+        array= CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks);
+    return array;

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


@@ -1117,117 +1290,160 @@ 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
+
+    CFArrayRemoveAllValues( GetAutoReleaseArray() );
+}
+
+void wxApp::MacAddToAutorelease( void* cfrefobj )
+{
+    CFArrayAppendValue( GetAutoReleaseArray(), cfrefobj );

 }
 
 }
 

-long wxMacTranslateKey(unsigned char key, unsigned char code) ;

 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;
     switch (key)
     {
         case kHomeCharCode :
 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;
     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;
+
+                default:
+                    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
 


@@ -1259,105 +1475,147 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
     }
 }
 
     }
 }
 

+#ifndef __DARWIN__

 bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {
 bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {

-//#ifdef __DARWIN__
-//     wxHIDKeyboard keyboard;
-//     return keyboard.IsActive(key);
-//#else
-// TODO:  Have it use HID Manager on OSX...
+    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));
 //  GetKeys((BigEndianLong*)keymap);
 //  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));

-//#endif

 }
 }

+#endif

 
 
 
 

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

 {
 {

-    if ( !focus )
-        return false ;
+    wxMouseState ms;

 
 

-    short keycode ;
-    short keychar ;
-    keychar = short(keymessage & charCodeMask);
-    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    wxPoint pt = wxGetMousePosition();
+    ms.SetX(pt.x);
+    ms.SetY(pt.y);

 
 

-    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;
-        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 ;
-    if ( keyval == keychar )
-    {
-        // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
-        realkeyval = short(keymessage & charCodeMask) ;
-        keyval = wxToupper( keyval ) ;
-    }
+#if TARGET_API_MAC_OSX
+    UInt32 buttons = GetCurrentButtonState();
+    ms.SetLeftDown( (buttons & 0x01) != 0 );
+    ms.SetMiddleDown( (buttons & 0x04) != 0 );
+    ms.SetRightDown( (buttons & 0x02) != 0 );
+#else
+    ms.SetLeftDown( Button() );
+    ms.SetMiddleDown( 0 );
+    ms.SetRightDown( 0 );
+#endif

 
 

-    wxKeyEvent event(wxEVT_KEY_DOWN);
-    bool handled = false ;
-    event.m_shiftDown = modifiers & shiftKey;
-    event.m_controlDown = modifiers & controlKey;
-    event.m_altDown = modifiers & optionKey;
-    event.m_metaDown = modifiers & cmdKey;
-    event.m_keyCode = keyval ;
+    UInt32 modifiers = GetCurrentKeyModifiers();
+    ms.SetControlDown(modifiers & controlKey);
+    ms.SetShiftDown(modifiers & shiftKey);
+    ms.SetAltDown(modifiers & optionKey);
+    ms.SetMetaDown(modifiers & cmdKey);
+
+    return ms;
+}
+
+// TODO : once the new key/char handling is tested, move all the code to wxWindow
+
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+    if ( !focus )
+        return false ;
+
+    bool handled;
+    wxKeyEvent event(wxEVT_KEY_DOWN) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;

 
 

-    event.m_x = wherex;
-    event.m_y = wherey;
-    event.m_timeStamp = when;
-    event.SetEventObject(focus);

     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)
+                wxEvtHandler * const handler = ancestor->GetEventHandler();
+
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                handled = handler->ProcessEvent( command_event );
+
+                if ( !handled )

                 {
                 {

-                    wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
-                    handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
-                    break;
+                    // accelerators can also be used with buttons, try them too
+                    command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+                    handled = handler->ProcessEvent( command_event );

                 }
                 }

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

             }
             }

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

         }
         }

-#endif // wxUSE_ACCEL

     }
     }

-    if (!handled)
-    {
-        event.Skip( FALSE ) ;
-        event.SetEventType( wxEVT_CHAR ) ;
-        // raw value again
-        event.m_keyCode = realkeyval ;
+#endif // wxUSE_ACCEL

 
 

-        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    return handled ;
+}
+
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+    if ( !focus )
+        return false ;
+
+    bool handled;
+    wxKeyEvent event( wxEVT_KEY_UP ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+
+    return handled ;
+}
+
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+    if ( !focus )
+        return false ;
+
+    wxKeyEvent event(wxEVT_CHAR) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    long keyval = event.m_keyCode ;
+
+    bool handled = false ;
+
+    wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+
+    if (tlw)
+    {
+        event.SetEventType( wxEVT_CHAR_HOOK );
+        handled = tlw->GetEventHandler()->ProcessEvent( event );

         if ( handled && event.GetSkipped() )
             handled = false ;
     }
         if ( handled && event.GetSkipped() )
             handled = false ;
     }

+
+    if ( !handled )
+    {
+        event.SetEventType( wxEVT_CHAR );
+        event.Skip( false ) ;
+        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    }
+

     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 ) )
             {


@@ -1371,79 +1629,122 @@ 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 ( keyval == WXK_RETURN )
+        // 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 || keyval == WXK_NUMPAD_ENTER )

             {
             {

-                 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 ;
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(focus), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
+                {
+                    wxButton *def = wxDynamicCast(tlw->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 )
+// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.
+void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )

 {
 {

-    if ( !focus )
-        return false ;
+    short keycode, keychar ;

 
 

-    short keycode ;
-    short 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 ( !(event.GetEventType() == wxEVT_CHAR) && (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);

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

     }
     }

+

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

+    if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )
+        keyval = wxToupper( keyval ) ;

 
 

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

     {
     {

-        keyval = wxToupper( keyval ) ;
+        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;
+
+        default:
+            break;
+        } // end switch

     }
     }

-    bool handled = false ;

 
 

-    wxKeyEvent event(wxEVT_KEY_UP);

     event.m_shiftDown = modifiers & shiftKey;
     event.m_controlDown = modifiers & controlKey;
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;
     event.m_shiftDown = modifiers & shiftKey;
     event.m_controlDown = modifiers & controlKey;
     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.m_x = wherex;
     event.m_y = wherey;

-    event.m_timeStamp = when;
+    event.SetTimestamp(when);

     event.SetEventObject(focus);
     event.SetEventObject(focus);

-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-
-    return handled ;

 }
 }