Make wxPASSWORD and wxPROCESS_ENTER really deprecated.

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 63898fed72d4d8c70b2070be27daffaa88769e7a..b128991ff072ab3a3437d8526479b96c677ec350 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -9,11 +9,7 @@
 // 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/window.h"
 #include "wx/frame.h"


@@ -37,6 +33,7 @@
 #include "wx/textctrl.h"
 #include "wx/menu.h"
 #include "wx/docview.h"
 #include "wx/textctrl.h"
 #include "wx/menu.h"
 #include "wx/docview.h"

+#include "wx/filename.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -48,14 +45,14 @@
   #endif
 #endif
 
   #endif
 #endif
 

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

 
 #include "wx/mac/uma.h"
 #include "wx/mac/macnotfy.h"
 
 #ifdef __DARWIN__
 #  include <CoreServices/CoreServices.h>
 
 #include "wx/mac/uma.h"
 #include "wx/mac/macnotfy.h"
 
 #ifdef __DARWIN__
 #  include <CoreServices/CoreServices.h>

-#  if defined(WXMAKINGDLL)
+#  if defined(WXMAKINGDLL_CORE)

 #    include <mach-o/dyld.h>
 #  endif
 #else
 #    include <mach-o/dyld.h>
 #  endif
 #else


@@ -67,33 +64,27 @@
 #endif
 
 extern wxList wxPendingDelete;
 #endif
 
 extern wxList wxPendingDelete;

-extern wxList *wxWinMacWindowList;
-extern wxList *wxWinMacControlList;
-
-// statics for implementation

 
 

-static bool s_inYield = FALSE;
+#if wxUSE_THREADS
+extern size_t g_numberOfThreads;
+#endif

 
 

-#if TARGET_CARBON
-static bool s_inReceiveEvent = FALSE ;
+// statics for implementation
+static bool s_inYield = false;
+static bool s_inReceiveEvent = false ;

 static EventTime sleepTime = kEventDurationNoWait ;
 static EventTime sleepTime = kEventDurationNoWait ;

-#else
-static long sleepTime = 0 ;
-#endif

 
 

-#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

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

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


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

-
-bool      wxApp::s_macDefaultEncodingIsPC = true ;

 bool      wxApp::s_macSupportPCMenuShortcuts = true ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 bool      wxApp::s_macSupportPCMenuShortcuts = true ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;

-long      wxApp::s_macPreferencesMenuItemId = 0 ;
+long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;

 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
 wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
 
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
 wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
 

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

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


@@ -119,6 +110,7 @@ pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long re
 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 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 , long WXUNUSED(refcon) )
 {
 
 pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
 {


@@ -140,6 +132,11 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WX
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 

+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAERApp( (AppleEvent*) 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))


@@ -149,9 +146,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;


@@ -165,12 +162,19 @@ 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;
 }
 
     return noErr;
 }
 


@@ -183,9 +187,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;


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

-    for (i = 1; i <= itemsInList; i++) {
-        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;
 }
 


@@ -220,16 +231,27 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {

- /*   wxWindow* win = GetTopWindow() ;
+    wxWindow* win = GetTopWindow() ;

     if ( win )
     {
     if ( win )
     {

-        win->Close(TRUE ) ;
+        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId);
+        if (!win->ProcessEvent(exitEvent))
+            win->Close(true) ;

     }
     else
     }
     else

- */

     {
         ExitMainLoop() ;
     }
     {
         ExitMainLoop() ;
     }

+
+    return noErr ;
+}
+
+// AEROApp calls MacReopenApp
+
+short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
+{
+    MacReopenApp() ;
+

     return noErr ;
 }
 
     return noErr ;
 }
 


@@ -239,13 +261,19 @@ short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 
 void wxApp::MacOpenFile(const wxString & fileName )
 {
 
 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 )
     {


@@ -253,16 +281,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();


@@ -270,284 +299,508 @@ void wxApp::MacPrintFile(const wxString & fileName )
             }
         }
     }
             }
         }
     }

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

 }
 
 }
 

+
+

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

+void wxApp::MacReopenApp()
+{
+    // 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 ) ;
+    }
+}
+

 //----------------------------------------------------------------------
 //----------------------------------------------------------------------

-// Carbon Event Handler
+// Macintosh CommandID support - converting between native and wx IDs

 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 

-#if TARGET_CARBON
+// if no native match they just return the passed-in id

 
 

-    static const EventTypeSpec eventList[] =
+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 )

     {
     {

-        { kEventClassCommand, kEventProcessCommand } ,
-        { kEventClassCommand, kEventCommandUpdateStatus } ,
+        case kHICommandPreferences :
+            wxid = wxApp::s_macPreferencesMenuItemId ;
+            break ;

 
 

-        { kEventClassMenu, kEventMenuOpening },
-        { kEventClassMenu, kEventMenuClosed },
+        case kHICommandQuit :
+            wxid = wxApp::s_macExitMenuItemId ;
+            break ;

 
 

-        { kEventClassApplication , kEventAppActivated } ,
-        { kEventClassApplication , kEventAppDeactivated } ,
-        // handling the quit event is not recommended by apple
-        // rather using the quit apple event - which we do
+        case kHICommandAbout :
+            wxid = wxApp::s_macAboutMenuItemId ;
+            break ;

 
 

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

 
 

-        { kEventClassMouse , kEventMouseDown } ,
-        { 'WXMC' , 'WXMC' }
-    } ;
+    if ( wxid == 0 )
+        wxid = (int) macCommandId ;

 
 

-static pascal OSStatus
-MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+    return wxid ;
+}
+
+UInt32 wxIdToMacCommand( int wxId ) 

 {
 {

-    // FIXME: this doesn't work for multiple windows
-    wxWindow *win = wxTheApp->GetTopWindow();
-    if ( win )
+    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

     {
     {

-        // 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;
+        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 ) ;

 
 

-        GetEventParameter(event,
-                          kEventParamDirectObject,
-                          typeMenuRef, NULL,
-                          sizeof(menuRef), NULL,
-                          &menuRef);
-#endif // 0
+        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 mh = NULL ;
+        if ( mh == NULL )
+        {
+            if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
+                mh = NULL ;
+        }

 
 

-        wxMenuEvent wxevent(GetEventKind(event) == kEventMenuOpening
-                        ? wxEVT_MENU_OPEN
-                        : wxEVT_MENU_CLOSE);
-        wxevent.SetEventObject(win);
+        // 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 )
+                item = mbar->FindItem( id , &itemMenu ) ;
+        }
+        else
+        {
+            UInt32 refCon ;

 
 

-        (void)win->GetEventHandler()->ProcessEvent(wxevent);
+            GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
+            itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
+            if ( itemMenu != NULL )
+                item = (wxMenuItem*) refCon ;
+        }

     }
 
     }
 

-    return eventNotHandledErr;
+    return itemMenu ;

 }
 
 }
 

-// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop
-// but have to use ReceiveNextEvent dealing with events manually, therefore we also have
-// deal with clicks in the menu bar explicitely
+//----------------------------------------------------------------------
+// Carbon Event Handler
+//----------------------------------------------------------------------

 
 

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

 {
 {

-    OSStatus result = eventNotHandledErr ;
+    { kEventClassCommand, kEventProcessCommand } ,
+    { kEventClassCommand, kEventCommandUpdateStatus } ,
+
+    { kEventClassMenu, kEventMenuOpening },
+    { kEventClassMenu, kEventMenuClosed },
+    { kEventClassMenu, kEventMenuTargetItem },

 
 

-    switch( GetEventKind(event) )
+    { kEventClassApplication , kEventAppActivated } ,
+    { kEventClassApplication , kEventAppDeactivated } ,
+    // handling the quit event is not recommended by apple
+    // rather using the quit apple event - which we do
+
+    { kEventClassAppleEvent , kEventAppleEvent } ,
+
+    { kEventClassMouse , kEventMouseDown } ,
+    { kEventClassMouse , kEventMouseMoved } ,
+    { kEventClassMouse , kEventMouseUp } ,
+    { kEventClassMouse , kEventMouseDragged } ,
+    { 'WXMC' , 'WXMC' }
+} ;
+
+static pascal OSStatus
+wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    wxMacCarbonEvent cEvent( event ) ;
+    MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
+    wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
+
+    if ( menu )

     {
     {

-        case kEventMouseDown :
+        wxEventType type=0;
+        MenuCommand cmd=0;
+        switch (GetEventKind(event))

         {
         {

-            Point point ;
-            WindowRef window ;
+            case kEventMenuOpening:
+                type = wxEVT_MENU_OPEN;
+                break;
+
+            case kEventMenuClosed:
+                type = wxEVT_MENU_CLOSE;
+                break;
+
+            case kEventMenuTargetItem:
+                cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
+                if (cmd != 0)
+                    type = wxEVT_MENU_HIGHLIGHT;
+                break;
+
+            default:
+                wxFAIL_MSG(wxT("Unexpected menu event kind"));
+                break;
+        }

 
 

-            GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
-                sizeof( Point ), NULL, &point );
-            short windowPart = ::FindWindow(point, &window);
+        if ( type )
+        {
+            wxMenuEvent wxevent(type, cmd, menu);
+            wxevent.SetEventObject(menu);

 
 

-            if ( windowPart == inMenuBar )
+            wxEvtHandler* handler = menu->GetEventHandler();
+            if (handler && handler->ProcessEvent(wxevent))

             {
             {

-                MenuSelect( point ) ;
-                result = noErr ;
+                // handled
+            }
+            else
+            {
+                wxWindow *win = menu->GetInvokingWindow();
+                if (win)
+                    win->GetEventHandler()->ProcessEvent(wxevent);
+                }

             }
             }

-        }
-        break ;

     }
 
     }
 

-    return result ;
+    return eventNotHandledErr;

 }
 
 }
 

-static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
 
     HICommand command ;
 
 {
     OSStatus result = eventNotHandledErr ;
 
     HICommand command ;
 

-    GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL,
-        sizeof( HICommand ), NULL, &command );
-
-    MenuCommand id = command.commandID ;
-    if ( id == kHICommandPreferences )
-        id = wxApp::s_macPreferencesMenuItemId ;
+    wxMacCarbonEvent cEvent( event ) ;
+    cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;

 
 

-    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 )
-        item = mbar->FindItem( id , &menu ) ;
-
-    if ( item == NULL || menu == NULL || mbar == NULL )
-        return result ;
-
-       switch( GetEventKind( event ) )
-       {
-           case kEventProcessCommand :
-           {
+    if ( item )
+    {
+        wxASSERT( itemMenu != NULL ) ;
+        
+        switch ( cEvent.GetKind() )
+        {
+            case kEventProcessCommand :
+            {

                 if (item->IsCheckable())
                 if (item->IsCheckable())

-                {

                     item->Check( !item->IsChecked() ) ;
                     item->Check( !item->IsChecked() ) ;

-                }

 
 

-                menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
-                result = noErr ;
+                if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
+                    result = noErr ;

             }
             }

-               break ;
+            break ;
+

         case kEventCommandUpdateStatus:
         case kEventCommandUpdateStatus:

-            // eventually trigger an updateui round
-                result = noErr ;
+            {
+                wxUpdateUIEvent event(id);
+                event.SetEventObject( itemMenu );
+                                
+                bool processed = false;
+                
+                // Try the menu's event handler
+                {
+                    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();
+                    }
+                }
+                
+                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 ;
             break ;

-           default :
-               break ;
-       }

 
 

+        default :
+            break ;
+        }
+    }

     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus ApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
     switch ( GetEventKind( event ) )
     {
         case kEventAppActivated :
 {
     OSStatus result = eventNotHandledErr ;
     switch ( GetEventKind( event ) )
     {
         case kEventAppActivated :

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

             break ;
             break ;

+

         case kEventAppDeactivated :
         case kEventAppDeactivated :

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

             break ;
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 

-pascal OSStatus wxAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+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 :
     {
         case kEventClassCommand :

-            result = CommandEventHandler( handler , event , data ) ;
+            result = wxMacAppCommandEventHandler( handler , event , data ) ;

             break ;
             break ;

+

         case kEventClassApplication :
         case kEventClassApplication :

-            result = ApplicationEventHandler( handler , event , data ) ;
+            result = wxMacAppApplicationEventHandler( handler , event , data ) ;

             break ;
             break ;

+

         case kEventClassMenu :
         case kEventClassMenu :

-            result = MenuEventHandler( handler , event , data ) ;
+            result = wxMacAppMenuEventHandler( handler , event , data ) ;

             break ;
             break ;

+

         case kEventClassMouse :
         case kEventClassMouse :

-            result = MouseEventHandler( handler , event , data ) ;
+            {
+                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 ;
 }
 
     return result ;
 }
 

-DEFINE_ONE_SHOT_HANDLER_GETTER( wxAppEventHandler )
-
-#endif
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )

 
 

-#if defined(WXMAKINGDLL) && !defined(__DARWIN__)
+#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)

 // we know it's there ;-)
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 
 // we know it's there ;-)
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 

-bool wxApp::Initialize(int& argc, wxChar **argv)
-{
-    int error = 0 ;
+#ifdef __WXDEBUG__

 
 

-    // Mac-specific
+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
+    wxString fileNameStr ;
+    wxString assertionStr ;
+    wxString exceptionStr ;
+    wxString errorStr ;
+
+#if wxUSE_UNICODE
+    fileNameStr = wxString(fileName, wxConvLocal);
+    assertionStr = wxString(assertionString, wxConvLocal);
+    exceptionStr = wxString((exceptionLabelString!=0) ? exceptionLabelString : "", wxConvLocal) ;
+    errorStr = wxString((errorString!=0) ? errorString : "", wxConvLocal) ;
+#else
+    fileNameStr = fileName;
+    assertionStr = assertionString;
+    exceptionStr = (exceptionLabelString!=0) ? exceptionLabelString : "" ;
+    errorStr = (errorString!=0) ? errorString : "" ;
+#endif

 
 

-    UMAInitToolbox( 4 ) ;
-    SetEventMask( everyEvent ) ;
-    UMAShowWatchCursor() ;
+#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(),
+        fileNameStr.c_str(), lineNumber ,
+        value ) ;
+#else

 
 

-#if defined(WXMAKINGDLL) && defined(__DARWIN__)
-    // open shared library resources from here since we don't have
-    //   __wxinitialize in Mach-O shared libraries
-    wxStAppResource::OpenSharedLibraryResource(NULL);
+    wxOnAssert(fileNameStr, lineNumber , assertionStr ,
+        wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ;

 #endif
 #endif

+}

 
 

-#ifndef __DARWIN__
-    // test the minimal configuration necessary
+#endif //__WXDEBUG__

 
 

-#  if !TARGET_CARBON
-    long theSystem ;
-    long theMachine;
+#ifdef __WXMAC_OSX__
+extern "C"
+{
+   // m_macEventPosted run loop source callback:
+   void macPostedEventCallback(void *unused);
+}

 
 

-    if (Gestalt(gestaltMachineType, &theMachine) != noErr)
-    {
-        error = kMacSTRWrongMachine;
-    }
-    else if (theMachine < gestaltMacPlus)
-    {
-        error = kMacSTRWrongMachine;
-    }
-    else if (Gestalt(gestaltSystemVersion, &theSystem) != noErr )
-    {
-        error = kMacSTROldSystem  ;
-    }
-    else if ( theSystem < 0x0860 )
-    {
-        error = kMacSTROldSystem  ;
-    }
-    else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
-    {
-        error = kMacSTRSmallSize;
-    }
-#  endif
-    /*
-    else
-    {
-        if ( !UMAHasAppearance() )
-        {
-            error = kMacSTRNoPre8Yet ;
-        }
-    }
-    */
+void macPostedEventCallback(void *unused)
+{
+    wxTheApp->ProcessPendingEvents();
+}

 #endif
 
 #endif
 

-    // if we encountered any problems so far, give the error code and exit immediately
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+    // Mac-specific

 
 

-  if ( error )
-  {
-        wxStAppResource resload ;
-        short itemHit;
-        Str255 message;
+#ifdef __WXDEBUG__
+    InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
+#endif

 
 

-        GetIndString(message, 128, error);
-        UMAShowArrowCursor() ;
-        ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p");
-        itemHit = Alert(128, nil);
-      return FALSE ;
-  }
+    UMAInitToolbox( 4, sm_isEmbedded ) ;
+    SetEventMask( everyEvent ) ;
+    UMAShowWatchCursor() ;

 
 #ifndef __DARWIN__
 #  if __option(profile)
 
 #ifndef __DARWIN__
 #  if __option(profile)

-    ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ;
+    ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;

 #  endif
 #endif
 
 #  endif
 #endif
 


@@ -559,7 +812,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #endif
 
 #endif
 #endif
 
 #endif

-    wxMacSetupConverters() ;

 
     s_macCursorRgn = ::NewRgn() ;
 
 
     s_macCursorRgn = ::NewRgn() ;
 


@@ -570,85 +822,112 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");

-        if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 )
+        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )

         {
             // remove this argument
         {
             // remove this argument

-            memmove(argv, argv + 1, argc--);
+            --argc;
+            memmove(argv + 1, argv + 2, argc * sizeof(char *));

         }
     }
 
     if ( !wxAppBase::Initialize(argc, argv) )
         return false;
 
         }
     }
 
     if ( !wxAppBase::Initialize(argc, argv) )
         return false;
 

-    wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-    wxWinMacControlList = new wxList(wxKEY_INTEGER);
+#if wxUSE_INTL
+    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);
+#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()
 {
 bool wxApp::OnInitGui()
 {

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

         return false ;
 
         return false ;
 

-#if TARGET_CARBON

     InstallStandardEventHandler( GetApplicationEventTarget() ) ;
 
     InstallStandardEventHandler( GetApplicationEventTarget() ) ;
 

-    InstallApplicationEventHandler(
-        GetwxAppEventHandlerUPP(),
-        GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));
-#endif
+    if (!sm_isEmbedded)
+    {
+        InstallApplicationEventHandler(
+            GetwxMacAppEventHandlerUPP(),
+            GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));
+    }

 
 

-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
-    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
-                           NewAEEventHandlerUPP(AEHandleODoc) ,
-                           0 , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
-                           NewAEEventHandlerUPP(AEHandleOApp) ,
-                           0 , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
-                           NewAEEventHandlerUPP(AEHandlePDoc) ,
-                           0 , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
-                           NewAEEventHandlerUPP(AEHandleQuit) ,
-                           0 , FALSE ) ;
-#else
-    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
-                           NewAEEventHandlerProc(AEHandleODoc) ,
-                           0 , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
-                           NewAEEventHandlerProc(AEHandleOApp) ,
-                           0 , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
-                           NewAEEventHandlerProc(AEHandlePDoc) ,
-                           0 , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
-                           NewAEEventHandlerProc(AEHandleQuit) ,
-                           0 , FALSE ) ;
-#endif
+    if (!sm_isEmbedded)
+    {
+        sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ;
+        sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ;
+        sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ;
+        sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ;
+        sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ;
+
+        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                               sODocHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               sOAppHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               sPDocHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               sRAppHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               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();
 
     wxMacDestroyNotifierTable() ;
 
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 
     wxMacDestroyNotifierTable() ;
 

-    delete wxWinMacWindowList ;
-    wxWinMacWindowList = NULL;
-
-    delete wxWinMacControlList ;
-    wxWinMacControlList = NULL;
-

 #ifndef __DARWIN__
 #  if __option(profile)
     ProfilerDump( (StringPtr)"\papp.prof" ) ;
 #ifndef __DARWIN__
 #  if __option(profile)
     ProfilerDump( (StringPtr)"\papp.prof" ) ;


@@ -656,21 +935,32 @@ void wxApp::CleanUp()
 #  endif
 #endif
 
 #  endif
 #endif
 

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

     UMACleanupToolbox() ;
     UMACleanupToolbox() ;

-    if (s_macCursorRgn) {
+    if (s_macCursorRgn)

         ::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();
 }


@@ -679,213 +969,66 @@ 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) && defined(__DARWIN__)
-CFBundleRef gSharedLibraryBundle = NULL;
-#endif /* WXMAKINGDLL && __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
-    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
-            char  *theResPath;
-            char  *theName;
-            char  *theExt;
-            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
-            theResPath = strdup(theLibPath);
-            if (theResPath != NULL) {
-                theName = strrchr(theResPath, '/');
-                if (theName == NULL) {
-                    // no directory elements in path
-                    theName = theResPath;
-                }
-                // find ".dylib" shared library extension
-                theExt = strstr(theName, ".dylib");
-                // overwrite extension with ".rsrc"
-                strcpy(theExt, ".rsrc");
-
-#if 0
-                wxLogDebug( wxT("wxMac resources file name is '%s'"),
-                            theResPath );
-#endif
-
-                theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);
-                if (theErr != noErr) {
-                    // try in current directory (using name only)
-                    theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false);
-                }
-
-                // open the resource file
-                if (theErr == noErr) {
-                    theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm,
-                                                 &gSharedLibraryResource);
-                }
-                if (theErr != noErr) {
-#ifdef __WXDEBUG__
-                    fprintf(stderr,
-                            wxT("unable to open wxMac resource file '%s'\n"),
-                            theResPath );
-#endif // __WXDEBUG__
-                }
-
-                // free duplicated resource file path
-                free(theResPath);
-            }
-        }
-#endif /* __DARWIN__ */
-    }
-#endif /* WXMAKINGDLL */
-}
-
-void wxStAppResource::CloseSharedLibraryResource()
-{
-#ifdef WXMAKINGDLL
-    // 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 */
-}
-
-#if defined(WXMAKINGDLL) && !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 && !__DARWIN__ */
-
-#if TARGET_CARBON
+#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 ;
                 if ( converted )
                 {
                     UInt32 keyCode ;


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

+

             case kEventClassTextInput :
             {
             case kEventClassTextInput :
             {

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

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

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

                             converted = true ;
                             converted = true ;

+

                             {
                             {

-                                UInt32 keyCode ;
+                                UInt32 keyCode, modifiers;

                                 unsigned char charCode ;
                                 unsigned char charCode ;

-                                UInt32 modifiers ;
+

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


@@ -923,130 +1070,63 @@ 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 ;

         }
     }
 
     return converted ;
 }
 
         }
     }
 
     return converted ;
 }
 

-/*
-pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
-    OSStatus result = eventNotHandledErr ;
-
-    EventRecord rec ;
-    switch ( GetEventClass( event ) )
-    {
-        case kEventClassKeyboard :
-            if ( wxMacConvertEventToRecord( event , &rec ) )
-            {
-                wxTheApp->MacHandleModifierEvents( &rec ) ;
-                wxTheApp->MacHandleOneEvent( &rec ) ;
-                result = noErr ;
-            }
-            break ;
-        case kEventClassTextInput :
-            if ( wxMacConvertEventToRecord( event , &rec ) )
-            {
-                wxTheApp->MacHandleModifierEvents( &rec ) ;
-                wxTheApp->MacHandleOneEvent( &rec ) ;
-                result = noErr ;
-            }
-            break ;
-        default :
-            break ;
-    }
-    return result ;
-}
-*/
-#endif
-

 wxApp::wxApp()
 {
 wxApp::wxApp()
 {

-  m_printMode = wxPRINT_WINDOWS;
-  m_auto3D = TRUE;
-
-  m_macCurrentEvent = NULL ;
-  m_macCurrentEventHandlerCallRef = NULL ;
-}
-
-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
-}
-
-int wxApp::MainLoop()
-{
-    m_keepGoing = TRUE;
-
-    while (m_keepGoing)
-    {
-        MacDoOneEvent() ;
-    }
-
-    return 0;
-}
-
-void wxApp::ExitMainLoop()
-{
-      m_keepGoing = FALSE;
-}
+    m_printMode = wxPRINT_WINDOWS;

 
 

-// Is a message/event pending?
-bool wxApp::Pending()
-{
-#if TARGET_CARBON
-    return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ;
-#else
-    EventRecord event ;
+    m_macCurrentEvent = NULL ;
+    m_macCurrentEventHandlerCallRef = NULL ;

 
 

-    return EventAvail( everyEvent , &event ) ;
+#ifdef __WXMAC_OSX__
+    m_macEventPosted = NULL ;

 #endif
 }
 
 #endif
 }
 

-// Dispatch a message.
-void wxApp::Dispatch()
-{
-    MacDoOneEvent() ;
-}
-

 void wxApp::OnIdle(wxIdleEvent& event)
 {
     wxAppBase::OnIdle(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();
 
     // 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();
 

-  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


@@ -1056,7 +1136,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);

     }
 }
 
     }
 }
 


@@ -1077,20 +1157,18 @@ 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;

 
 

-#if wxUSE_THREADS
-    YieldToAnyThread() ;
-#endif

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

-#if TARGET_CARBON
+

     EventRef theEvent;
 
     OSStatus status = noErr ;
     EventRef theEvent;
 
     OSStatus status = noErr ;

-    do
+
+    while ( status == noErr )

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


@@ -1111,1037 +1189,493 @@ bool wxApp::Yield(bool onlyIfNeeded)
             MacHandleOneEvent( theEvent ) ;
             ReleaseEvent(theEvent);
         }
             MacHandleOneEvent( theEvent ) ;
             ReleaseEvent(theEvent);
         }

-    } while( status == noErr ) ;
-#else
-    EventRecord event ;
-
-    // having a larger value here leads to large performance slowdowns
-    // so we cannot give background apps more processor time here
-    // we do so however having a large sleep value in the main event loop
-    sleepTime = 0 ;
-
-    while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
-    {
-        MacHandleModifierEvents( &event ) ;
-        MacHandleOneEvent( &event );
-        if ( event.what != kHighLevelEvent )
-            SetRectRgn( (RgnHandle) wxApp::s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;

     }
     }

-    MacHandleModifierEvents( &event ) ;
-#endif

 
     wxMacProcessNotifierAndPendingEvents() ;
 
     wxMacProcessNotifierAndPendingEvents() ;

-    s_inYield = FALSE;
-
-    return TRUE;
-}
+    s_inYield = false;

 
 

-// platform specifics
-
-void wxApp::MacSuspend( bool convertClipboard )
-{
-#if !TARGET_CARBON
-    // we have to deactive the top level windows manually
-
-    wxWindowListNode* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
-#if TARGET_CARBON
-#if 0 //  having problems right now with that
-        if (!win->HasFlag(wxSTAY_ON_TOP))
-#endif  
-#endif
-            win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
-
-        node = node->GetNext();
-    }
-
-    ::HideFloatingWindows() ;
-#endif
-    s_lastMouseDown = 0 ;
-
-    if( convertClipboard )
-    {
-        MacConvertPrivateToPublicScrap() ;
-    }
-}
-
-extern wxList wxModalDialogs;
-
-void wxApp::MacResume( bool convertClipboard )
-{
-    s_lastMouseDown = 0 ;
-    if( convertClipboard )
-    {
-        MacConvertPublicToPrivateScrap() ;
-    }
-
-#if !TARGET_CARBON
-    ::ShowFloatingWindows() ;
-    // raise modal dialogs in case a non modal window was selected to activate the app
-
-    wxNode* node = wxModalDialogs.GetFirst();
-    while (node)
-    {
-        wxDialog* dialog = (wxDialog *) node->GetData();
-        dialog->Raise();
-
-        node = node->GetNext();
-    }
-#endif
-}
-
-void wxApp::MacConvertPrivateToPublicScrap()
-{
-}
-
-void wxApp::MacConvertPublicToPrivateScrap()
-{
+    return true;

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

-#if TARGET_CARBON

     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 )
-    {
-        if ( wxTheApp->ProcessIdle() )
-            sleepTime = kEventDurationNoWait ;
-        else
-            sleepTime = kEventDurationForever ;
-    }
-    else if ( status == eventLoopQuitErr )
-    {
-        // according to QA1061 this may also occur when a WakeUp Process
-        // is executed
-    }
-    else
+
+    switch (status)

     {
     {

-        MacHandleOneEvent( theEvent ) ;
-        ReleaseEvent(theEvent);
-        sleepTime = kEventDurationNoWait ;
-    }
-#else
-      EventRecord event ;
+        case eventLoopTimedOutErr :
+            if ( wxTheApp->ProcessIdle() )
+                sleepTime = kEventDurationNoWait ;
+            else
+                sleepTime = kEventDurationSecond;
+            break;

 
 

-    EventMask eventMask = everyEvent ;
+        case eventLoopQuitErr :
+            // according to QA1061 this may also occur
+            // when a WakeUp Process is executed
+            break;

 
 

-    if (WaitNextEvent(eventMask, &event, sleepTime, (RgnHandle) s_macCursorRgn))
-    {
-        MacHandleModifierEvents( &event ) ;
-        MacHandleOneEvent( &event );
-    }
-    else
-    {
-        MacHandleModifierEvents( &event ) ;
-        // idlers
-        WindowPtr window = ::FrontWindow() ;
-        if ( window )
-            ::IdleControls( window ) ;
-
-        if ( wxTheApp->ProcessIdle() )
-            sleepTime = 0 ;
-        else
-            sleepTime = GetCaretTime() / 2 ;
+        default:
+            MacHandleOneEvent( theEvent ) ;
+            ReleaseEvent( theEvent );
+            sleepTime = kEventDurationNoWait ;
+            break;

     }
     }

-    if ( event.what != kHighLevelEvent )
-        SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
-#endif

     // repeaters
 
     DeletePendingObjects() ;
     wxMacProcessNotifierAndPendingEvents() ;
 }
 
     // repeaters
 
     DeletePendingObjects() ;
     wxMacProcessNotifierAndPendingEvents() ;
 }
 

+// virtual
+void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
+{
+    // Override to process unhandled events as you please
+}
+

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

-#if TARGET_CARBON

     EventTargetRef theTarget;
     theTarget = GetEventDispatcherTarget();
     m_macCurrentEvent = evr ;
     EventTargetRef theTarget;
     theTarget = GetEventDispatcherTarget();
     m_macCurrentEvent = evr ;

-    SendEventToEventTarget ((EventRef) evr , theTarget);
-#else
-    EventRecord* ev = (EventRecord*) evr ;
-    m_macCurrentEvent = ev ;

 
 

-    wxApp::sm_lastMessageTime = ev->when ;
+    OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget);
+    if (status == eventNotHandledErr)
+        MacHandleUnhandledEvent(evr);
+
+    wxMacProcessNotifierAndPendingEvents() ;
+
+#if wxUSE_THREADS
+    wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+}

 
 

-    switch (ev->what)
+long wxMacTranslateKey(unsigned char key, unsigned char code)
+{
+    long retval = key ;
+    switch (key)

     {
     {

-        case mouseDown:
-            MacHandleMouseDownEvent( ev ) ;
-            if ( ev->modifiers & controlKey )
-                s_lastMouseDown = 2;
-            else
-                s_lastMouseDown = 1;
-            break;
-        case mouseUp:
-            if ( s_lastMouseDown == 2 )
-            {
-                ev->modifiers |= controlKey ;
-            }
-            else
-            {
-                ev->modifiers &= ~controlKey ;
-            }
-            MacHandleMouseUpEvent( ev ) ;
-            s_lastMouseDown = 0;
+        case kHomeCharCode :
+            retval = WXK_HOME;

             break;
             break;

-        case activateEvt:
-            MacHandleActivateEvent( ev ) ;
+
+        case kEnterCharCode :
+            retval = WXK_RETURN;

             break;
             break;

-        case updateEvt:
-            MacHandleUpdateEvent( ev ) ;
+        case kEndCharCode :
+            retval = WXK_END;

             break;
             break;

-        case keyDown:
-        case autoKey:
-            MacHandleKeyDownEvent( ev ) ;
+
+        case kHelpCharCode :
+            retval = WXK_HELP;

             break;
             break;

-        case keyUp:
-            MacHandleKeyUpEvent( ev ) ;
+
+        case kBackspaceCharCode :
+            retval = WXK_BACK;

             break;
             break;

-        case diskEvt:
-            MacHandleDiskEvent( ev ) ;
+
+        case kTabCharCode :
+            retval = WXK_TAB;

             break;
             break;

-        case osEvt:
-            MacHandleOSEvent( ev ) ;
+
+        case kPageUpCharCode :
+            retval = WXK_PAGEUP;

             break;
             break;

-        case kHighLevelEvent:
-            MacHandleHighLevelEvent( ev ) ;
+
+        case kPageDownCharCode :
+            retval = WXK_PAGEDOWN;

             break;
             break;

-        default:
+
+        case kReturnCharCode :
+            retval = WXK_RETURN;

             break;
             break;

-    }
-#endif
-    wxMacProcessNotifierAndPendingEvents() ;
-}

 
 

-#if !TARGET_CARBON
-bool s_macIsInModalLoop = false ;
+        case kFunctionKeyCharCode :
+        {
+            switch ( code )
+            {
+                case 0x7a :
+                    retval = WXK_F1 ;
+                    break;

 
 

-void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
-    {
-        wxKeyEvent event(wxEVT_KEY_DOWN);
+                case 0x78 :
+                    retval = WXK_F2 ;
+                    break;

 
 

-        event.m_shiftDown = ev->modifiers & shiftKey;
-        event.m_controlDown = ev->modifiers & controlKey;
-        event.m_altDown = ev->modifiers & optionKey;
-        event.m_metaDown = ev->modifiers & cmdKey;
+                case 0x63 :
+                    retval = WXK_F3 ;
+                    break;

 
 

-        event.m_x = ev->where.h;
-        event.m_y = ev->where.v;
-        event.m_timeStamp = ev->when;
-        wxWindow* focus = wxWindow::FindFocus() ;
-        event.SetEventObject(focus);
+                case 0x76 :
+                    retval = WXK_F4 ;
+                    break;

 
 

-        if ( (ev->modifiers ^ s_lastModifiers ) & controlKey )
-        {
-            event.m_keyCode = WXK_CONTROL ;
-            event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
-            focus->GetEventHandler()->ProcessEvent( event ) ;
-        }
-        if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey )
-        {
-            event.m_keyCode = WXK_SHIFT ;
-            event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
-            focus->GetEventHandler()->ProcessEvent( event ) ;
-        }
-        if ( (ev->modifiers ^ s_lastModifiers ) & optionKey )
-        {
-            event.m_keyCode = WXK_ALT ;
-            event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
-            focus->GetEventHandler()->ProcessEvent( event ) ;
-        }
-        if ( ev->modifiers ^ s_lastModifiers ) & cmdKey )
-        {
-            event.m_keyCode = WXK_COMMAND ;
-            event.SetEventType( ( ev->modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
-            focus->GetEventHandler()->ProcessEvent( event ) ;
-        }
-        s_lastModifiers = ev->modifiers ;
-    }
-}
+                case 0x60 :
+                    retval = WXK_F5 ;
+                    break;

 
 

-void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr )
-{
-    // we must avoid reentrancy problems when processing high level events eg printing
-    bool former = s_inYield ;
-    s_inYield = TRUE ;
-    EventRecord* ev = (EventRecord*) evr ;
-    ::AEProcessAppleEvent( ev ) ;
-    s_inYield = former ;
-}
+                case 0x61 :
+                    retval = WXK_F6 ;
+                    break;

 
 

-void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    wxToolTip::RemoveToolTips() ;
+                case 0x62:
+                    retval = WXK_F7 ;
+                    break;

 
 

-    WindowRef window;
-    WindowRef frontWindow = ::FrontNonFloatingWindow() ;
-    WindowAttributes frontWindowAttributes = NULL ;
-    if ( frontWindow )
-        ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
+                case 0x64 :
+                    retval = WXK_F8 ;
+                    break;

 
 

-    short windowPart = ::FindWindow(ev->where, &window);
-    wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
-    if ( wxPendingDelete.Member(win) )
-        return ;
+                case 0x65 :
+                    retval = WXK_F9 ;
+                    break;

 
 

-    BitMap screenBits;
-    GetQDGlobalsScreenBits( &screenBits );
+                case 0x6D :
+                    retval = WXK_F10 ;
+                    break;

 
 

-    switch (windowPart)
-    {
-        case inMenuBar :
-            if ( s_macIsInModalLoop )
-            {
-                SysBeep ( 30 ) ;
-            }
-            else
-            {
-                UInt32 menuresult = MenuSelect(ev->where) ;
-               MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) );
-                s_lastMouseDown = 0;
+                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 inSysWindow :
-            SystemClick( ev , window ) ;
-            s_lastMouseDown = 0;
+
+        case kLeftArrowCharCode :
+            retval = WXK_LEFT ;

             break ;
             break ;

-        case inDrag :
-            if ( window != frontWindow && s_macIsInModalLoop && !(ev->modifiers & cmdKey ) )
-            {
-                SysBeep ( 30 ) ;
-            }
-            else
-            {
-                DragWindow(window, ev->where, &screenBits.bounds);
-                if (win)
-                {
-                    GrafPtr port ;
-                    GetPort( &port ) ;
-                    Point pt = { 0, 0 } ;
-                    SetPortWindowPort(window) ;
-                    LocalToGlobal( &pt ) ;
-                    SetPort( port ) ;
-                        win->SetSize( pt.h , pt.v , -1 ,
-                            -1 , wxSIZE_USE_EXISTING);
-                }
-                s_lastMouseDown = 0;
-            }
+
+        case kRightArrowCharCode :
+            retval = WXK_RIGHT ;

             break ;
             break ;

-        case inGoAway:
-            if (TrackGoAway(window, ev->where))
-            {
-                if ( win )
-                    win->Close() ;
-            }
-            s_lastMouseDown = 0;
-            break;
-        case inGrow:
-          {
-                Rect newContentRect ;
-                Rect constraintRect ;
-                constraintRect.top = win->GetMinHeight() ;
-                if ( constraintRect.top == -1 )
-                    constraintRect.top  = 0 ;
-                constraintRect.left = win->GetMinWidth() ;
-                if ( constraintRect.left == -1 )
-                    constraintRect.left  = 0 ;
-                constraintRect.right = win->GetMaxWidth() ;
-                if ( constraintRect.right == -1 )
-                    constraintRect.right  = 32000 ;
-                constraintRect.bottom = win->GetMaxHeight() ;
-                if ( constraintRect.bottom == -1 )
-                    constraintRect.bottom = 32000 ;
-
-                Boolean growResult = ResizeWindow( window , ev->where ,
-                    &constraintRect , &newContentRect ) ;
-                if ( growResult )
-                {
-                    win->SetSize( newContentRect.left , newContentRect.top ,
-                        newContentRect.right - newContentRect.left ,
-                        newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
-                }
-                s_lastMouseDown = 0;
-          }
-            break;
-        case inZoomIn:
-        case inZoomOut:
-                if (TrackBox(window, ev->where, windowPart))
-                {
-                    // TODO setup size event
-                    ZoomWindow( window , windowPart , false ) ;
-                    if (win)
-                    {
-                        Rect tempRect ;
-                        GrafPtr port ;
-                        GetPort( &port ) ;
-                        Point pt = { 0, 0 } ;
-                        SetPortWindowPort(window) ;
-                        LocalToGlobal( &pt ) ;
-                        SetPort( port ) ;
-
-                        GetWindowPortBounds(window, &tempRect ) ;
-                        win->SetSize( pt.h , pt.v , tempRect.right-tempRect.left ,
-                            tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING);
-                    }
-                }
-            s_lastMouseDown = 0;
-            break;
-        case inCollapseBox :
-                // TODO setup size event
-            s_lastMouseDown = 0;
+
+        case kUpArrowCharCode :
+            retval = WXK_UP ;

             break ;
 
             break ;
 

-        case inContent :
-                {
-                    GrafPtr port ;
-                    GetPort( &port ) ;
-                    SetPortWindowPort(window) ;
-                    SetPort( port ) ;
-                }
-                if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
-                {
-                    if ( s_macIsInModalLoop )
-                    {
-                        SysBeep ( 30 ) ;
-                    }
-                    else if ( UMAIsWindowFloating( window ) )
-                    {
-                        if ( win )
-                            win->MacMouseDown( ev , windowPart ) ;
-                    }
-                    else
-                    {
-                        if ( win )
-                            win->MacMouseDown( ev , windowPart ) ;
-                        ::SelectWindow( window ) ;
-                    }
-                }
-                else
-                {
-                    if ( win )
-                        win->MacMouseDown( ev , windowPart ) ;
-                }
+        case kDownArrowCharCode :
+            retval = WXK_DOWN ;

             break ;
             break ;

+
+        case kDeleteCharCode :
+            retval = WXK_DELETE ;
+            break ;
+

         default:
         default:

-            break;
-    }
+            break ;
+     } // end switch
+
+    return retval;

 }
 
 }
 

-void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
+int wxMacKeyCodeToModifier(wxKeyCode key)

 {
 {

-    EventRecord* ev = (EventRecord*) evr ;
-    WindowRef window;
-
-    short windowPart = inNoWindow ;
-    if ( wxTheApp->s_captureWindow )
-    {
-        window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
-        windowPart = inContent ;
-    }
-    else
+    switch (key)

     {
     {

-        windowPart = ::FindWindow(ev->where, &window) ;
-    }
+    case WXK_START:
+    case WXK_MENU:
+        return cmdKey;

 
 

-    switch (windowPart)
-    {
-        case inMenuBar :
-            break ;
-        case inSysWindow :
-            break ;
-        default:
-            {
-                wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
-                if ( win )
-                    win->MacMouseUp( ev , windowPart ) ;
-            }
-            break;
+    case WXK_SHIFT:
+        return shiftKey;
+
+    case WXK_CAPITAL:
+        return alphaLock;
+
+    case WXK_ALT:
+        return optionKey;
+
+    case WXK_CONTROL:
+        return controlKey;
+
+    default:
+        return 0;

     }
 }
 
     }
 }
 

+#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
+     return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key));
+//else
+//  KeyMapByteArray keymap;
+//  GetKeys((BigEndianLong*)keymap);
+//  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));
+}

 #endif
 
 #endif
 

-long wxMacTranslateKey(unsigned char key, unsigned char code) ;
-long wxMacTranslateKey(unsigned char key, unsigned char code)
+
+wxMouseState wxGetMouseState()

 {
 {

-    long retval = key ;
-    switch (key)
-    {
-        case kHomeCharCode :
-                 retval = WXK_HOME;
-          break;
-        case kEnterCharCode :
-                 retval = WXK_RETURN;
-          break;
-        case kEndCharCode :
-                 retval = WXK_END;
-          break;
-        case kHelpCharCode :
-                 retval = WXK_HELP;
-          break;
-        case kBackspaceCharCode :
-                 retval = WXK_BACK;
-          break;
-        case kTabCharCode :
-                 retval = WXK_TAB;
-          break;
-        case kPageUpCharCode :
-                 retval = WXK_PAGEUP;
-          break;
-        case kPageDownCharCode :
-                 retval = WXK_PAGEDOWN;
-          break;
-        case kReturnCharCode :
-                 retval = WXK_RETURN;
-          break;
-            case kFunctionKeyCharCode :
-            {
-                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;
-                }
-            }
-            break ;
-            case kEscapeCharCode :
-                retval = WXK_ESCAPE ;
-            break ;
-            case kLeftArrowCharCode :
-                retval = WXK_LEFT ;
-            break ;
-            case kRightArrowCharCode :
-                retval = WXK_RIGHT ;
-            break ;
-            case kUpArrowCharCode :
-                retval = WXK_UP ;
-            break ;
-            case kDownArrowCharCode :
-                retval = WXK_DOWN ;
-            break ;
-            case kDeleteCharCode :
-                retval = WXK_DELETE ;
-             default:
-            break ;
-     } // end switch
+    wxMouseState ms;

 
 

-    return retval;
+    wxPoint pt = wxGetMousePosition();
+    ms.SetX(pt.x);
+    ms.SetY(pt.y);
+
+#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
+
+    UInt32 modifiers = GetCurrentKeyModifiers();
+    ms.SetControlDown(modifiers & controlKey);
+    ms.SetShiftDown(modifiers & shiftKey);
+    ms.SetAltDown(modifiers & optionKey);
+    ms.SetMetaDown(modifiers & cmdKey);
+
+    return ms;

 }
 
 }
 

-#if !TARGET_CARBON
-void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
+// 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 )

 {
 {

-    EventRecord* ev = (EventRecord*) evr ;
-    wxToolTip::RemoveToolTips() ;
+    if ( !focus )
+        return false ;

 
 

-    UInt32 menuresult = UMAMenuEvent(ev) ;
-    if ( HiWord( menuresult ) )
-    {
-        if ( !s_macIsInModalLoop )
-            MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ;
-    }
-    else
-    {
-         wxWindow* focus = wxWindow::FindFocus() ;
+    bool handled; 
+    wxKeyEvent event(wxEVT_KEY_DOWN) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+        
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    if ( handled && event.GetSkipped() )
+        handled = false ;

 
 

-        if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
+#if wxUSE_ACCEL
+    if ( !handled )
+    {
+        wxWindow *ancestor = focus;
+        while (ancestor)

         {
         {

-#if 0
-            // we must handle control keys the other way round, otherwise text content is updated too late
-            // has not been handled -> perform default
-            wxControl* control = wxDynamicCast( focus , wxControl ) ;
-            if ( control &&  control->GetMacControl() != NULL )
+            int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+            if (command != -1)

             {
             {

-                short keycode ;
-                short keychar ;
-                keychar = short(ev->message & charCodeMask);
-                keycode = short(ev->message & keyCodeMask) >> 8 ;
-                ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
+                break;

             }
             }

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

         }
     }
         }
     }

+#endif // wxUSE_ACCEL
+
+    return handled ;

 }
 
 }
 

-void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )

 {
 {

-    EventRecord* ev = (EventRecord*) evr ;
-    wxToolTip::RemoveToolTips() ;
+    if ( !focus )
+        return false ;

 
 

-    UInt32 menuresult = UMAMenuEvent(ev) ;
-    if ( HiWord( menuresult ) )
-    {
-    }
-    else
-    {
-        MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
-    }
+    bool handled;
+    wxKeyEvent event( wxEVT_KEY_UP ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    
+    return handled ;

 }
 
 }
 

-#endif
-
-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )

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

+    
+    wxKeyEvent event(wxEVT_CHAR) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    long keyval = event.m_keyCode ;

 
 

-    short keycode ;
-    short keychar ;
-    keychar = short(keymessage & charCodeMask);
-    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    bool handled = false ;

 
 

-    if ( modifiers & ( controlKey|shiftKey|optionKey ) )
+    wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+        
+    if (tlw)

     {
     {

-        // 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 ) ;
+        event.SetEventType( wxEVT_CHAR_HOOK );
+        handled = tlw->GetEventHandler()->ProcessEvent( event );
+        if ( handled && event.GetSkipped() )
+            handled = false ;

     }
 
     }
 

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

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

-#if wxUSE_ACCEL
-        if (!handled)
+        event.SetEventType( wxEVT_CHAR );
+        event.Skip( false ) ;
+        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    }
+        
+    if ( !handled && (keyval == WXK_TAB) )
+    {
+        wxWindow* iter = focus->GetParent() ;
+        while ( iter && !handled )

         {
         {

-            wxWindow *ancestor = focus;
-            while (ancestor)
+            if ( iter->HasFlag( wxTAB_TRAVERSAL ) )

             {
             {

-                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();
+                wxNavigationKeyEvent new_event;
+                new_event.SetEventObject( focus );
+                new_event.SetDirection( !event.ShiftDown() );
+                /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+                new_event.SetWindowChange( event.ControlDown() );
+                new_event.SetCurrentFocus( focus );
+                handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                if ( handled && new_event.GetSkipped() )
+                    handled = false ;

             }
             }

+
+            iter = iter->GetParent() ;

         }
         }

-#endif // wxUSE_ACCEL

     }
     }

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

 
 

-        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-        if ( handled && event.GetSkipped() )
-            handled = false ;
-    }
-    if ( !handled &&
-         (keyval == WXK_TAB) &&
-// CS: copied the change below from wxGTK
-// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may
-//     have this style, yet choose not to process this particular TAB in which
-//     case TAB must still work as a navigational character
-#if 0
-         (!focus->HasFlag(wxTE_PROCESS_TAB)) &&
-#endif
-         (focus->GetParent()) &&
-         (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
-    {
-        wxNavigationKeyEvent new_event;
-        new_event.SetEventObject( focus );
-        new_event.SetDirection( !event.ShiftDown() );
-        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
-        new_event.SetWindowChange( event.ControlDown() );
-        new_event.SetCurrentFocus( focus );
-        handled = focus->GetEventHandler()->ProcessEvent( new_event );
-        if ( handled && new_event.GetSkipped() )
-            handled = false ;
-    }

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

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

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

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

                 }
             }
                 }
             }

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

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

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

             }
             }

-          }
+        }

     }
     return handled ;
 }
 
     }
     return handled ;
 }
 

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

 
 

-    if ( keyval == keychar )
-    {
+    long keyval = wxMacTranslateKey(keychar, keycode) ;
+    if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )

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

-    }
-    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_x = wherex;
-    event.m_y = wherey;
-    event.m_timeStamp = when;
-    event.SetEventObject(focus);
-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-
-    return handled ;
-}
-
-#if !TARGET_CARBON
-void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    WindowRef window = (WindowRef) ev->message ;
-    if ( window )
+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)

     {
     {

-        bool activate = (ev->modifiers & activeFlag ) ;
-        WindowClass wclass ;
-        ::GetWindowClass ( window , &wclass ) ;
-        if ( wclass == kFloatingWindowClass )
-        {
-            // if it is a floater we activate/deactivate the front non-floating window instead
-            window = ::FrontNonFloatingWindow() ;
-        }
-        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
-        if ( win )
-            win->MacActivate( ev->when , activate ) ;
-    }
-}
-
-void wxApp::MacHandleUpdateEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    WindowRef window = (WindowRef) ev->message ;
-    wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;
-    if ( win )
-    {
-        if ( !wxPendingDelete.Member(win) )
-            win->MacUpdate( ev->when ) ;
+        keyval = (keyval - '0') + WXK_NUMPAD0;

     }
     }

-    else
+    else if (keycode >= 67 && keycode <= 81)

     {
     {

-        // since there is no way of telling this foreign window to update itself
-        // we have to invalidate the update region otherwise we keep getting the same
-        // event over and over again
-        BeginUpdate( window ) ;
-        EndUpdate( window ) ;
-    }
-}
-
-void wxApp::MacHandleDiskEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    if ( HiWord( ev->message ) != noErr )
-  {
-        OSErr err ;
-        Point point ;
-         SetPt( &point , 100 , 100 ) ;
-
-          err = DIBadMount( point , ev->message ) ;
-        wxASSERT( err == noErr ) ;
-    }
-}
-
-void wxApp::MacHandleOSEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    switch( ( ev->message & osEvtMessageMask ) >> 24 )
-    {
-        case suspendResumeMessage :
-            {
-                bool isResuming = ev->message & resumeFlag ;
-                bool convertClipboard = ev->message & convertClipboardFlag ;
-
-                bool doesActivate = UMAGetProcessModeDoesActivateOnFGSwitch() ;
-                if ( isResuming )
-                {
-                    WindowRef oldFrontWindow = NULL ;
-                    WindowRef newFrontWindow = NULL ;
-
-                    // in case we don't take care of activating ourselves, we have to synchronize
-                    // our idea of the active window with the process manager's - which it already activated
-
-                    if ( !doesActivate )
-                        oldFrontWindow = ::FrontNonFloatingWindow() ;
-
-                    MacResume( convertClipboard ) ;
-
-                    newFrontWindow = ::FrontNonFloatingWindow() ;
-
-                    if ( oldFrontWindow )
-                    {
-                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ;
-                        if ( win )
-                            win->MacActivate( ev->when , false ) ;
-                    }
-                    if ( newFrontWindow )
-                    {
-                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ;
-                        if ( win )
-                            win->MacActivate( ev->when , true ) ;
-                    }
-                }
-                else
-                {
-                    MacSuspend( convertClipboard ) ;
-                }
-            }
-            break ;
-        case mouseMovedMessage :
-            {
-                WindowRef window;
-
-                wxWindow* currentMouseWindow = NULL ;
-
-                if (s_captureWindow )
-                {
-                    currentMouseWindow = s_captureWindow ;
-                }
-                else
-                {
-                    wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) ,
-                                                             &currentMouseWindow ) ;
-                }
+        switch (keycode)
+        {
+        case 76 :
+            keyval = WXK_NUMPAD_ENTER;
+            break;

 
 

-                if ( currentMouseWindow != wxWindow::s_lastMouseWindow )
-                {
-                    wxMouseEvent event ;
-
-                    bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
-                    bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
-
-                    event.m_leftDown = isDown && !controlDown;
-                    event.m_middleDown = FALSE;
-                    event.m_rightDown = isDown && controlDown;
-                    event.m_shiftDown = ev->modifiers & shiftKey;
-                    event.m_controlDown = ev->modifiers & controlKey;
-                    event.m_altDown = ev->modifiers & optionKey;
-                    event.m_metaDown = ev->modifiers & cmdKey;
-                    event.m_x = ev->where.h;
-                    event.m_y = ev->where.v;
-                    event.m_timeStamp = ev->when;
-                    event.SetEventObject(this);
-
-                    if ( wxWindow::s_lastMouseWindow )
-                    {
-                        wxMouseEvent eventleave(event);
-                        eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
-                        wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
-                        eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;

 
 

-                        wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
-                    }
-                    if ( currentMouseWindow )
-                    {
-                        wxMouseEvent evententer(event);
-                        evententer.SetEventType( wxEVT_ENTER_WINDOW );
-                        currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );
-                        evententer.SetEventObject( currentMouseWindow ) ;
-                        currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
-                    }
-                    wxWindow::s_lastMouseWindow = currentMouseWindow ;
-                }
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;

 
 

-                short windowPart = inNoWindow ;
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;

 
 

-                if ( s_captureWindow )
-                {
-                    window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
-                    windowPart = inContent ;
-                }
-                else
-                {
-                    windowPart = ::FindWindow(ev->where, &window);
-                }
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;

 
 

-                switch (windowPart)
-                {
-                    case inContent :
-                        {
-                            wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
-                            if ( win )
-                                win->MacMouseMoved( ev , windowPart ) ;
-                            else
-                            {
-                                if ( wxIsBusy() )
-                                {
-                                }
-                                else
-                                    UMAShowArrowCursor();
-                             }
-                        }
-                        break;
-                    default :
-                        {
-                            if ( wxIsBusy() )
-                            {
-                            }
-                            else
-                                UMAShowArrowCursor();
-                        }
-                        break ;
-                }
-            }
-            break ;
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;

 
 

-    }
-}
-#endif
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;

 
 

-void wxApp::MacHandleMenuCommand( wxUint32 id )
-{
-    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
-    wxFrame* frame = mbar->GetFrame();
-    wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") );
-    if ( frame )
-    {
-        frame->ProcessCommand(id);
+        default:
+            break;
+        } // end switch

     }
     }

-}

 
 

-#if !TARGET_CARBON
-void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum )
-{
-    if (macMenuId == 0)
-         return; // no menu item selected
+    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

 
 

-    if (macMenuId == kwxMacAppleMenuId && macMenuItemNum > 1)
-    {
-        #if ! TARGET_CARBON
-        Str255        deskAccessoryName ;
-        GrafPtr        savedPort ;
-
-        GetMenuItemText(GetMenuHandle(kwxMacAppleMenuId), macMenuItemNum, deskAccessoryName);
-        GetPort(&savedPort);
-        OpenDeskAcc(deskAccessoryName);
-        SetPort(savedPort);
-        #endif
-    }
-    else
-    {
-        MenuCommand id ;
-        GetMenuItemCommandID( GetMenuHandle(macMenuId) , macMenuItemNum , &id ) ;
-        MacHandleMenuCommand( id ) ;
-    }
-    HiliteMenu(0);
+    event.m_rawCode = keymessage;
+    event.m_rawFlags = modifiers;
+    event.m_x = wherex;
+    event.m_y = wherey;
+    event.SetTimestamp(when);
+    event.SetEventObject(focus);

 }
 }

-#endif