applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index be346f0a5732b464a0880f2cb0c5aeb401e0813a..f92a72d827852b6c0dc64b98286bcbca81d3e583 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1,25 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.cpp
 // Purpose:     wxApp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.cpp
 // Purpose:     wxApp

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

 // Modified by:
 // Modified by:

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

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "app.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "app.h"
 #endif
 

+#include "wx/defs.h"
+
+#include "wx/window.h"

 #include "wx/frame.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/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/icon.h"
 #include "wx/palette.h"
 #include "wx/dc.h"


@@ -28,1521 +33,1419 @@
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"

+#include "wx/tooltip.h"
+#include "wx/textctrl.h"
+#include "wx/menu.h"
+#include "wx/docview.h"
+#include "wx/filename.h"
+
+#include <string.h>

 
 

-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+// mac
+
+#ifndef __DARWIN__
+  #if __option(profile)
+    #include <profiler.h>
+  #endif

 #endif
 
 #endif
 

-#include <string.h>
+#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;
 
 extern wxList wxPendingDelete;
 

-wxApp *wxTheApp = NULL;
+#if wxUSE_THREADS
+extern size_t g_numberOfThreads;
+#endif // wxUSE_THREADS
+
+// 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)
 
 #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
 
 END_EVENT_TABLE()
 #endif
 

-// platform layer

 
 

-typedef void * PLEventHandle ;
+const short    kMacMinHeap = (29 * 1024) ;
+// platform specific static variables

 
 

-int PLTestMinimalRequirements() ;
-void PLErrorMessage( int errorCode ) ;
-int PLStartupPhase1() ;
-int PLStartupPhase2() ;
-void PLCleanup() ;
+const short kwxMacMenuBarResource = 1 ;
+const short kwxMacAppleMenuId = 1 ;

 
 

-bool PLDoOneEvent() ;
-bool PLHandleOneEvent( PLEventHandle event ) ; // true if really event
-bool PLCallbackIdle() ;
-bool PLCallbackRepeat() ;
+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 ;

 
 

-long wxApp::sm_lastMessageTime = 0;

 
 

-bool wxApp::Initialize()
-{
-  int error = 0 ;
-       
-  error = PLStartupPhase1() ;
-  if ( !error )
-  {
-    error = PLTestMinimalRequirements() ;
-    if ( !error )
-      error = PLStartupPhase2() ;
-  }
-       
-  if ( error )
-  {
-    PLErrorMessage( error ) ;
-    return FALSE ;
-  }  
-  
-#ifdef __WXMSW__
-  wxBuffer = new char[1500];
-#else
-  wxBuffer = new char[BUFSIZ + 512];
-#endif
+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") ;

 
 

-/* No longer used
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+// Normally we're not a plugin
+bool      wxApp::sm_isEmbedded = false;
+//----------------------------------------------------------------------
+// Core Apple Event Support
+//----------------------------------------------------------------------

 
 

-  streambuf* sBuf = new wxDebugStreamBuf;
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
-#endif
-*/
-  
-  wxClassInfo::InitializeClasses();
+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 ) ;

 
 

-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
-
-  wxInitializeStockLists();
-  wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-  wxInitializeResourceSystem();
-#endif
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
+}

 
 

-  wxBitmap::InitStandardHandlers();
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
+}

 
 

-  wxModule::RegisterModules();
-  wxASSERT( wxModule::InitializeModules() == TRUE );
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
+}

 
 

-  return TRUE;
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+{
+    return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;

 }
 
 }
 

-void wxApp::CleanUp()
+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )

 {
 {

-  wxModule::CleanUpModules();
+    return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
+}

 
 

-#if wxUSE_WX_RESOURCES
-  wxCleanUpResourceSystem();
-#endif
+// AEODoc Calls MacOpenFile on each of the files passed

 
 

-  wxDeleteStockObjects() ;
+short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
+{
+    AEDescList docList;
+    AEKeyword keywd;
+    DescType returnedType;
+    Size actualSize;
+    long itemsInList;
+    FSSpec theSpec;
+    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 ) ;
+
+    for (i = 1; i <= itemsInList; i++) {
+        AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
+        (Ptr) & theSpec, sizeof(theSpec), &actualSize);
+        wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+        MacOpenFile(fName);
+    }
+    return noErr;
+}

 
 

-  // Destroy all GDI lists, etc.
+// AEPDoc Calls MacPrintFile on each of the files passed

 
 

-  delete wxTheBrushList;
-  wxTheBrushList = NULL;
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply))
+{
+    AEDescList docList;
+    AEKeyword keywd;
+    DescType returnedType;
+    Size actualSize;
+    long itemsInList;
+    FSSpec theSpec;
+    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 ) ;
+
+    for (i = 1; i <= itemsInList; i++) {
+        AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
+        (Ptr) & theSpec, sizeof(theSpec), &actualSize);
+        wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+        MacPrintFile(fName);
+    }
+    return noErr;
+}

 
 

-  delete wxThePenList;
-  wxThePenList = NULL;
+// AEOApp calls MacNewFile

 
 

-  delete wxTheFontList;
-  wxTheFontList = NULL;
+short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
+{
+    MacNewFile() ;
+    return noErr ;
+}

 
 

-  delete wxTheBitmapList;
-  wxTheBitmapList = NULL;
+// AEQuit attempts to quit the application

 
 

-  delete wxTheColourDatabase;
-  wxTheColourDatabase = NULL;
+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() ;
+    }
+    return noErr ;
+}

 
 

-  wxBitmap::CleanUpHandlers();
+// AEROApp calls MacReopenApp

 
 

-  delete[] wxBuffer;
-  wxBuffer = NULL;
+short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
+{
+    MacReopenApp() ;
+    return noErr ;
+}

 
 

-  wxClassInfo::CleanUpClasses();

 
 

-  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);
+//----------------------------------------------------------------------
+// Support Routines linking the Mac...File Calls to the Document Manager
+//----------------------------------------------------------------------

 
 

-       PLCleanup() ;
+void wxApp::MacOpenFile(const wxString & fileName )
+{
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )
+        dm->CreateDocument(fileName , wxDOC_SILENT ) ;

 }
 
 }
 

-int wxEntry( int argc, char *argv[] )
+void wxApp::MacPrintFile(const wxString & fileName )

 {
 {

-  if (!wxApp::Initialize())
-    return FALSE;
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )

     {
     {

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

 
 

-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;
+    // eventually check for open docs, if none, call MacNewFile

 }
 
 }
 

-int wxApp::MainLoop()
+//----------------------------------------------------------------------
+// Carbon Event Handler
+//----------------------------------------------------------------------
+
+static const EventTypeSpec eventList[] =

 {
 {

-  m_keepGoing = TRUE;
+    { kEventClassCommand, kEventProcessCommand } ,
+    { kEventClassCommand, kEventCommandUpdateStatus } ,
+
+    { kEventClassMenu, kEventMenuOpening },
+    { kEventClassMenu, kEventMenuClosed },
+    { kEventClassMenu, kEventMenuTargetItem },
+
+    { kEventClassApplication , kEventAppActivated } ,
+    { kEventClassApplication , kEventAppDeactivated } ,
+    // handling the quit event is not recommended by apple
+    // rather using the quit apple event - which we do

 
 

-  while (m_keepGoing)
-  {
-               PLDoOneEvent() ;
-  }
+    { kEventClassAppleEvent , kEventAppleEvent } ,

 
 

-  return 0;
+    { kEventClassMouse , kEventMouseDown } ,
+    { kEventClassMouse , kEventMouseMoved } ,
+    { kEventClassMouse , kEventMouseUp } ,
+    { kEventClassMouse , kEventMouseDragged } ,
+    { 'WXMC' , 'WXMC' }
+} ;
+
+static pascal OSStatus
+wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar();
+    
+    if ( mbar )
+    {
+        wxFrame* win = mbar->GetFrame();
+        if ( win )
+        {
+            
+            // VZ: we could find the menu from its handle here by examining all
+            //     the menus in the menu bar recursively but knowing that neither
+            //     wxMSW nor wxGTK do it why bother...
+ #if 0
+            MenuRef menuRef;
+
+            GetEventParameter(event,
+                              kEventParamDirectObject,
+                              typeMenuRef, NULL,
+                              sizeof(menuRef), NULL,
+                              &menuRef);
+ #endif // 0
+
+            wxEventType type=0;        
+            MenuCommand cmd=0;
+            switch (GetEventKind(event))
+            {
+                case kEventMenuOpening:
+                    type = wxEVT_MENU_OPEN;
+                    break;
+                case kEventMenuClosed:
+                    type = wxEVT_MENU_CLOSE;
+                    break;
+                case kEventMenuTargetItem:
+                    type = wxEVT_MENU_HIGHLIGHT;
+                    GetEventParameter(event, kEventParamMenuCommand,
+                                      typeMenuCommand, NULL,
+                                      sizeof(cmd), NULL, &cmd);
+                    if (cmd == 0) return eventNotHandledErr;
+                    break;
+                default:
+                    wxFAIL_MSG(wxT("Unexpected menu event kind"));
+                    break;
+            }
+
+            wxMenuEvent wxevent(type, cmd);
+            wxevent.SetEventObject(win);
+
+            (void)win->GetEventHandler()->ProcessEvent(wxevent);
+        }
+    }
+
+    return eventNotHandledErr;

 }
 
 }
 

-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
+static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
 {

-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+    OSStatus result = eventNotHandledErr ;
+
+    HICommand command ;
+
+    GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL,
+        sizeof( HICommand ), NULL, &command );
+
+    MenuCommand id = command.commandID ;
+    if ( id == kHICommandPreferences )
+        id = wxApp::s_macPreferencesMenuItemId ;
+
+    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+    wxMenu* menu = NULL ;
+    wxMenuItem* item = NULL ;
+
+    if ( mbar )
+    {
+        item = mbar->FindItem( id , &menu ) ;
+        // it is not 100 % sure that an menu of id 0 is really ours, safety check
+        if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef )
+        {
+            item = NULL ;
+            menu = NULL ;
+        }
+    }

 
 

-    return event.MoreRequested();
+    if ( item == NULL || menu == NULL || mbar == NULL )
+        return result ;
+
+       switch( GetEventKind( event ) )
+       {
+           case kEventProcessCommand :
+           {
+                if (item->IsCheckable())
+                {
+                    item->Check( !item->IsChecked() ) ;
+                }
+
+                menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
+                result = noErr ;
+            }
+               break ;
+        case kEventCommandUpdateStatus:
+            // eventually trigger an updateui round
+            result = noErr ;
+            break ;
+           default :
+               break ;
+       }
+
+    return result ;

 }
 
 }
 

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

 {
 {

-  m_keepGoing = FALSE;
+    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 ;
+    }
+    return result ;

 }
 
 }
 

-// Is a message/event pending?
-bool wxApp::Pending()
+pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
 {

-/* TODO.
- */
-  return FALSE;
+    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 :
+            result = wxMacTopLevelMouseEventHandler( handler , event , data ) ;
+            break ;
+        case kEventClassAppleEvent :
+            {
+                EventRecord rec ;
+                wxMacConvertEventToRecord( event , &rec ) ;
+                result = AEProcessAppleEvent( &rec ) ;
+            }
+            break ;
+        default :
+            break ;
+    }
+
+    return result ;

 }
 
 }
 

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

 {
 {

-/* TODO.
- */
+    // 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

 }
 
 }
 

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

 {
 {

-  static bool inOnIdle = FALSE;
+    // Mac-specific

 
 

-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
+#if __WXDEBUG__
+    InstallDebugAssertOutputHandler ( NewDebugAssertOutputHandlerUPP( wxMacAssertOutputHandler ) );
+#endif
+    UMAInitToolbox( 4, sm_isEmbedded ) ;
+    SetEventMask( everyEvent ) ;
+    UMAShowWatchCursor() ;
+
+#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
+    // open shared library resources from here since we don't have
+    //   __wxinitialize in Mach-O shared libraries
+    wxStAppResource::OpenSharedLibraryResource(NULL);
+#endif

 
 

-  inOnIdle = TRUE;
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;
+#  endif
+#endif

 
 

-  // 'Garbage' collection of windows deleted with Close().
-  DeletePendingObjects();
+#ifndef __DARWIN__
+    // now avoid exceptions thrown for new (bad_alloc)
+    // FIXME CS for some changes outside wxMac does not compile anymore
+#if 0
+    std::__throws_bad_alloc = 0 ;
+#endif

 
 

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

 
 

-  // Send OnIdle events to all windows
-  bool needMore = SendIdleEvents();
+    s_macCursorRgn = ::NewRgn() ;

 
 

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

 
 

-  inOnIdle = FALSE;
-}
+    if ( !wxAppBase::Initialize(argc, argv) )
+        return false;

 
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
-       wxNode* node = wxTopLevelWindows.First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
-
-               node = node->Next();
-       }
-    return needMore;
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+
+
+    wxMacCreateNotifierTable() ;
+
+    UMAShowArrowCursor() ;
+
+    return true;

 }
 
 }
 

-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
+bool wxApp::OnInitGui()

 {
 {

-    bool needMore = FALSE;
+    if( !wxAppBase::OnInitGui() )
+        return false ;

 
 

-       wxIdleEvent event;
-       event.SetEventObject(win);
-       win->ProcessEvent(event);
+    InstallStandardEventHandler( GetApplicationEventTarget() ) ;

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+    if (!sm_isEmbedded)
+    {
+        InstallApplicationEventHandler(
+            GetwxMacAppEventHandlerUPP(),
+            GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));
+    }

 
 

-       wxNode* node = win->GetChildren().First();
-       while (node)
-       {
-               wxWindow* win = (wxWindow*) node->Data();
-               if (SendIdleEvents(win))
-            needMore = TRUE;
+    if (!sm_isEmbedded)
+    {
+        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                               NewAEEventHandlerUPP(AEHandleODoc) ,
+                               0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               NewAEEventHandlerUPP(AEHandleOApp) ,
+                               0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               NewAEEventHandlerUPP(AEHandlePDoc) ,
+                               0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               NewAEEventHandlerUPP(AEHandleRApp) ,
+                               0 , FALSE ) ;
+        AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               NewAEEventHandlerUPP(AEHandleQuit) ,
+                               0 , FALSE ) ;
+    }

 
 

-               node = node->Next();
-       }
-    return needMore ;
+    return TRUE ;

 }
 
 }
 

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

 {
 {

-  wxNode *node = wxPendingDelete.First();
-  while (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    
-    delete obj;
+    wxToolTip::RemoveToolTips() ;

 
 

-    if (wxPendingDelete.Member(obj))
-      delete node;
+    // One last chance for pending objects to be cleaned up
+    wxTheApp->DeletePendingObjects();

 
 

-    // Deleting one object may have deleted other pending
-    // objects, so start from beginning of list again.
-    node = wxPendingDelete.First();
-  }
-}
+    wxMacDestroyNotifierTable() ;

 
 

-wxLog* wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerDump( (StringPtr)"\papp.prof" ) ;
+    ProfilerTerm() ;
+#  endif
+#endif

 
 

-wxWindow* wxApp::GetTopWindow() const
-{
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
-}
+#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
+    // close shared library resources from here since we don't have
+    //   __wxterminate in Mach-O shared libraries
+    wxStAppResource::CloseSharedLibraryResource();
+#endif

 
 

-void wxExit()
-{
-  wxApp::CleanUp();
-/*
- * TODO: Exit in some platform-specific way. Not recommended that the app calls this:
- * only for emergencies.
- */
-}
+    UMACleanupToolbox() ;
+    if (s_macCursorRgn) {
+        ::DisposeRgn((RgnHandle)s_macCursorRgn);
+    }

 
 

-// Yield to other processes
-bool wxYield()
-{
-  /*
-   * TODO
-   */
-  return TRUE;
+    #if 0
+        TerminateAE() ;
+    #endif
+
+    wxAppBase::CleanUp();

 }
 
 }
 

-// -------------------------------------------------------------------
-// Portability Layer PL
-// -------------------------------------------------------------------
-// this is the c-api part, the only part of this file that needs to be
-// adapted for supporting a new platform
-// there are two flavours of PL... functions, Callbacks and normal functions
-// Callbacks are called by other PLxxx functions and allow to trigger idle 
-// processing etc. the callbacks don't have to be adapted for every platform
-// but only in case of changes to the underlying wx framework
+//----------------------------------------------------------------------
+// misc initialization stuff
+//----------------------------------------------------------------------

 
 

-// callbacks
+// extern variable for shared library resource id
+// need to be able to find it with NSLookupAndBindSymbol
+short gSharedLibraryResource = kResFileNotOpened ;

 
 

-bool PLCallbackIdle() 
-{
-       return wxTheApp->ProcessIdle() ;
-}
+#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
+CFBundleRef gSharedLibraryBundle = NULL;
+#endif /* WXMAKINGDLL_CORE && __DARWIN__ */

 
 

-bool PLCallbackRepeat() 
+wxStAppResource::wxStAppResource()

 {
 {

-       // wxMacProcessSocketEvents() ;  
-       return false ;
+    m_currentRefNum = CurResFile() ;
+    if ( gSharedLibraryResource != kResFileNotOpened )
+    {
+        UseResFile( gSharedLibraryResource ) ;
+    }

 }
 
 }
 

-// platform specific static variables
-
-bool                                   gMacHasAppearance = false ;
-long                                   gMacAppearanceVersion = 0 ;
-RgnHandle                      gMacCursorRgn = NULL ;
-
-#define        kMinHeap                                 (29 * 1024)
-#define        kMinSpace                               (20 * 1024)
-#define        eWrongMachine                   1
-#define        eSmallSize                              2
-#define        eNoMemory                               3
-#define        eOldSystem                              4
-#define        eGenericAbout                   5
-
-// platform specific prototypes
-
-void DoMacNullEvent( EventRecord *ev ) ;
-void DoMacHighLevelEvent( EventRecord *ev ) ;
-void DoMacMouseDownEvent( EventRecord *ev ) ;
-void DoMacMouseUpEvent( EventRecord *ev ) ;
-void DoMacKeyDownEvent( EventRecord *ev ) ;
-void DoMacKeyUpEvent( EventRecord *ev ) ;
-void DoMacAutoKeyEvent( EventRecord *ev ) ;
-void DoMacActivateEvent( EventRecord *ev ) ;
-void DoMacUpdateEvent( EventRecord *ev ) ;
-void DoMacDiskEvent( EventRecord *ev ) ;
-void DoMacOSEvent( EventRecord *ev ) ;
-
-// platform specific functions
-
-// -------------------------------------------------------------------
-// PLStartupPhase1
-// -------------------------------------------------------------------
-// Initializes the system so that at least the requirements can be tested
-// and that error messages will shop up at all ;-)
-// 
-// parameters   : none
-// return value : non zero for a implementation specific error code
-
-int PLStartupPhase1()
+wxStAppResource::~wxStAppResource()

 {
 {

-       ::InitGraf(&qd.thePort);
-       ::InitFonts();
-       ::InitWindows();
-       ::InitMenus();
-       ::TEInit();
-       ::InitDialogs(0L);
-       ::InitCursor();
-       CursHandle aCursHandle = ::GetCursor(watchCursor);      // Watch should be in system
-       if (aCursHandle)
-               ::SetCursor(*aCursHandle);                                              // Change cursor to watch 
-       ::FlushEvents(everyEvent, 0);
-       
-       gMacCursorRgn = ::NewRgn() ;
-
-       return 0 ;
+    if ( m_currentRefNum != kResFileNotOpened )
+    {
+        UseResFile( m_currentRefNum ) ;
+    }

 }
 
 }
 

-// -------------------------------------------------------------------
-// PLStartupPhase2
-// -------------------------------------------------------------------
-// booting the system further until all subsystems are running
-// 
-// parameters   : none
-// return value : non zero for a implementation specific error code
-
-int PLStartupPhase2()
+void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)

 {
 {

-       long total,contig;
+    gSharedLibraryResource = kResFileNotOpened;
+
+#ifdef WXMAKINGDLL_CORE
+    if ( initBlock != NULL ) {
+        const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
+        FSSpec *fileSpec = NULL;
+
+        if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
+            fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
+        }
+        else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
+            fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
+        }
+
+        if (fileSpec != NULL) {
+            gSharedLibraryResource =  FSpOpenResFile(fileSpec, fsRdPerm);
+        }
+    }
+    else {
+#ifdef __DARWIN__
+        // Open the shared library resource file if it is not yet open
+        NSSymbol    theSymbol;
+        NSModule    theModule;
+        const char *theLibPath;
+
+        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
+        if (gSharedLibraryBundle != NULL) {
+            // wxWindows has been bundled into a framework
+            //   load the framework resources
+
+            gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
+        }
+        else {
+            // wxWindows is a simple dynamic shared library
+            //   load the resources from the data fork of a separate resource file
+            wxString theResPath;
+            wxString theName;
+            FSRef  theResRef;
+            OSErr  theErr = noErr;
+
+            // get the library path
+            theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
+            theModule = NSModuleForSymbol(theSymbol);
+            theLibPath = NSLibraryNameForModule(theModule);
+
+            // if we call wxLogDebug from here then, as wxTheApp hasn't been
+            // created yet when we're called from wxApp::Initialize(), wxLog
+            // is going to create a default stderr-based log target instead of
+            // the expected normal GUI one -- don't do it, if we really want
+            // to see this message just use fprintf() here
+#if 0
+            wxLogDebug( wxT("wxMac library installation name is '%s'"),
+                        theLibPath );
+#endif

 
 

-       ::MaxApplZone();
-       for (long i = 1; i <= 4; i++)
-               ::MoreMasters();
-       PurgeSpace(&total, &contig);
-       ::SetCursor( &qd.arrow ) ; 
+            // allocate copy to replace .dylib.* extension with .rsrc
+            if (theLibPath != NULL) {
+#if wxUSE_UNICODE
+                theResPath = wxString(theLibPath, wxConvLocal);
+#else
+                theResPath = wxString(theLibPath);
+#endif
+                // replace '_core' with '' in case of multi-lib build
+                theResPath.Replace(wxT("_core"), wxEmptyString);
+                // replace ".dylib" shared library extension with ".rsrc"
+                theResPath.Replace(wxT(".dylib"), wxT(".rsrc"));
+                // Find the begining of the filename
+                theName = theResPath.AfterLast('/');

 
 #if 0
 
 #if 0

-       InitAEHandlers();
-       InitializeAECore() ;
-       GUSISetup(GUSIwithInternetSockets);
+                wxLogDebug( wxT("wxMac resources file name is '%s'"),
+                            theResPath.mb_str() );

 #endif
 
 #endif
 

-       return 0 ;
+                theErr = FSPathMakeRef((UInt8 *) theResPath.mb_str(), &theResRef, false);
+                if (theErr != noErr) {
+                    // try in current directory (using name only)
+                    theErr = FSPathMakeRef((UInt8 *) theName.mb_str(), &theResRef, false);
+                }
+
+                // open the resource file
+                if (theErr == noErr) {
+                    theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm,
+                                                 &gSharedLibraryResource);
+                }
+                if (theErr != noErr) {
+#ifdef __WXDEBUG__
+                    wxLogDebug( wxT("unable to open wxMac resource file '%s'\n"),
+                                theResPath.mb_str() );
+#endif // __WXDEBUG__
+                }
+
+            }
+        }
+#endif /* __DARWIN__ */
+    }
+#endif /* WXMAKINGDLL_CORE */

 }
 
 }
 

-// -------------------------------------------------------------------
-// PLErrorMessage
-// -------------------------------------------------------------------
-// notifies the user of a implementation specific error
-// is useful for messages before the wx System is up and running
-// 
-// parameters   : int error = error code (implementation specific)
-// return value : none
-
-void PLErrorMessage( int error )
+void wxStAppResource::CloseSharedLibraryResource()

 {
 {

-       short itemHit;
-       Str255 message;
-
-       SetCursor(&qd.arrow);
-       GetIndString(message, 128, error);
-       ParamText(message, (ConstStr255Param)"\p", (ConstStr255Param)"\p", (ConstStr255Param)"\p");
-       itemHit = Alert(129, nil);
+#ifdef WXMAKINGDLL_CORE
+    // Close the shared library resource file
+    if (gSharedLibraryResource != kResFileNotOpened) {
+#ifdef __DARWIN__
+        if (gSharedLibraryBundle != NULL) {
+            CFBundleCloseBundleResourceMap(gSharedLibraryBundle,
+                                           gSharedLibraryResource);
+            gSharedLibraryBundle = NULL;
+        }
+        else
+#endif /* __DARWIN__ */
+        {
+            CloseResFile(gSharedLibraryResource);
+        }
+        gSharedLibraryResource = kResFileNotOpened;
+    }
+#endif /* WXMAKINGDLL_CORE */

 }
 
 }
 

-// -------------------------------------------------------------------
-// PLCleanup
-// -------------------------------------------------------------------
-// notifies the user of a implementation specific error
-// is useful for messages before the wx System is up and running
-// 
-// parameters   : int error = error code (implementation specific)
-// return value : none
+#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)

 
 

-void PLCleanup()
-{
-       ::PrClose() ;
-       if (gMacCursorRgn)
-               ::DisposeRgn(gMacCursorRgn);
-#if 0
-       TerminateAE() ;
-#endif
-}
+// 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

 
 

-// -------------------------------------------------------------------
-// PLTestMinimalRequirements
-// -------------------------------------------------------------------
-// test whether we are on the correct runnable system and read out any
-// useful informations from the system
-// 
-// parameters  : none
-// return value : non zero for a implementation specific error code
+extern "C" {
+    void __sinit(void);    /*    (generated by linker)    */
+    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+    pascal void __terminate(void);
+}

 
 

-int PLTestMinimalRequirements()
+pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)

 {
 {

-       long theSystem ;
-       long theMachine;
-       long theAppearance ;
-
-       if (Gestalt(gestaltMachineType, &theMachine) != noErr)
-       {
-               return(eWrongMachine);
-       }
-
-       if (theMachine < gestaltMacPlus)
-       {
-               return(eWrongMachine);
-       }
-
-       if (Gestalt(gestaltSystemVersion, &theSystem) != noErr )
-       {
-               return( eOldSystem ) ;
-       }
-               
-       if ( theSystem < 0x0700 )
-       {
-               return( eOldSystem ) ;
-       }
-
-       if ((long)GetApplLimit() - (long)ApplicationZone() < kMinHeap)
-       {
-               return(eSmallSize);
-       }
-
-       if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-       {
-               gMacHasAppearance = true ;
-               RegisterAppearanceClient();
-               if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
-               {
-                       gMacAppearanceVersion = theAppearance ;
-               }
-               else
-               {
-                       gMacAppearanceVersion = 0x0100 ;
-               }
-       }
-
-       return 0 ;
+    wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ;
+    return __initialize( theInitBlock ) ;

 }
 
 }
 

-// -------------------------------------------------------------------
-// PLDoOneEvent
-// -------------------------------------------------------------------
-// 
-// parameters  : none
-// return value : returns true if a real event occured (no null or timeout event)
-
-bool PLDoOneEvent() 
+pascal void __wxterminate(void)

 {
 {

-  EventRecord event ;
-
-       long sleepTime = 60;
-
-       bool gotEvent = false ;
-  
-
-       if (WaitNextEvent(everyEvent, &event,sleepTime, gMacCursorRgn))
-       {
-    gotEvent = PLHandleOneEvent( &event );
-       }
-       else
-       {
-    PLCallbackIdle();
-       }
-               
-       PLCallbackRepeat() ;
-  
-  return gotEvent ;
+    wxStAppResource::CloseSharedLibraryResource() ;
+    __terminate() ;

 }
 
 }
 

-// -------------------------------------------------------------------
-// PLHandleOneEvent
-// -------------------------------------------------------------------
-// 
-// parameters  : event = event handle of the platform specific event to be handled
-// return value : returns true if a real event occured (no null or timeout event)
+#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */

 
 

-bool PLHandleOneEvent( PLEventHandle event ) 
+bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)

 {
 {

-       bool realEvent = true ;
-
-       EventRecord* ev = (EventRecord*) event ;
-
-       switch (ev->what)
-       {
-               case nullEvent:
-                       DoMacNullEvent( ev ) ;
-                       realEvent = false ;
-                       break ;
-               case kHighLevelEvent:
-                       DoMacHighLevelEvent( ev ) ;
-                       break;
-               case mouseDown:
-                       DoMacMouseDownEvent( ev ) ;
-                       wxTheApp->ExitMainLoop() ;
-                       break;
-               case mouseUp:
-                       DoMacMouseUpEvent( ev ) ;
-                       break;
-               case keyDown:
-                       DoMacKeyDownEvent( ev ) ;
-                       break;
-               case autoKey:
-                       DoMacAutoKeyEvent( ev ) ;
-                       break;
-               case keyUp:
-                       DoMacKeyUpEvent( ev ) ;
-                       break;
-               case activateEvt:
-                       DoMacActivateEvent( ev ) ;
-                       break;
-               case updateEvt:
-                       DoMacUpdateEvent( ev ) ;
-                       break;
-               case diskEvt:
-                       DoMacDiskEvent( ev ) ;
-                       break;
-               case osEvt:
-                       DoMacOSEvent( ev ) ;
-                       break;
-               default:
-                       break;
-       }
-  return realEvent ;
-}
+    bool converted = ConvertEventRefToEventRecord( event,rec) ;
+    OSStatus err = noErr ;
+    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 ;
+                                unsigned char charCode ;
+                                UInt32 modifiers ;
+                                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 ;
+        }
+    }

 
 

-// platform specific functions (non PLxxx functions)
+    return converted ;
+}

 
 

-void DoMacNullEvent( EventRecord *ev ) 
+wxApp::wxApp()

 {
 {

+  m_printMode = wxPRINT_WINDOWS;
+
+  m_macCurrentEvent = NULL ;
+  m_macCurrentEventHandlerCallRef = NULL ;

 }
 
 }
 

-void DoMacHighLevelEvent( EventRecord *ev )
+int wxApp::MainLoop()

 {
 {

+    m_keepGoing = TRUE;
+
+    while (m_keepGoing)
+    {
+        MacDoOneEvent() ;
+    }
+
+    return 0;

 }
 
 }
 

-void DoMacMouseDownEvent( EventRecord *ev )
+void wxApp::ExitMainLoop()

 {
 {

+      m_keepGoing = FALSE;

 }
 
 }
 

-void DoMacMouseUpEvent( EventRecord *ev )
+// Is a message/event pending?
+bool wxApp::Pending()

 {
 {

+    // without the receive event (with pull param = false ) nothing is ever reported
+    EventRef theEvent;
+    ReceiveNextEvent (0, NULL, kEventDurationNoWait, false, &theEvent);
+    return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ; 

 }
 
 }
 

-void DoMacKeyDownEvent( EventRecord *ev )
+// Dispatch a message.
+bool wxApp::Dispatch()

 {
 {

+    MacDoOneEvent() ;
+
+    return true;

 }
 
 }
 

-void DoMacKeyUpEvent( EventRecord *ev )
+void wxApp::OnIdle(wxIdleEvent& event)

 {
 {

+    wxAppBase::OnIdle(event);
+
+    // If they are pending events, we must process them: pending events are
+    // either events to the threads other than main or events posted with
+    // wxPostEvent() functions
+    wxMacProcessNotifierAndPendingEvents();
+
+  if(!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
+    wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();

 }
 
 }
 

-void DoMacAutoKeyEvent( EventRecord *ev )
+void wxApp::WakeUpIdle()

 {
 {

+    wxMacWakeUp() ;

 }
 
 }
 

-void DoMacActivateEvent( EventRecord *ev )
+void wxApp::Exit()

 {
 {

+    wxApp::CleanUp();
+    ::ExitToShell() ;

 }
 
 }
 

-void DoMacUpdateEvent( EventRecord *ev )
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))

 {
 {

+    if (GetTopWindow())
+        GetTopWindow()->Close(TRUE);

 }
 
 }
 

-void DoMacDiskEvent( EventRecord *ev )
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.
+void wxApp::OnQueryEndSession(wxCloseEvent& event)

 {
 {

+    if (GetTopWindow())
+    {
+        if (!GetTopWindow()->Close(!event.CanVeto()))
+            event.Veto(TRUE);
+    }

 }
 
 }
 

-void DoMacOSEvent( EventRecord *ev )
+extern "C" void wxCYield() ;
+void wxCYield()

 {
 {

+    wxYield() ;

 }
 
 }
 

+// Yield to other processes

 
 

-
-/*
-
-void wxApp::doMacMouseDown(void)
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-       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));
-       }
-}
+    if (s_inYield)
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }

 
 

-void wxApp::doMacMouseUp(void)
-{
-       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
+        return FALSE;
+    }

 
 

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

 
 

-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);
-                       }
-               }
-       }
+#if wxUSE_THREADS
+    YieldToAnyThread() ;

 #endif
 #endif

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

 
 

-void wxApp::doMacKeyDown(void)
-{
-       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);
-                       }
-               }
-       }
-}
+    EventRef theEvent;

 
 

-void wxApp::doMacAutoKey(void)
-{
-       doMacKeyDown();
-}
+    OSStatus status = noErr ;
+    do
+    {
+        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);
+        }
+    } while( status == noErr ) ;
+
+    wxMacProcessNotifierAndPendingEvents() ;
+    s_inYield = FALSE;

 
 

-void wxApp::doMacKeyUp(void)
-{
+    return TRUE;

 }
 
 }
 

-void wxApp::doMacActivateEvt(void)
+void wxApp::MacDoOneEvent()

 {
 {

-       HighlightAndActivateWindow( (WindowPtr) m_event.message , m_event.modifiers & activeFlag ) ;
-}
+    EventRef theEvent;

 
 

-void wxApp::doMacUpdateEvt(void)
-{
-       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);
-}
+    s_inReceiveEvent = true ;
+    OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ;
+    s_inReceiveEvent = false ;
+    if ( status == eventLoopTimedOutErr )
+    {
+        if ( wxTheApp->ProcessIdle() )
+            sleepTime = kEventDurationNoWait ;
+        else
+        {
+#if wxUSE_THREADS
+            if (g_numberOfThreads)
+            {
+                sleepTime = kEventDurationNoWait;
+            }
+            else
+#endif // wxUSE_THREADS
+            {
+                sleepTime = kEventDurationSecond;
+            }
+        }
+    }
+    else if ( status == eventLoopQuitErr )
+    {
+        // according to QA1061 this may also occur when a WakeUp Process
+        // is executed
+    }
+    else
+    {
+        MacHandleOneEvent( theEvent ) ;
+        ReleaseEvent(theEvent);
+        sleepTime = kEventDurationNoWait ;
+    }
+    // repeaters

 
 

-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);
-       }
+    DeletePendingObjects() ;
+    wxMacProcessNotifierAndPendingEvents() ;

 }
 
 }
 

-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;
-       }
+/*virtual*/ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
+{
+    // Override to process unhandled events as you please    

 }
 
 }
 

-void wxApp::doMacHighLevelEvent(void)
+void wxApp::MacHandleOneEvent( WXEVENTREF evr )

 {
 {

-       ::AEProcessAppleEvent(&m_event); // System 7 or higher
+    EventTargetRef theTarget;
+    theTarget = GetEventDispatcherTarget();
+    m_macCurrentEvent = evr ;
+    OSStatus status = SendEventToEventTarget ((EventRef) evr , theTarget);
+    if(status == eventNotHandledErr)
+    {
+        MacHandleUnhandledEvent(evr);
+    }
+    wxMacProcessNotifierAndPendingEvents() ;

 }
 
 }
 

-void wxApp::doMacResumeEvent(void)
+long wxMacTranslateKey(unsigned char key, unsigned char code) ;
+long wxMacTranslateKey(unsigned char key, unsigned char code)

 {
 {

-       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);
-       }
+    long retval = key ;
+    switch (key)
+    {
+        case kHomeCharCode :
+                 retval = WXK_HOME;
+          break;
+        case kEnterCharCode :
+                 retval = WXK_RETURN;
+          break;
+        case kEndCharCode :
+                 retval = WXK_END;
+          break;
+        case kHelpCharCode :
+                 retval = WXK_HELP;
+          break;
+        case kBackspaceCharCode :
+                 retval = WXK_BACK;
+          break;
+        case kTabCharCode :
+                 retval = WXK_TAB;
+          break;
+        case kPageUpCharCode :
+                 retval = WXK_PAGEUP;
+          break;
+        case kPageDownCharCode :
+                 retval = WXK_PAGEDOWN;
+          break;
+        case kReturnCharCode :
+                 retval = WXK_RETURN;
+          break;
+            case kFunctionKeyCharCode :
+            {
+                switch( code )
+                {
+                    case 0x7a :
+                        retval = WXK_F1 ;
+                        break;
+                    case 0x78 :
+                        retval = WXK_F2 ;
+                        break;
+                    case 0x63 :
+                        retval = WXK_F3 ;
+                        break;
+                    case 0x76 :
+                        retval = WXK_F4 ;
+                        break;
+                    case 0x60 :
+                        retval = WXK_F5 ;
+                        break;
+                    case 0x61 :
+                        retval = WXK_F6 ;
+                        break;
+                    case 0x62:
+                        retval = WXK_F7 ;
+                        break;
+                    case 0x64 :
+                        retval = WXK_F8 ;
+                        break;
+                    case 0x65 :
+                        retval = WXK_F9 ;
+                        break;
+                    case 0x6D :
+                        retval = WXK_F10 ;
+                        break;
+                    case 0x67 :
+                        retval = WXK_F11 ;
+                        break;
+                    case 0x6F :
+                        retval = WXK_F12 ;
+                        break;
+                    case 0x69 :
+                        retval = WXK_F13 ;
+                        break;
+                    case 0x6B :
+                        retval = WXK_F14 ;
+                        break;
+                    case 0x71 :
+                        retval = WXK_F15 ;
+                        break;
+                }
+            }
+            break ;
+            case kEscapeCharCode :
+                retval = WXK_ESCAPE ;
+            break ;
+            case kLeftArrowCharCode :
+                retval = WXK_LEFT ;
+            break ;
+            case kRightArrowCharCode :
+                retval = WXK_RIGHT ;
+            break ;
+            case kUpArrowCharCode :
+                retval = WXK_UP ;
+            break ;
+            case kDownArrowCharCode :
+                retval = WXK_DOWN ;
+            break ;
+            case kDeleteCharCode :
+                retval = WXK_DELETE ;
+             default:
+            break ;
+     } // end switch
+
+    return retval;

 }
 
 }
 

-void wxApp::doMacSuspendEvent(void)
+int wxMacKeyCodeToModifier(wxKeyCode key)

 {
 {

-       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);
-       }
-}
+    switch (key)
+    {
+    case WXK_START:
+    case WXK_MENU:
+        return cmdKey;

 
 

-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);
-}
+    case WXK_SHIFT:
+        return shiftKey;

 
 

-void wxApp::doMacInMenuBar(long menuResult)
-{
-       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);                                                                
-}
+    case WXK_CAPITAL:
+        return alphaLock;

 
 

-void wxApp::doMacInContent(WindowPtr window)
-{
-       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
-}
+    case WXK_ALT:
+        return optionKey;

 
 

-void wxApp::doMacContentClick(wxWindow* frame)
-{
-       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
-}
+    case WXK_CONTROL:
+        return controlKey;

 
 

-void wxApp::doMacInDrag(WindowPtr window)
-{
-       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...
-               }
-       }
-#endif
+    default:
+        return 0;
+    }

 }
 
 }
 

-void wxApp::doMacInGrow(WindowPtr window)
+bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below

 {
 {

-       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);
-               }
-       }
+//#ifdef __DARWIN__
+//     wxHIDKeyboard keyboard;
+//     return keyboard.IsActive(key);
+//#else
+// TODO:  Have it use HID Manager on OSX...
+//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::doMacInGoAway(WindowPtr window)
-{
-       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
-                       }
-               }
-       }
-}

 
 

-void wxApp::doMacInZoom(WindowPtr window, short windowPart)
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )

 {
 {

-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(window);
-       if (theMacWxFrame)
-       {
-               if (TrackBox(window, m_event.where, windowPart))
-               {
+    if ( !focus )
+        return false ;
+
+    short keycode ;
+    short keychar ;
+    keychar = short(keymessage & charCodeMask);
+    keycode = short(keymessage & keyCodeMask) >> 8 ;
+
+    if ( modifiers & ( controlKey|shiftKey|optionKey ) )
+    {
+        // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+        // and look at the character after
+        UInt32 state = 0;
+        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
+        keychar = short(keyInfo & charCodeMask);
+        keycode = short(keyInfo & keyCodeMask) >> 8 ;
+    }
+    long keyval = wxMacTranslateKey(keychar, keycode) ;
+    long realkeyval = keyval ;
+    if ( keyval == keychar )
+    {
+        // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
+        realkeyval = short(keymessage & charCodeMask) ;
+        keyval = wxToupper( keyval ) ;
+    }
+
+    wxKeyEvent event(wxEVT_KEY_DOWN);
+    bool handled = false ;
+    event.m_shiftDown = modifiers & shiftKey;
+    event.m_controlDown = modifiers & controlKey;
+    event.m_altDown = modifiers & optionKey;
+    event.m_metaDown = modifiers & cmdKey;
+    event.m_keyCode = keyval ;
+
+    event.m_x = wherex;
+    event.m_y = wherey;
+    event.m_timeStamp = when;
+    event.SetEventObject(focus);
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    if ( handled && event.GetSkipped() )
+        handled = false ;
+    if ( !handled )
+    {
+#if 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
+    }
+    if (!handled)
+    {
+        event.Skip( FALSE ) ;
+        event.SetEventType( wxEVT_CHAR ) ;
+        // raw value again
+        event.m_keyCode = realkeyval ;
+
+        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+        if ( handled && event.GetSkipped() )
+            handled = false ;
+    }
+    if ( !handled &&
+         (keyval == WXK_TAB) &&
+// CS: copied the change below from wxGTK
+// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may
+//     have this style, yet choose not to process this particular TAB in which
+//     case TAB must still work as a navigational character

 #if 0
 #if 0

-                       theMacWxFrame->Maximize(windowPart == inZoomOut);
+         (!focus->HasFlag(wxTE_PROCESS_TAB)) &&

 #endif
 #endif

-               }
-       }
+         (focus->GetParent()) &&
+         (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
+    {
+        wxNavigationKeyEvent new_event;
+        new_event.SetEventObject( focus );
+        new_event.SetDirection( !event.ShiftDown() );
+        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+        new_event.SetWindowChange( event.ControlDown() );
+        new_event.SetCurrentFocus( focus );
+        handled = focus->GetEventHandler()->ProcessEvent( new_event );
+        if ( handled && new_event.GetSkipped() )
+            handled = false ;
+    }
+    // backdoor handler for default return and command escape
+    if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
+    {
+          // 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 ;
+                }
+            }
+            /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
+            else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
+            {
+                  wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+                  new_event.SetEventObject( focus );
+                  handled = focus->GetEventHandler()->ProcessEvent( new_event );
+            }
+          }
+    }
+    return handled ;

 }
 
 }
 

-long wxApp::macTranslateKey(char key, int mods)
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )

 {
 {

-    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);
-      }        
+    if ( !focus )
+        return false ;
+
+    short keycode ;
+    short keychar ;
+    keychar = short(keymessage & charCodeMask);
+    keycode = short(keymessage & keyCodeMask) >> 8 ;
+    if ( modifiers & ( controlKey|shiftKey|optionKey ) )
+    {
+        // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
+        // and look at the character after
+        UInt32 state = 0;
+        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
+        keychar = short(keyInfo & charCodeMask);
+        keycode = short(keyInfo & keyCodeMask) >> 8 ;

     }
     }

- 
-    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);
-#endif
-         }
-       } // end switch
-       
-       return key;
-}
+    long keyval = wxMacTranslateKey(keychar, keycode) ;

 
 

-void
-wxApp::macAdjustCursor()
-{
-  if (m_event.what != kHighLevelEvent)
-  {
-       wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-       if (theMacWxFrame)
-       {
-         if (!theMacWxFrame->MacAdjustCursor(m_event.where))
-               ::SetCursor(&(qd.arrow));
-       }
-  }
+    if ( keyval == keychar )
+    {
+        keyval = wxToupper( keyval ) ;
+    }
+    bool handled = false ;
+
+    wxKeyEvent event(wxEVT_KEY_UP);
+    event.m_shiftDown = modifiers & shiftKey;
+    event.m_controlDown = modifiers & controlKey;
+    event.m_altDown = modifiers & optionKey;
+    event.m_metaDown = modifiers & cmdKey;
+    event.m_keyCode = keyval ;
+
+    event.m_x = wherex;
+    event.m_y = wherey;
+    event.m_timeStamp = when;
+    event.SetEventObject(focus);
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+
+    return handled ;

 }
 }

-*/
\ No newline at end of file