adding alpha to core graphics dc

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index b16dcd492a5019dfcf9458ec3a618e4f4d0a62e8..973bb8065df4799ad2d6fca2e5504e688d973331 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1,42 +1,44 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxApp
 // Purpose:     wxApp

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

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

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

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

 #include "wx/module.h"
 #include "wx/module.h"

-#include "wx/memory.h"

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

-#include "wx/textctrl.h"
-#include "wx/menu.h"
-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
-#endif
+#include "wx/docview.h"
+#include "wx/filename.h"
+#include "wx/link.h"

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


@@ -48,872 +50,1084 @@
   #endif
 #endif
 
   #endif
 #endif
 

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

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

-#if wxUSE_SOCKETS
-    #ifdef __DARWIN__
-        #include <CoreServices/CoreServices.h>
-    #else
-        #include <OpenTransport.h>
-        #include <OpenTptInternet.h>
-    #endif
+#ifdef __DARWIN__
+#  include <CoreServices/CoreServices.h>
+#  if defined(WXMAKINGDLL_CORE)
+#    include <mach-o/dyld.h>
+#  endif
+#else
+#  include <Sound.h>
+#  include <Threads.h>
+#  include <ToolUtils.h>
+#  include <DiskInit.h>
+#  include <Devices.h>
+#endif
+
+// Keep linker from discarding wxStockGDIMac
+wxFORCE_LINK_MODULE(gdiobj)
+
+#if wxUSE_THREADS
+extern size_t g_numberOfThreads;

 #endif
 
 #endif
 

-extern char *wxBuffer;
-extern wxList wxPendingDelete;
-extern wxList *wxWinMacWindowList;
-extern wxList *wxWinMacControlList;
+// statics for implementation
+static bool s_inYield = false;
+static bool s_inReceiveEvent = false ;
+static EventTime sleepTime = kEventDurationNoWait ;

 
 

-wxApp *wxTheApp = NULL;

 
 

-#if !USE_SHARED_LIBRARY

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

-        EVT_END_SESSION(wxApp::OnEndSession)
-        EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
+    EVT_END_SESSION(wxApp::OnEndSession)
+    EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)

 END_EVENT_TABLE()
 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 ;
 

-WXHRGN            wxApp::s_macCursorRgn = NULL;
-wxWindow*            wxApp::s_captureWindow = NULL ;
-int                    wxApp::s_lastMouseDown = 0 ;
-long                     wxApp::sm_lastMessageTime = 0;
+WXHRGN    wxApp::s_macCursorRgn = NULL;
+wxWindow* wxApp::s_captureWindow = NULL ;
+int       wxApp::s_lastMouseDown = 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 ;
-wxString wxApp::s_macHelpMenuTitleName = "&Help" ;
+bool      wxApp::s_macSupportPCMenuShortcuts = true ;
+long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
+long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
+long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
+wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
+
+bool      wxApp::sm_isEmbedded = false; // Normally we're not a plugin
+
+//----------------------------------------------------------------------
+// Core Apple Event Support
+//----------------------------------------------------------------------

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

+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;

 
 

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

 {
 {

-    wxApp* app = (wxApp*) refcon ;

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

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

 {
 {

-    wxApp* app = (wxApp*) refcon ;

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

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

 {
 {

-    wxApp* app = (wxApp*) refcon ;

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

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

 {
 {

-    wxApp* app = (wxApp*) refcon ;

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

-short wxApp::MacHandleAEODoc(const WXEVENTREF event , WXEVENTREF 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))

 {
 {

-    SysBeep(40) ;
+    AEDescList docList;
+    AEKeyword keywd;
+    DescType returnedType;
+    Size actualSize;
+    long itemsInList;
+    OSErr err;
+    short i;
+
+    err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
+    if (err != noErr)
+        return err;
+
+    err = AECountItems(&docList, &itemsInList);
+    if (err != noErr)
+        return err;
+

     ProcessSerialNumber PSN ;
     PSN.highLongOfPSN = 0 ;
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
     ProcessSerialNumber PSN ;
     PSN.highLongOfPSN = 0 ;
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;

-    return noErr ;
+
+    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);
+    }
+
+    return noErr;

 }
 
 }
 

-short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF reply)
+// AEPDoc Calls MacPrintFile on each of the files passed
+
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply))

 {
 {

-    return noErr ;
+    AEDescList docList;
+    AEKeyword keywd;
+    DescType returnedType;
+    Size actualSize;
+    long itemsInList;
+    OSErr err;
+    short i;
+
+    err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
+    if (err != noErr)
+        return err;
+
+    err = AECountItems(&docList, &itemsInList);
+    if (err != noErr)
+        return err;
+
+    ProcessSerialNumber PSN ;
+    PSN.highLongOfPSN = 0 ;
+    PSN.lowLongOfPSN = kCurrentProcess ;
+    SetFrontProcess( &PSN ) ;
+
+    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);
+    }
+
+    return noErr;

 }
 
 }
 

-short wxApp::MacHandleAEOApp(const WXEVENTREF event , WXEVENTREF reply)
+// AEOApp calls MacNewFile
+
+short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))

 {
 {

+    MacNewFile() ;

     return noErr ;
 }
 
     return noErr ;
 }
 

-short wxApp::MacHandleAEQuit(const WXEVENTREF event , WXEVENTREF reply)
+// AEQuit attempts to quit the application
+
+short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))

 {
     wxWindow* win = GetTopWindow() ;
     if ( win )
     {
 {
     wxWindow* win = GetTopWindow() ;
     if ( win )
     {

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

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

+

     return noErr ;
 }
 
     return noErr ;
 }
 

-char StringMac[] =     "\x0d\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
-                    "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
-                    "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf"
-                    "\xb1\xb4\xb5\xb6\xbb\xbc\xbe\xbf"
-                    "\xc0\xc1\xc2\xc4\xc7\xc8\xc9\xcb\xcc\xcd\xce\xcf"
-                    "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xca\xdb" ;
-
-char StringANSI[] = "\x0a\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8"
-                    "\xEA\xEB\xED\xEC\xEE\xEF\xF1\xF3\xF2\xF4\xF6\xF5\xFA\xF9\xFB\xFC"
-                    "\x86\xBA\xA2\xA3\xA7\x95\xB6\xDF\xAE\xA9\x99\xB4\xA8\xC6\xD8"
-                    "\xB1\xA5\xB5\xF0\xAA\xBA\xE6\xF8"
-                    "\xBF\xA1\xAC\x83\xAB\xBB\x85\xC0\xC3\xD5\x8C\x9C"
-                    "\x96\x97\x93\x94\x91\x92\xF7\xFF\xA0\x80" ;
-
-void wxMacConvertFromPC( const char *from , char *to , int len )
+// AEROApp calls MacReopenApp
+
+short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))

 {
 {

-    char *c ;
-    if ( from == to )
-    {
-        for( int i = 0 ; i < len ; ++ i )
-        {
-            c = strchr( StringANSI , *from ) ;
-            if ( c != NULL )
-            {
-                *to = StringMac[ c - StringANSI] ;
-            }
-            ++to ;
-            ++from ;
-        }
-    }
-    else
+    MacReopenApp() ;
+
+    return noErr ;
+}
+
+//----------------------------------------------------------------------
+// Support Routines linking the Mac...File Calls to the Document Manager
+//----------------------------------------------------------------------
+
+void wxApp::MacOpenFile(const wxString & fileName )
+{
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )
+        dm->CreateDocument(fileName , wxDOC_SILENT ) ;
+#endif
+}
+
+
+void wxApp::MacPrintFile(const wxString & fileName )
+{
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+
+#if wxUSE_PRINTING_ARCHITECTURE
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )

     {
     {

-        for( int i = 0 ; i < len ; ++ i )
+        wxDocument *doc = dm->CreateDocument(fileName , wxDOC_SILENT ) ;
+        if ( doc )

         {
         {

-            c = strchr( StringANSI , *from ) ;
-            if ( c != NULL )
+            wxView* view = doc->GetFirstView() ;
+            if ( view )

             {
             {

-                *to = StringMac[ c - StringANSI] ;
+                wxPrintout *printout = view->OnCreatePrintout();
+                if (printout)
+                {
+                    wxPrinter printer;
+                    printer.Print(view->GetFrame(), printout, true);
+                    delete printout;
+                }

             }
             }

-            else
+
+            if (doc->Close())

             {
             {

-                *to = *from ;
+                doc->DeleteAllViews();
+                dm->RemoveDocument(doc) ;

             }
             }

-            ++to ;
-            ++from ;

         }
     }
         }
     }

+#endif //print
+
+#endif //docview
+}
+
+
+
+void wxApp::MacNewFile()
+{

 }
 
 }
 

-void wxMacConvertToPC( const char *from , char *to , int len )
+void wxApp::MacReopenApp()

 {
 {

-    char *c ;
-    if ( from == to )
+    // 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 )

     {
     {

-        for( int i = 0 ; i < len ; ++ i )
-        {
-            c = strchr( StringMac , *from ) ;
-            if ( c != NULL )
-            {
-                *to = StringANSI[ c - StringMac] ;
-            }
-            ++to ;
-            ++from ;
-        }
+        MacNewFile() ;

     }
     else
     {
     }
     else
     {

-        for( int i = 0 ; i < len ; ++ i )
+        wxTopLevelWindow* firstIconized = NULL ;
+        while (node)

         {
         {

-            c = strchr( StringMac , *from ) ;
-            if ( c != NULL )
+            wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
+            if ( !win->IsIconized() )

             {
             {

-                *to = StringANSI[ c - StringMac] ;
+                firstIconized = NULL ;
+                break ;

             }
             else
             {
             }
             else
             {

-                *to = *from ;
+                if ( firstIconized == NULL )
+                    firstIconized = win ;

             }
             }

-            ++to ;
-            ++from ;
+
+            node = node->GetNext();

         }
         }

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

     }
 }
 
     }
 }
 

-void wxMacConvertFromPC( char * p )
-{
-    char *ptr = p ;
-    int len = strlen ( p ) ;
+//----------------------------------------------------------------------
+// Macintosh CommandID support - converting between native and wx IDs
+//----------------------------------------------------------------------

 
 

-    wxMacConvertFromPC( ptr , ptr , len ) ;
-}
+// if no native match they just return the passed-in id

 
 

-void wxMacConvertFromPCForControls( char * p )
+struct IdPair

 {
 {

-    char *ptr = p ;
-    int len = strlen ( p ) ;
-
-    wxMacConvertFromPC( ptr , ptr , len ) ;
-    for ( int i = 0 ; i < strlen ( ptr ) ; i++ )
-    {
-        if ( ptr[i] == '&' && ptr[i]+1 != ' ' )
-        {
-            memmove( &ptr[i] , &ptr[i+1] , strlen( &ptr[i+1] ) + 1) ;
-        }
-    }
-}
+    UInt32 macId ;
+    int wxId ;
+} ;

 
 

-void wxMacConvertFromPC( unsigned char *p )
+IdPair gCommandIds [] =

 {
 {

-    char *ptr = (char*) p + 1 ;
-    int len = p[0] ;
-
-    wxMacConvertFromPC( ptr , ptr , len ) ;
-}
+    { kHICommandCut ,           wxID_CUT } ,
+    { kHICommandCopy ,          wxID_COPY } ,
+    { kHICommandPaste ,         wxID_PASTE } ,
+    { kHICommandSelectAll ,     wxID_SELECTALL } ,
+    { kHICommandClear ,         wxID_CLEAR } ,
+    { kHICommandUndo ,          wxID_UNDO } ,
+    { kHICommandRedo ,          wxID_REDO } ,
+} ;

 
 

-extern char *wxBuffer ;
-
-wxString wxMacMakeMacStringFromPC( const char * p )
+int wxMacCommandToId( UInt32 macCommandId )

 {
 {

-    const char *ptr = p ;
-    int len = strlen ( p ) ;
-    char *buf = wxBuffer ;
+    int wxid = 0 ;

 
 

-    if ( len >= BUFSIZ + 512 )
+    switch ( macCommandId )

     {
     {

-        buf = new char [len+1] ;
-    }
-
-    wxMacConvertFromPC( ptr , buf , len ) ;
-    buf[len] = 0 ;
-    wxString result( buf ) ;
-    if ( buf != wxBuffer )
-        delete buf ;
-    return result ;
-}
+        case kHICommandPreferences :
+            wxid = wxApp::s_macPreferencesMenuItemId ;
+            break ;

 
 

+        case kHICommandQuit :
+            wxid = wxApp::s_macExitMenuItemId ;
+            break ;

 
 

-void wxMacConvertToPC( char * p )
-{
-    char *ptr = p ;
-    int len = strlen ( p ) ;
+        case kHICommandAbout :
+            wxid = wxApp::s_macAboutMenuItemId ;
+            break ;

 
 

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

 
 

-void wxMacConvertToPC( unsigned char *p )
-{
-    char *ptr = (char*) p + 1 ;
-    int len = p[0] ;
+    if ( wxid == 0 )
+        wxid = (int) macCommandId ;

 
 

-    wxMacConvertToPC( ptr , ptr , len ) ;
+    return wxid ;

 }
 
 }
 

-wxString wxMacMakePCStringFromMac( const char * p )
+UInt32 wxIdToMacCommand( int wxId )

 {
 {

-    const char *ptr = p ;
-    int len = strlen ( p ) ;
-    char *buf = wxBuffer ;
+    UInt32 macId = 0 ;

 
 

-    if ( len >= BUFSIZ + 512 )
+    if ( wxId == wxApp::s_macPreferencesMenuItemId )
+        macId = kHICommandPreferences ;
+    else if (wxId == wxApp::s_macExitMenuItemId)
+        macId = kHICommandQuit ;
+    else if (wxId == wxApp::s_macAboutMenuItemId)
+        macId = kHICommandAbout ;
+    else

     {
     {

-        buf = new char [len+1] ;
+        for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i )
+        {
+            if ( gCommandIds[i].wxId == wxId )
+            {
+                macId = gCommandIds[i].macId ;
+                break ;
+            }
+        }

     }
 
     }
 

-    wxMacConvertToPC( ptr , buf , len ) ;
-    buf[len] = 0 ;
+    if ( macId == 0 )
+        macId = (int) wxId ;

 
 

-    wxString result( buf ) ;
-    if ( buf != wxBuffer )
-        delete buf ;
-    return result ;
+    return macId ;

 }
 
 }
 

-wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding )
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )

 {
 {

-    if (mac2pcEncoding)
-    {
-      return wxMacMakePCStringFromMac( from ) ;
-    }
-    else
-    {
-      return wxString( from ) ;
-    }
-}
+    wxMenu* itemMenu = NULL ;
+    int id = 0 ;

 
 

-wxString wxMacMakeStringFromPascal( StringPtr from , bool mac2pcEncoding )
-{
-  // this is safe since a pascal string can never be larger than 256 bytes
-  char s[256] ;
-  CopyPascalStringToC( from , s ) ;
-    if (mac2pcEncoding)
-    {
-      return wxMacMakePCStringFromMac( s ) ;
-    }
-    else
+    // for 'standard' commands which don't have a wx-menu
+    if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout )

     {
     {

-      return wxString( s ) ;
-    }
-}
+        id = wxMacCommandToId( command.commandID ) ;

 
 

-void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding )
-{
-    if (pc2macEncoding)
-    {
-      CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
+        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+        if ( mbar )
+            item = mbar->FindItem( id , &itemMenu ) ;

     }
     }

-    else
+    else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )

     {
     {

-      CopyCStringToPascal( from , to ) ;
+        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 ;
+        }
+
+        // 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 ;
+
+            GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
+            itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
+            if ( itemMenu != NULL )
+                item = (wxMenuItem*) refCon ;
+        }

     }
     }

+
+    return itemMenu ;

 }
 
 }
 

-bool wxApp::Initialize()
-{
-  int error = 0 ;
+//----------------------------------------------------------------------
+// Carbon Event Handler
+//----------------------------------------------------------------------

 
 

-  // Mac-specific
+static const EventTypeSpec eventList[] =
+{
+    { kEventClassCommand, kEventProcessCommand } ,
+    { kEventClassCommand, kEventCommandUpdateStatus } ,

 
 

-  UMAInitToolbox( 4 ) ;
-  SetEventMask( everyEvent ) ;
-    UMAShowWatchCursor() ;
+    { kEventClassMenu, kEventMenuOpening },
+    { kEventClassMenu, kEventMenuClosed },
+    { kEventClassMenu, kEventMenuTargetItem },

 
 

-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
-    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerUPP(AEHandleODoc) ,
-                           (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) ,
-                           (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerUPP(AEHandlePDoc) ,
-                           (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) ,
-                           (long) wxTheApp , FALSE ) ;
-#else
-    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,
-                   (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerProc(AEHandleOApp) ,
-                   (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerProc(AEHandlePDoc) ,
-                   (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerProc(AEHandleQuit) ,
-                   (long) wxTheApp , FALSE ) ;
-#endif
+    { kEventClassApplication , kEventAppActivated } ,
+    { kEventClassApplication , kEventAppDeactivated } ,
+    // handling the quit event is not recommended by apple
+    // rather using the quit apple event - which we do

 
 

+    { kEventClassAppleEvent , kEventAppleEvent } ,

 
 

-#ifndef __DARWIN__
-  // test the minimal configuration necessary
+    { kEventClassMouse , kEventMouseDown } ,
+    { kEventClassMouse , kEventMouseMoved } ,
+    { kEventClassMouse , kEventMouseUp } ,
+    { kEventClassMouse , kEventMouseDragged } ,
+    { 'WXMC' , 'WXMC' }
+} ;

 
 

-    #if !TARGET_CARBON
-    long theSystem ;
-    long theMachine;
+static pascal OSStatus
+wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    wxMacCarbonEvent cEvent( event ) ;
+    MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
+    wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;

 
 

-    if (Gestalt(gestaltMachineType, &theMachine) != noErr)
+    if ( menu )

     {
     {

-        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() )
+        wxEventType type=0;
+        MenuCommand cmd=0;
+        switch (GetEventKind(event))

         {
         {

-            error = kMacSTRNoPre8Yet ;
+            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;

         }
         }

-    }
-    */
-#endif

 
 

-    // if we encountered any problems so far, give the error code and exit immediately
+        if ( type )
+        {
+            wxMenuEvent wxevent(type, cmd, menu);
+            wxevent.SetEventObject(menu);

 
 

-  if ( error )
-  {
-        short itemHit;
-        Str255 message;
+            wxEvtHandler* handler = menu->GetEventHandler();
+            if (handler && handler->ProcessEvent(wxevent))
+            {
+                // handled
+            }
+            else
+            {
+                wxWindow *win = menu->GetInvokingWindow();
+                if (win)
+                    win->GetEventHandler()->ProcessEvent(wxevent);
+                }
+            }
+    }

 
 

-        GetIndString(message, 128, error);
-        UMAShowArrowCursor() ;
-        ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p");
-        itemHit = Alert(128, nil);
-      return FALSE ;
-  }
+    return eventNotHandledErr;
+}

 
 

-#ifndef __DARWIN__
-  #if __option(profile)
-    ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ;
-  #endif
-#endif
+static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;

 
 

-  // now avoid exceptions thrown for new (bad_alloc)
+    HICommand command ;

 
 

-#ifndef __DARWIN__
-  std::__throws_bad_alloc = FALSE ;
-#endif
+    wxMacCarbonEvent cEvent( event ) ;
+    cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;

 
 

-    s_macCursorRgn = ::NewRgn() ;
+    wxMenuItem* item = NULL ;
+    wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ;
+    int id = wxMacCommandToId( command.commandID ) ;

 
 

-#ifdef __WXMSW__
-  wxBuffer = new char[1500];
-#else
-  wxBuffer = new char[BUFSIZ + 512];
-#endif
+    if ( item )
+    {
+        wxASSERT( itemMenu != NULL ) ;

 
 

-  wxClassInfo::InitializeClasses();
+        switch ( cEvent.GetKind() )
+        {
+            case kEventProcessCommand :
+            {
+                if (item->IsCheckable())
+                    item->Check( !item->IsChecked() ) ;

 
 

-#if wxUSE_RESOURCES
-//    wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
-#endif
+                if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
+                    result = noErr ;
+            }
+            break ;

 
 

-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection;
-#endif
-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+        case kEventCommandUpdateStatus:
+            {
+                wxUpdateUIEvent event(id);
+                event.SetEventObject( itemMenu );

 
 

-#ifdef __WXDEBUG__
-#if wxUSE_LOG
-    // flush the logged messages if any and install a 'safer' log target: the
-    // default one (wxLogGui) can't be used after the resources are freed just
-    // below and the user suppliedo ne might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
-    wxLog::DontCreateOnDemand();
-
-    // this will flush the old messages if any
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-#endif
+                bool processed = false;

 
 

-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+                // Try the menu's event handler
+                {
+                    wxEvtHandler *handler = itemMenu->GetEventHandler();
+                    if ( handler )
+                        processed = handler->ProcessEvent(event);
+                }

 
 

-#if wxUSE_WX_RESOURCES
-  wxInitializeResourceSystem();
-#endif
+                // 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();
+                    }
+                }

 
 

-  wxBitmap::InitStandardHandlers();
+                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 ;

 
 

-  wxModule::RegisterModules();
-  if (!wxModule::InitializeModules()) {
-     return FALSE;
-  }
+        default :
+            break ;
+        }
+    }
+    return result ;
+}

 
 

-  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-  wxWinMacControlList = new wxList(wxKEY_INTEGER);
+static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+    switch ( GetEventKind( event ) )
+    {
+        case kEventAppActivated :
+            if ( wxTheApp )
+                wxTheApp->SetActive( true , NULL ) ;
+            result = noErr ;
+            break ;

 
 

-  wxMacCreateNotifierTable() ;
+        case kEventAppDeactivated :
+            if ( wxTheApp )
+                wxTheApp->SetActive( false , NULL ) ;
+            result = noErr ;
+            break ;

 
 

-  UMAShowArrowCursor() ;
+        default :
+            break ;
+    }

 
 

-  return TRUE;
+    return result ;

 }
 
 }
 

-void wxApp::CleanUp()
+pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
 {

-#if wxUSE_LOG
-    // flush the logged messages if any and install a 'safer' log target: the
-    // default one (wxLogGui) can't be used after the resources are freed just
-    // below and the user suppliedo ne might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
-    wxLog::DontCreateOnDemand();
+    EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+    EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+    wxTheApp->MacSetCurrentEvent( event , handler ) ;

 
 

-    // this will flush the old messages if any
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
+    OSStatus result = eventNotHandledErr ;
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassCommand :
+            result = wxMacAppCommandEventHandler( handler , event , data ) ;
+            break ;

 
 

-    // One last chance for pending objects to be cleaned up
-    wxTheApp->DeletePendingObjects();
+        case kEventClassApplication :
+            result = wxMacAppApplicationEventHandler( handler , event , data ) ;
+            break ;

 
 

-  wxModule::CleanUpModules();
+        case kEventClassMenu :
+            result = wxMacAppMenuEventHandler( handler , event , data ) ;
+            break ;

 
 

-#if wxUSE_WX_RESOURCES
-  wxCleanUpResourceSystem();
-#endif
+        case kEventClassMouse :
+            {
+                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 ;
+
+        case kEventClassAppleEvent :
+            {
+                EventRecord rec ;

 
 

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

 
 

-    // Destroy all GDI lists, etc.
-    wxDeleteStockLists();
+        default :
+            break ;
+    }

 
 

-  delete wxTheColourDatabase;
-  wxTheColourDatabase = NULL;
+    wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;

 
 

-  wxBitmap::CleanUpHandlers();
+    return result ;
+}

 
 

-  delete[] wxBuffer;
-  wxBuffer = NULL;
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )

 
 

-  wxMacDestroyNotifierTable() ;
-  if (wxWinMacWindowList)
-    delete wxWinMacWindowList ;
+#ifdef __WXDEBUG__

 
 

-    delete wxPendingEvents;
-#if wxUSE_THREADS
-    delete wxPendingEventsLocker;
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+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
 
 #endif
 

-  wxClassInfo::CleanUpClasses();
+#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

 
 

-#ifndef __DARWIN__
-  #if __option(profile)
-  ProfilerDump( "\papp.prof" ) ;
-  ProfilerTerm() ;
-  #endif
-#endif
-
-  delete wxTheApp;
-  wxTheApp = NULL;
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // At this point we want to check if there are any memory
-    // blocks that aren't part of the wxDebugContext itself,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks."));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-    //  wxDebugContext::SetStream(NULL, NULL);
+    wxOnAssert(fileNameStr, lineNumber , assertionStr ,
+        wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ;

 #endif
 #endif

-
-#if wxUSE_LOG
-    // do it as the very last thing because everything else can log messages
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-
-    UMACleanupToolbox() ;
-    if (s_macCursorRgn)
-        ::DisposeRgn((RgnHandle)s_macCursorRgn);
-
-    #if 0
-        TerminateAE() ;
-    #endif

 }
 
 }
 

-//----------------------------------------------------------------------
-// wxEntry
-//----------------------------------------------------------------------
+#endif //__WXDEBUG__

 
 

-int wxEntryStart( int argc, char *argv[] )
+#ifdef __WXMAC_OSX__
+extern "C"

 {
 {

-    return wxApp::Initialize();
+   // m_macEventPosted run loop source callback:
+   void macPostedEventCallback(void *unused);

 }
 
 }
 

-
-int wxEntryInitGui()
+void macPostedEventCallback(void *unused)

 {
 {

-    return wxTheApp->OnInitGui();
+    wxTheApp->ProcessPendingEvents();

 }
 }

+#endif

 
 

-
-void wxEntryCleanup()
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

-    wxApp::CleanUp();
-}
+    // Mac-specific

 
 

-
-int wxEntry( int argc, char *argv[] , bool enterLoop )
-{
-#ifdef __MWERKS__
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // This seems to be necessary since there are 'rogue'
-    // objects present at this point (perhaps global objects?)
-    // Setting a checkpoint will ignore them as far as the
-    // memory checking facility is concerned.
-    // Of course you may argue that memory allocated in globals should be
-    // checked, but this is a reasonable compromise.
-    wxDebugContext::SetCheckpoint();
-#endif
+#ifdef __WXDEBUG__
+    InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );

 #endif
 #endif

-    if (!wxEntryStart(argc, argv)) {
-        return 0;
-    }
-   // create the application object or ensure that one already exists
-    if (!wxTheApp)
-    {
-        // The app may have declared a global application object, but we recommend
-        // the IMPLEMENT_APP macro is used instead, which sets an initializer
-        // function for delayed, dynamic app object construction.
-        wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
-                     wxT("No initializer - use IMPLEMENT_APP macro.") );

 
 

-        wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) ();
-    }
-
-    wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
+    UMAInitToolbox( 4, sm_isEmbedded ) ;
+    SetEventMask( everyEvent ) ;
+    UMAShowWatchCursor() ;

 
 #ifndef __DARWIN__
 
 #ifndef __DARWIN__

-    argc = 0 ; // currently we don't support files as parameters
+#  if __option(profile)
+    ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;
+#  endif

 #endif
 #endif

-    // we could try to get the open apple events here to adjust argc and argv better

 
 

-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
-
-    // GUI-specific initialization, such as creating an app context.
-    wxEntryInitGui();
-
-
-    // Here frames insert themselves automatically
-    // into wxTopLevelWindows by getting created
-    // in OnInit().
+#ifndef __DARWIN__
+    // now avoid exceptions thrown for new (bad_alloc)
+    // FIXME CS for some changes outside wxMac does not compile anymore
+#if 0
+    std::__throws_bad_alloc = 0 ;
+#endif

 
 

-    int retValue = 0;
+#endif

 
 

-    if ( wxTheApp->OnInit() )
-    {
-        if ( enterLoop )
-        {
-            retValue = wxTheApp->OnRun();
-        }
-        else
-            // We want to initialize, but not run or exit immediately.
-            return 1;
-    }
-    //else: app initialization failed, so we skipped OnRun()
+    s_macCursorRgn = ::NewRgn() ;

 
 

-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if ( topWindow )
+    // Mac OS X passes a process serial number command line argument when
+    // the application is launched from the Finder. This argument must be
+    // removed from the command line arguments before being handled by the
+    // application (otherwise applications would need to handle it)
+    if ( argc > 1 )

     {
     {

-        // Forcibly delete the window.
-        if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-        {
-            topWindow->Close(TRUE);
-            wxTheApp->DeletePendingObjects();
-        }
-        else
+        static const wxChar *ARG_PSN = _T("-psn_");
+        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )

         {
         {

-            delete topWindow;
-            wxTheApp->SetTopWindow(NULL);
+            // remove this argument
+            --argc;
+            memmove(argv + 1, argv + 2, argc * sizeof(char *));

         }
     }
 
         }
     }
 

-    wxTheApp->OnExit();
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;

 
 

-    wxEntryCleanup();
-
-    return retValue;
-}
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+#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

 
 

-wxApp::wxApp()
-{
-  m_topWindow = NULL;
-  wxTheApp = this;
+    wxMacCreateNotifierTable() ;

 
 

-  m_wantDebugOutput = TRUE ;
+#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

 
 

-  argc = 0;
-  argv = NULL;
+    UMAShowArrowCursor() ;

 
 

-  m_printMode = wxPRINT_WINDOWS;
-  m_exitOnFrameDelete = TRUE;
-  m_auto3D = TRUE;
+    return true;

 }
 
 }
 

-bool wxApp::Initialized()
-{
-  if (GetTopWindow())
-    return TRUE;
-  else
-    return FALSE;
-}
+AEEventHandlerUPP sODocHandler = NULL ;
+AEEventHandlerUPP sOAppHandler = NULL ;
+AEEventHandlerUPP sPDocHandler = NULL ;
+AEEventHandlerUPP sRAppHandler = NULL ;
+AEEventHandlerUPP sQuitHandler = NULL ;

 
 

-int wxApp::MainLoop()
+bool wxApp::OnInitGui()

 {
 {

-  m_keepGoing = TRUE;
+    if ( !wxAppBase::OnInitGui() )
+        return false ;

 
 

-  while (m_keepGoing)
-  {
-        MacDoOneEvent() ;
-  }
+    InstallStandardEventHandler( GetApplicationEventTarget() ) ;

 
 

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

 
 

-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+    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 event.MoreRequested();
+    return true ;

 }
 
 }
 

-void wxApp::ExitMainLoop()
+void wxApp::CleanUp()

 {
 {

-  m_keepGoing = FALSE;
-}
+#if wxUSE_TOOLTIPS
+    wxToolTip::RemoveToolTips() ;
+#endif

 
 

-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    EventRecord event ;
+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+        CFRelease(m_macEventPosted);
+    m_macEventPosted = NULL;
+#endif

 
 

-  return EventAvail( everyEvent , &event ) ;
-}
+    // One last chance for pending objects to be cleaned up
+    wxTheApp->DeletePendingObjects();

 
 

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

 
 

-void wxApp::OnIdle(wxIdleEvent& event)
-{
-   static bool s_inOnIdle = FALSE;
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerDump( (StringPtr)"\papp.prof" ) ;
+    ProfilerTerm() ;
+#  endif
+#endif

 
 

-    // Avoid recursion (via ProcessEvent default case)
-    if ( s_inOnIdle )
-        return;
+    UMACleanupToolbox() ;
+    if (s_macCursorRgn)
+        ::DisposeRgn((RgnHandle)s_macCursorRgn);

 
 

+    if (!sm_isEmbedded)
+        RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );

 
 

-  s_inOnIdle = TRUE;
+    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 ) ;
+    }

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    wxAppBase::CleanUp();
+}

 
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+//----------------------------------------------------------------------
+// misc initialization stuff
+//----------------------------------------------------------------------

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)

 
 

-  if (needMore)
-    event.RequestMore(TRUE);
+// 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

 
 

-    // 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();
+extern "C"
+{
+    void __sinit(void);    // (generated by linker)
+    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+    pascal void __terminate(void);
+}

 
 

-  s_inOnIdle = FALSE;
+pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
+{
+    return __initialize( theInitBlock ) ;

 }
 
 }
 

-void wxWakeUpIdle()
+pascal void __wxterminate(void)

 {
 {

-    wxMacWakeUp() ;
+    __terminate() ;

 }
 
 }
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */
+
+bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)

 {
 {

-    bool needMore = FALSE;
-    wxNode* node = wxTopLevelWindows.First();
-    while (node)
+    OSStatus err = noErr ;
+    bool converted = ConvertEventRefToEventRecord( event, rec) ;
+
+    if ( !converted )

     {
     {

-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
+        switch ( GetEventClass( event ) )
+        {
+            case kEventClassKeyboard :
+            {
+                converted = true ;
+                switch ( GetEventKind(event) )
+                {
+                    case kEventRawKeyDown :
+                        rec->what = keyDown ;
+                        break ;

 
 

-        node = node->Next();
-    }
-    return needMore;
-}
+                    case kEventRawKeyRepeat :
+                        rec->what = autoKey ;
+                        break ;

 
 

-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
+                    case kEventRawKeyUp :
+                        rec->what = keyUp ;
+                        break ;

 
 

-    wxIdleEvent event;
-    event.SetEventObject(win);
-    win->ProcessEvent(event);
+                    case kEventRawKeyModifiersChanged :
+                        rec->what = nullEvent ;
+                        break ;

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+                    default :
+                        converted = false ;
+                        break ;
+                }

 
 

-    wxNode* node = win->GetChildren().First();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
+                if ( converted )
+                {
+                    UInt32 keyCode ;
+                    unsigned char charCode ;
+                    UInt32 modifiers ;
+                    GetMouse( &rec->where) ;
+
+                    err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
+                    err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
+                    err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
+                    rec->modifiers = modifiers ;
+                    rec->message = (keyCode << 8 ) + charCode ;
+                }
+            }
+            break ;
+
+            case kEventClassTextInput :
+            {
+                switch ( GetEventKind( event ) )
+                {
+                    case kEventTextInputUnicodeForKeyEvent :
+                        {
+                            EventRef rawEvent ;
+                            err = GetEventParameter(
+                                event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL,
+                                sizeof(rawEvent), NULL, &rawEvent ) ;
+                            converted = true ;
+
+                            {
+                                UInt32 keyCode, modifiers;
+                                unsigned char charCode ;
+
+                                GetMouse( &rec->where) ;
+                                rec->what = keyDown ;
+                                err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
+                                err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
+                                err = GetEventParameter(rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
+                                rec->modifiers = modifiers ;
+                                rec->message = (keyCode << 8 ) + charCode ;
+                            }
+                       }
+                       break ;
+
+                    default :
+                        break ;
+                }
+            }
+            break ;

 
 

-        node = node->Next();
+            default :
+                break ;
+        }

     }
     }

-    return needMore ;
+
+    return converted ;

 }
 
 }
 

-void wxApp::DeletePendingObjects()
+wxApp::wxApp()

 {
 {

-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
+    m_printMode = wxPRINT_WINDOWS;

 
 

-    delete obj;
+    m_macCurrentEvent = NULL ;
+    m_macCurrentEventHandlerCallRef = NULL ;

 
 

-    if (wxPendingDelete.Member(obj))
-      delete node;
-
-    // Deleting one object may have deleted other pending
-    // objects, so start from beginning of list again.
-    node = wxPendingDelete.First();
-  }
+#ifdef __WXMAC_OSX__
+    m_macEventPosted = NULL ;
+#endif

 }
 
 }
 

-wxIcon
-wxApp::GetStdIcon(int which) const
+void wxApp::OnIdle(wxIdleEvent& event)

 {
 {

-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon("wxICON_INFO");
-
-        case wxICON_QUESTION:
-            return wxIcon("wxICON_QUESTION");
-
-        case wxICON_EXCLAMATION:
-            return wxIcon("wxICON_WARNING");
+    wxAppBase::OnIdle(event);

 
 

-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
+    // 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();

 
 

-        case wxICON_HAND:
-            return wxIcon("wxICON_ERROR");
-    }
+  if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+    wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();

 }
 
 }
 

-void wxExit()
+void wxApp::WakeUpIdle()

 {
 {

-    wxLogError(_("Fatal error: exiting"));
+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+    {
+        CFRunLoopSourceSignal(m_macEventPosted);
+    }
+#endif

 
 

-    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


@@ -923,7 +1137,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);

     }
 }
 
     }
 }
 


@@ -937,8 +1151,6 @@ void wxCYield()
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {

-    static bool s_inYield = FALSE;
-

     if (s_inYield)
     {
         if ( !onlyIfNeeded )
     if (s_inYield)
     {
         if ( !onlyIfNeeded )


@@ -946,527 +1158,402 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
-    }
-
-    s_inYield = TRUE;
-
-#if wxUSE_THREADS
-    YieldToAnyThread() ;
-#endif
-    EventRecord event ;
-
-    long sleepTime = 1 ; //::GetCaretTime();
-
-    while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
-    {
-        wxTheApp->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 ) ;
+        return false;

     }
 
     }
 

-    wxMacProcessNotifierAndPendingEvents() ;
-
-    s_inYield = FALSE;
+    s_inYield = true;

 
 

-    return TRUE;
-}
+    // by definition yield should handle all non-processed events

 
 

-// platform specifics
+    EventRef theEvent;

 
 

-void wxApp::MacSuspend( bool convertClipboard )
-{
-    // we have to deactive the top level windows manually
+    OSStatus status = noErr ;

 
 

-    wxNode* node = wxTopLevelWindows.First();
-    while (node)
+    while ( status == noErr )

     {
     {

-        wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
-        win->MacActivate( MacGetCurrentEvent() , false ) ;
-
-        node = node->Next();
-    }
+        s_inReceiveEvent = true ;
+        status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ;
+        s_inReceiveEvent = false ;

 
 

-     s_lastMouseDown = 0 ;
-     if( convertClipboard )
-     {
-         MacConvertPrivateToPublicScrap() ;
-     }
-
-     ::HideFloatingWindows() ;
-}
-
-void wxApp::MacResume( bool convertClipboard )
-{
-        s_lastMouseDown = 0 ;
-        if( convertClipboard )
+        if ( status == eventLoopTimedOutErr )

         {
         {

-            MacConvertPublicToPrivateScrap() ;
+            // make sure next time the event loop will trigger idle events
+            sleepTime = kEventDurationNoWait ;

         }
         }

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

 
 

-        ::ShowFloatingWindows() ;
-}
-
-void wxApp::MacConvertPrivateToPublicScrap()
-{
-}
+    wxMacProcessNotifierAndPendingEvents() ;
+    s_inYield = false;

 
 

-void wxApp::MacConvertPublicToPrivateScrap()
-{
+    return true;

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

-  EventRecord event ;
+    EventRef theEvent;

 
 

-    long sleepTime = 1; // GetCaretTime() / 4 ;
+    s_inReceiveEvent = true ;
+    OSStatus status = ReceiveNextEvent(0, NULL, sleepTime, true, &theEvent) ;
+    s_inReceiveEvent = false ;

 
 

-    if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn))
+    switch (status)

     {
     {

-        MacHandleOneEvent( &event );
-    }
-    else
-    {
-        // idlers
-        WindowPtr window = ::FrontWindow() ;
-        if ( window )
-            ::IdleControls( window ) ;
+        case eventLoopTimedOutErr :
+            if ( wxTheApp->ProcessIdle() )
+                sleepTime = kEventDurationNoWait ;
+            else
+                sleepTime = kEventDurationSecond;
+            break;

 
 

-        wxTheApp->ProcessIdle() ;
-    }
-    if ( event.what != kHighLevelEvent )
-        SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
+        case eventLoopQuitErr :
+            // according to QA1061 this may also occur
+            // when a WakeUp Process is executed
+            break;

 
 

+        default:
+            MacHandleOneEvent( theEvent ) ;
+            ReleaseEvent( theEvent );
+            sleepTime = kEventDurationNoWait ;
+            break;
+    }

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

-    EventRecord* ev = (EventRecord*) evr ;
-    m_macCurrentEvent = ev ;
+    EventTargetRef theTarget;
+    theTarget = GetEventDispatcherTarget();
+    m_macCurrentEvent = evr ;

 
 

-    wxApp::sm_lastMessageTime = ev->when ;
+    OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget);
+    if (status == eventNotHandledErr)
+        MacHandleUnhandledEvent(evr);

 
 

-    switch (ev->what)
+    wxMacProcessNotifierAndPendingEvents() ;
+
+#if wxUSE_THREADS
+    wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+}
+
+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;

-    }
-    wxMacProcessNotifierAndPendingEvents() ;
-}

 
 

-void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    ::AEProcessAppleEvent( ev ) ;
-}
+        case kFunctionKeyCharCode :
+        {
+            switch ( code )
+            {
+                case 0x7a :
+                    retval = WXK_F1 ;
+                    break;

 
 

-bool s_macIsInModalLoop = false ;
+                case 0x78 :
+                    retval = WXK_F2 ;
+                    break;

 
 

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

 
 

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

 
 

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

 
 

-    BitMap screenBits;
-    GetQDGlobalsScreenBits( &screenBits );
+                case 0x61 :
+                    retval = WXK_F6 ;
+                    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 0x62:
+                    retval = WXK_F7 ;
+                    break;
+
+                case 0x64 :
+                    retval = WXK_F8 ;
+                    break;
+
+                case 0x65 :
+                    retval = WXK_F9 ;
+                    break;
+
+                case 0x6D :
+                    retval = WXK_F10 ;
+                    break;
+
+                case 0x67 :
+                    retval = WXK_F11 ;
+                    break;
+
+                case 0x6F :
+                    retval = WXK_F12 ;
+                    break;
+
+                case 0x69 :
+                    retval = WXK_F13 ;
+                    break;
+
+                case 0x6B :
+                    retval = WXK_F14 ;
+                    break;
+
+                case 0x71 :
+                    retval = WXK_F15 ;
+                    break;
+
+                default:
+                    break;

             }
             }

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

             break ;
             break ;

-#if !TARGET_CARBON
-        case inSysWindow :
-            SystemClick( ev , window ) ;
-            s_lastMouseDown = 0;
-            break ;
-#endif
-        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 } ;
-                    SetPort( GetWindowPort(window) ) ;
-                    LocalToGlobal( &pt ) ;
-                    SetPort( port ) ;
-                        win->SetSize( pt.h , pt.v , -1 ,
-                            -1 , wxSIZE_USE_EXISTING);
-                }
-                s_lastMouseDown = 0;
-            }
+
+        case kLeftArrowCharCode :
+            retval = WXK_LEFT ;

             break ;
             break ;

-        case inGoAway:
-            if (TrackGoAway(window, ev->where))
-            {
-                if ( win )
-                    win->Close() ;
-            }
-            s_lastMouseDown = 0;
-            break;
-        case inGrow:
-          {
-                int growResult = GrowWindow(window , ev->where, &screenBits.bounds);
-                if (growResult != 0)
-                {
-                    int newWidth = LoWord(growResult);
-                    int newHeight = HiWord(growResult);
-                    int oldWidth, oldHeight;

 
 

+        case kRightArrowCharCode :
+            retval = WXK_RIGHT ;
+            break ;

 
 

-                    if (win)
-                    {
-                        win->GetSize(&oldWidth, &oldHeight);
-                        if (newWidth == 0)
-                            newWidth = oldWidth;
-                        if (newHeight == 0)
-                            newHeight = oldHeight;
-                        win->SetSize( -1, -1, newWidth, newHeight, 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 ;
+        case kUpArrowCharCode :
+            retval = WXK_UP ;
+            break ;

 
 

-                        GetWindowPortBounds(window, &tempRect ) ;
-                        win->SetSize( -1, -1, 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 kDownArrowCharCode :
+            retval = WXK_DOWN ;

             break ;
 
             break ;
 

-        case inContent :
-                {
-                    GrafPtr port ;
-                    GetPort( &port ) ;
-                    SetPort( GetWindowPort(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 kDeleteCharCode :
+            retval = WXK_DELETE ;

             break ;
 
         default:
             break ;
 
         default:

-            break;
+            break ;
+     } // end switch
+
+    return retval;
+}
+
+int wxMacKeyCodeToModifier(wxKeyCode key)
+{
+    switch (key)
+    {
+    case WXK_START:
+    case WXK_MENU:
+        return cmdKey;
+
+    case WXK_SHIFT:
+        return shiftKey;
+
+    case WXK_CAPITAL:
+        return alphaLock;
+
+    case WXK_ALT:
+        return optionKey;
+
+    case WXK_CONTROL:
+        return controlKey;
+
+    default:
+        return 0;

     }
 }
 
     }
 }
 

-void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
+#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
+
+
+wxMouseState wxGetMouseState()

 {
 {

-    EventRecord* ev = (EventRecord*) evr ;
-    WindowRef window;
+    wxMouseState ms;
+
+    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;
+}
+
+// TODO : once the new key/char handling is tested, move all the code to wxWindow
+
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+    if ( !focus )
+        return false ;
+
+    bool handled;
+    wxKeyEvent event(wxEVT_KEY_DOWN) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;

 
 

-    short windowPart = ::FindWindow(ev->where, &window);
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    if ( handled && event.GetSkipped() )
+        handled = false ;

 
 

-    switch (windowPart)
+#if wxUSE_ACCEL
+    if ( !handled )

     {
     {

-        case inMenuBar :
-            break ;
-        case inSysWindow :
-            break ;
-        default:
+        wxWindow *ancestor = focus;
+        while (ancestor)
+        {
+            int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+            if (command != -1)

             {
             {

-                wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
-                if ( win )
-                    win->MacMouseUp( ev , windowPart ) ;
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                handled = ancestor->GetEventHandler()->ProcessEvent( command_event );
+                break;

             }
             }

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

     }
     }

+#endif // wxUSE_ACCEL
+
+    return handled ;

 }
 
 }
 

-long wxMacTranslateKey(unsigned char key, unsigned char code) ;
-long wxMacTranslateKey(unsigned char key, unsigned char code)
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )

 {
 {

-    long retval = key ;
-    switch (key)
-    {
-        case 0x01 :
-                 retval = WXK_HOME;
-          break;
-        case 0x03 :
-                 retval = WXK_RETURN;
-          break;
-        case 0x04 :
-                 retval = WXK_END;
-          break;
-        case 0x05 :
-                 retval = WXK_HELP;
-          break;
-        case 0x08 :
-                 retval = WXK_BACK;
-          break;
-        case 0x09 :
-                 retval = WXK_TAB;
-          break;
-        case 0x0b :
-                 retval = WXK_PAGEUP;
-          break;
-        case 0x0c :
-                 retval = WXK_PAGEDOWN;
-          break;
-        case 0x0d :
-                 retval = WXK_RETURN;
-          break;
-            case 0x10 :
-            {
-                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 0x1b :
-                retval = WXK_ESCAPE ;
-            break ;
-            case 0x1c :
-                retval = WXK_LEFT ;
-            break ;
-            case 0x1d :
-                retval = WXK_RIGHT ;
-            break ;
-            case 0x1e :
-                retval = WXK_UP ;
-            break ;
-            case 0x1f :
-                retval = WXK_DOWN ;
-            break ;
-            case 0x7F :
-                retval = WXK_DELETE ;
-             default:
-            break ;
-     } // end switch
+    if ( !focus )
+        return false ;

 
 

-    return retval;
+    bool handled;
+    wxKeyEvent event( wxEVT_KEY_UP ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+
+    return handled ;

 }
 
 }
 

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

 {
 {

-    EventRecord* ev = (EventRecord*) evr ;
-    wxToolTip::RemoveToolTips() ;
+    if ( !focus )
+        return false ;
+
+    wxKeyEvent event(wxEVT_CHAR) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    long keyval = event.m_keyCode ;

 
 

-    UInt32 menuresult = UMAMenuEvent(ev) ;
-    if ( HiWord( menuresult ) )
+    bool handled = false ;
+
+    wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+
+    if (tlw)

     {
     {

-        if ( !s_macIsInModalLoop )
-        MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ;
+        event.SetEventType( wxEVT_CHAR_HOOK );
+        handled = tlw->GetEventHandler()->ProcessEvent( event );
+        if ( handled && event.GetSkipped() )
+            handled = false ;

     }
     }

-    else
+
+    if ( !handled )

     {
     {

-        short keycode ;
-        short keychar ;
-        keychar = short(ev->message & charCodeMask);
-        keycode = short(ev->message & keyCodeMask) >> 8 ;
-        long keyval = wxMacTranslateKey(keychar, keycode) ;
-        bool handled = false ;
-        wxWindow* focus = wxWindow::FindFocus() ;
-        if ( focus )
-        {
+        event.SetEventType( wxEVT_CHAR );
+        event.Skip( false ) ;
+        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    }

 
 

-            wxKeyEvent event(wxEVT_KEY_DOWN);
-            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_keyCode = keyval;
-            event.m_x = ev->where.h;
-            event.m_y = ev->where.v;
-            event.m_timeStamp = ev->when;
-            event.SetEventObject(focus);
-            handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-            if ( !handled )
-            {
-                #if wxUSE_ACCEL
-                if (!handled)
-                {
-                    wxWindow *ancestor = focus;
-                    /*
-                    while (ancestor)
-                    {
-                        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->m_isFrame)
-                            break;
-                        ancestor = ancestor->GetParent();
-                    }
-                    */
-                }
-                #endif // wxUSE_ACCEL
-            }
-            if (!handled)
-            {
-                wxKeyEvent event(wxEVT_CHAR);
-                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_keyCode = keyval;
-                event.m_x = ev->where.h;
-                event.m_y = ev->where.v;
-                event.m_timeStamp = ev->when;
-                event.SetEventObject(focus);
-                handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-            }
-            if ( !handled &&
-                 (keyval == WXK_TAB) &&
-                 (!focus->HasFlag(wxTE_PROCESS_TAB)) &&
-                 (focus->GetParent()) &&
-                 (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
+    if ( !handled && (keyval == WXK_TAB) )
+    {
+        wxWindow* iter = focus->GetParent() ;
+        while ( iter && !handled )
+        {
+            if ( iter->HasFlag( wxTAB_TRAVERSAL ) )

             {
                 wxNavigationKeyEvent new_event;
                 new_event.SetEventObject( focus );
             {
                 wxNavigationKeyEvent new_event;
                 new_event.SetEventObject( focus );


@@ -1474,326 +1561,126 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( event.ControlDown() );
                 new_event.SetCurrentFocus( focus );
                 /* 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 );
+                handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                if ( handled && new_event.GetSkipped() )
+                    handled = false ;

             }
             }

+
+            iter = iter->GetParent() ;

         }
         }

-        if ( !handled )
+    }
+
+    // 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
-          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 ;
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(focus), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
+                {
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
+                    if ( def && def->IsEnabled() )
+                    {
+                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        event.SetEventObject(def);
+                        def->Command(event);
+
+                        return true ;
+                    }

                 }
             }
                 }
             }

-            /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
-            else if (keyval == WXK_ESCAPE || (keyval == '.' && ev->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 ;

 }
 
 }
 

-void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
+// 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 )

 {
 {

-    EventRecord* ev = (EventRecord*) evr ;
-    wxToolTip::RemoveToolTips() ;
+    short keycode, keychar ;

 
 

-    UInt32 menuresult = UMAMenuEvent(ev) ;
-    if ( HiWord( menuresult ) )
-    {
-    }
-    else
+    keychar = short(keymessage & charCodeMask);
+    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    if ( !(event.GetEventType() == wxEVT_CHAR) && (modifiers & (controlKey | shiftKey | optionKey) ) )

     {
     {

-        short keycode ;
-        short keychar ;
-        keychar = short(ev->message & charCodeMask);
-        keycode = short(ev->message & keyCodeMask) >> 8 ;
-
-        wxWindow* focus = wxWindow::FindFocus() ;
-        if ( focus )
-        {
-            long keyval = wxMacTranslateKey(keychar, keycode) ;
-
-            wxKeyEvent event(wxEVT_KEY_UP);
-            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_keyCode = keyval;
-            event.m_x = ev->where.h;
-            event.m_y = ev->where.v;
-            event.m_timeStamp = ev->when;
-            event.SetEventObject(focus);
-            bool handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-        }
+        // 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);

     }
     }

-}

 
 

-void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    WindowRef window = (WindowRef) ev->message ;
-    if ( window )
-    {
-        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 , activate ) ;
-    }
-}
+    long keyval = wxMacTranslateKey(keychar, keycode) ;
+    if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )
+        keyval = wxToupper( keyval ) ;

 
 

-void wxApp::MacHandleUpdateEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    WindowRef window = (WindowRef) ev->message ;
-    wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;
-    if ( win )
+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)

     {
     {

-        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 )
-  {
- #if !TARGET_CARBON
-        OSErr err ;
-        Point point ;
-         SetPt( &point , 100 , 100 ) ;
-
-          err = DIBadMount( point , ev->message ) ;
-        wxASSERT( err == noErr ) ;
-#endif
-    }
-}
-
-void wxApp::MacHandleOSEvent( WXEVENTREF evr )
-{
-    EventRecord* ev = (EventRecord*) evr ;
-    switch( ( ev->message & osEvtMessageMask ) >> 24 )
-    {
-        case suspendResumeMessage :
-            {
-                bool isResuming = ev->message & resumeFlag ;
-#if !TARGET_CARBON
-                bool convertClipboard = ev->message & convertClipboardFlag ;
-#else
-                bool convertClipboard = false;
-#endif
-                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 , false ) ;
-                    }
-                    if ( newFrontWindow )
-                    {
-                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ;
-                        if ( win )
-                            win->MacActivate( ev , true ) ;
-                    }
-                }
-                else
-                {
-                    MacSuspend( convertClipboard ) ;
-
-                    // in case this suspending did close an active window, another one might
-                    // have surfaced -> lets deactivate that one
-
-/* TODO : find out what to do on systems < 10 , perhaps FrontNonFloatingWindow
-                    WindowRef newActiveWindow = ::ActiveNonFloatingWindow() ;
-                    if ( newActiveWindow )
-                    {
-                        wxWindow* win = wxFindWinFromMacWindow( newActiveWindow ) ;
-                        if ( win )
-                            win->MacActivate( ev , false ) ;
-                    }
-*/
-                }
-            }
-            break ;
-        case mouseMovedMessage :
-            {
-                WindowRef window;
-
-                wxWindow* currentMouseWindow = NULL ;
-
-                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->GetEventHandler()->ProcessEvent(eventleave);
-                    }
-                    if ( currentMouseWindow )
-                    {
-                        wxMouseEvent evententer(event ) ;
-                        evententer.SetEventType( wxEVT_ENTER_WINDOW ) ;
-                        currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
-                    }
-                    wxWindow::s_lastMouseWindow = currentMouseWindow ;
-                }
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;

 
 

-                short windowPart = ::FindWindow(ev->where, &window);
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;

 
 

-                switch (windowPart)
-                {
-                    // fixes for setting the cursor back from dominic mazzoni
-                    case inMenuBar :
-                        UMAShowArrowCursor();
-                        break ;
-                    case inSysWindow :
-                        UMAShowArrowCursor();
-                        break ;
-                    default:
-                        {
-                            // if ( s_lastMouseDown == 0 )
-                            //     ev->modifiers |= btnState ;
-                                
-                            // Calling GetNextEvent with a zero event mask will always
-                            // pass back a null event. However, it fills the EventRecord
-                            // with the state of the modifier keys. This is needed since
-                            // the modifier state returned by WaitForNextEvent often is
-                            // wrong mouse move events. The attempt above to correct this
-                            // didn't always work (under OS X at least).
-            
-                            EventRecord tmp;
-                            ::GetNextEvent(0, &tmp);
-                            ev->modifiers = tmp.modifiers;
-                            
-                            wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
-                            if ( win )
-                                win->MacMouseMoved( ev , windowPart ) ;
-                            else
-                                UMAShowArrowCursor();
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;

 
 

-                        }
-                        break;
-                }
-            }
-            break ;
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;

 
 

-    }
-}
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;

 
 

-void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum )
-{
-    if (macMenuId == 0)
-         return; // no menu item selected
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;

 
 

-    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
-    {
-        wxWindow* frontwindow = wxFindWinFromMacWindow( ::FrontWindow() )  ;
-        if ( frontwindow && wxMenuBar::MacGetInstalledMenuBar() )
-            wxMenuBar::MacGetInstalledMenuBar()->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ;
+        default:
+            break;
+        } // end switch

     }
     }

-    HiliteMenu(0);
-}
-
-/*
-long wxApp::MacTranslateKey(char key, int mods)
-{
-}

 
 

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

 
 

-*/
-/*
-void
-wxApp::macAdjustCursor()
-{
-  if (ev->what != kHighLevelEvent)
-  {
-    wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-    if (theMacWxFrame)
-    {
-        if (!theMacWxFrame->MacAdjustCursor(ev->where))
-        ::SetCursor(&(qd.arrow));
-      }
-  }
+    event.m_rawCode = keymessage;
+    event.m_rawFlags = modifiers;
+    event.m_x = wherex;
+    event.m_y = wherey;
+    event.SetTimestamp(when);
+    event.SetEventObject(focus);

 }
 }

-*/