corrected GetDepth method and wrong disposal calls for pixmap

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 1a02ff2e587aeacf24f0a864ab6d37b20b158502..dcd512fa879335634cad43cbebabab8303096708 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -57,8 +57,11 @@
     #ifdef __DARWIN__
         #include <CoreServices/CoreServices.h>
     #else
-        #include <OpenTransport.h>
-        #include <OpenTptInternet.h>
+        #include <Sound.h>
+        #include <Threads.h>
+        #include <ToolUtils.h>
+        #include <DiskInit.h>
+        #include <Devices.h>
     #endif
 #endif
 
@@ -85,7 +88,7 @@ const short    kMacMinHeap = (29 * 1024) ;
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 
-RgnHandle            wxApp::s_macCursorRgn = NULL;
+WXHRGN            wxApp::s_macCursorRgn = NULL;
 wxWindow*            wxApp::s_captureWindow = NULL ;
 int                    wxApp::s_lastMouseDown = 0 ;
 long                     wxApp::sm_lastMessageTime = 0;
@@ -125,7 +128,7 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long re
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
-OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEODoc(const WXEVENTREF event , WXEVENTREF reply)
 {
     SysBeep(40) ;
     ProcessSerialNumber PSN ;
@@ -135,17 +138,17 @@ OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply)
     return noErr ;
 }
 
-OSErr wxApp::MacHandleAEPDoc(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF reply)
 {
     return noErr ;
 }
 
-OSErr wxApp::MacHandleAEOApp(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEOApp(const WXEVENTREF event , WXEVENTREF reply)
 {
     return noErr ;
 }
 
-OSErr wxApp::MacHandleAEQuit(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEQuit(const WXEVENTREF event , WXEVENTREF reply)
 {
     wxWindow* win = GetTopWindow() ;
     if ( win )
@@ -526,6 +529,7 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
+    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
@@ -563,6 +567,9 @@ void wxApp::CleanUp()
   if (wxWinMacWindowList)
     delete wxWinMacWindowList ;
 
+  if (wxWinMacControlList)
+    delete wxWinMacControlList ;
+
     delete wxPendingEvents;
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
@@ -603,7 +610,7 @@ void wxApp::CleanUp()
 
     UMACleanupToolbox() ;
     if (s_macCursorRgn)
-        ::DisposeRgn(s_macCursorRgn);
+        ::DisposeRgn((RgnHandle)s_macCursorRgn);
 
     #if 0
         TerminateAE() ;
@@ -958,11 +965,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     long sleepTime = 1 ; //::GetCaretTime();
 
-    while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, wxApp::s_macCursorRgn))
+    while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) 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 ) ;
+            SetRectRgn( (RgnHandle) wxApp::s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
     }
 
     wxMacProcessNotifierAndPendingEvents() ;
@@ -1021,7 +1028,7 @@ void wxApp::MacDoOneEvent()
 
     long sleepTime = 1; // GetCaretTime() / 4 ;
 
-    if (WaitNextEvent(everyEvent, &event, sleepTime, s_macCursorRgn))
+    if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn))
     {
         MacHandleOneEvent( &event );
     }
@@ -1035,7 +1042,7 @@ void wxApp::MacDoOneEvent()
         wxTheApp->ProcessIdle() ;
     }
     if ( event.what != kHighLevelEvent )
-        SetRectRgn( s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
+        SetRectRgn( (RgnHandle) s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
 
     // repeaters
 
@@ -1043,8 +1050,9 @@ void wxApp::MacDoOneEvent()
     wxMacProcessNotifierAndPendingEvents() ;
 }
 
-void wxApp::MacHandleOneEvent( EventRecord *ev )
+void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     m_macCurrentEvent = ev ;
 
     wxApp::sm_lastMessageTime = ev->when ;
@@ -1098,15 +1106,17 @@ void wxApp::MacHandleOneEvent( EventRecord *ev )
     wxMacProcessNotifierAndPendingEvents() ;
 }
 
-void wxApp::MacHandleHighLevelEvent( EventRecord *ev )
+void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     ::AEProcessAppleEvent( ev ) ;
 }
 
 bool s_macIsInModalLoop = false ;
 
-void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
+void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     wxToolTip::RemoveToolTips() ;
 
     WindowRef window;
@@ -1156,11 +1166,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
                     GrafPtr port ;
                     GetPort( &port ) ;
                     Point pt = { 0, 0 } ;
-                    #if TARGET_CARBON
-                    SetPort( GetWindowPort(window) ) ;
-                    #else
-                    SetPort( (window) ) ;
-                    #endif
+                    SetPortWindowPort(window) ;
                     LocalToGlobal( &pt ) ;
                     SetPort( port ) ;
                         win->SetSize( pt.h , pt.v , -1 ,
@@ -1226,11 +1232,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
                 {
                     GrafPtr port ;
                     GetPort( &port ) ;
-                    #if TARGET_CARBON
-                    SetPort( GetWindowPort(window) ) ;
-                    #else
-                    SetPort( (window) ) ;
-                    #endif
+                    SetPortWindowPort(window) ;
                     SetPort( port ) ;
                 }
                 if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
@@ -1263,8 +1265,9 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
     }
 }
 
-void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
+void wxApp::MacHandleMouseUpEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     WindowRef window;
 
     short windowPart = ::FindWindow(ev->where, &window);
@@ -1394,8 +1397,9 @@ long wxMacTranslateKey(unsigned char key, unsigned char code)
     return retval;
 }
 
-void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
+void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     wxToolTip::RemoveToolTips() ;
 
     UInt32 menuresult = UMAMenuEvent(ev) ;
@@ -1511,8 +1515,9 @@ void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
     }
 }
 
-void wxApp::MacHandleKeyUpEvent( EventRecord *ev )
+void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     wxToolTip::RemoveToolTips() ;
 
     UInt32 menuresult = UMAMenuEvent(ev) ;
@@ -1546,8 +1551,9 @@ void wxApp::MacHandleKeyUpEvent( EventRecord *ev )
     }
 }
 
-void wxApp::MacHandleActivateEvent( EventRecord *ev )
+void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     WindowRef window = (WindowRef) ev->message ;
     if ( window )
     {
@@ -1565,8 +1571,9 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
     }
 }
 
-void wxApp::MacHandleUpdateEvent( EventRecord *ev )
+void wxApp::MacHandleUpdateEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     WindowRef window = (WindowRef) ev->message ;
     wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;
     if ( win )
@@ -1584,8 +1591,9 @@ void wxApp::MacHandleUpdateEvent( EventRecord *ev )
     }
 }
 
-void wxApp::MacHandleDiskEvent( EventRecord *ev )
+void wxApp::MacHandleDiskEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     if ( HiWord( ev->message ) != noErr )
   {
  #if !TARGET_CARBON
@@ -1599,8 +1607,9 @@ void wxApp::MacHandleDiskEvent( EventRecord *ev )
     }
 }
 
-void wxApp::MacHandleOSEvent( EventRecord *ev )
+void wxApp::MacHandleOSEvent( WXEVENTREF evr )
 {
+    EventRecord* ev = (EventRecord*) evr ;
     switch( ( ev->message & osEvtMessageMask ) >> 24 )
     {
         case suspendResumeMessage :