Added nbkbase.cpp

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 314d307ec8854dca1697dfc2d83d9f338d855af2..d03b4244fd6607c5c19e6235f412dab3ee07ed2a 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -353,14 +353,14 @@ bool wxApp::Initialize()
   SetEventMask( everyEvent ) ;
        UMAShowWatchCursor() ;
 
-#ifdef __UNIX__
-    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   AEHandleODoc ,
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
+    AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerUPP(AEHandleODoc) ,
                            (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , AEHandleOApp ,
+    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) ,
                            (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  AEHandlePDoc ,
+    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerUPP(AEHandlePDoc) ,
                            (long) wxTheApp , FALSE ) ;
-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , AEHandleQuit ,
+    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) ,
                            (long) wxTheApp , FALSE ) ;
 #else
        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,
@@ -900,11 +900,13 @@ bool wxYield()
 #endif
     EventRecord event ;
 
-       long sleepTime = 0 ; //::GetCaretTime();
+       long sleepTime = 1 ; //::GetCaretTime();
 
        while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, wxApp::s_macCursorRgn))
        {
        wxTheApp->MacHandleOneEvent( &event );
+           if ( event.what != kHighLevelEvent )
+                   SetRectRgn( wxApp::s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
        }
 
        wxMacProcessNotifierAndPendingEvents() ;
@@ -981,7 +983,7 @@ void wxApp::MacDoOneEvent()
                wxTheApp->ProcessIdle() ;
        }
        if ( event.what != kHighLevelEvent )
-               SetRectRgn( s_macCursorRgn , event.where.h - 1 , event.where.v - 1,  event.where.h + 1 , event.where.v + 1 ) ;
+               SetRectRgn( s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
 
        // repeaters
 
@@ -1194,6 +1196,8 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
                                        }
                                        else
                                        {
+                                               if ( win )
+                                                       win->MacMouseDown( ev , windowPart ) ;
                                                UMASelectWindow( window ) ;
                                        }
                                }