X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..d76240bfe106c10ca9a775448f712311fc5e1443:/src/mac/carbon/app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index fd5a0009b0..3fd3606748 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -6,20 +6,25 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "app.h"
 #endif
 
+#include "wx/defs.h"
+
+#include "wx/window.h"
 #include "wx/frame.h"
+#include "wx/button.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/cursor.h"
+#include "wx/intl.h"
 #include "wx/icon.h"
 #include "wx/palette.h"
 #include "wx/dc.h"
@@ -28,386 +33,541 @@
 #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"
 
 #if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+#  include "wx/resource.h"
 #endif
 
 #include <string.h>
 
 // mac
 
-#if __option(profile)
-	#include <profiler.h>
-#endif	
+#ifndef __DARWIN__
+  #if __option(profile)
+    #include <profiler.h>
+  #endif
+#endif
 
 #include "apprsrc.h"
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
+#include "wx/mac/macnotfy.h"
+
+#ifdef __DARWIN__
+#  include <CoreServices/CoreServices.h>
+#  if defined(WXMAKINGDLL)
+#    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 *wxWinMacWindowList;
 extern wxList *wxWinMacControlList;
 
+// statics for implementation
+
+static bool s_inYield = FALSE;
+static bool s_inOnIdle = FALSE;
+
+#if TARGET_CARBON
+static bool s_inReceiveEvent = FALSE ;
+static EventTime sleepTime = kEventDurationNoWait ;
+#else
+static long sleepTime = 0 ;
+#endif
+
 wxApp *wxTheApp = NULL;
 
 #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
 
 
-const short	kMacMinHeap = (29 * 1024) ;
+const short    kMacMinHeap = (29 * 1024) ;
 // platform specific static variables
 
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 
-RgnHandle			wxApp::s_macCursorRgn = NULL;
-wxWindow*			wxApp::s_captureWindow = NULL ;
-int					wxApp::s_lastMouseDown = 0 ;
-long 					wxApp::sm_lastMessageTime = 0;
+WXHRGN    wxApp::s_macCursorRgn = NULL;
+wxWindow* wxApp::s_captureWindow = NULL ;
+int       wxApp::s_lastMouseDown = 0 ;
+long      wxApp::sm_lastMessageTime = 0;
+long      wxApp::s_lastModifiers = 0 ;
 
-#ifdef __WXMAC__
 
-bool	wxApp::s_macDefaultEncodingIsPC = true ;
-bool wxApp::s_macSupportPCMenuShortcuts = true ;
-long wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
-wxString wxApp::s_macHelpMenuTitleName = "&Help" ;
+bool      wxApp::s_macDefaultEncodingIsPC = true ;
+bool      wxApp::s_macSupportPCMenuShortcuts = true ;
+long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
+long      wxApp::s_macPreferencesMenuItemId = 0 ;
+long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
+wxString  wxApp::s_macHelpMenuTitleName = "&Help" ;
 
-OSErr AEHandleODoc( AppleEvent *event , AppleEvent *reply , long refcon )
-{
-	wxApp* app = (wxApp*) refcon ;
-	return wxTheApp->MacHandleAEODoc( event , reply) ;
-}
+//----------------------------------------------------------------------
+// Core Apple Event Support
+//----------------------------------------------------------------------
 
-OSErr AEHandleOApp( AppleEvent *event , AppleEvent *reply , long refcon )
-{
-	wxApp* app = (wxApp*) refcon ;
-	return wxTheApp->MacHandleAEOApp( event , reply ) ;
-}
+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 ) ;
 
-OSErr AEHandlePDoc( AppleEvent *event , AppleEvent *reply , long refcon )
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
 {
-	wxApp* app = (wxApp*) refcon ;
-	return wxTheApp->MacHandleAEPDoc( event , reply ) ;
+    return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 
-OSErr AEHandleQuit( AppleEvent *event , AppleEvent *reply , long refcon )
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
 {
-	wxApp* app = (wxApp*) refcon ;
-	return wxTheApp->MacHandleAEQuit( event , reply) ;
+    return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 
-OSErr wxApp::MacHandleAEODoc(AppleEvent *event , AppleEvent *reply) 
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
 {
-	ProcessSerialNumber PSN ;
-	PSN.highLongOfPSN = 0 ;
-	PSN.lowLongOfPSN = kCurrentProcess ;
-	SetFrontProcess( &PSN ) ;
-	return noErr ;
+    return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 
-OSErr wxApp::MacHandleAEPDoc(AppleEvent *event , AppleEvent *reply) 
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
 {
-	return noErr ;
+    return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
-OSErr wxApp::MacHandleAEOApp(AppleEvent *event , AppleEvent *reply) 
+// AEODoc Calls MacOpenFile on each of the files passed
+
+short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
 {
-	return noErr ;
+    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;
 }
 
-OSErr wxApp::MacHandleAEQuit(AppleEvent *event , AppleEvent *reply) 
+// AEPDoc Calls MacPrintFile on each of the files passed
+
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply))
 {
-	wxWindow* win = GetTopWindow() ;
-	if ( win )
-	{
-		win->Close(TRUE ) ;
-	}
-	else
-	{
-		ExitMainLoop() ;
-	}
-	return noErr ;
+    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;
 }
 
-char StringMac[] = 	"\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
-					"\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
-					"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf"
-					"\xb1\xb4\xb5\xb6\xbb\xbc\xbe\xbf"
-					"\xc0\xc1\xc2\xc4\xc7\xc8\xc9\xcb\xcc\xcd\xce\xcf"
-					"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xca\xdb" ;
-
-char StringANSI[] = "\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8"
-					"\xEA\xEB\xED\xEC\xEE\xEF\xF1\xF3\xF2\xF4\xF6\xF5\xFA\xF9\xFB\xFC"
-					"\x86\xBA\xA2\xA3\xA7\x95\xB6\xDF\xAE\xA9\x99\xB4\xA8\xC6\xD8"
-					"\xB1\xA5\xB5\xF0\xAA\xBA\xE6\xF8"
-					"\xBF\xA1\xAC\x83\xAB\xBB\x85\xC0\xC3\xD5\x8C\x9C"
-					"\x96\x97\x93\x94\x91\x92\xF7\xFF\xA0\x80" ;
+// AEOApp calls MacNewFile
 
-void wxMacConvertFromPC( const char *from , char *to , int len )
+short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
-	char *c ;
-	if ( from == to )
-	{
-		for( int i = 0 ; i < len ; ++ i )
-		{
-			c = strchr( StringANSI , *from ) ;
-			if ( c != NULL )
-			{
-				*to = StringMac[ c - StringANSI] ;
-			}	
-			++to ;
-			++from ;
-		}
-	}
-	else
-	{
-		for( int i = 0 ; i < len ; ++ i )
-		{
-			c = strchr( StringANSI , *from ) ;
-			if ( c != NULL )
-			{
-				*to = StringMac[ c - StringANSI] ;
-			}	
-			else
-			{
-				*to = *from ;
-			}
-			++to ;
-			++from ;
-		}
-	}
+    MacNewFile() ;
+    return noErr ;
 }
 
-void wxMacConvertToPC( const char *from , char *to , int len )
+// AEQuit attempts to quite the application 
+
+short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
-	char *c ;
-	if ( from == to )
-	{
-		for( int i = 0 ; i < len ; ++ i )
-		{
-			c = strchr( StringMac , *from ) ;
-			if ( c != NULL )
-			{
-				*to = StringANSI[ c - StringMac] ;
-			}	
-			++to ;
-			++from ;
-		}
-	}
-	else
-	{
-		for( int i = 0 ; i < len ; ++ i )
-		{
-			c = strchr( StringMac , *from ) ;
-			if ( c != NULL )
-			{
-				*to = StringANSI[ c - StringMac] ;
-			}	
-			else
-			{
-				*to = *from ;
-			}
-			++to ;
-			++from ;
-		}
-	}
+ /*   wxWindow* win = GetTopWindow() ;
+    if ( win )
+    {
+        win->Close(TRUE ) ;
+    }
+    else
+ */
+    {
+        ExitMainLoop() ;
+    }
+    return noErr ;
 }
 
-void wxMacConvertFromPC( char * p ) 
+//----------------------------------------------------------------------
+// Support Routines linking the Mac...File Calls to the Document Manager
+//----------------------------------------------------------------------
+
+void wxApp::MacOpenFile(const wxString & fileName )
 {
-	char *ptr = p ;
-	int len = strlen ( p ) ;
-	
-	wxMacConvertFromPC( ptr , ptr , len ) ;
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )
+        dm->CreateDocument(fileName , wxDOC_SILENT ) ;
 }
 
-void wxMacConvertFromPCForControls( char * p ) 
+void wxApp::MacPrintFile(const wxString & fileName )
 {
-	char *ptr = p ;
-	int len = strlen ( p ) ;
-	
-	wxMacConvertFromPC( ptr , ptr , len ) ;
-	for ( int i = 0 ; i < strlen ( ptr ) ; i++ )
-	{
-		if ( ptr[i] == '&' && ptr[i]+1 != ' ' )
-		{
-			memmove( &ptr[i] , &ptr[i+1] , strlen( &ptr[i+1] ) + 1) ;
-		}
-	}
+    wxDocManager* dm = wxDocManager::GetDocumentManager() ;
+    if ( dm )
+    {
+        wxDocument *doc = dm->CreateDocument(fileName , wxDOC_SILENT ) ;
+        if ( doc )
+        {
+            wxView* view = doc->GetFirstView() ;
+            if( view )
+            {
+                wxPrintout *printout = view->OnCreatePrintout();
+                if (printout)
+                {
+                    wxPrinter printer;
+                    printer.Print(view->GetFrame(), printout, TRUE);
+                    delete printout;
+                }
+            }
+            if (doc->Close())
+            {
+                doc->DeleteAllViews();
+                dm->RemoveDocument(doc) ;
+            }
+        }
+    }
 }
 
-void wxMacConvertFromPC( unsigned char *p ) 
+void wxApp::MacNewFile()
 {
-	char *ptr = (char*) p + 1 ;
-	int len = p[0] ;
-	
-	wxMacConvertFromPC( ptr , ptr , len ) ;
 }
 
-extern char *wxBuffer ;
+//----------------------------------------------------------------------
+// Carbon Event Handler
+//----------------------------------------------------------------------
 
-wxString wxMacMakeMacStringFromPC( const char * p ) 
-{
-	const char *ptr = p ;
-	int len = strlen ( p ) ;
-	char *buf = wxBuffer ;
-	
-	if ( len >= BUFSIZ + 512 )
-	{
-		buf = new char [len+1] ;
-	}
+#if TARGET_CARBON
 
-	wxMacConvertFromPC( ptr , buf , len ) ;
-	buf[len] = 0 ;
-	wxString result( buf ) ;
-	if ( buf != wxBuffer )
-		delete buf ;
-	return result ;
+	static const EventTypeSpec eventList[] = 
+	{
+	    { kEventClassCommand, kEventProcessCommand } ,
+	    { kEventClassCommand, kEventCommandUpdateStatus } ,
+	    
+	    { kEventClassApplication , kEventAppActivated } ,
+	    { kEventClassApplication , kEventAppDeactivated } ,
+	    // handling the quit event is not recommended by apple
+	    // rather using the quit apple event - which we do
+	    
+	    { kEventClassAppleEvent , kEventAppleEvent } ,
+	    
+    	{ kEventClassMouse , kEventMouseDown } ,
+	} ;
+
+static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+    UInt32 kind = GetEventKind( event ) ;
+    
+    return result ;
 }
 
+// due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop 
+// but have to use ReceiveNextEvent dealing with events manually, therefore we also have
+// deal with clicks in the menu bar explicitely
 
-void wxMacConvertToPC( char * p ) 
+static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
-	char *ptr = p ;
-	int len = strlen ( p ) ;
-	
-	wxMacConvertToPC( ptr , ptr , len ) ;
+    OSStatus result = eventNotHandledErr ;
+    
+    switch( GetEventKind(event) )
+    {
+    	case kEventMouseDown :
+    	{
+			Point point ;
+			WindowRef window ;
+		
+			GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
+				sizeof( Point ), NULL, &point );
+		    short windowPart = ::FindWindow(point, &window);
+
+			if ( windowPart == inMenuBar )
+			{
+				MenuSelect( point ) ;
+				result = noErr ;
+			}
+    	}
+    	break ;
+    }	
+
+    return result ;
 }
 
-void wxMacConvertToPC( unsigned char *p ) 
+static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
-	char *ptr = (char*) p + 1 ;
-	int len = p[0] ;
+    OSStatus result = eventNotHandledErr ;
+
+	HICommand command ;
 	
-	wxMacConvertToPC( ptr , ptr , len ) ;
+	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 ) ;
+
+    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 ;
 }
 
-wxString wxMacMakePCStringFromMac( const char * p ) 
+static pascal OSStatus ApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
-	const char *ptr = p ;
-	int len = strlen ( p ) ;
-	char *buf = wxBuffer ;
-	
-	if ( len >= BUFSIZ + 512 )
+    OSStatus result = eventNotHandledErr ;
+	switch ( GetEventKind( event ) )
 	{
-		buf = new char [len+1] ;
+		case kEventAppActivated :
+			{
+				wxTheApp->MacResume( true ) ;
+				result = noErr ;
+			}
+			break ;
+		case kEventAppDeactivated :
+			{
+				wxTheApp->MacSuspend( true ) ;
+				result = noErr ;
+			}
+			break ;
+		default :
+			break ;
 	}
+    return result ;
+}
 
-	wxMacConvertToPC( ptr , buf , len ) ;
-	buf[len] = 0 ;
-	
-	wxString result( buf ) ;
-	if ( buf != wxBuffer )
-		delete buf ;
-	return result ;
+pascal OSStatus wxAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+    switch( GetEventClass( event ) )
+    {
+    	case kEventClassCommand :
+    		result = CommandEventHandler( handler , event , data ) ;
+    		break ;
+    	case kEventClassApplication :
+    		result = ApplicationEventHandler( handler , event , data ) ;
+    		break ;
+    	case kEventClassMenu :
+    		result = MenuEventHandler( handler , event , data ) ;
+    		break ;
+    	case kEventClassMouse :
+    		result = MouseEventHandler( handler , event , data ) ;
+    		break ;
+    	case kEventClassAppleEvent :
+    		{
+    			EventRecord rec ;
+    			wxMacConvertEventToRecord( event , &rec ) ;
+    			result = AEProcessAppleEvent( &rec ) ;
+    		}
+    		break ;
+    	default :
+    		break ;
+    }
+
+    return result ;
 }
 
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxAppEventHandler )
+
+#endif
+
+#if defined(WXMAKINGDLL) && !defined(__DARWIN__)
+// we know it's there ;-)
+WXIMPORT char std::__throws_bad_alloc ;
 #endif
 
 bool wxApp::Initialize()
 {
-  int error = 0 ;
-	
-  // Mac-specific
-  
-  UMAInitToolbox( 4 ) ;
-	UMAShowWatchCursor() ;
-
-	AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerProc(AEHandleODoc) , (long) wxTheApp , FALSE ) ;
-	AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerProc(AEHandleOApp) , (long) wxTheApp , FALSE ) ;
-	AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerProc(AEHandlePDoc) , (long) wxTheApp , FALSE ) ;
-	AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerProc(AEHandleQuit) , (long) wxTheApp  , FALSE ) ;
-#if 0
-	GUSISetup(GUSIwithInternetSockets);
+    int error = 0 ;
+
+    // Mac-specific
+
+    UMAInitToolbox( 4 ) ;
+    SetEventMask( everyEvent ) ;
+    UMAShowWatchCursor() ;
+
+#if defined(WXMAKINGDLL) && defined(__DARWIN__)
+    // open shared library resources from here since we don't have
+    //   __wxinitialize in Mach-O shared libraries
+    wxStAppResource::OpenSharedLibraryResource(NULL);
 #endif
 
-	
-  // test the minimal configuration necessary
+#ifndef __DARWIN__
+    // test the minimal configuration necessary
 
-	long theSystem ;
-	long theMachine;
+#  if !TARGET_CARBON
+    long theSystem ;
+    long theMachine;
 
-	if (Gestalt(gestaltMachineType, &theMachine) != noErr)
-	{
-		error = kMacSTRWrongMachine;
-	}
-	else if (theMachine < gestaltMacPlus)
-	{
-		error = kMacSTRWrongMachine;
-	}
-	else if (Gestalt(gestaltSystemVersion, &theSystem) != noErr )
-	{
-		error = kMacSTROldSystem  ;
-	}	
-	else if ( theSystem < 0x0750 )
-	{
-		error = kMacSTROldSystem  ;
-	}
-	#if !TARGET_CARBON
-	else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
-	{
-		error = kMacSTRSmallSize;
-	}
-	#endif
-	/*
-	else
-	{
-		if ( !UMAHasAppearance() )
-		{
-			error = kMacSTRNoPre8Yet ;
-		}
-	}
-	*/
+    if (Gestalt(gestaltMachineType, &theMachine) != noErr)
+    {
+        error = kMacSTRWrongMachine;
+    }
+    else if (theMachine < gestaltMacPlus)
+    {
+        error = kMacSTRWrongMachine;
+    }
+    else if (Gestalt(gestaltSystemVersion, &theSystem) != noErr )
+    {
+        error = kMacSTROldSystem  ;
+    }
+    else if ( theSystem < 0x0860 )
+    {
+        error = kMacSTROldSystem  ;
+    }
+    else if ((long)GetApplLimit() - (long)ApplicationZone() < kMacMinHeap)
+    {
+        error = kMacSTRSmallSize;
+    }
+#  endif
+    /*
+    else
+    {
+        if ( !UMAHasAppearance() )
+        {
+            error = kMacSTRNoPre8Yet ;
+        }
+    }
+    */
+#endif
+
+    // if we encountered any problems so far, give the error code and exit immediately
 
-	// if we encountered any problems so far, give the error code and exit immediately
-  	
   if ( error )
-  {  	
-		short itemHit;
-		Str255 message;
-
-		GetIndString(message, 128, error);
-		UMAShowArrowCursor() ;
-		ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p");
-		itemHit = Alert(128, nil);
-	  return FALSE ;
-  }  
-
-#if __option(profile)
-	ProfilerInit( collectDetailed, bestTimeBase , 20000 , 30 ) ;
-#endif	
-
-  // now avoid exceptions thrown for new (bad_alloc)
-  
-  std::__throws_bad_alloc = FALSE ;
-  
-	s_macCursorRgn = ::NewRgn() ;
-
-#ifdef __WXMSW__
-  wxBuffer = new char[1500];
-#else
-  wxBuffer = new char[BUFSIZ + 512];
+  {
+        wxStAppResource resload ;
+        short itemHit;
+        Str255 message;
+
+        GetIndString(message, 128, error);
+        UMAShowArrowCursor() ;
+        ParamText("\pFatal Error", message, (ConstStr255Param)"\p", (ConstStr255Param)"\p");
+        itemHit = Alert(128, nil);
+      return FALSE ;
+  }
+
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ;
+#  endif
 #endif
 
-/* No longer used
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#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
 
-  streambuf* sBuf = new wxDebugStreamBuf;
-  ostream* oStr = new ostream(sBuf) ;
-  wxDebugContext::SetStream(oStr, sBuf);
 #endif
-*/
-  
-  wxClassInfo::InitializeClasses();
 
-  wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-  wxTheColourDatabase->Initialize();
+    s_macCursorRgn = ::NewRgn() ;
+
+    wxClassInfo::InitializeClasses();
+
+#if wxUSE_RESOURCES
+//    wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
+#endif
+
+#if wxUSE_THREADS
+    wxPendingEventsLocker = new wxCriticalSection;
+#endif
+
+    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
+    wxTheColourDatabase->Initialize();
+
+#ifdef __WXDEBUG__
+#if wxUSE_LOG
+    // flush the logged messages if any and install a 'safer' log target: the
+    // default one (wxLogGui) can't be used after the resources are freed just
+    // below and the user suppliedo ne might be even more unsafe (using any
+    // wxWindows GUI function is unsafe starting from now)
+    wxLog::DontCreateOnDemand();
+
+    // this will flush the old messages if any
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif // wxUSE_LOG
+#endif
+
+  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
+  wxWinMacControlList = new wxList(wxKEY_INTEGER);
 
   wxInitializeStockLists();
   wxInitializeStockObjects();
@@ -419,164 +579,562 @@ bool wxApp::Initialize()
   wxBitmap::InitStandardHandlers();
 
   wxModule::RegisterModules();
-  if (!wxModule::InitializeModules())
+  if (!wxModule::InitializeModules()) {
      return FALSE;
+  }
 
-  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-  wxWinMacControlList = new wxList(wxKEY_INTEGER);
+  wxMacCreateNotifierTable() ;
+
+  UMAShowArrowCursor() ;
 
-	UMAShowArrowCursor() ;
-  
   return TRUE;
 }
 
+bool wxApp::OnInitGui()
+{
+	if( !wxAppBase::OnInitGui() )
+		return false ;
+		
+#if TARGET_CARBON		
+	InstallStandardEventHandler( GetApplicationEventTarget() ) ;
+	
+	InstallApplicationEventHandler(
+		GetwxAppEventHandlerUPP(), 
+		GetEventTypeCount(eventList), eventList, wxTheApp, &((EventHandlerRef)wxTheApp->m_macEventHandler));    
+#endif
+		
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
+    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                           NewAEEventHandlerUPP(AEHandleODoc) ,
+                           0 , FALSE ) ;
+    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
+                           NewAEEventHandlerUPP(AEHandleOApp) ,
+                           0 , FALSE ) ;
+    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                           NewAEEventHandlerUPP(AEHandlePDoc) ,
+                           0 , FALSE ) ;
+    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
+                           NewAEEventHandlerUPP(AEHandleQuit) ,
+                           0 , FALSE ) ;
+#else
+    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                           NewAEEventHandlerProc(AEHandleODoc) ,
+                           0 , FALSE ) ;
+    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
+                           NewAEEventHandlerProc(AEHandleOApp) ,
+                           0 , FALSE ) ;
+    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                           NewAEEventHandlerProc(AEHandlePDoc) ,
+                           0 , FALSE ) ;
+    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
+                           NewAEEventHandlerProc(AEHandleQuit) ,
+                           0 , FALSE ) ;
+#endif
+
+	return TRUE ;
+}
+
 void wxApp::CleanUp()
 {
-  wxModule::CleanUpModules();
+    wxToolTip::RemoveToolTips() ;
+#if wxUSE_LOG
+    // flush the logged messages if any and install a 'safer' log target: the
+    // default one (wxLogGui) can't be used after the resources are freed just
+    // below and the user suppliedo ne might be even more unsafe (using any
+    // wxWindows GUI function is unsafe starting from now)
+    wxLog::DontCreateOnDemand();
 
-#if wxUSE_WX_RESOURCES
-  wxCleanUpResourceSystem();
-#endif
+    // this will flush the old messages if any
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif // wxUSE_LOG
 
-  wxDeleteStockObjects() ;
+    // One last chance for pending objects to be cleaned up
+    wxTheApp->DeletePendingObjects();
 
-  // Destroy all GDI lists, etc.
+    wxModule::CleanUpModules();
 
-  delete wxTheBrushList;
-  wxTheBrushList = NULL;
+#if wxUSE_WX_RESOURCES
+    wxCleanUpResourceSystem();
+#endif
 
-  delete wxThePenList;
-  wxThePenList = NULL;
+    wxDeleteStockObjects() ;
 
-  delete wxTheFontList;
-  wxTheFontList = NULL;
+    // Destroy all GDI lists, etc.
+    wxDeleteStockLists();
 
-  delete wxTheBitmapList;
-  wxTheBitmapList = NULL;
+    delete wxTheColourDatabase;
+    wxTheColourDatabase = NULL;
 
-  delete wxTheColourDatabase;
-  wxTheColourDatabase = NULL;
+    wxBitmap::CleanUpHandlers();
 
-  wxBitmap::CleanUpHandlers();
+    wxMacDestroyNotifierTable() ;
+    if (wxWinMacWindowList) {
+        delete wxWinMacWindowList ;
+    }
+    if (wxWinMacControlList) {
+        delete wxWinMacControlList ;
+    }
+    delete wxPendingEvents;
 
-  delete[] wxBuffer;
-  wxBuffer = NULL;
+#if wxUSE_THREADS
+    delete wxPendingEventsLocker;
+    // If we don't do the following, we get an apparent memory leak.
+    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+#endif
 
-  if (wxWinMacWindowList)
-    delete wxWinMacWindowList ;
+    wxClassInfo::CleanUpClasses();
 
-  wxClassInfo::CleanUpClasses();
+#ifndef __DARWIN__
+#  if __option(profile)
+    ProfilerDump( "\papp.prof" ) ;
+    ProfilerTerm() ;
+#  endif
+#endif
 
-#if __option(profile)
-	ProfilerDump( "\papp.prof" ) ;
-	ProfilerTerm() ;
-#endif	
+    delete wxTheApp;
+    wxTheApp = NULL;
 
-  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);
+    // At this point we want to check if there are any memory
+    // blocks that aren't part of the wxDebugContext itself,
+    // as a special case. Then when dumping we need to ignore
+    // wxDebugContext, too.
+    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+    {
+        wxLogDebug(wxT("There were memory leaks."));
+        wxDebugContext::Dump();
+        wxDebugContext::PrintStatistics();
+    }
+    //  wxDebugContext::SetStream(NULL, NULL);
 #endif
-  
-  // do it as the very last thing because everything else can log messages
-  wxLog::DontCreateOnDemand();
-  // do it as the very last thing because everything else can log messages
-  delete wxLog::SetActiveTarget(NULL);
 
-	::PrClose() ;
-	if (s_macCursorRgn)
-		::DisposeRgn(s_macCursorRgn);
-	#if 0
-		TerminateAE() ;
-	#endif
+#if wxUSE_LOG
+    // do it as the very last thing because everything else can log messages
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+
+#if defined(WXMAKINGDLL) && defined(__DARWIN__)
+    // close shared library resources from here since we don't have
+    //   __wxterminate in Mach-O shared libraries
+    wxStAppResource::CloseSharedLibraryResource();
+#endif
+
+    UMACleanupToolbox() ;
+    if (s_macCursorRgn) {
+        ::DisposeRgn((RgnHandle)s_macCursorRgn);
+    }
+
+    #if 0
+        TerminateAE() ;
+    #endif
 }
 
-int wxEntry( int argc, char *argv[] )
+//----------------------------------------------------------------------
+// wxEntry
+//----------------------------------------------------------------------
+
+// extern variable for shared library resource id
+// need to be able to find it with NSLookupAndBindSymbol
+short gSharedLibraryResource = kResFileNotOpened ;
+
+#if defined(WXMAKINGDLL) && defined(__DARWIN__)
+CFBundleRef gSharedLibraryBundle = NULL;
+#endif /* WXMAKINGDLL && __DARWIN__ */
+
+wxStAppResource::wxStAppResource()
 {
-  if (!wxApp::Initialize())
-    return FALSE;
-  if (!wxTheApp)
-  {
-    if (!wxApp::GetInitializerFunction())
+    m_currentRefNum = CurResFile() ;
+    if ( gSharedLibraryResource != kResFileNotOpened )
     {
-      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;
-  };
+        UseResFile( gSharedLibraryResource ) ;
+    }
+}
+
+wxStAppResource::~wxStAppResource()
+{
+    if ( m_currentRefNum != kResFileNotOpened )
+    {
+        UseResFile( m_currentRefNum ) ;
+    }
+}
+
+void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
+{
+    gSharedLibraryResource = kResFileNotOpened;
+
+#ifdef WXMAKINGDLL
+    if ( initBlock != NULL ) {
+        const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
+        FSSpec *fileSpec = NULL;
+
+        if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
+            fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
+        }
+        else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
+            fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
+        }
+
+        if (fileSpec != NULL) {
+            gSharedLibraryResource =  FSpOpenResFile(fileSpec, fsRdPerm);
+        }
+    }
+    else {
+#ifdef __DARWIN__
+        // Open the shared library resource file if it is not yet open
+        NSSymbol    theSymbol;
+        NSModule    theModule;
+        const char *theLibPath;
+
+        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
+        if (gSharedLibraryBundle != NULL) {
+            // wxWindows has been bundled into a framework
+            //   load the framework resources
+
+            gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
+        }
+        else {
+            // wxWindows is a simple dynamic shared library
+            //   load the resources from the data fork of a separate resource file
+            char  *theResPath;
+            char  *theName;
+            char  *theExt;
+            FSRef  theResRef;
+            OSErr  theErr = noErr;
+
+            // get the library path
+            theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
+            theModule = NSModuleForSymbol(theSymbol);
+            theLibPath = NSLibraryNameForModule(theModule);
+
+            wxLogDebug( wxT("wxMac library installation name is '%s'"),
+                        theLibPath );
+
+            // allocate copy to replace .dylib.* extension with .rsrc
+            theResPath = strdup(theLibPath);
+            if (theResPath != NULL) {
+                theName = strrchr(theResPath, '/');
+                if (theName == NULL) {
+                    // no directory elements in path
+                    theName = theResPath;
+                }
+                // find ".dylib" shared library extension
+                theExt = strstr(theName, ".dylib");
+                // overwrite extension with ".rsrc"
+                strcpy(theExt, ".rsrc");
+
+                wxLogDebug( wxT("wxMac resources file name is '%s'"),
+                            theResPath );
+
+                theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);
+                if (theErr != noErr) {
+                    // try in current directory (using name only)
+                    theErr = FSPathMakeRef((UInt8 *) theName, &theResRef, false);
+                }
+
+                // open the resource file
+                if (theErr == noErr) {
+                    theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm,
+                                                 &gSharedLibraryResource);
+                }
+                if (theErr != noErr) {
+                    wxLogDebug( wxT("unable to open wxMac resource file '%s'"),
+                                theResPath );
+                }
+
+                // free duplicated resource file path
+                free(theResPath);
+            }
+        }
+#endif /* __DARWIN__ */
+    }
+#endif /* WXMAKINGDLL */
+}
+
+void wxStAppResource::CloseSharedLibraryResource()
+{
+#ifdef WXMAKINGDLL
+    // Close the shared library resource file
+    if (gSharedLibraryResource != kResFileNotOpened) {
+#ifdef __DARWIN__
+        if (gSharedLibraryBundle != NULL) {
+            CFBundleCloseBundleResourceMap(gSharedLibraryBundle,
+                                           gSharedLibraryResource);
+            gSharedLibraryBundle = NULL;
+        }
+        else
+#endif /* __DARWIN__ */
+        {
+            CloseResFile(gSharedLibraryResource);
+        }
+        gSharedLibraryResource = kResFileNotOpened;
+    }
+#endif /* WXMAKINGDLL */
+}
+
+#if defined(WXMAKINGDLL) && !defined(__DARWIN__)
+
+// for shared libraries we have to manually get the correct resource
+// ref num upon initializing and releasing when terminating, therefore
+// the __wxinitialize and __wxterminate must be used
+
+extern "C" {
+    void __sinit(void);	/*	(generated by linker)	*/
+    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+    pascal void __terminate(void);
+}
+
+pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
+{
+    wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ;
+    return __initialize( theInitBlock ) ;
+}
+
+pascal void __wxterminate(void)
+{
+    wxStAppResource::CloseSharedLibraryResource() ;
+    __terminate() ;
+}
+
+#endif /* WXMAKINGDLL && !__DARWIN__ */
+
+int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] )
+{
+    return wxApp::Initialize();
+}
+
+int WXDLLEXPORT wxEntryInitGui()
+{
+    return wxTheApp->OnInitGui();
+}
+
+void WXDLLEXPORT wxEntryCleanup()
+{
+    wxApp::CleanUp();
+}
 
-#ifdef __WXMAC__
-  argc = 1 ; // currently we don't support files as parameters
+int wxEntry( int argc, char *argv[] , bool enterLoop )
+{
+#ifdef __MWERKS__
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+    // This seems to be necessary since there are 'rogue'
+    // objects present at this point (perhaps global objects?)
+    // Setting a checkpoint will ignore them as far as the
+    // memory checking facility is concerned.
+    // Of course you may argue that memory allocated in globals should be
+    // checked, but this is a reasonable compromise.
+    wxDebugContext::SetCheckpoint();
+#endif
 #endif
+    if (!wxEntryStart(argc, argv)) {
+        return 0;
+    }
+   // create the application object or ensure that one already exists
+    if (!wxTheApp)
+    {
+        // The app may have declared a global application object, but we recommend
+        // the IMPLEMENT_APP macro is used instead, which sets an initializer
+        // function for delayed, dynamic app object construction.
+        wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
+                     wxT("No initializer - use IMPLEMENT_APP macro.") );
+
+        wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) ();
+    }
+
+    wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
+
+#ifdef __DARWIN__
+    // 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) {
+        if (strncmp(argv[1], "-psn_", 5) == 0) {
+            // assume the argument is always the only one and remove it
+            --argc;
+        }
+    }
+#else
+    argc = 0 ; // currently we don't support files as parameters
+#endif
+    // we could try to get the open apple events here to adjust argc and argv better
 
-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
+    wxTheApp->argc = argc;
+    wxTheApp->argv = argv;
 
-  // GUI-specific initialization, such as creating an app context.
-  wxTheApp->OnInitGui();
-  
-  // we could try to get the open apple events here to adjust argc and argv better
-  
+    // GUI-specific initialization, such as creating an app context.
+    wxEntryInitGui();
 
-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
-  
-  if (!wxTheApp->OnInit()) return 0;
+    // Here frames insert themselves automatically
+    // into wxTopLevelWindows by getting created
+    // in OnInit().
 
-  int retValue = 0;
-  
-  if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+    int retValue = 0;
 
-  if (wxTheApp->GetTopWindow())
-  {
-    delete wxTheApp->GetTopWindow();
-    wxTheApp->SetTopWindow(NULL);
-  }
-  
-  wxTheApp->DeletePendingObjects();  
-  
-  wxTheApp->OnExit();
-  
-  wxApp::CleanUp();
+    if ( wxTheApp->OnInit() )
+    {
+        if ( enterLoop )
+        {
+            retValue = wxTheApp->OnRun();
+        }
+        else
+            // We want to initialize, but not run or exit immediately.
+            return 1;
+    }
+    //else: app initialization failed, so we skipped OnRun()
+
+    wxWindow *topWindow = wxTheApp->GetTopWindow();
+    if ( topWindow )
+    {
+        // Forcibly delete the window.
+        if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+        {
+            topWindow->Close(TRUE);
+            wxTheApp->DeletePendingObjects();
+        }
+        else
+        {
+            delete topWindow;
+            wxTheApp->SetTopWindow(NULL);
+        }
+    }
+
+    wxTheApp->OnExit();
+
+    wxEntryCleanup();
+
+    return retValue;
+}
+
+#if TARGET_CARBON
+
+bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
+{
+    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 ;
+        }
+    }
+
+    return converted ;
+}
 
-  return retValue;
-};
+/*
+pascal OSStatus wxMacApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    EventRecord rec ;
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassKeyboard :
+            if ( wxMacConvertEventToRecord( event , &rec ) )
+            {
+                wxTheApp->MacHandleModifierEvents( &rec ) ;
+                wxTheApp->MacHandleOneEvent( &rec ) ;
+                result = noErr ;
+            }
+            break ;
+        case kEventClassTextInput :
+            if ( wxMacConvertEventToRecord( event , &rec ) )
+            {
+                wxTheApp->MacHandleModifierEvents( &rec ) ;
+                wxTheApp->MacHandleOneEvent( &rec ) ;
+                result = noErr ;
+            }
+            break ;
+        default :
+            break ;
+    }
+    return result ;
+}
+*/
+#endif
 
 // Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 wxApp::wxApp()
 {
   m_topWindow = NULL;
   wxTheApp = this;
-  m_className = "";
-  m_wantDebugOutput = TRUE ;
-  m_appName = "";
+
+#if WXWIN_COMPATIBILITY_2_2
+  m_wantDebugOutput = TRUE;
+#endif
+
   argc = 0;
   argv = NULL;
 
   m_printMode = wxPRINT_WINDOWS;
-
-  m_exitOnFrameDelete = TRUE;
   m_auto3D = TRUE;
 }
 
@@ -590,14 +1148,14 @@ bool wxApp::Initialized()
 
 int wxApp::MainLoop()
 {
-  m_keepGoing = TRUE;
+	m_keepGoing = TRUE;
 
-  while (m_keepGoing)
-  {
-		MacDoOneEvent() ;
-  }
+	while (m_keepGoing)
+	{
+	    MacDoOneEvent() ;
+	}
 
-  return 0;
+	return 0;
 }
 
 // Returns TRUE if more time is needed.
@@ -612,32 +1170,42 @@ bool wxApp::ProcessIdle()
 
 void wxApp::ExitMainLoop()
 {
-  m_keepGoing = FALSE;
+#if TARGET_CARBON
+	if (s_inReceiveEvent)
+		QuitApplicationEventLoop() ;
+	else
+  		m_keepGoing = FALSE;
+#else
+  	m_keepGoing = FALSE;
+#endif
 }
 
 // Is a message/event pending?
 bool wxApp::Pending()
 {
-	EventRecord event ;
+#if TARGET_CARBON
+	return GetNumEventsInQueue( GetMainEventQueue() ) > 0 ;
+#else
+    EventRecord event ;
 
-  return EventAvail( everyEvent , &event ) ;
+  	return EventAvail( everyEvent , &event ) ;
+#endif
 }
 
 // Dispatch a message.
 void wxApp::Dispatch()
 {
-	MacDoOneEvent() ;
+    MacDoOneEvent() ;
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 {
-  static bool inOnIdle = FALSE;
+    // Avoid recursion (via ProcessEvent default case)
+    if ( s_inOnIdle )
+        return;
 
-  // Avoid recursion (via ProcessEvent default case)
-  if (inOnIdle)
-    return;
 
-  inOnIdle = TRUE;
+  s_inOnIdle = TRUE;
 
   // 'Garbage' collection of windows deleted with Close().
   DeletePendingObjects();
@@ -653,22 +1221,32 @@ void wxApp::OnIdle(wxIdleEvent& event)
   if (needMore)
     event.RequestMore(TRUE);
 
-  inOnIdle = FALSE;
+    // 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();
+
+  s_inOnIdle = FALSE;
+}
+
+void wxWakeUpIdle()
+{
+    wxMacWakeUp() ;
 }
 
 // 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))
+    wxNode* node = wxTopLevelWindows.First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        if (SendIdleEvents(win))
             needMore = TRUE;
 
-		node = node->Next();
-	}
+        node = node->Next();
+    }
     return needMore;
 }
 
@@ -677,22 +1255,22 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 {
     bool needMore = FALSE;
 
-	wxIdleEvent event;
-	event.SetEventObject(win);
-	win->ProcessEvent(event);
+    wxIdleEvent event;
+    event.SetEventObject(win);
+    win->ProcessEvent(event);
 
     if (event.MoreRequested())
         needMore = TRUE;
 
-	wxNode* node = win->GetChildren().First();
-	while (node)
-	{
-		wxWindow* win = (wxWindow*) node->Data();
-		if (SendIdleEvents(win))
+    wxNode* node = win->GetChildren().First();
+    while (node)
+    {
+        wxWindow* win = (wxWindow*) node->Data();
+        if (SendIdleEvents(win))
             needMore = TRUE;
 
-		node = node->Next();
-	}
+        node = node->Next();
+    }
     return needMore ;
 }
 
@@ -702,7 +1280,7 @@ void wxApp::DeletePendingObjects()
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();
-    
+
     delete obj;
 
     if (wxPendingDelete.Member(obj))
@@ -714,658 +1292,1104 @@ void wxApp::DeletePendingObjects()
   }
 }
 
-wxLog* wxApp::CreateLogTarget()
+void wxExit()
 {
-    return new wxLogGui;
+    wxLogError(_("Fatal error: exiting"));
+
+    wxApp::CleanUp();
+    ::ExitToShell() ;
 }
 
-wxWindow* wxApp::GetTopWindow() const
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
+    if (GetTopWindow())
+        GetTopWindow()->Close(TRUE);
 }
 
-void wxExit()
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.
+void wxApp::OnQueryEndSession(wxCloseEvent& event)
 {
-  wxApp::CleanUp();
-	::ExitToShell() ;
+    if (GetTopWindow())
+    {
+        if (!GetTopWindow()->Close(!event.CanVeto()))
+            event.Veto(TRUE);
+    }
 }
 
-// Yield to other processes
-bool wxYield()
+extern "C" void wxCYield() ;
+void wxCYield()
 {
-//	YieldToAnyThread() ;
-	SystemTask() ;
-  return TRUE;
+    wxYield() ;
 }
 
-// platform specifics 
+// Yield to other processes
 
-void wxApp::MacSuspend( bool convertClipboard )
+bool wxApp::Yield(bool onlyIfNeeded)
 {
-		s_lastMouseDown = 0 ;
-		if( convertClipboard ) 
+    if (s_inYield)
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
+
+        return FALSE;
+    }
+
+    s_inYield = TRUE;
+
+#if wxUSE_THREADS
+    YieldToAnyThread() ;
+#endif
+	// by definition yield should handle all non-processed events
+#if TARGET_CARBON
+	EventRef theEvent;
+
+	OSStatus status = noErr ;
+	do
+	{
+		s_inReceiveEvent = true ;
+		status = ReceiveNextEvent(0, NULL,kEventDurationNoWait,true,&theEvent) ;
+		s_inReceiveEvent = false ;
+		
+		if ( status == eventLoopTimedOutErr )
 		{
-			MacConvertPrivateToPublicScrap() ;
+			// make sure next time the event loop will trigger idle events
+	        sleepTime = kEventDurationNoWait ;
 		}
-		
-		UMAHideFloatingWindows() ;
+		else if ( status == eventLoopQuitErr )
+		{
+			m_keepGoing = false ;
+		}
+		else
+		{
+			MacHandleOneEvent( theEvent ) ;
+			ReleaseEvent(theEvent);
+		}
+	} while( status == noErr ) ;
+#else
+    EventRecord event ;
+
+	// having a larger value here leads to large performance slowdowns
+	// so we cannot give background apps more processor time here
+	// we do so however having a large sleep value in the main event loop
+    long sleepTime = 0 ; 
+
+    while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
+    {
+        MacHandleModifierEvents( &event ) ;
+        MacHandleOneEvent( &event );
+        if ( event.what != kHighLevelEvent )
+            SetRectRgn( (RgnHandle) wxApp::s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
+    }
+    MacHandleModifierEvents( &event ) ;
+#endif
+
+    wxMacProcessNotifierAndPendingEvents() ;
+    s_inYield = FALSE;
+
+    return TRUE;
+}
+
+// platform specifics
+
+void wxApp::MacSuspend( bool convertClipboard )
+{
+#if !TARGET_CARBON
+    // we have to deactive the top level windows manually
+
+    wxNode* node = wxTopLevelWindows.First();
+    while (node)
+    {
+        wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
+        win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
+
+        node = node->Next();
+    }
+
+    ::HideFloatingWindows() ;
+#endif
+    s_lastMouseDown = 0 ;
+
+    if( convertClipboard )
+    {
+        MacConvertPrivateToPublicScrap() ;
+    }
 }
 
+extern wxList wxModalDialogs;
+
 void wxApp::MacResume( bool convertClipboard )
 {
-		s_lastMouseDown = 0 ;
-		if( convertClipboard ) 
-		{
-			MacConvertPublicToPrivateScrap() ;
-		}
-		
-		UMAShowFloatingWindows() ;
+    s_lastMouseDown = 0 ;
+    if( convertClipboard )
+    {
+        MacConvertPublicToPrivateScrap() ;
+    }
+
+#if !TARGET_CARBON
+    ::ShowFloatingWindows() ;
+    // raise modal dialogs in case a non modal window was selected to activate the app
+
+    wxNode* node = wxModalDialogs.First();
+    while (node)
+    {
+        wxDialog* dialog = (wxDialog *) node->Data();
+        dialog->Raise();
+
+        node = node->Next();
+    }
+#endif
 }
 
 void wxApp::MacConvertPrivateToPublicScrap()
 {
-	::ZeroScrap();
-	::TEToScrap();
 }
 
 void wxApp::MacConvertPublicToPrivateScrap()
 {
-	::TEFromScrap() ;
 }
 
-void wxApp::MacDoOneEvent() 
+void wxApp::MacDoOneEvent()
 {
-  EventRecord event ;
-
-	long sleepTime = ::GetCaretTime();
+#if TARGET_CARBON
+	EventRef theEvent;
 
-	if (WaitNextEvent(everyEvent, &event,sleepTime, s_macCursorRgn))
+	s_inReceiveEvent = true ;
+	OSStatus status = ReceiveNextEvent(0, NULL,sleepTime,true,&theEvent) ;
+	s_inReceiveEvent = false ;
+	if ( status == eventLoopTimedOutErr )
 	{
-    MacHandleOneEvent( &event );
+        if ( wxTheApp->ProcessIdle() )
+        	sleepTime = kEventDurationNoWait ;
+        else
+        	sleepTime = kEventDurationForever ;
+	}
+	else if ( status == eventLoopQuitErr )
+	{
+		m_keepGoing = false ;
 	}
 	else
 	{
-		// idlers
-		WindowPtr window = UMAFrontWindow() ;
-		if ( window )
-			UMAIdleControls( window ) ;
-			
-		wxTheApp->ProcessIdle() ;
+		MacHandleOneEvent( theEvent ) ;
+		ReleaseEvent(theEvent);
 	}
-	if ( event.what != kHighLevelEvent )
-		SetRectRgn( s_macCursorRgn , event.where.h - 1 , event.where.v - 1,  event.where.h + 1 , event.where.v + 1 ) ;
+#else
+  	EventRecord event ;
 
-	// repeaters
+	EventMask eventMask = everyEvent ;
 
-#if 0
-	wxMacProcessSocketEvents() ;  
+    if (WaitNextEvent(eventMask, &event, sleepTime, (RgnHandle) s_macCursorRgn))
+    {
+        MacHandleModifierEvents( &event ) ;
+        MacHandleOneEvent( &event );
+    }
+    else
+    {
+        MacHandleModifierEvents( &event ) ;
+        // idlers
+        WindowPtr window = ::FrontWindow() ;
+        if ( window )
+            ::IdleControls( window ) ;
+
+        if ( wxTheApp->ProcessIdle() )
+        	sleepTime = 0 ;
+        else
+        	sleepTime = GetCaretTime() / 2 ;
+    }
+    if ( event.what != kHighLevelEvent )
+        SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
 #endif
+    // repeaters
+
+    DeletePendingObjects() ;
+    wxMacProcessNotifierAndPendingEvents() ;
 }
 
-void wxApp::MacHandleOneEvent( EventRecord *ev ) 
+void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 {
-	m_macCurrentEvent = ev ;
-	
-	wxApp::sm_lastMessageTime = ev->when ;
-	
-	switch (ev->what)
-	{
-		case mouseDown:
-			MacHandleMouseDownEvent( ev ) ;
-			if ( ev->modifiers & controlKey )
-				s_lastMouseDown = 2;
-			else
-				s_lastMouseDown = 1;
-			break;
-		case mouseUp:
-			if ( s_lastMouseDown == 2 )
-			{
-				ev->modifiers |= controlKey ;
-			}
-			else
-			{
-				ev->modifiers &= ~controlKey ;
-			}			
-			MacHandleMouseUpEvent( ev ) ;
-			s_lastMouseDown = 0;
-			break;
-		case activateEvt:
-			MacHandleActivateEvent( ev ) ;
-			break;
-		case updateEvt:
-			MacHandleUpdateEvent( ev ) ;
-			break;
-		case keyDown:
-		case autoKey:
-			MacHandleKeyDownEvent( ev ) ;
-			break;
-		case keyUp:
-			MacHandleKeyUpEvent( ev ) ;
-			break;
-		case diskEvt:
-			MacHandleDiskEvent( ev ) ;
-			break;
-		case osEvt:
-			MacHandleOSEvent( ev ) ;
-			break;
-		case kHighLevelEvent:
-			MacHandleHighLevelEvent( ev ) ;
-			break;
-		default:
-			break;
-	}
+#if TARGET_CARBON
+	EventTargetRef theTarget;
+	theTarget = GetEventDispatcherTarget();
+    m_macCurrentEvent = evr ;
+	SendEventToEventTarget ((EventRef) evr , theTarget);
+#else
+    EventRecord* ev = (EventRecord*) evr ;
+    m_macCurrentEvent = ev ;
+
+    wxApp::sm_lastMessageTime = ev->when ;
+
+    switch (ev->what)
+    {
+        case mouseDown:
+            MacHandleMouseDownEvent( ev ) ;
+            if ( ev->modifiers & controlKey )
+                s_lastMouseDown = 2;
+            else
+                s_lastMouseDown = 1;
+            break;
+        case mouseUp:
+            if ( s_lastMouseDown == 2 )
+            {
+                ev->modifiers |= controlKey ;
+            }
+            else
+            {
+                ev->modifiers &= ~controlKey ;
+            }
+            MacHandleMouseUpEvent( ev ) ;
+            s_lastMouseDown = 0;
+            break;
+        case activateEvt:
+            MacHandleActivateEvent( ev ) ;
+            break;
+        case updateEvt:
+            MacHandleUpdateEvent( ev ) ;
+            break;
+        case keyDown:
+        case autoKey:
+            MacHandleKeyDownEvent( ev ) ;
+            break;
+        case keyUp:
+            MacHandleKeyUpEvent( ev ) ;
+            break;
+        case diskEvt:
+            MacHandleDiskEvent( ev ) ;
+            break;
+        case osEvt:
+            MacHandleOSEvent( ev ) ;
+            break;
+        case kHighLevelEvent:
+            MacHandleHighLevelEvent( ev ) ;
+            break;
+        default:
+            break;
+    }
+#endif
+    wxMacProcessNotifierAndPendingEvents() ;
 }
 
-void wxApp::MacHandleHighLevelEvent( EventRecord *ev )
+#if !TARGET_CARBON
+bool s_macIsInModalLoop = false ;
+
+void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
 {
-	::AEProcessAppleEvent( ev ) ;
+    EventRecord* ev = (EventRecord*) evr ;
+    if ( ev->modifiers != s_lastModifiers && wxWindow::FindFocus() != NULL )
+    {
+        wxKeyEvent event(wxEVT_KEY_DOWN);
+
+        event.m_shiftDown = ev->modifiers & shiftKey;
+        event.m_controlDown = ev->modifiers & controlKey;
+        event.m_altDown = ev->modifiers & optionKey;
+        event.m_metaDown = ev->modifiers & cmdKey;
+
+        event.m_x = ev->where.h;
+        event.m_y = ev->where.v;
+        event.m_timeStamp = ev->when;
+        wxWindow* focus = wxWindow::FindFocus() ;
+        event.SetEventObject(focus);
+
+        if ( (ev->modifiers ^ s_lastModifiers ) & controlKey )
+        {
+            event.m_keyCode = WXK_CONTROL ;
+            event.SetEventType( ( ev->modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+            focus->GetEventHandler()->ProcessEvent( event ) ;
+        }
+        if ( (ev->modifiers ^ s_lastModifiers ) & shiftKey )
+        {
+            event.m_keyCode = WXK_SHIFT ;
+            event.SetEventType( ( ev->modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+            focus->GetEventHandler()->ProcessEvent( event ) ;
+        }
+        if ( (ev->modifiers ^ s_lastModifiers ) & optionKey )
+        {
+            event.m_keyCode = WXK_ALT ;
+            event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+            focus->GetEventHandler()->ProcessEvent( event ) ;
+        }
+        s_lastModifiers = ev->modifiers ;
+    }
 }
 
-bool s_macIsInModalLoop = false ;
+void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr )
+{
+    // we must avoid reentrancy problems when processing high level events eg printing
+    bool former = s_inYield ;
+    s_inYield = TRUE ;
+    EventRecord* ev = (EventRecord*) evr ;
+    ::AEProcessAppleEvent( ev ) ;
+    s_inYield = former ;
+}
 
-void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
+void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
 {
-	WindowRef window;
-	WindowRef frontWindow = UMAFrontNonFloatingWindow() ;
-	WindowAttributes frontWindowAttributes = NULL ;
-	if ( frontWindow )
-		UMAGetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
-	
-	short windowPart = ::FindWindow(ev->where, &window);
-	wxWindow* win = wxFindWinFromMacWindow( window ) ;
-	
-	switch (windowPart)
-	{
-		case inMenuBar :
-			if ( s_macIsInModalLoop ) 
-			{
-				SysBeep ( 30 ) ;
-			}
-			else
-			{
-				UInt32 menuresult = MenuSelect(ev->where) ;
-				MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) );
-				s_lastMouseDown = 0;
-			}
-			break ;
-		case inSysWindow :
-			SystemClick( ev , window ) ;
-			s_lastMouseDown = 0;
-			break ;
-		case inDrag :
-			if ( window != frontWindow && s_macIsInModalLoop && !(ev->modifiers & cmdKey ) )
-			{
-				SysBeep ( 30 ) ;
-			}
-			else
-			{
-				DragWindow(window, ev->where, &qd.screenBits.bounds);
-				if (win)
-				{
-					GrafPtr port ;
-					GetPort( &port ) ;
-					Point pt = { 0, 0 } ;
-					SetPort( window ) ;
-					SetOrigin( 0 , 0 ) ;
-					LocalToGlobal( &pt ) ;
-					SetPort( port ) ;
-						win->SetSize( pt.h , pt.v , -1 , 
-							-1 , wxSIZE_USE_EXISTING);
-				}
-				s_lastMouseDown = 0;
-			}
-			break ;
-		case inGoAway:
-			if (TrackGoAway(window, ev->where))
-			{
-				if ( win )
-					win->Close() ;
-			}
-			s_lastMouseDown = 0;
-			break;
-		case inGrow:
-				int growResult = GrowWindow(window , ev->where, &qd.screenBits.bounds);
-				if (growResult != 0)
-				{
-					int newWidth = LoWord(growResult);
-					int newHeight = HiWord(growResult);
-					int oldWidth, oldHeight;
-					
-					win->GetSize(&oldWidth, &oldHeight);
-					if (newWidth == 0) 
-						newWidth = oldWidth;
-					if (newHeight == 0) 
-						newHeight = oldHeight;
-					
-					if (win)
-						win->SetSize( -1, -1, newWidth, newHeight, wxSIZE_USE_EXISTING);
-				}
-				s_lastMouseDown = 0;
-			break;
-		case inZoomIn:
-		case inZoomOut:
-				if (TrackBox(window, ev->where, windowPart))
-				{
-					// TODO setup size event
-					ZoomWindow( window , windowPart , false ) ;
-					if (win)
-						win->SetSize( -1, -1, window->portRect.right-window->portRect.left , 
-							window->portRect.bottom-window->portRect.top, wxSIZE_USE_EXISTING);
-				}
-			s_lastMouseDown = 0;
-			break;
-		case inCollapseBox :
-				// TODO setup size event
-			s_lastMouseDown = 0;
-			break ;
+    EventRecord* ev = (EventRecord*) evr ;
+    wxToolTip::RemoveToolTips() ;
 
-		case inContent :
-				if ( window != frontWindow )
-				{
-					if ( s_macIsInModalLoop ) 
-					{
-						SysBeep ( 30 ) ;
-					}
-					else if ( UMAIsWindowFloating( window ) )
-					{
-						if ( win )
-							win->MacMouseDown( ev , windowPart ) ;
-					}
-					else
-					{
-						UMASelectWindow( window ) ;
-					}
-				}
-				else
-				{
-					if ( win )
-						win->MacMouseDown( ev , windowPart ) ;
-				}
-			break ;
-			
-		default:
-			break;
-	}
+    WindowRef window;
+    WindowRef frontWindow = ::FrontNonFloatingWindow() ;
+    WindowAttributes frontWindowAttributes = NULL ;
+    if ( frontWindow )
+        ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
+
+    short windowPart = ::FindWindow(ev->where, &window);
+    wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
+    if ( wxPendingDelete.Member(win) )
+        return ;
+
+    BitMap screenBits;
+    GetQDGlobalsScreenBits( &screenBits );
+
+    switch (windowPart)
+    {
+        case inMenuBar :
+            if ( s_macIsInModalLoop )
+            {
+                SysBeep ( 30 ) ;
+            }
+            else
+            {
+                UInt32 menuresult = MenuSelect(ev->where) ;
+               MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) );
+                s_lastMouseDown = 0;
+            }
+            break ;
+        case inSysWindow :
+            SystemClick( ev , window ) ;
+            s_lastMouseDown = 0;
+            break ;
+        case inDrag :
+            if ( window != frontWindow && s_macIsInModalLoop && !(ev->modifiers & cmdKey ) )
+            {
+                SysBeep ( 30 ) ;
+            }
+            else
+            {
+                DragWindow(window, ev->where, &screenBits.bounds);
+                if (win)
+                {
+                    GrafPtr port ;
+                    GetPort( &port ) ;
+                    Point pt = { 0, 0 } ;
+                    SetPortWindowPort(window) ;
+                    LocalToGlobal( &pt ) ;
+                    SetPort( port ) ;
+                        win->SetSize( pt.h , pt.v , -1 ,
+                            -1 , wxSIZE_USE_EXISTING);
+                }
+                s_lastMouseDown = 0;
+            }
+            break ;
+        case inGoAway:
+            if (TrackGoAway(window, ev->where))
+            {
+                if ( win )
+                    win->Close() ;
+            }
+            s_lastMouseDown = 0;
+            break;
+        case inGrow:
+          {
+                Rect newContentRect ;
+                Rect constraintRect ;
+                constraintRect.top = win->GetMinHeight() ;
+                if ( constraintRect.top == -1 )
+                    constraintRect.top  = 0 ;
+                constraintRect.left = win->GetMinWidth() ;
+                if ( constraintRect.left == -1 )
+                    constraintRect.left  = 0 ;
+                constraintRect.right = win->GetMaxWidth() ;
+                if ( constraintRect.right == -1 )
+                    constraintRect.right  = 32000 ;
+                constraintRect.bottom = win->GetMaxHeight() ;
+                if ( constraintRect.bottom == -1 )
+                    constraintRect.bottom = 32000 ;
+
+                Boolean growResult = ResizeWindow( window , ev->where ,
+                    &constraintRect , &newContentRect ) ;
+                if ( growResult )
+                {
+                    win->SetSize( newContentRect.left , newContentRect.top , 
+                        newContentRect.right - newContentRect.left , 
+                        newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
+                }
+                s_lastMouseDown = 0;
+          }
+            break;
+        case inZoomIn:
+        case inZoomOut:
+                if (TrackBox(window, ev->where, windowPart))
+                {
+                    // TODO setup size event
+                    ZoomWindow( window , windowPart , false ) ;
+                    if (win)
+                    {
+                        Rect tempRect ;
+                        GrafPtr port ;
+                        GetPort( &port ) ;
+                        Point pt = { 0, 0 } ;
+                        SetPortWindowPort(window) ;
+                        LocalToGlobal( &pt ) ;
+                        SetPort( port ) ;
+
+                        GetWindowPortBounds(window, &tempRect ) ;
+                        win->SetSize( pt.h , pt.v , tempRect.right-tempRect.left ,
+                            tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING);
+                    }
+                }
+            s_lastMouseDown = 0;
+            break;
+        case inCollapseBox :
+                // TODO setup size event
+            s_lastMouseDown = 0;
+            break ;
+
+        case inContent :
+                {
+                    GrafPtr port ;
+                    GetPort( &port ) ;
+                    SetPortWindowPort(window) ;
+                    SetPort( port ) ;
+                }
+                if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
+                {
+                    if ( s_macIsInModalLoop )
+                    {
+                        SysBeep ( 30 ) ;
+                    }
+                    else if ( UMAIsWindowFloating( window ) )
+                    {
+                        if ( win )
+                            win->MacMouseDown( ev , windowPart ) ;
+                    }
+                    else
+                    {
+                        if ( win )
+                            win->MacMouseDown( ev , windowPart ) ;
+                        ::SelectWindow( window ) ;
+                    }
+                }
+                else
+                {
+                    if ( win )
+                        win->MacMouseDown( ev , windowPart ) ;
+                }
+            break ;
+        default:
+            break;
+    }
 }
 
-void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
+void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
 {
-	WindowRef window;
-	
-	short windowPart = ::FindWindow(ev->where, &window);
-	
-	switch (windowPart)
+    EventRecord* ev = (EventRecord*) evr ;
+    WindowRef window;
+
+    short windowPart = inNoWindow ;
+	if ( wxTheApp->s_captureWindow )
 	{
-		case inMenuBar :
-			break ;
-		case inSysWindow :
-			break ;
-		default:
-			{
-				wxWindow* win = wxFindWinFromMacWindow( window ) ;
-				if ( win )
-					win->MacMouseUp( ev , windowPart ) ;
-			}
-			break;
+		window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
+		windowPart = inContent ;
 	}
+	else
+	{
+		windowPart = ::FindWindow(ev->where, &window) ;
+	}
+
+    switch (windowPart)
+    {
+        case inMenuBar :
+            break ;
+        case inSysWindow :
+            break ;
+        default:
+            {
+                wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
+                if ( win )
+                    win->MacMouseUp( ev , windowPart ) ;
+            }
+            break;
+    }
 }
 
-long wxMacTranslateKey(char key, char code)
-{ 
-    switch (key) 
+#endif 
+
+long wxMacTranslateKey(unsigned char key, unsigned char code) ;
+long wxMacTranslateKey(unsigned char key, unsigned char code)
+{
+    long retval = key ;
+    switch (key)
     {
-    	case 0x01 :
-		 		key = WXK_HOME;
-		  break;
-    	case 0x03 :
-		 		key = WXK_RETURN;
-		  break;
-    	case 0x04 :
-		 		key = WXK_END;
-		  break;
-    	case 0x05 :
-		 		key = WXK_HELP;
-		  break;
-    	case 0x08 :
-		 		key = WXK_BACK;
-		  break;
-    	case 0x09 :
-		 		key = WXK_TAB;
-		  break;
-    	case 0x0b :
-		 		key = WXK_PAGEUP;
-		  break;
-    	case 0x0c :
-		 		key = WXK_PAGEDOWN;
-		  break;
-    	case 0x0d :
-		 		key = WXK_RETURN;
-		  break;
-			case 0x10 :
-			{
-				switch( code )
-				{
-					case 0x7a :
-						key = WXK_F1 ;
-						break;
-					case 0x78 :
-						key = WXK_F2 ;
-						break;
-					case 0x63 :
-						key = WXK_F3 ;
-						break;
-					case 0x76 :
-						key = WXK_F4 ;
-						break;
-					case 0x60 :
-						key = WXK_F5 ;
-						break;
-					case 0x61 :
-						key = WXK_F6 ;
-						break;
-					case 0x62:
-						key = WXK_F7 ;
-						break;
-					case 0x64 :
-						key = WXK_F8 ;
-						break;
-					case 0x65 :
-						key = WXK_F9 ;
-						break;
-					case 0x6D :
-						key = WXK_F10 ;
-						break;
-					case 0x67 :
-						key = WXK_F11 ;
-						break;
-					case 0x6F :
-						key = WXK_F12 ;
-						break;
-					case 0x69 :
-						key = WXK_F13 ;
-						break;
-					case 0x6B :
-						key = WXK_F14 ;
-						break;
-					case 0x71 :
-						key = WXK_F15 ;
-						break;
-				}
-			}
-			break ;
-			case 0x1b :
-				key = WXK_DELETE ;
-			break ;
-			case 0x1c :
-				key = WXK_LEFT ;
-			break ;
-			case 0x1d :
-				key = WXK_RIGHT ;
-			break ;
-			case 0x1e :
-				key = WXK_UP ;
-			break ;
-			case 0x1f :
-				key = WXK_DOWN ;
-			break ;
-	 		default:
-			break ;
- 	} // end switch
-	
-	return 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::MacHandleKeyDownEvent( EventRecord *ev )
+#if !TARGET_CARBON
+void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
 {
-	UInt32 menuresult = UMAMenuEvent(ev) ;
-	if ( HiWord( menuresult ) )
-		MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ;
-	else
-	{
-		short keycode ;
-		short keychar ;
-		keychar = short(ev->message & charCodeMask);
-		keycode = short(ev->message & keyCodeMask) >> 8 ; 
-		
-		wxWindow* focus = wxWindow::FindFocus() ;
-		if ( focus )
-		{
-			wxKeyEvent event(wxEVT_CHAR);
-			event.m_shiftDown = ev->modifiers & shiftKey;
-			event.m_controlDown = ev->modifiers & controlKey;
-			event.m_altDown = ev->modifiers & optionKey;
-			event.m_metaDown = ev->modifiers & cmdKey;
-			event.m_keyCode = wxMacTranslateKey(keychar, keycode);
-			event.m_x = ev->where.h;
-			event.m_y = ev->where.v;
-			event.m_timeStamp = ev->when;
-			event.SetEventObject(focus);
-			focus->GetEventHandler()->ProcessEvent( event ) ;
-		}
-	}
+    EventRecord* ev = (EventRecord*) evr ;
+    wxToolTip::RemoveToolTips() ;
+
+    UInt32 menuresult = UMAMenuEvent(ev) ;
+    if ( HiWord( menuresult ) )
+    {
+        if ( !s_macIsInModalLoop )
+            MacHandleMenuSelect( HiWord( menuresult ) , LoWord( menuresult ) ) ;
+    }
+    else
+    {
+         wxWindow* focus = wxWindow::FindFocus() ;
+ 
+        if ( MacSendKeyDownEvent( focus , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
+        {
+            // has not been handled -> perform default
+            wxControl* control = wxDynamicCast( focus , wxControl ) ;
+            if ( control &&  control->GetMacControl() != NULL )
+            {
+                short keycode ;
+                short keychar ;
+                keychar = short(ev->message & charCodeMask);
+                keycode = short(ev->message & keyCodeMask) >> 8 ;
+                ::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
+            }
+        }
+    }
 }
 
-void wxApp::MacHandleKeyUpEvent( EventRecord *ev )
+void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
 {
-	// nothing to do
+    EventRecord* ev = (EventRecord*) evr ;
+    wxToolTip::RemoveToolTips() ;
+
+    UInt32 menuresult = UMAMenuEvent(ev) ;
+    if ( HiWord( menuresult ) )
+    {
+    }
+    else
+    {
+        MacSendKeyUpEvent( wxWindow::FindFocus() , ev->message , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
+    }
 }
 
-void wxApp::MacHandleActivateEvent( EventRecord *ev )
+#endif
+
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
 {
-	WindowRef window = (WindowRef) ev->message ;
-	if ( window )
+    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 )
 	{
-		bool activate = (ev->modifiers & activeFlag ) ;
-		WindowClass wclass ;
-		UMAGetWindowClass ( window , &wclass ) ;
-		if ( wclass == kFloatingWindowClass )
-		{
-			// if it is a floater we activate/deactivate the front non-floating window instead
-			window = UMAFrontNonFloatingWindow() ;
-		}
-		wxWindow* win = wxFindWinFromMacWindow( window ) ;
-		if ( win )
-			win->MacActivate( ev , activate ) ;
+		// 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
+         (!focus->HasFlag(wxTE_PROCESS_TAB)) &&
+#endif
+         (focus->GetParent()) &&
+         (focus->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
+    {
+        wxNavigationKeyEvent new_event;
+        new_event.SetEventObject( focus );
+        new_event.SetDirection( !event.ShiftDown() );
+        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+        new_event.SetWindowChange( event.ControlDown() );
+        new_event.SetCurrentFocus( focus );
+        handled = focus->GetEventHandler()->ProcessEvent( new_event );
+        if ( handled && new_event.GetSkipped() )
+            handled = false ;
+    }
+    // backdoor handler for default return and command escape
+    if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
+    {
+          // 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 ;
 }
 
-void wxApp::MacHandleUpdateEvent( EventRecord *ev )
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
 {
-	WindowRef window = (WindowRef) ev->message ;
-	wxWindow * win = wxFindWinFromMacWindow( window ) ;
-	if ( win )
+    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) ;
+
+	if ( keyval == keychar )
 	{
-		win->MacUpdate( ev ) ;
+		keyval = wxToupper( keyval ) ;	
 	}
+    bool handled = false ;
+
+    wxKeyEvent event(wxEVT_KEY_UP);
+    event.m_shiftDown = modifiers & shiftKey;
+    event.m_controlDown = modifiers & controlKey;
+    event.m_altDown = modifiers & optionKey;
+    event.m_metaDown = modifiers & cmdKey;
+    event.m_keyCode = keyval ;
+
+    event.m_x = wherex;
+    event.m_y = wherey;
+    event.m_timeStamp = when;
+    event.SetEventObject(focus);
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+
+    return handled ;
+}
+
+#if !TARGET_CARBON
+void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
+{
+    EventRecord* ev = (EventRecord*) evr ;
+    WindowRef window = (WindowRef) ev->message ;
+    if ( window )
+    {
+        bool activate = (ev->modifiers & activeFlag ) ;
+        WindowClass wclass ;
+        ::GetWindowClass ( window , &wclass ) ;
+        if ( wclass == kFloatingWindowClass )
+        {
+            // if it is a floater we activate/deactivate the front non-floating window instead
+            window = ::FrontNonFloatingWindow() ;
+        }
+        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
+        if ( win )
+            win->MacActivate( ev->when , activate ) ;
+    }
+}
+
+void wxApp::MacHandleUpdateEvent( WXEVENTREF evr )
+{
+    EventRecord* ev = (EventRecord*) evr ;
+    WindowRef window = (WindowRef) ev->message ;
+    wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;
+    if ( win )
+    {
+        if ( !wxPendingDelete.Member(win) )
+            win->MacUpdate( ev->when ) ;
+    }
+    else
+    {
+        // since there is no way of telling this foreign window to update itself
+        // we have to invalidate the update region otherwise we keep getting the same
+        // event over and over again
+        BeginUpdate( window ) ;
+        EndUpdate( window ) ;
+    }
 }
 
-void wxApp::MacHandleDiskEvent( EventRecord *ev )
+void wxApp::MacHandleDiskEvent( WXEVENTREF evr )
 {
-	if ( HiWord( ev->message ) != noErr )
+    EventRecord* ev = (EventRecord*) evr ;
+    if ( HiWord( ev->message ) != noErr )
   {
-		OSErr err ;
-		Point point ;
- 		SetPt( &point , 100 , 100 ) ;
- 		
-  	err = DIBadMount( point , ev->message ) ;
-		wxASSERT( err == noErr ) ;
-	}
+        OSErr err ;
+        Point point ;
+         SetPt( &point , 100 , 100 ) ;
+
+          err = DIBadMount( point , ev->message ) ;
+        wxASSERT( err == noErr ) ;
+    }
 }
 
-void wxApp::MacHandleOSEvent( EventRecord *ev )
+void wxApp::MacHandleOSEvent( WXEVENTREF evr )
 {
-	switch( ( ev->message & osEvtMessageMask ) >> 24 )
-	{
-		case suspendResumeMessage :
-			{
-				bool isResuming = ev->message & resumeFlag ;
-				bool convertClipboard = ev->message & convertClipboardFlag ;
-				bool doesActivate = UMAGetProcessModeDoesActivateOnFGSwitch() ;
-				if ( isResuming )
+    EventRecord* ev = (EventRecord*) evr ;
+    switch( ( ev->message & osEvtMessageMask ) >> 24 )
+    {
+        case suspendResumeMessage :
+            {
+                bool isResuming = ev->message & resumeFlag ;
+                bool convertClipboard = ev->message & convertClipboardFlag ;
+
+                bool doesActivate = UMAGetProcessModeDoesActivateOnFGSwitch() ;
+                if ( isResuming )
+                {
+                    WindowRef oldFrontWindow = NULL ;
+                    WindowRef newFrontWindow = NULL ;
+
+                    // in case we don't take care of activating ourselves, we have to synchronize
+                    // our idea of the active window with the process manager's - which it already activated
+
+                    if ( !doesActivate )
+                        oldFrontWindow = ::FrontNonFloatingWindow() ;
+
+                    MacResume( convertClipboard ) ;
+
+                    newFrontWindow = ::FrontNonFloatingWindow() ;
+
+                    if ( oldFrontWindow )
+                    {
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ;
+                        if ( win )
+                            win->MacActivate( ev->when , false ) ;
+                    }
+                    if ( newFrontWindow )
+                    {
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ;
+                        if ( win )
+                            win->MacActivate( ev->when , true ) ;
+                    }
+                }
+                else
+                {
+                    MacSuspend( convertClipboard ) ;
+                }
+            }
+            break ;
+        case mouseMovedMessage :
+            {
+                WindowRef window;
+
+                wxWindow* currentMouseWindow = NULL ;
+
+				if (s_captureWindow )
 				{
-					WindowRef oldFrontWindow = NULL ;
-					WindowRef newFrontWindow = NULL ;
-					
-					// in case we don't take care of activating ourselves, we have to synchronize
-					// our idea of the active window with the process manager's - which it already activated
-					
-					if ( !doesActivate )
-						oldFrontWindow = UMAFrontNonFloatingWindow() ;
-					
-					MacResume( convertClipboard ) ;
-					
-					newFrontWindow = UMAFrontNonFloatingWindow() ;
-					
-					if ( oldFrontWindow )
-					{
-						wxWindow* win = wxFindWinFromMacWindow( oldFrontWindow ) ;
-						if ( win )
-							win->MacActivate( ev , false ) ;
-					}
-					if ( newFrontWindow )
-					{
-						wxWindow* win = wxFindWinFromMacWindow( newFrontWindow ) ;
-						if ( win )
-							win->MacActivate( ev , true ) ;
-					}
+					currentMouseWindow = s_captureWindow ;
 				}
 				else
-				{			
-					MacSuspend( convertClipboard ) ;
-				
-					// in case this suspending did close an active window, another one might 
-					// have surfaced -> lets deactivate that one
-					
-					WindowRef newActiveWindow = UMAGetActiveNonFloatingWindow() ;
-					if ( newActiveWindow )
-					{
-						wxWindow* win = wxFindWinFromMacWindow( newActiveWindow ) ;
-						if ( win )
-							win->MacActivate( ev , false ) ;
-					}
-				}
-			}
-			break ;
-		case mouseMovedMessage :
-			{
-				WindowRef window;
-				
-				wxWindow* currentMouseWindow = NULL ;
-				
-				MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) , &currentMouseWindow ) ; 
-				
-				if ( currentMouseWindow != wxWindow::s_lastMouseWindow )
 				{
-					wxMouseEvent event ;
-					
-					bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
-					bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
-					
-					event.m_leftDown = isDown && !controlDown;
-					event.m_middleDown = FALSE;
-					event.m_rightDown = isDown && controlDown;				
-					event.m_shiftDown = ev->modifiers & shiftKey;
-					event.m_controlDown = ev->modifiers & controlKey;
-					event.m_altDown = ev->modifiers & optionKey;
-					event.m_metaDown = ev->modifiers & cmdKey;				
-					event.m_x = ev->where.h;
-					event.m_y = ev->where.v;					
-					event.m_timeStamp = ev->when;
-					event.SetEventObject(this);
-					
-					if ( wxWindow::s_lastMouseWindow )
-					{
-						wxMouseEvent eventleave(event ) ;
-						eventleave.SetEventType( wxEVT_LEAVE_WINDOW ) ;
-						wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
-					}
-					if ( currentMouseWindow )
-					{
-						wxMouseEvent evententer(event ) ;
-						evententer.SetEventType( wxEVT_ENTER_WINDOW ) ;
-						currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
-					}
-					wxWindow::s_lastMouseWindow = currentMouseWindow ;
+			    	wxWindow::MacGetWindowFromPoint( wxPoint( ev->where.h , ev->where.v ) ,
+			                                                 &currentMouseWindow ) ;
+			    }
+
+                if ( currentMouseWindow != wxWindow::s_lastMouseWindow )
+                {
+                    wxMouseEvent event ;
+
+                    bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
+                    bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
+
+                    event.m_leftDown = isDown && !controlDown;
+                    event.m_middleDown = FALSE;
+                    event.m_rightDown = isDown && controlDown;
+                    event.m_shiftDown = ev->modifiers & shiftKey;
+                    event.m_controlDown = ev->modifiers & controlKey;
+                    event.m_altDown = ev->modifiers & optionKey;
+                    event.m_metaDown = ev->modifiers & cmdKey;
+                    event.m_x = ev->where.h;
+                    event.m_y = ev->where.v;
+                    event.m_timeStamp = ev->when;
+                    event.SetEventObject(this);
+
+                    if ( wxWindow::s_lastMouseWindow )
+                    {
+                        wxMouseEvent eventleave(event);
+                        eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
+                        wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
+                        eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;
+
+                        wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
+                    }
+                    if ( currentMouseWindow )
+                    {
+                        wxMouseEvent evententer(event);
+                        evententer.SetEventType( wxEVT_ENTER_WINDOW );
+                        currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );
+                        evententer.SetEventObject( currentMouseWindow ) ;
+                        currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
+                    }
+                    wxWindow::s_lastMouseWindow = currentMouseWindow ;
+                }
+
+                short windowPart = inNoWindow ;
+
+				if ( s_captureWindow )
+				{
+					window = (WindowRef) s_captureWindow->MacGetRootWindow() ;
+					windowPart = inContent ;
 				}
-				
-				short windowPart = ::FindWindow(ev->where, &window);
-				
-				switch (windowPart)
+				else
 				{
-					case inMenuBar :
-						break ;
-					case inSysWindow :
-						break ;
-					default:
-						{							
-							if ( s_lastMouseDown == 0 )
-								ev->modifiers |= btnState ;
-
-							wxWindow* win = wxFindWinFromMacWindow( window ) ;
-							if ( win )
-								win->MacMouseMoved( ev , windowPart ) ;
-						}
-						break;
+					windowPart = ::FindWindow(ev->where, &window); 
 				}
-			}
-			break ;
-			
-	}
+				
+                switch (windowPart)
+                {
+                    case inContent :
+                        {
+                            wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;
+                            if ( win )
+                                win->MacMouseMoved( ev , windowPart ) ;
+                            else
+                            {
+                                if ( wxIsBusy() )
+                                {
+                                }
+                                else
+                                    UMAShowArrowCursor();
+                             }
+                        }
+                        break;
+                    default :
+                        {
+                            if ( wxIsBusy() )
+                            {
+                            }
+                            else
+                                UMAShowArrowCursor();
+                        }
+                        break ;
+                }
+            }
+            break ;
+
+    }
 }
+#endif
 
-void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum )
+void wxApp::MacHandleMenuCommand( wxUint32 id )
 {
-	if (macMenuId == 0) 					
-		 return; // no menu item selected
-		 
-	if (macMenuId == kwxMacAppleMenuId && macMenuItemNum > 1) 
-	{
-		#if ! TARGET_CARBON
-		Str255		deskAccessoryName ;
-		GrafPtr		savedPort ;
+        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+        wxMenu* menu = NULL ;
+        wxMenuItem* item = NULL ;
+        if ( mbar )
+        {
+            item = mbar->FindItem( id , &menu ) ;
+        }
+        wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") );
+            
+        if (item->IsCheckable())
+        {
+            item->Check( !item->IsChecked() ) ;
+        }
 		
-		GetMenuItemText(GetMenuHandle(kwxMacAppleMenuId), macMenuItemNum, deskAccessoryName);
-		GetPort(&savedPort);
-		OpenDeskAcc(deskAccessoryName);
-		SetPort(savedPort);
-		#endif
-	}
-	else
-	{
-		wxWindow* frontwindow = wxFindWinFromMacWindow( ::FrontWindow() )  ;
-		if ( frontwindow && wxMenuBar::s_macInstalledMenuBar )
-			wxMenuBar::s_macInstalledMenuBar->MacMenuSelect( frontwindow->GetEventHandler() , 0 , macMenuId , macMenuItemNum ) ;
-	}		
-	HiliteMenu(0);								
+		menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
 }
 
-/*
-long wxApp::MacTranslateKey(char key, int mods)
-{
-}
-
-void wxApp::MacAdjustCursor()
+#if !TARGET_CARBON
+void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum )
 {
-}
+    if (macMenuId == 0)
+         return; // no menu item selected
 
-*/
-/*
-void
-wxApp::macAdjustCursor()
-{
-  if (ev->what != kHighLevelEvent)
-  {
-	wxWindow* theMacWxFrame = wxFrame::MacFindFrameOrDialog(::FrontWindow());
-	if (theMacWxFrame)
-	{
-  	  if (!theMacWxFrame->MacAdjustCursor(ev->where))
-		::SetCursor(&(qd.arrow));
-  	}
-  }
+    if (macMenuId == kwxMacAppleMenuId && macMenuItemNum > 1)
+    {
+        #if ! TARGET_CARBON
+        Str255        deskAccessoryName ;
+        GrafPtr        savedPort ;
+
+        GetMenuItemText(GetMenuHandle(kwxMacAppleMenuId), macMenuItemNum, deskAccessoryName);
+        GetPort(&savedPort);
+        OpenDeskAcc(deskAccessoryName);
+        SetPort(savedPort);
+        #endif
+    }
+    else
+    {
+        MenuCommand id ;
+        GetMenuItemCommandID( GetMenuHandle(macMenuId) , macMenuItemNum , &id ) ;
+		MacHandleMenuCommand( id ) ;
+    }
+    HiliteMenu(0);
 }
-*/
\ No newline at end of file
+#endif
\ No newline at end of file