since DoScreenToClient and ClientToScreen in toplvlcmn are implemented by calling...

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index b27475c3f1b1006ba86adc35a53e8c03102551e7..dcd512fa879335634cad43cbebabab8303096708 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -15,6 +15,7 @@
 
 #include "wx/window.h"
 #include "wx/frame.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/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"


@@ -56,8 +57,11 @@
     #ifdef __DARWIN__
         #include <CoreServices/CoreServices.h>
     #else
     #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
 
     #endif
 #endif
 


@@ -84,7 +88,7 @@ const short    kMacMinHeap = (29 * 1024) ;
 const short kwxMacMenuBarResource = 1 ;
 const short kwxMacAppleMenuId = 1 ;
 
 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;
 wxWindow*            wxApp::s_captureWindow = NULL ;
 int                    wxApp::s_lastMouseDown = 0 ;
 long                     wxApp::sm_lastMessageTime = 0;


@@ -124,7 +128,7 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long re
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
     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 ;
 {
     SysBeep(40) ;
     ProcessSerialNumber PSN ;


@@ -134,17 +138,17 @@ OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply)
     return noErr ;
 }
 
     return noErr ;
 }
 

-OSErr wxApp::MacHandleAEPDoc(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF reply)

 {
     return noErr ;
 }
 
 {
     return noErr ;
 }
 

-OSErr wxApp::MacHandleAEOApp(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEOApp(const WXEVENTREF event , WXEVENTREF reply)

 {
     return noErr ;
 }
 
 {
     return noErr ;
 }
 

-OSErr wxApp::MacHandleAEQuit(const AppleEvent *event , AppleEvent *reply)
+short wxApp::MacHandleAEQuit(const WXEVENTREF event , WXEVENTREF reply)

 {
     wxWindow* win = GetTopWindow() ;
     if ( win )
 {
     wxWindow* win = GetTopWindow() ;
     if ( win )


@@ -525,6 +529,7 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
 
 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
 #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


@@ -562,6 +567,9 @@ void wxApp::CleanUp()
   if (wxWinMacWindowList)
     delete wxWinMacWindowList ;
 
   if (wxWinMacWindowList)
     delete wxWinMacWindowList ;
 

+  if (wxWinMacControlList)
+    delete wxWinMacControlList ;
+

     delete wxPendingEvents;
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
     delete wxPendingEvents;
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;


@@ -602,7 +610,7 @@ void wxApp::CleanUp()
 
     UMACleanupToolbox() ;
     if (s_macCursorRgn)
 
     UMACleanupToolbox() ;
     if (s_macCursorRgn)

-        ::DisposeRgn(s_macCursorRgn);
+        ::DisposeRgn((RgnHandle)s_macCursorRgn);

 
     #if 0
         TerminateAE() ;
 
     #if 0
         TerminateAE() ;


@@ -957,11 +965,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     long sleepTime = 1 ; //::GetCaretTime();
 
 
     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 )
     {
         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() ;
     }
 
     wxMacProcessNotifierAndPendingEvents() ;


@@ -975,19 +983,24 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 void wxApp::MacSuspend( bool convertClipboard )
 {
 
 void wxApp::MacSuspend( bool convertClipboard )
 {

-    // we have to deactive the window manually
+    // we have to deactive the top level windows manually

 
 

-    wxWindow* window = GetTopWindow() ;
-    if ( window )
-        window->MacActivate( MacGetCurrentEvent() , false ) ;
+    wxNode* node = wxTopLevelWindows.First();
+    while (node)
+    {
+        wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
+        win->MacActivate( MacGetCurrentEvent() , false ) ;

 
 

-        s_lastMouseDown = 0 ;
-        if( convertClipboard )
-        {
-            MacConvertPrivateToPublicScrap() ;
-        }
+        node = node->Next();
+    }
+
+     s_lastMouseDown = 0 ;
+     if( convertClipboard )
+     {
+         MacConvertPrivateToPublicScrap() ;
+     }

 
 

-        ::HideFloatingWindows() ;
+     ::HideFloatingWindows() ;

 }
 
 void wxApp::MacResume( bool convertClipboard )
 }
 
 void wxApp::MacResume( bool convertClipboard )


@@ -1015,7 +1028,7 @@ void wxApp::MacDoOneEvent()
 
     long sleepTime = 1; // GetCaretTime() / 4 ;
 
 
     long sleepTime = 1; // GetCaretTime() / 4 ;
 

-    if (WaitNextEvent(everyEvent, &event, sleepTime, s_macCursorRgn))
+    if (WaitNextEvent(everyEvent, &event, sleepTime, (RgnHandle) s_macCursorRgn))

     {
         MacHandleOneEvent( &event );
     }
     {
         MacHandleOneEvent( &event );
     }


@@ -1029,7 +1042,7 @@ void wxApp::MacDoOneEvent()
         wxTheApp->ProcessIdle() ;
     }
     if ( event.what != kHighLevelEvent )
         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
 
 
     // repeaters
 


@@ -1037,8 +1050,9 @@ void wxApp::MacDoOneEvent()
     wxMacProcessNotifierAndPendingEvents() ;
 }
 
     wxMacProcessNotifierAndPendingEvents() ;
 }
 

-void wxApp::MacHandleOneEvent( EventRecord *ev )
+void wxApp::MacHandleOneEvent( WXEVENTREF evr )

 {
 {

+    EventRecord* ev = (EventRecord*) evr ;

     m_macCurrentEvent = ev ;
 
     wxApp::sm_lastMessageTime = ev->when ;
     m_macCurrentEvent = ev ;
 
     wxApp::sm_lastMessageTime = ev->when ;


@@ -1092,15 +1106,17 @@ void wxApp::MacHandleOneEvent( EventRecord *ev )
     wxMacProcessNotifierAndPendingEvents() ;
 }
 
     wxMacProcessNotifierAndPendingEvents() ;
 }
 

-void wxApp::MacHandleHighLevelEvent( EventRecord *ev )
+void wxApp::MacHandleHighLevelEvent( WXEVENTREF evr )

 {
 {

+    EventRecord* ev = (EventRecord*) evr ;

     ::AEProcessAppleEvent( ev ) ;
 }
 
 bool s_macIsInModalLoop = false ;
 
     ::AEProcessAppleEvent( ev ) ;
 }
 
 bool s_macIsInModalLoop = false ;
 

-void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
+void wxApp::MacHandleMouseDownEvent( WXEVENTREF evr )

 {
 {

+    EventRecord* ev = (EventRecord*) evr ;

     wxToolTip::RemoveToolTips() ;
 
     WindowRef window;
     wxToolTip::RemoveToolTips() ;
 
     WindowRef window;


@@ -1110,7 +1126,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
         ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);
         ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);

-    wxWindow* win = wxFindWinFromMacWindow( window ) ;
+    wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

     if ( wxPendingDelete.Member(win) )
         return ;
 
     if ( wxPendingDelete.Member(win) )
         return ;
 


@@ -1150,12 +1166,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
                     GrafPtr port ;
                     GetPort( &port ) ;
                     Point pt = { 0, 0 } ;
                     GrafPtr port ;
                     GetPort( &port ) ;
                     Point pt = { 0, 0 } ;

-                    #if TARGET_CARBON
-                    SetPort( GetWindowPort(window) ) ;
-                    #else
-                    SetPort( (window) ) ;
-                    #endif
-                    SetOrigin( 0 , 0 ) ;
+                    SetPortWindowPort(window) ;

                     LocalToGlobal( &pt ) ;
                     SetPort( port ) ;
                         win->SetSize( pt.h , pt.v , -1 ,
                     LocalToGlobal( &pt ) ;
                     SetPort( port ) ;
                         win->SetSize( pt.h , pt.v , -1 ,


@@ -1221,12 +1232,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
                 {
                     GrafPtr port ;
                     GetPort( &port ) ;
                 {
                     GrafPtr port ;
                     GetPort( &port ) ;

-                    #if TARGET_CARBON
-                    SetPort( GetWindowPort(window) ) ;
-                    #else
-                    SetPort( (window) ) ;
-                    #endif
-                    SetOrigin( 0 , 0 ) ;
+                    SetPortWindowPort(window) ;

                     SetPort( port ) ;
                 }
                 if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )
                     SetPort( port ) ;
                 }
                 if ( window != frontWindow && wxTheApp->s_captureWindow == NULL )


@@ -1259,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);
     WindowRef window;
 
     short windowPart = ::FindWindow(ev->where, &window);


@@ -1273,7 +1280,7 @@ void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
             break ;
         default:
             {
             break ;
         default:
             {

-                wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

                 if ( win )
                     win->MacMouseUp( ev , windowPart ) ;
             }
                 if ( win )
                     win->MacMouseUp( ev , windowPart ) ;
             }


@@ -1390,8 +1397,9 @@ long wxMacTranslateKey(unsigned char key, unsigned char code)
     return retval;
 }
 
     return retval;
 }
 

-void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
+void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )

 {
 {

+    EventRecord* ev = (EventRecord*) evr ;

     wxToolTip::RemoveToolTips() ;
 
     UInt32 menuresult = UMAMenuEvent(ev) ;
     wxToolTip::RemoveToolTips() ;
 
     UInt32 menuresult = UMAMenuEvent(ev) ;


@@ -1406,11 +1414,11 @@ void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
         short keychar ;
         keychar = short(ev->message & charCodeMask);
         keycode = short(ev->message & keyCodeMask) >> 8 ;
         short keychar ;
         keychar = short(ev->message & charCodeMask);
         keycode = short(ev->message & keyCodeMask) >> 8 ;

-
+        long keyval = wxMacTranslateKey(keychar, keycode) ;
+        bool handled = false ;

         wxWindow* focus = wxWindow::FindFocus() ;
         if ( focus )
         {
         wxWindow* focus = wxWindow::FindFocus() ;
         if ( focus )
         {

-            long keyval = wxMacTranslateKey(keychar, keycode) ;

 
             wxKeyEvent event(wxEVT_KEY_DOWN);
             event.m_shiftDown = ev->modifiers & shiftKey;
 
             wxKeyEvent event(wxEVT_KEY_DOWN);
             event.m_shiftDown = ev->modifiers & shiftKey;


@@ -1422,7 +1430,7 @@ void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
             event.m_y = ev->where.v;
             event.m_timeStamp = ev->when;
             event.SetEventObject(focus);
             event.m_y = ev->where.v;
             event.m_timeStamp = ev->when;
             event.SetEventObject(focus);

-            bool handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+            handled = focus->GetEventHandler()->ProcessEvent( event ) ;

             if ( !handled )
             {
                 #if wxUSE_ACCEL
             if ( !handled )
             {
                 #if wxUSE_ACCEL


@@ -1475,20 +1483,41 @@ void wxApp::MacHandleKeyDownEvent( EventRecord *ev )
                 new_event.SetCurrentFocus( focus );
                 handled = focus->GetEventHandler()->ProcessEvent( new_event );
             }
                 new_event.SetCurrentFocus( focus );
                 handled = focus->GetEventHandler()->ProcessEvent( new_event );
             }

+        }
+        if ( !handled )
+        {
+            // if window is not having a focus still testing for default enter or cancel
+            // TODO add the UMA version for ActiveNonFloatingWindow
+          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 ;
+                }
+            }

             /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
             /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */

-            if ( (!handled) &&
-                 (keyval == '.' && event.ControlDown() ) )
+            else if (keyval == WXK_ESCAPE || (keyval == '.' && ev->modifiers & cmdKey ) )

             {
             {

-                wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-                new_event.SetEventObject( focus );
-                handled = focus->GetEventHandler()->ProcessEvent( new_event );
+                  wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+                  new_event.SetEventObject( focus );
+                  handled = focus->GetEventHandler()->ProcessEvent( new_event );

             }
             }

+          }

         }
     }
 }
 
         }
     }
 }
 

-void wxApp::MacHandleKeyUpEvent( EventRecord *ev )
+void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )

 {
 {

+    EventRecord* ev = (EventRecord*) evr ;

     wxToolTip::RemoveToolTips() ;
 
     UInt32 menuresult = UMAMenuEvent(ev) ;
     wxToolTip::RemoveToolTips() ;
 
     UInt32 menuresult = UMAMenuEvent(ev) ;


@@ -1522,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 )
     {
     WindowRef window = (WindowRef) ev->message ;
     if ( window )
     {


@@ -1535,20 +1565,21 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
             // if it is a floater we activate/deactivate the front non-floating window instead
             window = ::FrontNonFloatingWindow() ;
         }
             // if it is a floater we activate/deactivate the front non-floating window instead
             window = ::FrontNonFloatingWindow() ;
         }

-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
+        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

         if ( win )
             win->MacActivate( ev , activate ) ;
     }
 }
 
         if ( win )
             win->MacActivate( ev , activate ) ;
     }
 }
 

-void wxApp::MacHandleUpdateEvent( EventRecord *ev )
+void wxApp::MacHandleUpdateEvent( WXEVENTREF evr )

 {
 {

+    EventRecord* ev = (EventRecord*) evr ;

     WindowRef window = (WindowRef) ev->message ;
     WindowRef window = (WindowRef) ev->message ;

-    wxWindow * win = wxFindWinFromMacWindow( window ) ;
+    wxTopLevelWindowMac * win = wxFindWinFromMacWindow( window ) ;

     if ( win )
     {
         if ( !wxPendingDelete.Member(win) )
     if ( win )
     {
         if ( !wxPendingDelete.Member(win) )

-            win->MacUpdate( ev ) ;
+            win->MacUpdate( ev->when ) ;

     }
     else
     {
     }
     else
     {


@@ -1560,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
     if ( HiWord( ev->message ) != noErr )
   {
  #if !TARGET_CARBON


@@ -1575,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 :
     switch( ( ev->message & osEvtMessageMask ) >> 24 )
     {
         case suspendResumeMessage :


@@ -1605,13 +1638,13 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
 
                     if ( oldFrontWindow )
                     {
 
                     if ( oldFrontWindow )
                     {

-                        wxWindow* win = wxFindWinFromMacWindow( oldFrontWindow ) ;
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( oldFrontWindow ) ;

                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newFrontWindow )
                     {
                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newFrontWindow )
                     {

-                        wxWindow* win = wxFindWinFromMacWindow( newFrontWindow ) ;
+                        wxTopLevelWindowMac* win = wxFindWinFromMacWindow( newFrontWindow ) ;

                         if ( win )
                             win->MacActivate( ev , true ) ;
                     }
                         if ( win )
                             win->MacActivate( ev , true ) ;
                     }


@@ -1705,7 +1738,7 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
                             ::GetNextEvent(0, &tmp);
                             ev->modifiers = tmp.modifiers;
                             
                             ::GetNextEvent(0, &tmp);
                             ev->modifiers = tmp.modifiers;
                             

-                            wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                            wxTopLevelWindowMac* win = wxFindWinFromMacWindow( window ) ;

                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             else