]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/carbon/app.cpp
no changes, just corrected the comment for wxConvLocal
[wxWidgets.git] / src / mac / carbon / app.cpp
index 3061f99aeaeda5ecf31808a1ab6300fc92e43359..b128991ff072ab3a3437d8526479b96c677ec350 100644 (file)
@@ -1,25 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.cpp
 // Purpose:     wxApp
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// 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/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/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
-
-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
-#endif
+#include "wx/tooltip.h"
+#include "wx/textctrl.h"
+#include "wx/menu.h"
+#include "wx/docview.h"
+#include "wx/filename.h"
 
 #include <string.h>
 
 // mac
 
-#include "apprsrc.h"
+#ifndef __DARWIN__
+  #if __option(profile)
+    #include <profiler.h>
+  #endif
+#endif
+
+// #include "apprsrc.h"
+
+#include "wx/mac/uma.h"
+#include "wx/mac/macnotfy.h"
+
+#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
 
-extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
-wxApp *wxTheApp = NULL;
+#if wxUSE_THREADS
+extern size_t g_numberOfThreads;
+#endif
+
+// statics for implementation
+static bool s_inYield = false;
+static bool s_inReceiveEvent = false ;
+static EventTime sleepTime = kEventDurationNoWait ;
+
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
+    EVT_END_SESSION(wxApp::OnEndSession)
+    EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()
-#endif
 
-long wxApp::sm_lastMessageTime = 0;
 
-const short    kMacMinHeap = (29 * 1024) ;
 // platform specific static variables
+const short kMacMinHeap = (29 * 1024) ;
+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;
+long      wxApp::s_lastModifiers = 0 ;
+
+bool      wxApp::s_macSupportPCMenuShortcuts = true ;
+long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
+long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
+long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
+wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
+
+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 AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
+}
 
-bool                                   gMacHasAppearance = false ;
-long                                   gMacAppearanceVersion = 0 ;
-RgnHandle                      gMacCursorRgn = NULL ;
-
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
+}
 
-bool wxApp::Initialize()
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
 {
-  int error = 0 ;
-       
-  // Mac-specific
-       long total,contig;
-  
-  // init all managers
-
-       ::InitGraf(&qd.thePort);
-       ::InitFonts();
-       ::InitWindows();
-       ::InitMenus();
-       ::TEInit();
-       ::InitDialogs(0L);
-       ::InitCursor();
-       CursHandle aCursHandle = ::GetCursor(watchCursor);      // Watch should be in system
-       if (aCursHandle)
-               ::SetCursor(*aCursHandle);                                                                                      
-       ::FlushEvents(everyEvent, 0);
-       
-       // setup memory of application 
-       
-       ::MaxApplZone();
-       for (long i = 1; i <= 4; i++)
-               ::MoreMasters();
-       PurgeSpace(&total, &contig);
-       ::SetCursor( &qd.arrow ) ; 
+    return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
+}
 
-#if 0
-       InitAEHandlers();
-       InitializeAECore() ;
-       GUSISetup(GUSIwithInternetSockets);
-#endif
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
+}
 
-  // test the minimal configuration necessary
-
-       long theSystem ;
-       long theMachine;
-       long theAppearance ;
-
-       if (Gestalt(gestaltMachineType, &theMachine) != noErr)
-       {
-               error = kMacSTRWrongMachine;
-       }
-       else if (theMachine < gestaltMacPlus)
-       {
-               error = kMacSTRWrongMachine;
-       }
-       else if (Gestalt(gestaltSystemVersion, &theSystem) != noErr )
-       {
-               error = kMacSTROldSystem  ;
-       }       
-       else if ( theSystem < 0x0700 )
-       {
-               error = kMacSTROldSystem  ;
-       }
-       else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
-       {
-               error = kMacSTRSmallSize;
-       }
-       else
-       {
-               if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-               {
-                       gMacHasAppearance = true ;
-                       RegisterAppearanceClient();
-                       if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
-                       {
-                               gMacAppearanceVersion = theAppearance ;
-                       }
-                       else
-                       {
-                               gMacAppearanceVersion = 0x0100 ;
-                       }
-               }
-               else
-                       error = kMacSTRNoPre8Yet ;
-       }
-
-       // if we encountered any problems so far, give the error code and exit immediately
-       
-  if ( error )
-  {    
-               short itemHit;
-               Str255 message;
-       
-               SetCursor(&qd.arrow);
-               GetIndString(message, 128, error);
-               ParamText(message, (ConstStr255Param)"\p", (ConstStr255Param)"\p", (ConstStr255Param)"\p");
-               itemHit = Alert(129, nil);
-         return FALSE ;
-  }  
-  
-  // now avoid exceptions thrown for new (bad_alloc)
-  
-  std::__throws_bad_alloc = FALSE ;
-  
-       gMacCursorRgn = ::NewRgn() ;
-
-#ifdef __WXMSW__
-  wxBuffer = new char[1500];
-#else
-  wxBuffer = new char[BUFSIZ + 512];
-#endif
+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
+}
 
-/* No longer used
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+// AEODoc Calls MacOpenFile on each of the files passed
 
-  streambuf* sBuf = new wxDebugStreamBuf;
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
-#endif
-*/
-  
-  wxClassInfo::InitializeClasses();
+short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
+{
+    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 ) ;
 
-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+        MacOpenFile(fName);
+    }
 
-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+    return noErr;
+}
 
-#if wxUSE_WX_RESOURCES
-  wxInitializeResourceSystem();
-#endif
+// AEPDoc Calls MacPrintFile on each of the files passed
 
-  wxBitmap::InitStandardHandlers();
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply))
+{
+    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 ) ;
 
-  wxModule::RegisterModules();
-  wxASSERT( wxModule::InitializeModules() == TRUE );
+        MacPrintFile(fName);
+    }
 
-  return TRUE;
+    return noErr;
 }
 
-void wxApp::CleanUp()
+// AEOApp calls MacNewFile
+
+short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
-  wxModule::CleanUpModules();
+    MacNewFile() ;
+    return noErr ;
+}
 
-#if wxUSE_WX_RESOURCES
-  wxCleanUpResourceSystem();
-#endif
+// AEQuit attempts to quit the application
 
-  wxDeleteStockObjects() ;
+short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
+{
+    wxWindow* win = GetTopWindow() ;
+    if ( win )
+    {
+        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, s_macExitMenuItemId);
+        if (!win->ProcessEvent(exitEvent))
+            win->Close(true) ;
+    }
+    else
+    {
+        ExitMainLoop() ;
+    }
 
-  // Destroy all GDI lists, etc.
+    return noErr ;
+}
 
-  delete wxTheBrushList;
-  wxTheBrushList = NULL;
+// AEROApp calls MacReopenApp
 
-  delete wxThePenList;
-  wxThePenList = NULL;
+short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
+{
+    MacReopenApp() ;
 
-  delete wxTheFontList;
-  wxTheFontList = NULL;
+    return noErr ;
+}
 
-  delete wxTheBitmapList;
-  wxTheBitmapList = NULL;
+//----------------------------------------------------------------------
+// Support Routines linking the Mac...File Calls to the Document Manager
+//----------------------------------------------------------------------
 
-  delete wxTheColourDatabase;
-  wxTheColourDatabase = NULL;
+void wxApp::MacOpenFile(const wxString & fileName )
+{
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )
+        dm->CreateDocument(fileName , wxDOC_SILENT ) ;
+#endif
+}
 
-  wxBitmap::CleanUpHandlers();
 
-  delete[] wxBuffer;
-  wxBuffer = NULL;
+void wxApp::MacPrintFile(const wxString & fileName )
+{
+#if wxUSE_DOC_VIEW_ARCHITECTURE
 
-  wxClassInfo::CleanUpClasses();
+#if wxUSE_PRINTING_ARCHITECTURE
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )
+    {
+        wxDocument *doc = dm->CreateDocument(fileName , wxDOC_SILENT ) ;
+        if ( doc )
+        {
+            wxView* view = doc->GetFirstView() ;
+            if ( view )
+            {
+                wxPrintout *printout = view->OnCreatePrintout();
+                if (printout)
+                {
+                    wxPrinter printer;
+                    printer.Print(view->GetFrame(), printout, true);
+                    delete printout;
+                }
+            }
+
+            if (doc->Close())
+            {
+                doc->DeleteAllViews();
+                dm->RemoveDocument(doc) ;
+            }
+        }
+    }
+#endif //print
 
-  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() > 0)
-  {
-    wxTrace("There were memory leaks.\n");
-    wxDebugContext::Dump();
-    wxDebugContext::PrintStatistics();
-  }
-//  wxDebugContext::SetStream(NULL, NULL);
-#endif
-  
-  // do it as the very last thing because everything else can log messages
-  wxLog::DontCreateOnDemand();
-  // do it as the very last thing because everything else can log messages
-  delete wxLog::SetActiveTarget(NULL);
-
-       ::PrClose() ;
-       if (gMacCursorRgn)
-               ::DisposeRgn(gMacCursorRgn);
-       #if 0
-               TerminateAE() ;
-       #endif
+#endif //docview
 }
 
-int wxEntry( int argc, char *argv[] )
-{
-  if (!wxApp::Initialize())
-    return FALSE;
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
-    {
-      printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-      return 0;
-    };
-    
-       wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
-  };
-  
-  if (!wxTheApp) 
-  {
-    printf( "wxWindows error: wxTheApp == NULL\n" );
-    return 0;
-  };
-
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
-
-  // GUI-specific initialization, such as creating an app context.
-  wxTheApp->OnInitGui();
-
-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
-  
-  if (!wxTheApp->OnInit()) return 0;
-
-  int retValue = 0;
-  
-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-
-  if (wxTheApp->GetTopWindow())
-  {
-    delete wxTheApp->GetTopWindow();
-    wxTheApp->SetTopWindow(NULL);
-  }
-  
-  wxTheApp->DeletePendingObjects();  
-  
-  wxTheApp->OnExit();
-  
-  wxApp::CleanUp();
-
-  return retValue;
-};
-
-// Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
-wxApp::wxApp()
+
+void wxApp::MacNewFile()
 {
-  m_topWindow = NULL;
-  wxTheApp = this;
-  m_className = "";
-  m_wantDebugOutput = TRUE ;
-  m_appName = "";
-  argc = 0;
-  argv = NULL;
-#ifdef __WXMSW__
-  m_printMode = wxPRINT_WINDOWS;
-#else
-  m_printMode = wxPRINT_POSTSCRIPT;
-#endif
-  m_exitOnFrameDelete = TRUE;
-  m_auto3D = TRUE;
 }
 
-bool wxApp::Initialized()
+void wxApp::MacReopenApp()
 {
-    return TRUE;
-//  if (GetTopWindow())
-//    return TRUE;
-//  else
-//    return FALSE;
+    // HIG says :
+    // if there is no open window -> create a new one
+    // if all windows are hidden -> show the first
+    // if some windows are not hidden -> do nothing
+
+    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+    if ( node == NULL )
+    {
+        MacNewFile() ;
+    }
+    else
+    {
+        wxTopLevelWindow* firstIconized = NULL ;
+        while (node)
+        {
+            wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
+            if ( !win->IsIconized() )
+            {
+                firstIconized = NULL ;
+                break ;
+            }
+            else
+            {
+                if ( firstIconized == NULL )
+                    firstIconized = win ;
+            }
+
+            node = node->GetNext();
+        }
+
+        if ( firstIconized )
+            firstIconized->Iconize( false ) ;
+    }
 }
 
-int wxApp::MainLoop()
-{
-  m_keepGoing = TRUE;
+//----------------------------------------------------------------------
+// Macintosh CommandID support - converting between native and wx IDs
+//----------------------------------------------------------------------
 
-  while (m_keepGoing)
-  {
-               MacDoOneEvent() ;
-  }
+// if no native match they just return the passed-in id
 
-  return 0;
-}
+struct IdPair
+{
+    UInt32 macId ;
+    int wxId ;
+} ;
 
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
+IdPair gCommandIds [] = 
 {
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+    { kHICommandCut ,           wxID_CUT } ,
+    { kHICommandCopy ,          wxID_COPY } ,
+    { kHICommandPaste ,         wxID_PASTE } ,
+    { kHICommandSelectAll ,     wxID_SELECTALL } ,
+    { kHICommandClear ,         wxID_CLEAR } ,
+    { kHICommandUndo ,          wxID_UNDO } ,
+    { kHICommandRedo ,          wxID_REDO } ,
+} ;
+
+int wxMacCommandToId( UInt32 macCommandId ) 
+{
+    int wxid = 0 ;
+    
+    switch ( macCommandId )
+    {
+        case kHICommandPreferences :
+            wxid = wxApp::s_macPreferencesMenuItemId ;
+            break ;
+
+        case kHICommandQuit :
+            wxid = wxApp::s_macExitMenuItemId ;
+            break ;
+
+        case kHICommandAbout :
+            wxid = wxApp::s_macAboutMenuItemId ;
+            break ;
+
+        default :
+            {
+                for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i )
+                {
+                    if ( gCommandIds[i].macId == macCommandId )
+                    {
+                        wxid = gCommandIds[i].wxId ;
+                        break ;
+                    }
+                }
+            }
+            break ;
+    }
 
-    return event.MoreRequested();
-}
+    if ( wxid == 0 )
+        wxid = (int) macCommandId ;
 
-void wxApp::ExitMainLoop()
-{
-  m_keepGoing = FALSE;
+    return wxid ;
 }
 
-// Is a message/event pending?
-bool wxApp::Pending()
+UInt32 wxIdToMacCommand( int wxId ) 
 {
-/* TODO.
- */
-  return FALSE;
+    UInt32 macId = 0 ;
+    
+    if ( wxId == wxApp::s_macPreferencesMenuItemId )
+        macId = kHICommandPreferences ;
+    else if (wxId == wxApp::s_macExitMenuItemId)
+        macId = kHICommandQuit ;
+    else if (wxId == wxApp::s_macAboutMenuItemId)
+        macId = kHICommandAbout ;
+    else
+    {
+        for ( size_t i = 0 ; i < WXSIZEOF(gCommandIds) ; ++i )
+        {
+            if ( gCommandIds[i].wxId == wxId )
+            {
+                macId = gCommandIds[i].macId ;
+                break ;
+            }
+        }
+    }
+
+    if ( macId == 0 )
+        macId = (int) wxId ;
+
+    return macId ;
 }
 
-// Dispatch a message.
-void wxApp::Dispatch()
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) 
 {
-/* TODO.
- */
+    wxMenu* itemMenu = NULL ;
+    int id = 0 ;
+
+    // for 'standard' commands which don't have a wx-menu
+    if ( command.commandID == kHICommandPreferences || command.commandID == kHICommandQuit || command.commandID == kHICommandAbout )
+    {
+        id = wxMacCommandToId( command.commandID ) ;
+
+        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+        if ( mbar )
+            item = mbar->FindItem( id , &itemMenu ) ;
+    }
+    else if ( command.commandID != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
+    {
+        id = wxMacCommandToId( command.commandID ) ;
+        // make sure it is one of our own menus, or of the 'synthetic' apple and help menus , otherwise don't touch
+        MenuItemIndex firstUserHelpMenuItem ;
+        static MenuHandle 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 ;
 }
 
-void wxApp::OnIdle(wxIdleEvent& event)
+//----------------------------------------------------------------------
+// Carbon Event Handler
+//----------------------------------------------------------------------
+
+static const EventTypeSpec eventList[] =
 {
-  static bool inOnIdle = FALSE;
+    { kEventClassCommand, kEventProcessCommand } ,
+    { kEventClassCommand, kEventCommandUpdateStatus } ,
 
-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+    { kEventClassMenu, kEventMenuOpening },
+    { kEventClassMenu, kEventMenuClosed },
+    { kEventClassMenu, kEventMenuTargetItem },
 
-  inOnIdle = TRUE;
+    { kEventClassApplication , kEventAppActivated } ,
+    { kEventClassApplication , kEventAppDeactivated } ,
+    // handling the quit event is not recommended by apple
+    // rather using the quit apple event - which we do
 
-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+    { kEventClassAppleEvent , kEventAppleEvent } ,
 
-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
+    { kEventClassMouse , kEventMouseDown } ,
+    { kEventClassMouse , kEventMouseMoved } ,
+    { kEventClassMouse , kEventMouseUp } ,
+    { kEventClassMouse , kEventMouseDragged } ,
+    { 'WXMC' , 'WXMC' }
+} ;
 
-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+static pascal OSStatus
+wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    wxMacCarbonEvent cEvent( event ) ;
+    MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
+    wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
 
-  if (needMore)
-    event.RequestMore(TRUE);
+    if ( menu )
+    {
+        wxEventType type=0;
+        MenuCommand cmd=0;
+        switch (GetEventKind(event))
+        {
+            case kEventMenuOpening:
+                type = wxEVT_MENU_OPEN;
+                break;
+
+            case kEventMenuClosed:
+                type = wxEVT_MENU_CLOSE;
+                break;
+
+            case kEventMenuTargetItem:
+                cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
+                if (cmd != 0)
+                    type = wxEVT_MENU_HIGHLIGHT;
+                break;
+
+            default:
+                wxFAIL_MSG(wxT("Unexpected menu event kind"));
+                break;
+        }
+
+        if ( type )
+        {
+            wxMenuEvent wxevent(type, cmd, menu);
+            wxevent.SetEventObject(menu);
+
+            wxEvtHandler* handler = menu->GetEventHandler();
+            if (handler && handler->ProcessEvent(wxevent))
+            {
+                // handled
+            }
+            else
+            {
+                wxWindow *win = menu->GetInvokingWindow();
+                if (win)
+                    win->GetEventHandler()->ProcessEvent(wxevent);
+                }
+            }
+    }
 
-  inOnIdle = FALSE;
+    return eventNotHandledErr;
 }
 
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
-    bool needMore = FALSE;
-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
-
-               node = node->Next();
-       }
-    return needMore;
-}
+    OSStatus result = eventNotHandledErr ;
 
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
+    HICommand command ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+    cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
 
-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+    wxMenuItem* item = NULL ;
+    wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ;
+    int id = wxMacCommandToId( command.commandID ) ;
 
-    if (event.MoreRequested())
-        needMore = TRUE;
+    if ( item )
+    {
+        wxASSERT( itemMenu != NULL ) ;
+        
+        switch ( cEvent.GetKind() )
+        {
+            case kEventProcessCommand :
+            {
+                if (item->IsCheckable())
+                    item->Check( !item->IsChecked() ) ;
+
+                if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
+                    result = noErr ;
+            }
+            break ;
+
+        case kEventCommandUpdateStatus:
+            {
+                wxUpdateUIEvent event(id);
+                event.SetEventObject( itemMenu );
+                                
+                bool processed = false;
+                
+                // Try the menu's event handler
+                {
+                    wxEvtHandler *handler = itemMenu->GetEventHandler();
+                    if ( handler )
+                        processed = handler->ProcessEvent(event);
+                }
+                
+                // Try the window the menu was popped up from
+                // (and up through the hierarchy)
+                if ( !processed )
+                {
+                    const wxMenuBase *menu = itemMenu;
+                    while ( menu )
+                    {
+                        wxWindow *win = menu->GetInvokingWindow();
+                        if ( win )
+                        {
+                            processed = win->GetEventHandler()->ProcessEvent(event);
+                            break;
+                        }
+                        
+                        menu = menu->GetParent();
+                    }
+                }
+                
+                if ( processed )
+                {
+                    // if anything changed, update the changed attribute
+                    if (event.GetSetText())
+                        itemMenu->SetLabel(id, event.GetText());
+                    if (event.GetSetChecked())
+                        itemMenu->Check(id, event.GetChecked());
+                    if (event.GetSetEnabled())
+                        itemMenu->Enable(id, event.GetEnabled());
+
+                    result = noErr ;
+                }
+            }
+            break ;
+
+        default :
+            break ;
+        }
+    }
+    return result ;
+}
 
-       wxNode* node = win->GetChildren().First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
+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 ;
+
+        case kEventAppDeactivated :
+            if ( wxTheApp )
+                wxTheApp->SetActive( false , NULL ) ;
+            result = noErr ;
+            break ;
+
+        default :
+            break ;
+    }
 
-               node = node->Next();
-       }
-    return needMore ;
+    return result ;
 }
 
-void wxApp::DeletePendingObjects()
+pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    
-    delete obj;
+    EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+    EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+    wxTheApp->MacSetCurrentEvent( event , handler ) ;
 
-    if (wxPendingDelete.Member(obj))
-      delete node;
+    OSStatus result = eventNotHandledErr ;
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassCommand :
+            result = wxMacAppCommandEventHandler( handler , event , data ) ;
+            break ;
+
+        case kEventClassApplication :
+            result = wxMacAppApplicationEventHandler( handler , event , data ) ;
+            break ;
+
+        case kEventClassMenu :
+            result = wxMacAppMenuEventHandler( handler , event , data ) ;
+            break ;
+
+        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 ;
+
+                wxMacConvertEventToRecord( event , &rec ) ;
+                result = AEProcessAppleEvent( &rec ) ;
+            }
+            break ;
+
+        default :
+            break ;
+    }
 
-    // Deleting one object may have deleted other pending
-    // objects, so start from beginning of list again.
-    node = wxPendingDelete.First();
-  }
+    wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+
+    return result ;
 }
 
-wxLog* wxApp::CreateLogTarget()
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
+
+#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
+// we know it's there ;-)
+WXIMPORT char std::__throws_bad_alloc ;
+#endif
+
+#ifdef __WXDEBUG__
+
+pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,
+    const char *assertionString, const char *exceptionLabelString,
+    const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg)
 {
-    return new wxLogGui;
+    // 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
+
+#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
+
+    wxOnAssert(fileNameStr, lineNumber , assertionStr ,
+        wxString::Format( wxT("%s %s value (%p)") , exceptionStr, errorStr , value ) ) ;
+#endif
 }
 
-wxWindow* wxApp::GetTopWindow() const
+#endif //__WXDEBUG__
+
+#ifdef __WXMAC_OSX__
+extern "C"
 {
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
+   // m_macEventPosted run loop source callback:
+   void macPostedEventCallback(void *unused);
 }
 
-void wxExit()
+void macPostedEventCallback(void *unused)
 {
-  wxApp::CleanUp();
-       ::ExitToShell() ;
+    wxTheApp->ProcessPendingEvents();
 }
+#endif
 
-// Yield to other processes
-bool wxYield()
+bool wxApp::Initialize(int& argc, wxChar **argv)
 {
-#if 0
-       ::YieldToOtherThreads() ;
-       ::SystemTime() ;
+    // Mac-specific
+
+#ifdef __WXDEBUG__
+    InstallDebugAssertOutputHandler( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
 #endif
-  return TRUE;
-}
 
-// platform specifics 
+    UMAInitToolbox( 4, sm_isEmbedded ) ;
+    SetEventMask( everyEvent ) ;
+    UMAShowWatchCursor() ;
 
-void wxApp::MacDoOneEvent() 
-{
-  EventRecord event ;
-
-       long sleepTime = 60;
-
-       if (WaitNextEvent(everyEvent, &event,sleepTime, gMacCursorRgn))
-       {
-    MacHandleOneEvent( &event );
-       }
-       else
-       {
-               // idlers
-               wxTheApp->ProcessIdle() ;
-       }
-       
-       // repeaters
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;
+#  endif
+#endif
+
+#ifndef __DARWIN__
+    // now avoid exceptions thrown for new (bad_alloc)
+    // FIXME CS for some changes outside wxMac does not compile anymore
 #if 0
-       wxMacProcessSocketEvents() ;  
+    std::__throws_bad_alloc = 0 ;
 #endif
-}
 
-void wxApp::MacHandleOneEvent( EventRecord *ev ) 
-{
-       switch (ev->what)
-       {
-               case nullEvent:
-                       MacHandleNullEvent( ev ) ;
-                       break ;
-               case kHighLevelEvent:
-                       MacHandleHighLevelEvent( ev ) ;
-                       break;
-               case mouseDown:
-                       MacHandleMouseDownEvent( ev ) ;
-                       wxTheApp->ExitMainLoop() ;
-                       break;
-               case mouseUp:
-                       MacHandleMouseUpEvent( ev ) ;
-                       break;
-               case keyDown:
-                       MacHandleKeyDownEvent( ev ) ;
-                       break;
-               case autoKey:
-                       MacHandleAutoKeyEvent( ev ) ;
-                       break;
-               case keyUp:
-                       MacHandleKeyUpEvent( ev ) ;
-                       break;
-               case activateEvt:
-                       MacHandleActivateEvent( ev ) ;
-                       break;
-               case updateEvt:
-                       MacHandleUpdateEvent( ev ) ;
-                       break;
-               case diskEvt:
-                       MacHandleDiskEvent( ev ) ;
-                       break;
-               case osEvt:
-                       MacHandleOSEvent( ev ) ;
-                       break;
-               default:
-                       break;
-       }
-}
+#endif
 
-void wxApp::MacHandleNullEvent( EventRecord *ev ) 
-{
-}
+    s_macCursorRgn = ::NewRgn() ;
 
-void wxApp::MacHandleHighLevelEvent( EventRecord *ev )
-{
-}
+    // 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 )
+    {
+        static const wxChar *ARG_PSN = _T("-psn_");
+        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
+        {
+            // remove this argument
+            --argc;
+            memmove(argv + 1, argv + 2, argc * sizeof(char *));
+        }
+    }
 
-void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
-{
-}
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;
 
-void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
-{
-}
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
 
-void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
-{
-}
+#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
 
-void wxApp::MacHandleKeyUpEvent( EventRecord *ev )
-{
+    wxMacCreateNotifierTable() ;
+
+#ifdef __WXMAC_OSX__
+    /* connect posted events to common-mode run loop so that wxPostEvent events
+       are handled even while we're in the menu or on a scrollbar */
+    CFRunLoopSourceContext event_posted_context = {0};
+    event_posted_context.perform = macPostedEventCallback;
+    m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
+#endif
+
+    UMAShowArrowCursor() ;
+
+    return true;
 }
 
-void wxApp::MacHandleAutoKeyEvent( EventRecord *ev )
+AEEventHandlerUPP sODocHandler = NULL ;
+AEEventHandlerUPP sOAppHandler = NULL ;
+AEEventHandlerUPP sPDocHandler = NULL ;
+AEEventHandlerUPP sRAppHandler = NULL ;
+AEEventHandlerUPP sQuitHandler = NULL ;
+
+bool wxApp::OnInitGui()
 {
+    if ( !wxAppBase::OnInitGui() )
+        return false ;
+
+    InstallStandardEventHandler( GetApplicationEventTarget() ) ;
+
+    if (!sm_isEmbedded)
+    {
+        InstallApplicationEventHandler(
+            GetwxMacAppEventHandlerUPP(),
+            GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));
+    }
+
+    if (!sm_isEmbedded)
+    {
+        sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ;
+        sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ;
+        sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ;
+        sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ;
+        sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ;
+
+        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                               sODocHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               sOAppHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               sPDocHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               sRAppHandler , 0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               sQuitHandler , 0 , FALSE ) ;
+    }
+
+    return true ;
 }
 
-void wxApp::MacHandleActivateEvent( EventRecord *ev )
+void wxApp::CleanUp()
 {
+#if wxUSE_TOOLTIPS
+    wxToolTip::RemoveToolTips() ;
+#endif
+
+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+        CFRelease(m_macEventPosted);
+    m_macEventPosted = NULL;
+#endif
+
+    // One last chance for pending objects to be cleaned up
+    wxTheApp->DeletePendingObjects();
+
+    wxMacDestroyNotifierTable() ;
+
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerDump( (StringPtr)"\papp.prof" ) ;
+    ProfilerTerm() ;
+#  endif
+#endif
+
+    UMACleanupToolbox() ;
+    if (s_macCursorRgn)
+        ::DisposeRgn((RgnHandle)s_macCursorRgn);
+
+    if (!sm_isEmbedded)
+        RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
+
+    if (!sm_isEmbedded)
+    {
+        AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                               sODocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               sOAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               sPDocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               sRAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               sQuitHandler , FALSE ) ;
+
+        DisposeAEEventHandlerUPP( sODocHandler ) ;
+        DisposeAEEventHandlerUPP( sOAppHandler ) ;
+        DisposeAEEventHandlerUPP( sPDocHandler ) ;
+        DisposeAEEventHandlerUPP( sRAppHandler ) ;
+        DisposeAEEventHandlerUPP( sQuitHandler ) ;
+    }
+
+    wxAppBase::CleanUp();
 }
 
-void wxApp::MacHandleUpdateEvent( EventRecord *ev )
+//----------------------------------------------------------------------
+// misc initialization stuff
+//----------------------------------------------------------------------
+
+#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
+
+// for shared libraries we have to manually get the correct resource
+// ref num upon initializing and releasing when terminating, therefore
+// the __wxinitialize and __wxterminate must be used
+
+extern "C"
 {
+    void __sinit(void);    // (generated by linker)
+    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+    pascal void __terminate(void);
 }
 
-void wxApp::MacHandleDiskEvent( EventRecord *ev )
+pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
 {
+    return __initialize( theInitBlock ) ;
 }
 
-void wxApp::MacHandleOSEvent( EventRecord *ev )
+pascal void __wxterminate(void)
 {
+    __terminate() ;
 }
 
+#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */
 
+bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
+{
+    OSStatus err = noErr ;
+    bool converted = ConvertEventRefToEventRecord( event, rec) ;
 
-/*
+    if ( !converted )
+    {
+        switch ( GetEventClass( event ) )
+        {
+            case kEventClassKeyboard :
+            {
+                converted = true ;
+                switch ( GetEventKind(event) )
+                {
+                    case kEventRawKeyDown :
+                        rec->what = keyDown ;
+                        break ;
+
+                    case kEventRawKeyRepeat :
+                        rec->what = autoKey ;
+                        break ;
+
+                    case kEventRawKeyUp :
+                        rec->what = keyUp ;
+                        break ;
+
+                    case kEventRawKeyModifiersChanged :
+                        rec->what = nullEvent ;
+                        break ;
+
+                    default :
+                        converted = false ;
+                        break ;
+                }
+
+                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 ;
+
+            default :
+                break ;
+        }
+    }
 
-void wxApp::doMacMouseDown(void)
-{
-       WindowPtr window;
-       short windowPart = ::FindWindow(m_event.where, &window);
-       if ( windowPart != inMenuBar )
-       {
-               WindowPtr frontWindow = FrontWindow();
-               if (WindowIsModal(frontWindow) && (window != frontWindow))
-                       SysBeep(1);
-               else
-               {       
-                       switch (windowPart)
-                       {
-                               case inMenuBar:
-                                       break;
-                               case inContent:
-                                       doMacInContent(window); break;
-                               case inDrag:
-                                       doMacInDrag(window); break;
-                               case inGrow:
-                                       doMacInGrow(window); break;
-                               case inGoAway:
-                                       doMacInGoAway(window); break;
-                               case inZoomIn:
-                               case inZoomOut:
-                                       doMacInZoom(window, windowPart); break;
-                               default:
-                                       break;
-                       }
-       
-               }
-       }
-       else
-       {
-               doMacInMenuBar(::MenuSelect(m_event.where));
-       }
+    return converted ;
 }
 
-void wxApp::doMacMouseUp(void)
+wxApp::wxApp()
 {
-       if (m_mouseWindow)
-       {
-#if 0
-               int hitX = m_event.where.h;                             // screen window c.s.
-               int hitY = m_event.where.v;                             // screen window c.s.
-               m_mouseWindow->ScreenToClient(&hitX, &hitY);            // mouseWindow client c.s.
-               m_mouseWindow->ClientToLogical(&hitX, &hitY);   // mouseWindow logical c.s.
-#endif
-               
-               wxMouseEvent event(wxEVT_LEFT_UP);
-               event.m_shiftDown = m_event.modifiers & shiftKey;
-               event.m_controlDown = m_event.modifiers & controlKey;
-               event.m_altDown = m_event.modifiers & optionKey;
-               event.m_metaDown = m_event.modifiers & cmdKey;
-               event.m_leftDown = FALSE;
-               event.m_middleDown = FALSE;
-               event.m_rightDown = FALSE;
-               event.m_x = m_event.where.h;
-               event.m_y = m_event.where.v;
-               event.m_timeStamp = m_event.when;
-               event.SetEventObject(m_mouseWindow);
-
-               m_mouseWindow->ProcessEvent(event);
-       }
-       else
-       {
-               //??? Can't we just throw away mouse up events without matching mouse down
-               wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-               if (theMacWxFrame)
-               {
-#if 0
-                       int hitX = cCurrentEvent.where.h; // screen window c.s.
-                       int hitY = cCurrentEvent.where.v; // screen window c.s.
-                       theMacWxFrame->ScreenToWindow(&hitX, &hitY);
-#endif
+    m_printMode = wxPRINT_WINDOWS;
 
-                       wxMouseEvent event(wxEVT_LEFT_UP);
-                       event.m_shiftDown = m_event.modifiers & shiftKey;
-                       event.m_controlDown = m_event.modifiers & controlKey;
-                       event.m_altDown = m_event.modifiers & optionKey;
-                       event.m_metaDown = m_event.modifiers & cmdKey;
-                       event.m_leftDown = FALSE;
-                       event.m_middleDown = FALSE;
-                       event.m_rightDown = FALSE;
-                       event.m_x = m_event.where.h;
-                       event.m_y = m_event.where.v;
-                       event.m_timeStamp = m_event.when;
-                       event.SetEventObject(m_mouseWindow);
-
-                       theMacWxFrame->ProcessEvent(event);
-               }
-       }
-}
+    m_macCurrentEvent = NULL ;
+    m_macCurrentEventHandlerCallRef = NULL ;
 
-void wxApp::doMacMouseMotion(void)
-{
-       if (m_mouseWindow) {
-               wxMouseEvent event(wxEVT_MOTION);
-               event.m_shiftDown = m_event.modifiers & shiftKey;
-               event.m_controlDown = m_event.modifiers & controlKey;
-               event.m_altDown = m_event.modifiers & optionKey;
-               event.m_metaDown = m_event.modifiers & cmdKey;
-               event.m_leftDown = !(m_event.modifiers & btnState);
-               event.m_middleDown = FALSE;
-               event.m_rightDown = FALSE;
-               event.m_x = m_event.where.h;
-               event.m_y = m_event.where.v;
-               event.m_timeStamp = m_event.when;
-               event.SetEventObject(m_mouseWindow);
-
-               m_mouseWindow->ProcessEvent(event);
-       }
-       else
-       {
-               wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-               if (theMacWxFrame)
-               {
-                       wxMouseEvent event(wxEVT_MOTION);
-                       event.m_shiftDown = m_event.modifiers & shiftKey;
-                       event.m_controlDown = m_event.modifiers & controlKey;
-                       event.m_altDown = m_event.modifiers & optionKey;
-                       event.m_metaDown = m_event.modifiers & cmdKey;
-                       event.m_leftDown = !(m_event.modifiers & btnState);
-                       event.m_middleDown = FALSE;
-                       event.m_rightDown = FALSE;
-                       event.m_x = m_event.where.h;
-                       event.m_y = m_event.where.v;
-                       event.m_timeStamp = m_event.when;
-                       event.SetEventObject(m_mouseWindow);
-
-                       m_mouseWindow->ProcessEvent(event);
-               }
-       }
-       
-       //??? Need to work with floating windows... isn't there a toolbox call to find the
-       // top window intersecting a point is screen coordinates??
-#if 0
-       else    // will only work for one floating window at the moment... ?
-       {       
-               WindowPtr frontDocPtr = findFrontNonFloatingWindow();
-               WindowPtr frontFloatingPtr = ::FrontWindow();
-               
-               int hitX = cCurrentEvent.where.h;
-               int hitY = cCurrentEvent.where.v;
-               
-               wxFrame* macWxFrame = findMacWxFrame(frontDocPtr);
-               
-               if ((frontFloatingPtr != frontDocPtr) & (frontFloatingPtr != NULL))
-               {
-                       RgnHandle frontFloatStrRgn = getStructureRegion(frontFloatingPtr);
-                       Rect      frontFloatRect = (**frontFloatStrRgn).rgnBBox;
-       
-                       if         ((hitX >= frontFloatRect.left) & 
-                                       (hitX <= frontFloatRect.right) & 
-                                       (hitY >= frontFloatRect.top) &
-                                       (hitY <= frontFloatRect.bottom))
-                       {
-                               macWxFrame = findMacWxFrame(frontFloatingPtr);
-                       }
-               }
-       }
+#ifdef __WXMAC_OSX__
+    m_macEventPosted = NULL ;
 #endif
 }
 
-void wxApp::doMacKeyDown(void)
+void wxApp::OnIdle(wxIdleEvent& event)
 {
-       long menuResult = 0 ;
-       short keycode ;
-       short keychar ;
-       keychar = short(m_event.message & charCodeMask);
-       keycode = short(m_event.message & keyCodeMask) >> 8 ;
-
-       // Handle menu accelerators
-       if ( gSFMacHasAppearance )
-       {
-               menuResult = MenuEvent( &m_event ) ;
-               if ( HiWord( menuResult ) )
-               {
-                       doMacInMenuBar( menuResult ) ;
-               }
-               else
-               {
-                       ControlHandle control ;
-                       
-                       GetKeyboardFocus( FrontNonFloatingWindow() , &control ) ;
-                       if ( control && keychar != 0x07 )
-                               HandleControlKey( control , keycode , keychar , m_event.modifiers ) ;
-                       else
-                       {
-                               wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-                               if (theMacWxFrame)
-                               {
-                                       wxKeyEvent event(wxEVT_CHAR);
-                                       event.m_shiftDown = m_event.modifiers & shiftKey;
-                                       event.m_controlDown = m_event.modifiers & controlKey;
-                                       event.m_altDown = m_event.modifiers & optionKey;
-                                       event.m_metaDown = m_event.modifiers & cmdKey;
-                                       event.m_keyCode = macTranslateKey(keychar, m_event.modifiers & (shiftKey|optionKey));
-                                       event.m_x = m_event.where.h;
-                                       event.m_y = m_event.where.v;
-                                       event.m_timeStamp = m_event.when;
-                                       event.SetEventObject(theMacWxFrame);
-                       
-                                       theMacWxFrame->ProcessEvent(event);
-                               }
-                       }
-               }
-       }
-       else
-       {
-               if (GetMenuHandle( kwxMacAppleMenuId ) )
-               {
-//                     menuResult = MDEF_MenuKey(m_event.message, m_event.modifiers , GetMenuHandle( kwxMacAppleMenuId ) );
-               }
-               else
-               {
-                       if (m_event.modifiers & cmdKey)
-                       {
-                               menuResult = MenuKey( keychar ) ;
-                       }
-               }
-
-               if ( HiWord( menuResult ) )
-               {
-                       doMacInMenuBar( menuResult ) ;
-               }
-               else
-               {
-                       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-                       if (theMacWxFrame)
-                       {
-                               wxKeyEvent event(wxEVT_CHAR);
-                               event.m_shiftDown = m_event.modifiers & shiftKey;
-                               event.m_controlDown = m_event.modifiers & controlKey;
-                               event.m_altDown = m_event.modifiers & optionKey;
-                               event.m_metaDown = m_event.modifiers & cmdKey;
-                               event.m_keyCode = macTranslateKey(keychar, m_event.modifiers & (shiftKey|optionKey));
-                               event.m_x = m_event.where.h;
-                               event.m_y = m_event.where.v;
-                               event.m_timeStamp = m_event.when;
-                               event.SetEventObject(theMacWxFrame);
-               
-                               theMacWxFrame->ProcessEvent(event);
-                       }
-               }
-       }
+    wxAppBase::OnIdle(event);
+
+    // If they are pending events, we must process them: pending events are
+    // either events to the threads other than main or events posted with
+    // wxPostEvent() functions
+    wxMacProcessNotifierAndPendingEvents();
+
+  if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+    wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 }
 
-void wxApp::doMacAutoKey(void)
+void wxApp::WakeUpIdle()
 {
-       doMacKeyDown();
+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+    {
+        CFRunLoopSourceSignal(m_macEventPosted);
+    }
+#endif
+
+    wxMacWakeUp() ;
 }
 
-void wxApp::doMacKeyUp(void)
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
+    if (GetTopWindow())
+        GetTopWindow()->Close(true);
 }
 
-void wxApp::doMacActivateEvt(void)
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.
+void wxApp::OnQueryEndSession(wxCloseEvent& event)
 {
-       HighlightAndActivateWindow( (WindowPtr) m_event.message , m_event.modifiers & activeFlag ) ;
+    if (GetTopWindow())
+    {
+        if (!GetTopWindow()->Close(!event.CanVeto()))
+            event.Veto(true);
+    }
 }
 
-void wxApp::doMacUpdateEvt(void)
+extern "C" void wxCYield() ;
+void wxCYield()
 {
-       WindowPtr theMacWindow = (WindowPtr)(m_event.message);
-       ::BeginUpdate(theMacWindow);
-       
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(theMacWindow);
-       if (theMacWxFrame)
-       {
-//             if (!::EmptyRgn(theMacWindow->visRgn))  // this doesn't work with windowshade
-//             {
-                       if ( theMacWxFrame->MacSetupPort() )
-                       {
-                               // Erase update region
-                               // we must do this, because controls add their former rect to the inval
-                               // rgn and the background might not have been correct at that moment
-                               ::EraseRect(&theMacWindow->portRect); 
-       
-                               // Can't use UpdateControls since each control has it's own coordinate system
-                               //              ::UpdateControls(theMacWindow, theMacWindow->visRgn);
-       
-                               ::UpdateControls( theMacWindow , theMacWindow->visRgn ) ;
-       #if 0
-                               // Draw the grow box
-                               if (cStyle & wxRESIZE_BORDER)
-                                       MacDrawGrowIcon();
-       #endif
-       
-                               wxPaintEvent event;
-                               event.m_timeStamp = m_event.when;
-                               event.SetEventObject(theMacWxFrame);
-       
-                               theMacWxFrame->ProcessEvent(event);
-       //                      ::SetThemeWindowBackground(  theMacWindow , kThemeActiveDialogBackgroundBrush ,  false ) ;
-                               ::ClipRect( &theMacWindow->portRect ) ;         
-                               ::SetOrigin(  0 , 0 );  
-                       }
-                       else
-                       {
-                               wxASSERT_MSG( false , "unabled to setup window mac port") ;
-                       }
-                       
-//             }
-       }
-
-       ::EndUpdate(theMacWindow);
+    wxYield() ;
 }
 
-void wxApp::doMacDiskEvt(void)
-{ // based on "Programming for System 7" by Gary Little and Tim Swihart
-       if ((m_event.message >> 16) != noErr)
-       {
-               const int kDILeft = 0x0050; // top coord for disk init dialog
-               const int kDITop = 0x0070; // left coord for disk init dialog
-               Point mountPoint;
-               mountPoint.h = kDILeft;
-               mountPoint.v = kDITop;
-               int myError = DIBadMount(mountPoint, m_event.message);
-       }
-}
+// Yield to other processes
+
+bool wxApp::Yield(bool onlyIfNeeded)
+{
+    if (s_inYield)
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
+
+        return false;
+    }
+
+    s_inYield = true;
+
+    // by definition yield should handle all non-processed events
+
+    EventRef theEvent;
+
+    OSStatus status = noErr ;
+
+    while ( status == noErr )
+    {
+        s_inReceiveEvent = true ;
+        status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ;
+        s_inReceiveEvent = false ;
+
+        if ( status == eventLoopTimedOutErr )
+        {
+            // 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);
+        }
+    }
+
+    wxMacProcessNotifierAndPendingEvents() ;
+    s_inYield = false;
 
-void wxApp::doMacOsEvt(void)
-{ // based on "Programming for System 7" by Gary Little and Tim Swihart
-       switch ((m_event.message >> 24) & 0x0ff)
-       {
-               case suspendResumeMessage:
-                       if (m_event.message & resumeFlag)
-                               doMacResumeEvent();
-                       else
-                               doMacSuspendEvent();
-                       break;
-               case mouseMovedMessage:
-                       doMacMouseMovedMessage();
-                       break;
-       }
+    return true;
 }
 
-void wxApp::doMacHighLevelEvent(void)
+void wxApp::MacDoOneEvent()
 {
-       ::AEProcessAppleEvent(&m_event); // System 7 or higher
+    EventRef theEvent;
+
+    s_inReceiveEvent = true ;
+    OSStatus status = ReceiveNextEvent(0, NULL, sleepTime, true, &theEvent) ;
+    s_inReceiveEvent = false ;
+
+    switch (status)
+    {
+        case eventLoopTimedOutErr :
+            if ( wxTheApp->ProcessIdle() )
+                sleepTime = kEventDurationNoWait ;
+            else
+                sleepTime = kEventDurationSecond;
+            break;
+
+        case eventLoopQuitErr :
+            // according to QA1061 this may also occur
+            // when a WakeUp Process is executed
+            break;
+
+        default:
+            MacHandleOneEvent( theEvent ) ;
+            ReleaseEvent( theEvent );
+            sleepTime = kEventDurationNoWait ;
+            break;
+    }
+    // repeaters
+
+    DeletePendingObjects() ;
+    wxMacProcessNotifierAndPendingEvents() ;
 }
 
-void wxApp::doMacResumeEvent(void)
+// virtual
+void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
 {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-       if (theMacWxFrame)
-       {
-               if (m_event.message & convertClipboardFlag)
-                       ::TEFromScrap();
-
-               wxActivateEvent event(wxEVT_ACTIVATE, TRUE);
-               event.m_timeStamp = m_event.when;
-               event.SetEventObject(theMacWxFrame);
-
-               theMacWxFrame->ProcessEvent(event);
-       }
+    // Override to process unhandled events as you please
 }
 
-void wxApp::doMacSuspendEvent(void)
+void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-       if (theMacWxFrame)
-       {
-               ::ZeroScrap();
-               ::TEToScrap();
-
-               wxActivateEvent event(wxEVT_ACTIVATE, FALSE);
-               event.m_timeStamp = m_event.when;
-               event.SetEventObject(theMacWxFrame);
-
-               theMacWxFrame->ProcessEvent(event);
-       }
-}
+    EventTargetRef theTarget;
+    theTarget = GetEventDispatcherTarget();
+    m_macCurrentEvent = evr ;
+
+    OSStatus status = SendEventToEventTarget((EventRef) evr , theTarget);
+    if (status == eventNotHandledErr)
+        MacHandleUnhandledEvent(evr);
 
-void wxApp::doMacMouseMovedMessage(void)
-{ // based on "Programming for System 7" by Gary Little and Tim Swihart
-       if (m_cursorRgn)
-               ::DisposeRgn(m_cursorRgn);
-       m_cursorRgn = ::NewRgn();
-       ::SetRectRgn(m_cursorRgn, -32768, -32768, 32766, 32766);
+    wxMacProcessNotifierAndPendingEvents() ;
+
+#if wxUSE_THREADS
+    wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
 }
 
-void wxApp::doMacInMenuBar(long menuResult)
+long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
-       int macMenuId = HiWord(menuResult);
-       int macMenuItemNum = LoWord(menuResult); // counting from 1
-
-       if (macMenuId == 0)                                     // no menu item selected;
-                return;
-       if (macMenuId == 128) 
-       {
-               if (macMenuItemNum != 1) 
-               {                       // if not the "About" entry (or the separator)
-                       Str255          daName;
-                       ::GetMenuItemText(GetMenuHandle(128), macMenuItemNum, daName);
-                       (void)::OpenDeskAcc(daName);
-                       ::HiliteMenu(0);                                                                
-                       return;
-               }
-       }
-
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-       if (theMacWxFrame)
-       {
-               if ( theMacWxFrame->IsKindOf( CLASSINFO( wxDialog ) ) )
-                       (( wxDialog *) theMacWxFrame)->MacMenuSelect(m_event, macMenuId, macMenuItemNum);
-               else if ( theMacWxFrame->IsKindOf( CLASSINFO( wxFrame ) ) )
-                       (( wxFrame *) theMacWxFrame)->MacMenuSelect(m_event, macMenuId, macMenuItemNum);
-       }
-       ::HiliteMenu(0);                                                                
+    long retval = key ;
+    switch (key)
+    {
+        case kHomeCharCode :
+            retval = WXK_HOME;
+            break;
+
+        case kEnterCharCode :
+            retval = WXK_RETURN;
+            break;
+        case kEndCharCode :
+            retval = WXK_END;
+            break;
+
+        case kHelpCharCode :
+            retval = WXK_HELP;
+            break;
+
+        case kBackspaceCharCode :
+            retval = WXK_BACK;
+            break;
+
+        case kTabCharCode :
+            retval = WXK_TAB;
+            break;
+
+        case kPageUpCharCode :
+            retval = WXK_PAGEUP;
+            break;
+
+        case kPageDownCharCode :
+            retval = WXK_PAGEDOWN;
+            break;
+
+        case kReturnCharCode :
+            retval = WXK_RETURN;
+            break;
+
+        case kFunctionKeyCharCode :
+        {
+            switch ( code )
+            {
+                case 0x7a :
+                    retval = WXK_F1 ;
+                    break;
+
+                case 0x78 :
+                    retval = WXK_F2 ;
+                    break;
+
+                case 0x63 :
+                    retval = WXK_F3 ;
+                    break;
+
+                case 0x76 :
+                    retval = WXK_F4 ;
+                    break;
+
+                case 0x60 :
+                    retval = WXK_F5 ;
+                    break;
+
+                case 0x61 :
+                    retval = WXK_F6 ;
+                    break;
+
+                case 0x62:
+                    retval = WXK_F7 ;
+                    break;
+
+                case 0x64 :
+                    retval = WXK_F8 ;
+                    break;
+
+                case 0x65 :
+                    retval = WXK_F9 ;
+                    break;
+
+                case 0x6D :
+                    retval = WXK_F10 ;
+                    break;
+
+                case 0x67 :
+                    retval = WXK_F11 ;
+                    break;
+
+                case 0x6F :
+                    retval = WXK_F12 ;
+                    break;
+
+                case 0x69 :
+                    retval = WXK_F13 ;
+                    break;
+
+                case 0x6B :
+                    retval = WXK_F14 ;
+                    break;
+
+                case 0x71 :
+                    retval = WXK_F15 ;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        break ;
+
+        case kEscapeCharCode :
+            retval = WXK_ESCAPE ;
+            break ;
+
+        case kLeftArrowCharCode :
+            retval = WXK_LEFT ;
+            break ;
+
+        case kRightArrowCharCode :
+            retval = WXK_RIGHT ;
+            break ;
+
+        case kUpArrowCharCode :
+            retval = WXK_UP ;
+            break ;
+
+        case kDownArrowCharCode :
+            retval = WXK_DOWN ;
+            break ;
+
+        case kDeleteCharCode :
+            retval = WXK_DELETE ;
+            break ;
+
+        default:
+            break ;
+     } // end switch
+
+    return retval;
 }
 
-void wxApp::doMacInContent(WindowPtr window)
+int wxMacKeyCodeToModifier(wxKeyCode key)
 {
-       WindowPtr frontWindow = FrontWindow();
-       if (window != frontWindow )
-       {
-//             SFSelectWindow( window ) ;
-       }
-       else
-       {
-               ControlHandle   control ;
-               Point           localwhere = m_event.where ;
-               GrafPtr         port ;
-               SInt16          controlpart ;
-               
-               ::GetPort( &port ) ;
-               ::SetPort( window ) ;
-               ::GlobalToLocal( &localwhere ) ;
-
-               ::SetPort( port ) ;
-               
-               if ( !gSFMacHasAppearance )
-               {
-                       controlpart = FindControl( localwhere , window , &control ) ;
-               }
-               else
-               {
-                       control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
-               }
-               
-               if ( control && IsControlActive( control ) )
-               {
-                       wxControl* wxc = (wxControl*) GetControlReference( control ) ;
-                                       
-                       if ( wxWindow::FindFocus() != wxc &&  wxc->AcceptsFocus() )
-                       {
-                               wxc->SetFocus() ;       
-                               if ( wxWindow::FindFocus() != wxc )
-                                       control = NULL ; // we were not able to change focus
-                       }               
-                                                               
-                       if ( control )
-                       {
-                               if ( !gSFMacHasAppearance)
-                               {
-                                       controlpart = TrackControl( control , localwhere , NULL ) ;
-                               }
-                               else
-                               {
-                                       controlpart = HandleControlClick( control , localwhere , m_event.modifiers , (ControlActionUPP) -1 ) ;
-                               }
-                               
-                               if ( controlpart )
-                               {
-                                       wxControl*      wx = (wxControl*) GetControlReference( control ) ;
-                                       if ( wx )
-                                               wx->MacHandleControlClick( control , controlpart ) ;
-                               }
-                       }
-               }
-               else
-               {
-                       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(window);
-                       if (theMacWxFrame)
-                       {
-                               doMacContentClick((wxFrame*)theMacWxFrame); // todo : this cast is wrong
-                       }
-               }
-       }
-       
-#if 0
-       wxFrame* theMacWxFrame = findMacWxFrame(window);
-       if (theMacWxFrame)
-       {
-               WindowPtr MacWindow = findFrontNonFloatingWindow();
-               if (window != MacWindow)
-               {               
-                       wxFrame* frontFrame = findMacWxFrame(MacWindow);
-                       if (!frontFrame) wxFatalError("No wxFrame for frontnonfloatingWindow.");
-                       if (!frontFrame->IsModal())
-                       {
-                               frontFrame->SetFocus();
-                               doMacContentClick(theMacWxFrame);       // jonto - to deal with doc windows behind floaters ?
-                               ::newSelectWindow(window);                      // WCH : should I be calling some wxMethod?
-                               if (!IsFloating(MacWindow))
-                               {
-                                       KeyMap keyMap;
-                                       GetKeys(keyMap);
-                                       if (!(keyMap[1] & 0x8000)) theMacWxFrame->ShowAsActive(true);   // temporary measure...
-                               }
-                       }                                                                               // jonto : not sure yet, but let's try this ...
-                       else ::SysBeep(3);
-               }
-               else
-               {
-                       doMacContentClick(theMacWxFrame);
-               }
-       }
-#endif
+    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::doMacContentClick(wxWindow* frame)
+#ifndef __DARWIN__
+bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {
-       m_mouseWindow = frame;
-
-       wxMouseEvent event(wxEVT_LEFT_DOWN);
-       event.m_shiftDown = m_event.modifiers & shiftKey;
-       event.m_controlDown = m_event.modifiers & controlKey;
-       event.m_altDown = m_event.modifiers & optionKey;
-       event.m_metaDown = m_event.modifiers & cmdKey;
-       event.m_leftDown = FALSE;
-       event.m_middleDown = FALSE;
-       event.m_rightDown = FALSE;
-       if ( m_event.modifiers & controlKey )
-       {
-               event.m_rightDown = TRUE;
-       }
-       else
-       {
-               event.m_leftDown = TRUE;
-       }
-#if 0
-  event.m_leftDown = !(m_event.modifiers & btnState);
-       event.m_middleDown = FALSE;
-       event.m_rightDown = FALSE;
-#endif
-       event.m_x = m_event.where.h;
-       event.m_y = m_event.where.v;
-       event.m_timeStamp = m_event.when;
-       event.SetEventObject(m_mouseWindow);
-
-//     m_mouseWindow->ProcessEvent(event);
-       m_mouseWindow->MacDispatchMouseEvent(event);
-       
-#if 0
-       // RightButton is cmdKey click  on the mac platform for one-button mouse
-       Bool rightButton = cCurrentEvent.modifiers & cmdKey;
-       // altKey is optionKey on the mac platform:
-       Bool isAltKey = cCurrentEvent.modifiers & optionKey;
-
-       WXTYPE mouseEventType = rightButton ? wxEVENT_TYPE_RIGHT_DOWN
-                                                                               : wxEVENT_TYPE_LEFT_DOWN;
-       wxMouseEvent theMouseEvent(mouseEventType);
-       theMouseEvent.leftDown = !rightButton;
-       theMouseEvent.middleDown = FALSE;
-       theMouseEvent.rightDown = rightButton;
-       theMouseEvent.shiftDown = cCurrentEvent.modifiers & shiftKey;
-       theMouseEvent.controlDown = cCurrentEvent.modifiers & controlKey;
-       theMouseEvent.altDown = isAltKey;
-       theMouseEvent.metaDown = FALSE;  // mflatt
-       theMouseEvent.timeStamp = cCurrentEvent.when; // mflatt
-
-       int hitX = cCurrentEvent.where.h; // screen window c.s.
-       int hitY = cCurrentEvent.where.v; // screen window c.s.
-
-       frame->ScreenToWindow(&hitX, &hitY);
-//     frameParentArea->ScreenToArea(&hitX, &hitY);                    // tx coords ?
-       theMouseEvent.x = hitX; // frame parent area c.s.
-       theMouseEvent.y = hitY; // frame parent area c.s.
-
-       frame->SeekMouseEventArea(theMouseEvent);
-#endif
+    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
+
 
-void wxApp::doMacInDrag(WindowPtr window)
+wxMouseState wxGetMouseState()
 {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(window);
-       if (theMacWxFrame)
-       {
-               // should be desktop, not screen
-               Rect dragBoundsRect = qd.screenBits.bounds;     // can't move to a different screen
-//xxx  ::InsetRect(&dragBoundsRect, 4, ::GetMBarHeight() + 4); // This is not really necessary
-               Rect oldPos = (**(((WindowPeek)window)->strucRgn)).rgnBBox;
-               ::DragReferencedWindow(window, m_event.where, &dragBoundsRect); // jonto
-               #if 0
-               theMacWxFrame->m_x += (**(((WindowPeek)window)->strucRgn)).rgnBBox.left - oldPos.left;
-               theMacWxFrame->m_y += (**(((WindowPeek)window)->strucRgn)).rgnBBox.top - oldPos.top;
-               #endif
-               Move( (**(((WindowPeek)window)->strucRgn)).rgnBBox.left , (**(((WindowPeek)window)->strucRgn)).rgnBBox.top ) ;
-#if 0
-               theMacWxFrame->wxMacRecalcNewSize(); // Actually, recalc new position only
-#endif
-       }
-       
-#if 0
-//     if (window != ::FrontWindow())
-       if (window != findFrontNonFloatingWindow())
-       {
-//             wxFrame* frontFrame = findMacWxFrame(::FrontWindow());
-               wxFrame* frontFrame = findMacWxFrame(findFrontNonFloatingWindow());
-               if (!frontFrame) wxFatalError("No wxFrame for frontWindow.");
-               if (frontFrame->IsModal())
-               {
-                       ::SysBeep(3);
-                       return;
-               }
-       }
-
-       wxFrame* theMacWxFrame = findMacWxFrame(window);
-       if (theMacWxFrame)
-       {
-               Rect dragBoundsRect = qd.screenBits.bounds;     // can't move to a different screen
-               ::InsetRect(&dragBoundsRect, 4, ::GetMBarHeight() + 4); // This is not really necessary
-               newDragWindow(window, cCurrentEvent.where, &dragBoundsRect);    // jonto
-               theMacWxFrame->wxMacRecalcNewSize(); // Actually, recalc new position only
-               if (!IsFloating(window))
-               {
-                       theMacWxFrame->ShowAsActive(true);      // temporary measure...
-               }
-       }
+    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;
 }
 
-void wxApp::doMacInGrow(WindowPtr window)
+// 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 )
 {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(window);
-       if (theMacWxFrame)
-       {
-               Rect growSizeRect; // WCH: growSizeRect should be a member of wxFrame class
-               growSizeRect.top = 1; // minimum window height
-               growSizeRect.left = 1; // minimum window width
-               growSizeRect.bottom = qd.screenBits.bounds.bottom - qd.screenBits.bounds.top;
-               growSizeRect.right = qd.screenBits.bounds.right - qd.screenBits.bounds.left;
-               long windSize = ::GrowWindow(window, m_event.where, &growSizeRect);
-               if (windSize != 0)
-               {
-                       int nWidth = LoWord(windSize);
-                       int nHeight = HiWord(windSize);
-                       int oWidth, oHeight;
-                       theMacWxFrame->GetSize(&oWidth, &oHeight);
-                       if (nWidth == 0) nWidth = oWidth;
-                       if (nHeight == 0) nHeight = oHeight;
-                       theMacWxFrame->SetSize( -1, -1, nWidth, nHeight, wxSIZE_USE_EXISTING);
-               }
-       }
+    if ( !focus )
+        return false ;
+
+    bool handled; 
+    wxKeyEvent event(wxEVT_KEY_DOWN) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+        
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    if ( handled && event.GetSkipped() )
+        handled = false ;
+
+#if 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->IsTopLevel())
+                break;
+
+            ancestor = ancestor->GetParent();
+        }
+    }
+#endif // wxUSE_ACCEL
+
+    return handled ;
 }
 
-void wxApp::doMacInGoAway(WindowPtr window)
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(window);
-       if (theMacWxFrame)
-       {
-               if (TrackGoAway(window, m_event.where))
-               {
-            // TODO: Stefan, I think you need to send a wxCloseEvent to the window
-            // here. The OnCloseWindow handler will take care of delete the frame
-            // if it wishes to (there should be a default wxFrame::OnCloseWindow
-            // that destroys the frame).
-                       if (theMacWxFrame->OnClose()) {
-#if WXGARBAGE_COLLECTION_ON
-                               theMacWxFrame->Show(FALSE);
-#else
-                               delete theMacWxFrame;
-#endif
-                       }
-               }
-       }
+    if ( !focus )
+        return false ;
+
+    bool handled;
+    wxKeyEvent event( wxEVT_KEY_UP ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    
+    return handled ;
 }
 
-void wxApp::doMacInZoom(WindowPtr window, short windowPart)
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(window);
-       if (theMacWxFrame)
-       {
-               if (TrackBox(window, m_event.where, windowPart))
-               {
-#if 0
-                       theMacWxFrame->Maximize(windowPart == inZoomOut);
-#endif
-               }
-       }
+    if ( !focus )
+        return false ;
+    
+    wxKeyEvent event(wxEVT_CHAR) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    long keyval = event.m_keyCode ;
+
+    bool handled = false ;
+
+    wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+        
+    if (tlw)
+    {
+        event.SetEventType( wxEVT_CHAR_HOOK );
+        handled = tlw->GetEventHandler()->ProcessEvent( event );
+        if ( handled && event.GetSkipped() )
+            handled = false ;
+    }
+
+    if ( !handled )
+    {
+        event.SetEventType( wxEVT_CHAR );
+        event.Skip( false ) ;
+        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    }
+        
+    if ( !handled && (keyval == WXK_TAB) )
+    {
+        wxWindow* iter = focus->GetParent() ;
+        while ( iter && !handled )
+        {
+            if ( iter->HasFlag( wxTAB_TRAVERSAL ) )
+            {
+                wxNavigationKeyEvent new_event;
+                new_event.SetEventObject( focus );
+                new_event.SetDirection( !event.ShiftDown() );
+                /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+                new_event.SetWindowChange( event.ControlDown() );
+                new_event.SetCurrentFocus( focus );
+                handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                if ( handled && new_event.GetSkipped() )
+                    handled = false ;
+            }
+
+            iter = iter->GetParent() ;
+        }
+    }
+
+    // backdoor handler for default return and command escape
+    if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
+    {
+        // if window is not having a focus still testing for default enter or cancel
+        // TODO: add the UMA version for ActiveNonFloatingWindow
+        wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
+        if ( focus )
+        {
+            if ( keyval == WXK_RETURN )
+            {
+                wxButton *def = wxDynamicCast(focus->GetDefaultItem(), wxButton);
+                if ( def && def->IsEnabled() )
+                {
+                    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                    event.SetEventObject(def);
+                    def->Command(event);
+
+                    return true ;
+                }
+            }
+            else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
+            {
+                // 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 ;
 }
 
-long wxApp::macTranslateKey(char key, int mods)
+// 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 )
 {
-    static Handle transH = NULL;
-    static unsigned long transState = 0;
-    static Handle ScriptH = NULL;
-    static short region_code = 1;
-
-       if (!ScriptH) { // tom: don't guess the regioncode!!!!
-      struct ItlbRecord * r;
-      ScriptH = GetResource('itlb',0);
-      if (ScriptH) {
-       HLock(ScriptH);
-       r = (ItlbRecord*)*ScriptH;
-       region_code = r->itlbKeys;      
-       HUnlock(ScriptH);
-      }        
+    short keycode, keychar ;
+
+    keychar = short(keymessage & charCodeMask);
+    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    if ( !(event.GetEventType() == wxEVT_CHAR) && (modifiers & (controlKey | shiftKey | optionKey) ) )
+    {
+        // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+        // and look at the character after
+        UInt32 state = 0;
+        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state);
+        keychar = short(keyInfo & charCodeMask);
     }
-    switch (key) {
-    case 0x7e:
-    case 0x3e:
-      key = WXK_UP;
-      break;
-    case 0x7d:
-    case 0x3d:
-      key = WXK_DOWN;
-      break;
-    case 0x7b:
-    case 0x3b:
-      key = WXK_LEFT;
-      break;
-    case 0x7c:
-    case 0x3c:
-      key = WXK_RIGHT;
-      break;
-    case 0x24:
-    case 0x4c:
-      key = WXK_RETURN;
-      break;
-    case 0x30:
-      key = WXK_TAB;
-      break;
-    case 0x33:
-      key = WXK_BACK;
-      break;
-    case 0x75:
-      key = WXK_DELETE;
-      break;
-    case 0x73:
-         key = WXK_HOME;
-         break;
-       case 0x77:
-         key = WXK_END;
-         break;   
-       case 0x74:
-         key = WXK_PAGEUP;
-         break;     
-       case 0x79:
-         key = WXK_PAGEDOWN;
-         break;     
-    default:
-      if (!transH) {
-               transH = GetIndResource('KCHR', 1);
-               HNoPurge(transH);
-      }
-#if 0 //Tom replaces
-      if (transH) {
-               // Only let shift & option modify the key: 
-               HLock(transH);
-               key = KeyTranslate(*transH, (key & 0x7F) | mods, &transState) & charCodeMask;
-               HUnlock(transH);
-#else
-       if (0) { // tom fettig@dfki.uni-sb.de
-               // why if(0):
-               // code is not correct, see inside Macintosh: Text 1-87
-               // and 'itlk'-resource!!
-               // and it is not necessary, as the translated char is in
-               // cCurrrentEvent.message!!
-               // Only let shift & option modify the key: 
-               HLock(transH);
-               key = KeyTranslate(*transH, (key & 0x7F) | mods, &transState) & charCodeMask;
-               HUnlock(transH);
+
+    long keyval = wxMacTranslateKey(keychar, keycode) ;
+    if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )
+        keyval = wxToupper( keyval ) ;
+
+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
+    {
+        keyval = (keyval - '0') + WXK_NUMPAD0;
+    }
+    else if (keycode >= 67 && keycode <= 81)
+    {
+        switch (keycode)
+        {
+        case 76 :
+            keyval = WXK_NUMPAD_ENTER;
+            break;
+
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;
+
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;
+
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;
+
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;
+
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;
+
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;
+
+        default:
+            break;
+        } // end switch
+    }
+
+    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
-         }
-       } // end switch
-       
-       return key;
-}
 
-void
-wxApp::macAdjustCursor()
-{
-  if (m_event.what != kHighLevelEvent)
-  {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-       if (theMacWxFrame)
-       {
-         if (!theMacWxFrame->MacAdjustCursor(m_event.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);
 }
-*/