splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index a70e3bbc11afcef2bf3788e6522dccd01d27689c..12e9408f9b678213a283682557317f37b4a1b9b5 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        mac/toplevel.cpp
-// Purpose:     implements wxTopLevelWindow for MSW
-// Author:      Vadim Zeitlin
+// Name:        src/mac/carbon/toplevel.cpp
+// Purpose:     implements wxTopLevelWindow for Mac
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     24.09.01
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2004 Stefan Csomor

 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "toplevel.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,26 +24,45 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/toplevel.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/toplevel.h"

     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/settings.h"
+    #include "wx/strconv.h"
+    #include "wx/control.h"

 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"

-#include "wx/app.h"

 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 

-#define wxMAC_DEBUG_REDRAW 0
-#ifndef wxMAC_DEBUG_REDRAW
-#define wxMAC_DEBUG_REDRAW 0
+#if wxUSE_SYSTEM_OPTIONS
+    #include "wx/sysopt.h"
+#endif
+
+#ifndef __DARWIN__
+#include <ToolUtils.h>

 #endif
 
 #endif
 

+// for targeting OSX
+#include "wx/mac/private.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// unified title and toolbar constant - not in Tiger headers, so we duplicate it here
+#define kWindowUnifiedTitleAndToolbarAttribute (1 << 7)
+
+// trace mask for activation tracing messages
+static const wxChar *TRACE_ACTIVATE = _T("activation");
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -55,120 +70,125 @@
 // list of all frames and modeless dialogs
 wxWindowList       wxModelessWindows;
 
 // list of all frames and modeless dialogs
 wxWindowList       wxModelessWindows;
 

-// double click testing
-static   Point     gs_lastWhere;
-static   long      gs_lastWhen = 0;
-
-

 static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
 
 // ============================================================================
 // wxTopLevelWindowMac implementation
 // ============================================================================
 
 static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
 
 // ============================================================================
 // wxTopLevelWindowMac implementation
 // ============================================================================
 

+BEGIN_EVENT_TABLE(wxTopLevelWindowMac, wxTopLevelWindowBase)
+END_EVENT_TABLE()
+

 // ---------------------------------------------------------------------------
 // Carbon Events
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // Carbon Events
 // ---------------------------------------------------------------------------
 

-#if TARGET_CARBON
-
-extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
-

 static const EventTypeSpec eventList[] =
 {
 static const EventTypeSpec eventList[] =
 {

-    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+    // TODO: remove control related event like key and mouse (except for WindowLeave events)

 
     { kEventClassKeyboard, kEventRawKeyDown } ,
     { kEventClassKeyboard, kEventRawKeyRepeat } ,
     { kEventClassKeyboard, kEventRawKeyUp } ,
     { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
 
 
     { kEventClassKeyboard, kEventRawKeyDown } ,
     { kEventClassKeyboard, kEventRawKeyRepeat } ,
     { kEventClassKeyboard, kEventRawKeyUp } ,
     { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
 

-    { kEventClassWindow , kEventWindowUpdate } ,
+    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+    { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
+
+    { kEventClassWindow , kEventWindowShown } ,

     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,
     { kEventClassWindow , kEventWindowBoundsChanging } ,
     { kEventClassWindow , kEventWindowBoundsChanged } ,
     { kEventClassWindow , kEventWindowClose } ,
     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,
     { kEventClassWindow , kEventWindowBoundsChanging } ,
     { kEventClassWindow , kEventWindowBoundsChanged } ,
     { kEventClassWindow , kEventWindowClose } ,

+    { kEventClassWindow , kEventWindowGetRegion } ,
+
+    // we have to catch these events on the toplevel window level,
+    // as controls don't get the raw mouse events anymore

 
     { kEventClassMouse , kEventMouseDown } ,
     { kEventClassMouse , kEventMouseUp } ,
 
     { kEventClassMouse , kEventMouseDown } ,
     { kEventClassMouse , kEventMouseUp } ,

+    { kEventClassMouse , kEventMouseWheelMoved } ,

     { kEventClassMouse , kEventMouseMoved } ,
     { kEventClassMouse , kEventMouseDragged } ,
     { kEventClassMouse , kEventMouseMoved } ,
     { kEventClassMouse , kEventMouseDragged } ,

-

 } ;
 
 } ;
 

-static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
 {
     OSStatus result = eventNotHandledErr ;

+    // call DoFindFocus instead of FindFocus, because for Composite Windows(like WxGenericListCtrl)
+    // FindFocus does not return the actual focus window, but the enclosing window
+    wxWindow* focus = wxWindow::DoFindFocus();
+    if ( focus == NULL )
+        focus = (wxTopLevelWindowMac*) data ;
+
+    unsigned char charCode ;
+    wxChar uniChar[2] ;
+    uniChar[0] = 0;
+    uniChar[1] = 0;

 
 

-    wxWindow* focus = wxWindow::FindFocus() ;
-    char charCode ;

     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 

-    EventRef rawEvent ;
+#if wxUSE_UNICODE
+    ByteCount dataSize = 0 ;
+    if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
+    {
+        UniChar buf[2] ;
+        int numChars = dataSize / sizeof( UniChar) + 1;

 
 

-    GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ;
+        UniChar* charBuf = buf ;

 
 

-    GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
-    GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL,  sizeof(UInt32), NULL, &keyCode );
-       GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
-    GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
-        sizeof( Point ), NULL, &point );
+        if ( numChars * 2 > 4 )
+            charBuf = new UniChar[ numChars ] ;
+        GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
+        charBuf[ numChars - 1 ] = 0;

 
 

-    UInt32 message = (keyCode << 8) + charCode;
+#if SIZEOF_WCHAR_T == 2
+        uniChar = charBuf[0] ;
+#else
+        wxMBConvUTF16 converter ;
+        converter.MB2WC( uniChar , (const char*)charBuf , 2 ) ;
+#endif

 
 

-    switch ( GetEventKind( event ) )
-    {
-        case kEventTextInputUnicodeForKeyEvent :
-            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
-                focus , message , modifiers , when , point.h , point.v ) )
-            {
-                result = noErr ;
-            }
-            break ;
+        if ( numChars * 2 > 4 )
+            delete[] charBuf ;

     }
     }

+#endif

 
 

-    return result ;
-}
-
-static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
-    OSStatus result = eventNotHandledErr ;
-
-    wxWindow* focus = wxWindow::FindFocus() ;
-    char charCode ;
-    UInt32 keyCode ;
-    UInt32 modifiers ;
-    Point point ;
-    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
-
-    GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
-    GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL,  sizeof(UInt32), NULL, &keyCode );
-       GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
-    GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
-        sizeof( Point ), NULL, &point );
+    GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+    GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
+    GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
+    GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );

 
     UInt32 message = (keyCode << 8) + charCode;
 
     UInt32 message = (keyCode << 8) + charCode;

-    switch( GetEventKind( event ) )
+    switch ( GetEventKind( event ) )

     {
         case kEventRawKeyRepeat :
         case kEventRawKeyDown :
     {
         case kEventRawKeyRepeat :
         case kEventRawKeyDown :

-            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
-                focus , message , modifiers , when , point.h , point.v ) )

             {
             {

-                result = noErr ;
+                WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+                WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+                wxTheApp->MacSetCurrentEvent( event , handler ) ;
+                if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
+                    focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
+                {
+                    result = noErr ;
+                }
+                wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;

             }
             break ;
             }
             break ;

+

         case kEventRawKeyUp :
         case kEventRawKeyUp :

-            if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent(
-                focus , message , modifiers , when , point.h , point.v ) )
+            if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
+                focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )

             {
                 result = noErr ;
             }
             break ;
             {
                 result = noErr ;
             }
             break ;

+

         case kEventRawKeyModifiersChanged :
             {
                 wxKeyEvent event(wxEVT_KEY_DOWN);
         case kEventRawKeyModifiersChanged :
             {
                 wxKeyEvent event(wxEVT_KEY_DOWN);


@@ -177,174 +197,602 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 event.m_controlDown = modifiers & controlKey;
                 event.m_altDown = modifiers & optionKey;
                 event.m_metaDown = modifiers & cmdKey;
                 event.m_controlDown = modifiers & controlKey;
                 event.m_altDown = modifiers & optionKey;
                 event.m_metaDown = modifiers & cmdKey;

-

                 event.m_x = point.h;
                 event.m_y = point.v;
                 event.m_x = point.h;
                 event.m_y = point.v;

-                event.m_timeStamp = when;
-                wxWindow* focus = wxWindow::FindFocus() ;
+
+#if wxUSE_UNICODE
+                event.m_uniChar = uniChar[0] ;
+#endif
+
+                event.SetTimestamp(when);

                 event.SetEventObject(focus);
 
                 event.SetEventObject(focus);
 

-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )
+                if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & controlKey )

                 {
                     event.m_keyCode = WXK_CONTROL ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                 {
                     event.m_keyCode = WXK_CONTROL ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

-                    focus->GetEventHandler()->ProcessEvent( event ) ;
+                    focus->HandleWindowEvent( event ) ;

                 }
                 }

-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey )
+                if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & shiftKey )

                 {
                     event.m_keyCode = WXK_SHIFT ;
                     event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                 {
                     event.m_keyCode = WXK_SHIFT ;
                     event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

-                    focus->GetEventHandler()->ProcessEvent( event ) ;
+                    focus->HandleWindowEvent( event ) ;

                 }
                 }

-                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey )
+                if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & optionKey )

                 {
                     event.m_keyCode = WXK_ALT ;
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                 {
                     event.m_keyCode = WXK_ALT ;
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

-                    focus->GetEventHandler()->ProcessEvent( event ) ;
+                    focus->HandleWindowEvent( event ) ;

                 }
                 }

-                wxTheApp->s_lastModifiers = modifiers ;
+                if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & cmdKey )
+                {
+                    event.m_keyCode = WXK_COMMAND ;
+                    event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+                    focus->HandleWindowEvent( event ) ;
+                }
+
+                wxApp::s_lastModifiers = modifiers ;

             }
             }

-             break ;
+            break ;
+
+        default:
+            break;

     }
 
     return result ;
 }
 
     }
 
     return result ;
 }
 

-static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+// we don't interfere with foreign controls on our toplevel windows, therefore we always give back eventNotHandledErr
+// for windows that we didn't create (like eg Scrollbars in a databrowser), or for controls where we did not handle the
+// mouse down at all
+//
+// This handler can also be called from app level where data (ie target window) may be null or a non wx window
+
+wxWindow* g_MacLastWindow = NULL ;
+
+EventMouseButton g_lastButton = 0 ;
+bool g_lastButtonWasFakeRight = false ;
+
+void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )

 {
 {

-    OSStatus result = eventNotHandledErr ;
+    UInt32 modifiers = cEvent.GetParameter<UInt32>(kEventParamKeyModifiers, typeUInt32) ;
+    Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;

 
 

-    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
-    Point point ;
-    UInt32 modifiers = 0;
+    // these parameters are not given for all events

     EventMouseButton button = 0 ;
     EventMouseButton button = 0 ;

-    UInt32 click = 0 ;
+    UInt32 clickCount = 0 ;
+    UInt32 mouseChord = 0;
+
+    cEvent.GetParameter<EventMouseButton>( kEventParamMouseButton, typeMouseButton , &button ) ;
+    cEvent.GetParameter<UInt32>( kEventParamClickCount, typeUInt32 , &clickCount ) ;
+    // the chord is the state of the buttons pressed currently
+    cEvent.GetParameter<UInt32>( kEventParamMouseChord, typeUInt32 , &mouseChord ) ;
+
+    wxevent.m_x = screenMouseLocation.h;
+    wxevent.m_y = screenMouseLocation.v;
+    wxevent.m_shiftDown = modifiers & shiftKey;
+    wxevent.m_controlDown = modifiers & controlKey;
+    wxevent.m_altDown = modifiers & optionKey;
+    wxevent.m_metaDown = modifiers & cmdKey;
+    wxevent.m_clickCount = clickCount;
+    wxevent.SetTimestamp( cEvent.GetTicks() ) ;
+
+    // a control click is interpreted as a right click
+    bool thisButtonIsFakeRight = false ;
+    if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
+    {
+        button = kEventMouseButtonSecondary ;
+        thisButtonIsFakeRight = true ;
+    }
+
+    // otherwise we report double clicks by connecting a left click with a ctrl-left click
+    if ( clickCount > 1 && button != g_lastButton )
+        clickCount = 1 ;
+
+    // we must make sure that our synthetic 'right' button corresponds in
+    // mouse down, moved and mouse up, and does not deliver a right down and left up
+
+    if ( cEvent.GetKind() == kEventMouseDown )
+    {
+        g_lastButton = button ;
+        g_lastButtonWasFakeRight = thisButtonIsFakeRight ;
+    }
+
+    if ( button == 0 )
+    {
+        g_lastButton = 0 ;
+        g_lastButtonWasFakeRight = false ;
+    }
+    else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight )
+        button = g_lastButton ;
+
+    // Adjust the chord mask to remove the primary button and add the
+    // secondary button.  It is possible that the secondary button is
+    // already pressed, e.g. on a mouse connected to a laptop, but this
+    // possibility is ignored here:
+    if( thisButtonIsFakeRight && ( mouseChord & 1U ) )
+        mouseChord = ((mouseChord & ~1U) | 2U);
+
+    if(mouseChord & 1U)
+                wxevent.m_leftDown = true ;
+    if(mouseChord & 2U)
+                wxevent.m_rightDown = true ;
+    if(mouseChord & 4U)
+                wxevent.m_middleDown = true ;
+
+    // translate into wx types
+    switch ( cEvent.GetKind() )
+    {
+        case kEventMouseDown :
+            switch ( button )
+            {
+                case kEventMouseButtonPrimary :
+                    wxevent.SetEventType( clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN )  ;
+                    break ;
+
+                case kEventMouseButtonSecondary :
+                    wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ;
+                    break ;
+
+                case kEventMouseButtonTertiary :
+                    wxevent.SetEventType( clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ;
+                    break ;
+
+                default:
+                    break ;
+            }
+            break ;
+
+        case kEventMouseUp :
+            switch ( button )
+            {
+                case kEventMouseButtonPrimary :
+                    wxevent.SetEventType( wxEVT_LEFT_UP )  ;
+                    break ;
+
+                case kEventMouseButtonSecondary :
+                    wxevent.SetEventType( wxEVT_RIGHT_UP ) ;
+                    break ;
+
+                case kEventMouseButtonTertiary :
+                    wxevent.SetEventType( wxEVT_MIDDLE_UP ) ;
+                    break ;
+
+                default:
+                    break ;
+            }
+            break ;
+
+     case kEventMouseWheelMoved :
+        {
+            wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
+
+            EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
+            SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeSInt32) ;

 
 

-    GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
-        sizeof( Point ), NULL, &point );
-    GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,
-        sizeof( UInt32 ), NULL, &modifiers );
-    GetEventParameter( event, kEventParamMouseButton, typeMouseButton, NULL,
-        sizeof( EventMouseButton ), NULL, &button );
-    GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
-        sizeof( UInt32 ), NULL, &click );
+            wxevent.m_wheelRotation = delta;
+            wxevent.m_wheelDelta = 1;
+            wxevent.m_linesPerAction = 1;
+            if ( axis == kEventMouseWheelAxisX )
+                wxevent.m_wheelAxis = 1;
+        }
+        break ;

 
 

-    if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
-        modifiers += btnState ;
+        case kEventMouseEntered :
+        case kEventMouseExited :
+        case kEventMouseDragged :
+        case kEventMouseMoved :
+            wxevent.SetEventType( wxEVT_MOTION ) ;
+            break;
+        default :
+            break ;
+    }
+}

 
 

-    WindowRef window ;
-    short windowPart = ::FindWindow(point, &window);
+#define NEW_CAPTURE_HANDLING 1

 
 

-    if ( IsWindowActive(window) && windowPart == inContent )
+pascal OSStatus
+wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
+                               EventRef event,
+                               void *data)
+{
+    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+
+    Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
+    Point windowMouseLocation = screenMouseLocation ;
+
+    WindowRef window = NULL;
+    short windowPart = ::FindWindow(screenMouseLocation, &window);
+
+    wxWindow* currentMouseWindow = NULL ;
+    ControlRef control = NULL ;
+
+#if NEW_CAPTURE_HANDLING
+    if ( wxApp::s_captureWindow )

     {
     {

-        switch ( GetEventKind( event ) )
+        window = (WindowRef) wxApp::s_captureWindow->MacGetTopLevelWindowRef() ;
+        windowPart = inContent ;
+    }
+#endif
+
+    if ( window )
+    {
+        wxMacGlobalToLocal( window,  &windowMouseLocation ) ;
+
+        if ( wxApp::s_captureWindow
+#if !NEW_CAPTURE_HANDLING
+             && wxApp::s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent
+#endif
+             )

         {
         {

-            case kEventMouseDown :
-                toplevelWindow->MacFireMouseEvent( mouseDown , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
-                break ;
-            case kEventMouseUp :
-                toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
-                break ;
-            case kEventMouseMoved :
-                toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
-                break ;
-            case kEventMouseDragged :
-                toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
-                break ;
-            default :
-                break ;
+            currentMouseWindow = wxApp::s_captureWindow ;
+        }
+        else if ( (IsWindowActive(window) && windowPart == inContent) )
+        {
+            ControlPartCode part ;
+            control = FindControlUnderMouse( windowMouseLocation , window , &part ) ;
+            // if there is no control below the mouse position, send the event to the toplevel window itself
+            if ( control == 0 )
+            {
+                currentMouseWindow = (wxWindow*) data ;
+            }
+            else
+            {
+                currentMouseWindow = (wxWindow*) wxFindControlFromMacControl( control ) ;
+#ifndef __WXUNIVERSAL__
+                if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved )
+                {
+#if wxUSE_TOOLBAR
+                    // for wxToolBar to function we have to send certaint events to it
+                    // instead of its children (wxToolBarTools)
+                    ControlRef parent ;
+                    GetSuperControl(control, &parent );
+                    wxWindow *wxParent = (wxWindow*) wxFindControlFromMacControl( parent ) ;
+                    if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
+                        currentMouseWindow = wxParent ;
+#endif
+                }
+#endif
+            }
+
+            // disabled windows must not get any input messages
+            if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() )
+                currentMouseWindow = NULL;

         }
     }
 
         }
     }
 

-    return result ;
+    wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
+    SetupMouseEvent( wxevent , cEvent ) ;
+
+    // handle all enter / leave events
+
+    if ( currentMouseWindow != g_MacLastWindow )
+    {
+        if ( g_MacLastWindow )
+        {
+            wxMouseEvent eventleave(wxevent);
+            eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
+            g_MacLastWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
+            eventleave.SetEventObject( g_MacLastWindow ) ;
+            wxevent.SetId( g_MacLastWindow->GetId() ) ;
+
+#if wxUSE_TOOLTIPS
+            wxToolTip::RelayEvent( g_MacLastWindow , eventleave);
+#endif
+
+            g_MacLastWindow->HandleWindowEvent(eventleave);
+        }
+
+        if ( currentMouseWindow )
+        {
+            wxMouseEvent evententer(wxevent);
+            evententer.SetEventType( wxEVT_ENTER_WINDOW );
+            currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );
+            evententer.SetEventObject( currentMouseWindow ) ;
+            wxevent.SetId( currentMouseWindow->GetId() ) ;
+
+#if wxUSE_TOOLTIPS
+            wxToolTip::RelayEvent( currentMouseWindow , evententer );
+#endif

 
 

+            currentMouseWindow->HandleWindowEvent(evententer);
+        }
+
+        g_MacLastWindow = currentMouseWindow ;
+    }

 
 

+    if ( windowPart == inMenuBar )
+    {
+        // special case menu bar, as we are having a low-level runloop we must do it ourselves
+        if ( cEvent.GetKind() == kEventMouseDown )
+        {
+            ::MenuSelect( screenMouseLocation ) ;
+            ::HiliteMenu(0);
+            result = noErr ;
+        }
+    }
+    else if ( currentMouseWindow )
+    {
+        wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent();
+
+        currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ;
+
+        wxevent.SetEventObject( currentMouseWindow ) ;
+        wxevent.SetId( currentMouseWindow->GetId() ) ;
+
+        // make tooltips current
+
+#if wxUSE_TOOLTIPS
+        if ( wxevent.GetEventType() == wxEVT_MOTION )
+            wxToolTip::RelayEvent( currentMouseWindow , wxevent );
+#endif
+
+        if ( currentMouseWindow->HandleWindowEvent(wxevent) )
+        {
+            if ((currentMouseWindowParent != NULL) &&
+                (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL))
+                currentMouseWindow = NULL;
+
+            result = noErr;
+        }
+        else
+        {
+            // if the user code did _not_ handle the event, then perform the
+            // default processing
+            if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
+            {
+                // ... that is set focus to this window
+                if (currentMouseWindow->CanAcceptFocus() && wxWindow::FindFocus()!=currentMouseWindow)
+                    currentMouseWindow->SetFocus();
+            }
+        }
+
+        if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow )
+        {
+            wxApp::s_captureWindow = NULL ;
+            // update cursor ?
+         }
+
+        // update cursor
+
+        wxWindow* cursorTarget = currentMouseWindow ;
+        wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
+
+        extern wxCursor gGlobalCursor;
+
+        if (!gGlobalCursor.IsOk())
+        {
+            while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+            {
+                cursorTarget = cursorTarget->GetParent() ;
+                if ( cursorTarget )
+                    cursorPoint += cursorTarget->GetPosition();
+            }
+        }
+
+    }
+    else // currentMouseWindow == NULL
+    {
+        // don't mess with controls we don't know about
+        // for some reason returning eventNotHandledErr does not lead to the correct behaviour
+        // so we try sending them the correct control directly
+        if ( cEvent.GetKind() == kEventMouseDown && toplevelWindow && control )
+        {
+            EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+            Point clickLocation = windowMouseLocation ;
+
+            HIPoint hiPoint ;
+            hiPoint.x = clickLocation.h ;
+            hiPoint.y = clickLocation.v ;
+            HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control  ) ;
+            clickLocation.h = (int)hiPoint.x ;
+            clickLocation.v = (int)hiPoint.y ;
+
+            HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ;
+            result = noErr ;
+        }
+    }
+
+    return result ;

 }
 }

-static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+
+static pascal OSStatus
+wxMacTopLevelWindowEventHandler(EventHandlerCallRef WXUNUSED(handler),
+                                EventRef event,
+                                void *data)

 {
     OSStatus result = eventNotHandledErr ;
 {
     OSStatus result = eventNotHandledErr ;

-    OSStatus err = noErr ;

 
 

-    UInt32        attributes;
-    WindowRef windowRef ;
-    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+    wxMacCarbonEvent cEvent( event ) ;

 
 

-    GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
-        sizeof( WindowRef ), NULL, &windowRef );
+    // WindowRef windowRef = cEvent.GetParameter<WindowRef>(kEventParamDirectObject) ;
+    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;

 
 

-    switch( GetEventKind( event ) )
+    switch ( GetEventKind( event ) )

     {
     {

-        case kEventWindowUpdate :
-            if ( !wxPendingDelete.Member(toplevelWindow) )
-                toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
-            result = noErr ;
-            break ;

         case kEventWindowActivated :
         case kEventWindowActivated :

-                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
-            result = noErr ;
+        {
+            toplevelWindow->MacActivate( cEvent.GetTicks() , true) ;
+            wxActivateEvent wxevent(wxEVT_ACTIVATE, true , toplevelWindow->GetId());
+            wxevent.SetTimestamp( cEvent.GetTicks() ) ;
+            wxevent.SetEventObject(toplevelWindow);
+            toplevelWindow->HandleWindowEvent(wxevent);
+            // we still sending an eventNotHandledErr in order to allow for default processing
+        }

             break ;
             break ;

+

         case kEventWindowDeactivated :
         case kEventWindowDeactivated :

-                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
+        {
+            toplevelWindow->MacActivate(cEvent.GetTicks() , false) ;
+            wxActivateEvent wxevent(wxEVT_ACTIVATE, false , toplevelWindow->GetId());
+            wxevent.SetTimestamp( cEvent.GetTicks() ) ;
+            wxevent.SetEventObject(toplevelWindow);
+            toplevelWindow->HandleWindowEvent(wxevent);
+            // we still sending an eventNotHandledErr in order to allow for default processing
+        }
+            break ;
+
+        case kEventWindowShown :
+            toplevelWindow->Refresh() ;

             result = noErr ;
             break ;
             result = noErr ;
             break ;

+

         case kEventWindowClose :
         case kEventWindowClose :

-                toplevelWindow->Close() ;
+            toplevelWindow->Close() ;

             result = noErr ;
             break ;
             result = noErr ;
             break ;

+

         case kEventWindowBoundsChanged :
         case kEventWindowBoundsChanged :

-            err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
-                        NULL, sizeof( UInt32 ), NULL, &attributes );
-            if ( err == noErr )
+        {
+            UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes, typeUInt32) ;
+            Rect newRect = cEvent.GetParameter<Rect>(kEventParamCurrentBounds) ;
+            wxRect r( newRect.left , newRect.top , newRect.right - newRect.left , newRect.bottom - newRect.top ) ;
+            if ( attributes & kWindowBoundsChangeSizeChanged )

             {
             {

-                Rect newContentRect ;
+#ifndef __WXUNIVERSAL__
+                // according to the other ports we handle this within the OS level
+                // resize event, not within a wxSizeEvent
+                wxFrame *frame = wxDynamicCast( toplevelWindow , wxFrame ) ;
+                if ( frame )
+                {
+                    frame->PositionBars();
+                }
+#endif
+                wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ;
+                event.SetEventObject( toplevelWindow ) ;
+
+                toplevelWindow->HandleWindowEvent(event) ;
+                toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+            }

 
 

-                GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
-                    sizeof( newContentRect ), NULL, &newContentRect );
+            if ( attributes & kWindowBoundsChangeOriginChanged )
+            {
+                wxMoveEvent event( r.GetLeftTop() , toplevelWindow->GetId() ) ;
+                event.SetEventObject( toplevelWindow ) ;
+                toplevelWindow->HandleWindowEvent(event) ;
+            }
+
+            result = noErr ;
+        }
+            break ;

 
 

-                toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
-                    newContentRect.right - newContentRect.left ,
-                    newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
+        case kEventWindowBoundsChanging :
+        {
+            UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes,typeUInt32) ;
+            Rect newRect = cEvent.GetParameter<Rect>(kEventParamCurrentBounds) ;

 
 

-                result = noErr;
+            if ( (attributes & kWindowBoundsChangeSizeChanged) || (attributes & kWindowBoundsChangeOriginChanged) )
+            {
+                // all (Mac) rects are in content area coordinates, all wxRects in structure coordinates
+                int left , top , right , bottom ;
+                toplevelWindow->MacGetContentAreaInset( left , top , right , bottom ) ;
+
+                wxRect r(
+                    newRect.left - left,
+                    newRect.top - top,
+                    newRect.right - newRect.left + left + right,
+                    newRect.bottom - newRect.top + top + bottom ) ;
+
+                // this is a EVT_SIZING not a EVT_SIZE type !
+                wxSizeEvent wxevent( r , toplevelWindow->GetId() ) ;
+                wxevent.SetEventObject( toplevelWindow ) ;
+                wxRect adjustR = r ;
+                if ( toplevelWindow->HandleWindowEvent(wxevent) )
+                    adjustR = wxevent.GetRect() ;
+
+                if ( toplevelWindow->GetMaxWidth() != -1 && adjustR.GetWidth() > toplevelWindow->GetMaxWidth() )
+                    adjustR.SetWidth( toplevelWindow->GetMaxWidth() ) ;
+                if ( toplevelWindow->GetMaxHeight() != -1 && adjustR.GetHeight() > toplevelWindow->GetMaxHeight() )
+                    adjustR.SetHeight( toplevelWindow->GetMaxHeight() ) ;
+                if ( toplevelWindow->GetMinWidth() != -1 && adjustR.GetWidth() < toplevelWindow->GetMinWidth() )
+                    adjustR.SetWidth( toplevelWindow->GetMinWidth() ) ;
+                if ( toplevelWindow->GetMinHeight() != -1 && adjustR.GetHeight() < toplevelWindow->GetMinHeight() )
+                    adjustR.SetHeight( toplevelWindow->GetMinHeight() ) ;
+                const Rect adjustedRect = { adjustR.y + top  , adjustR.x + left , adjustR.y + adjustR.height - bottom , adjustR.x + adjustR.width - right } ;
+                if ( !EqualRect( &newRect , &adjustedRect ) )
+                    cEvent.SetParameter<Rect>( kEventParamCurrentBounds , &adjustedRect ) ;
+                toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified

             }
             }

+
+            result = noErr ;
+        }

             break ;
             break ;

+
+        case kEventWindowGetRegion :
+            {
+                if ( toplevelWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
+                {
+                    WindowRegionCode windowRegionCode ;
+
+                    // Fetch the region code that is being queried
+                    GetEventParameter( event,
+                                       kEventParamWindowRegionCode,
+                                       typeWindowRegionCode, NULL,
+                                       sizeof windowRegionCode, NULL,
+                                       &windowRegionCode ) ;
+
+                    // If it is the opaque region code then set the
+                    // region to empty and return noErr to stop event
+                    // propagation
+                    if ( windowRegionCode == kWindowOpaqueRgn ) {
+                        RgnHandle region;
+                        GetEventParameter( event,
+                                           kEventParamRgnHandle,
+                                           typeQDRgnHandle, NULL,
+                                           sizeof region, NULL,
+                                           &region) ;
+                        SetEmptyRgn(region) ;
+                        result = noErr ;
+                    }
+                }
+            }
+            break ;
+

         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 

-pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+// mix this in from window.cpp
+pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
+
+pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
 
     switch ( GetEventClass( event ) )
     {
 {
     OSStatus result = eventNotHandledErr ;
 
     switch ( GetEventClass( event ) )
     {

+        case kEventClassTextInput :
+            result = wxMacUnicodeTextEventHandler( handler, event , data ) ;
+            break ;
+

         case kEventClassKeyboard :
             result = KeyboardEventHandler( handler, event , data ) ;
             break ;
         case kEventClassKeyboard :
             result = KeyboardEventHandler( handler, event , data ) ;
             break ;

-        case kEventClassTextInput :
-            result = TextInputEventHandler( handler, event , data ) ;
-            break ;
+

         case kEventClassWindow :
         case kEventClassWindow :

-            result = WindowEventHandler( handler, event , data ) ;
+            result = wxMacTopLevelWindowEventHandler( handler, event , data ) ;

             break ;
             break ;

+

         case kEventClassMouse :
         case kEventClassMouse :

-            result = MouseEventHandler( handler, event , data ) ;
+            result = wxMacTopLevelMouseEventHandler( handler, event , data ) ;

             break ;
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 

-DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
-
-#endif
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTopLevelEventHandler )

 
 // ---------------------------------------------------------------------------
 // wxWindowMac utility functions
 
 // ---------------------------------------------------------------------------
 // wxWindowMac utility functions


@@ -352,63 +800,73 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 
 // Find an item given the Macintosh Window Reference
 
 
 // Find an item given the Macintosh Window Reference
 

-wxList *wxWinMacWindowList = NULL;
-wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)
+WX_DECLARE_HASH_MAP(WindowRef, wxTopLevelWindowMac*, wxPointerHash, wxPointerEqual, MacWindowMap);
+
+static MacWindowMap wxWinMacWindowList;
+
+wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)

 {
 {

-    wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
-    if (!node)
-        return NULL;
-    return (wxTopLevelWindowMac *)node->GetData();
+    MacWindowMap::iterator node = wxWinMacWindowList.find(inWindowRef);
+
+    return (node == wxWinMacWindowList.end()) ? NULL : node->second;

 }
 
 }
 

-void wxAssociateWinWithMacWindow(WXWindow inWindowRef, wxTopLevelWindowMac *win)
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win) ;
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win)

 {
     // adding NULL WindowRef is (first) surely a result of an error and
 {
     // adding NULL WindowRef is (first) surely a result of an error and

-    // (secondly) breaks menu command processing
+    // nothing else :-)

     wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
 
     wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
 

-    if ( !wxWinMacWindowList->Find((long)inWindowRef) )
-        wxWinMacWindowList->Append((long)inWindowRef, win);
+    wxWinMacWindowList[inWindowRef] = win;

 }
 
 }
 

+void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ;

 void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 {
 void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 {

-    wxWinMacWindowList->DeleteObject(win);
+    MacWindowMap::iterator it;
+    for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it )
+    {
+        if ( it->second == win )
+        {
+            wxWinMacWindowList.erase(it);
+            break;
+        }
+    }

 }
 
 }
 

-

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac creation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac creation
 // ----------------------------------------------------------------------------
 

-WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;
+wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;
+
+typedef struct
+{
+    wxPoint m_position ;
+    wxSize m_size ;
+    bool m_wasResizable ;
+} FullScreenData ;

 
 void wxTopLevelWindowMac::Init()
 {
     m_iconized =
 
 void wxTopLevelWindowMac::Init()
 {
     m_iconized =

-    m_maximizeOnShow = FALSE;
-    m_macNoEraseUpdateRgn = NewRgn() ;
-    m_macNeedsErasing = false ;
+    m_maximizeOnShow = false;

     m_macWindow = NULL ;
     m_macWindow = NULL ;

-#if TARGET_CARBON
+

     m_macEventHandler = NULL ;
     m_macEventHandler = NULL ;

- #endif
+    m_macFullScreenData = NULL ;

 }
 
 }
 

-class wxMacDeferredWindowDeleter : public wxObject
+wxMacDeferredWindowDeleter::wxMacDeferredWindowDeleter( WindowRef windowRef )

 {
 {

-public :
-    wxMacDeferredWindowDeleter( WindowRef windowRef )
-    {
-        m_macWindow = windowRef ;
-    }
-    virtual ~wxMacDeferredWindowDeleter()
-    {
-        UMADisposeWindow( (WindowRef) m_macWindow ) ;
-    }
- protected :
-    WindowRef m_macWindow ;
-} ;
+    m_macWindow = windowRef ;
+}
+
+wxMacDeferredWindowDeleter::~wxMacDeferredWindowDeleter()
+{
+    DisposeWindow( (WindowRef) m_macWindow ) ;
+}

 
 bool wxTopLevelWindowMac::Create(wxWindow *parent,
                                  wxWindowID id,
 
 bool wxTopLevelWindowMac::Create(wxWindow *parent,
                                  wxWindowID id,


@@ -423,40 +881,54 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    SetName(name);
+    SetName( name );

 
     m_windowId = id == -1 ? NewControlId() : id;
 
     m_windowId = id == -1 ? NewControlId() : id;

+    wxWindow::SetLabel( title ) ;
+
+    DoMacCreateRealWindow( parent, title, pos , size , style , name ) ;
+
+    SetBackgroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
+
+    if (GetExtraStyle() & wxFRAME_EX_METAL)
+        MacSetMetalAppearance(true);

 
     wxTopLevelWindows.Append(this);
 
     if ( parent )
         parent->AddChild(this);
 
 
     wxTopLevelWindows.Append(this);
 
     if ( parent )
         parent->AddChild(this);
 

-    return TRUE;
+    return true;

 }
 
 wxTopLevelWindowMac::~wxTopLevelWindowMac()
 {
     if ( m_macWindow )
     {
 }
 
 wxTopLevelWindowMac::~wxTopLevelWindowMac()
 {
     if ( m_macWindow )
     {

+#if wxUSE_TOOLTIPS

         wxToolTip::NotifyWindowDelete(m_macWindow) ;
         wxToolTip::NotifyWindowDelete(m_macWindow) ;

+#endif

         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
 
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
 

-#if TARGET_CARBON

     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
         m_macEventHandler = NULL ;
     }
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
         m_macEventHandler = NULL ;
     }

-#endif

 
     wxRemoveMacWindowAssociation( this ) ;
 
     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);
 
 
     wxRemoveMacWindowAssociation( this ) ;
 
     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);
 

-    DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
+    FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+    delete data ;
+    m_macFullScreenData = NULL ;
+
+    // avoid dangling refs
+    if ( s_macDeactivateWindow == this )
+        s_macDeactivateWindow = NULL;

 }
 
 
 }
 
 


@@ -466,74 +938,144 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {

-    // not available on mac
+    Point idealSize = { 0 , 0 } ;
+    if ( maximize )
+    {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+        HIRect bounds ;
+        HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
+            &bounds);
+        idealSize.h = bounds.size.width;
+        idealSize.v = bounds.size.height;
+#else
+        Rect rect ;
+        GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ;
+        idealSize.h = rect.right - rect.left ;
+        idealSize.v = rect.bottom - rect.top ;
+#endif
+    }
+    ZoomWindowIdeal( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , &idealSize ) ;

 }
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {
 }
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {

-    return false ;
+    return IsWindowInStandardState( (WindowRef)m_macWindow , NULL , NULL ) ;

 }
 
 void wxTopLevelWindowMac::Iconize(bool iconize)
 {
 }
 
 void wxTopLevelWindowMac::Iconize(bool iconize)
 {

-    // not available on mac
+    if ( IsWindowCollapsable( (WindowRef)m_macWindow) )
+        CollapseWindow( (WindowRef)m_macWindow , iconize ) ;

 }
 
 bool wxTopLevelWindowMac::IsIconized() const
 {
 }
 
 bool wxTopLevelWindowMac::IsIconized() const
 {

-    // mac dialogs cannot be iconized
-    return FALSE;
+    return IsWindowCollapsed((WindowRef)m_macWindow ) ;

 }
 
 void wxTopLevelWindowMac::Restore()
 {
 }
 
 void wxTopLevelWindowMac::Restore()
 {

-    // not available on mac
+    if ( IsMaximized() )
+        Maximize(false);
+    else if ( IsIconized() )
+        Iconize(false);

 }
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac misc
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac misc
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowMac::SetIcon(const wxIcon& icon)
+wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const

 {
 {

-    // this sets m_icon
-    wxTopLevelWindowBase::SetIcon(icon);
+    return wxPoint(0, 0) ;

 }
 
 }
 

-void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name )
+bool wxTopLevelWindowMac::SetBackgroundColour(const wxColour& c )

 {
 {

+    wxColour col = c;
+    if ( col == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )
+        col = wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground));
+    else if ( col == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
+        col = wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive));
+        
+    if ( !wxTopLevelWindowBase::SetBackgroundColour(col) && m_hasBgCol )
+        return false ;
+    
+    if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground)) )
+    {
+        SetThemeWindowBackground( (WindowRef) m_macWindow,  kThemeBrushDocumentWindowBackground, false ) ;
+        SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+    }
+    else if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive)) )
+    {
+        SetThemeWindowBackground( (WindowRef) m_macWindow,  kThemeBrushDialogBackgroundActive, false ) ;
+        SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+    }
+    return true;
+}    
+
+void wxTopLevelWindowMacInstallTopLevelWindowEventHandler(WindowRef window, EventHandlerRef* handler, void *ref)
+{
+    InstallWindowEventHandler(window, GetwxMacTopLevelEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, ref, handler );
+}
+
+void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler()
+{
+    if ( m_macEventHandler != NULL )
+    {
+        verify_noerr( ::RemoveEventHandler( (EventHandlerRef) m_macEventHandler ) ) ;
+    }
+    wxTopLevelWindowMacInstallTopLevelWindowEventHandler(MAC_WXHWND(m_macWindow),(EventHandlerRef *)&m_macEventHandler,this);
+}
+
+void  wxTopLevelWindowMac::MacCreateRealWindow(
+    const wxString& title,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )
+{
+    DoMacCreateRealWindow( NULL, title, pos, size, style, name );
+}
+
+void  wxTopLevelWindowMac::DoMacCreateRealWindow(
+    wxWindow* parent,
+    const wxString& title,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )
+{
+    OSStatus err = noErr ;

     SetName(name);
     m_windowStyle = style;
     SetName(name);
     m_windowStyle = style;

-    m_isShown = FALSE;
+    m_isShown = false;

 
     // create frame.
 
     // create frame.

+    int x = (int)pos.x;
+    int y = (int)pos.y;

 
     Rect theBoundsRect;
 
     Rect theBoundsRect;

+    wxRect display = wxGetClientDisplayRect() ;

 
 

-    m_x = (int)pos.x;
-    m_y = (int)pos.y;
-    if ( m_y < 50 )
-        m_y = 50 ;
-    if ( m_x < 20 )
-        m_x = 20 ;
+    if ( x == wxDefaultPosition.x )
+        x = display.x ;

 
 

-    m_width = size.x;
-    if (m_width == -1)
-        m_width = 20;
-    m_height = size.y;
-    if (m_height == -1)
-        m_height = 20;
+    if ( y == wxDefaultPosition.y )
+        y = display.y ;

 
 

-    ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
+    int w = WidthDefault(size.x);
+    int h = HeightDefault(size.y);

 
 

-    // translate the window attributes in the appropriate window class and attributes
+    ::SetRect(&theBoundsRect, x, y , x + w, y + h);

 
 

+    // translate the window attributes in the appropriate window class and attributes

     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;
     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;

+    WindowGroupRef group = NULL ;
+    bool activationScopeSet = false;
+    WindowActivationScope activationScope = kWindowActivationScopeNone;

 
     if ( HasFlag( wxFRAME_TOOL_WINDOW) )
     {
 
     if ( HasFlag( wxFRAME_TOOL_WINDOW) )
     {


@@ -543,544 +1085,717 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
             HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT)
             )
         {
             HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT)
             )
         {

-            wclass = kFloatingWindowClass ;
+            if ( HasFlag( wxSTAY_ON_TOP ) )
+                wclass = kUtilityWindowClass;
+            else
+                wclass = kFloatingWindowClass ;
+

             if ( HasFlag(wxTINY_CAPTION_VERT) )
             if ( HasFlag(wxTINY_CAPTION_VERT) )

-            {

                 attr |= kWindowSideTitlebarAttribute ;
                 attr |= kWindowSideTitlebarAttribute ;

-            }

         }
         else
         {
         }
         else
         {

-#if TARGET_CARBON
-            wclass = kPlainWindowClass ;
-#else
-            wclass = kFloatingWindowClass ;
-#endif
+            wclass = kPlainWindowClass ;
+            activationScopeSet = true;
+            activationScope = kWindowActivationScopeNone;

         }
     }
         }
     }

+    else if ( HasFlag( wxPOPUP_WINDOW ) )
+    {
+        // TEMPORARY HACK!
+        // Until we've got a real wxPopupWindow class on wxMac make it a
+        // little easier for wxFrame to be used to emulate it and workaround
+        // the lack of wxPopupWindow.
+        if ( HasFlag( wxBORDER_NONE ) )
+            wclass = kHelpWindowClass ;   // has no border
+        else
+            wclass = kPlainWindowClass ;  // has a single line border, it will have to do for now
+        //attr |= kWindowNoShadowAttribute; // turn off the shadow  Should we??
+        group = GetWindowGroupOfClass(    // float above other windows
+            kFloatingWindowClass) ;
+    }

     else if ( HasFlag( wxCAPTION ) )
     {
         wclass = kDocumentWindowClass ;
     else if ( HasFlag( wxCAPTION ) )
     {
         wclass = kDocumentWindowClass ;

+        attr |= kWindowInWindowMenuAttribute ;
+    }
+    else if ( HasFlag( wxFRAME_DRAWER ) )
+    {
+        wclass = kDrawerWindowClass;

     }
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
     }
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||

-            HasFlag( wxSYSTEM_MENU ) )
+            HasFlag( wxCLOSE_BOX ) || HasFlag( wxSYSTEM_MENU ) )

         {
             wclass = kDocumentWindowClass ;
         }
         {
             wclass = kDocumentWindowClass ;
         }

+        else if ( HasFlag( wxNO_BORDER ) )
+        {
+            wclass = kSimpleWindowClass ;
+        }

         else
         {
         else
         {

-#if TARGET_CARBON

             wclass = kPlainWindowClass ;
             wclass = kPlainWindowClass ;

-#else
-            wclass = kModalWindowClass ;
-#endif

         }
     }
 
         }
     }
 

-    if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
-    {
-        attr |= kWindowFullZoomAttribute ;
-        attr |= kWindowCollapseBoxAttribute ;
-    }
-    if ( HasFlag( wxRESIZE_BORDER ) )
+    if ( wclass != kPlainWindowClass )

     {
     {

-        attr |= kWindowResizableAttribute ;
+        if ( HasFlag( wxMINIMIZE_BOX ) )
+            attr |= kWindowCollapseBoxAttribute ;
+
+        if ( HasFlag( wxMAXIMIZE_BOX ) )
+            attr |= kWindowFullZoomAttribute ;
+
+        if ( HasFlag( wxRESIZE_BORDER ) )
+            attr |= kWindowResizableAttribute ;
+
+        if ( HasFlag( wxCLOSE_BOX) )
+            attr |= kWindowCloseBoxAttribute ;

     }
     }

-    if ( HasFlag( wxSYSTEM_MENU ) )
+    attr |= kWindowLiveResizeAttribute;
+
+    if ( HasFlag(wxSTAY_ON_TOP) )
+        group = GetWindowGroupOfClass(kUtilityWindowClass) ;
+
+    if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) )
+        group = GetWindowGroupOfClass(kFloatingWindowClass) ;
+
+    if ( group == NULL && parent != NULL )

     {
     {

-        attr |= kWindowCloseBoxAttribute ;
+        WindowRef parenttlw = (WindowRef) parent->MacGetTopLevelWindowRef();
+        if( parenttlw )
+            group = GetWindowGroupParent( GetWindowGroup( parenttlw ) );

     }
 
     }
 

-    if (HasFlag(wxSTAY_ON_TOP))
-       wclass = kUtilityWindowClass;
+    attr |= kWindowCompositingAttribute;
+#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
+    attr |= kWindowFrameworkScaledAttribute;
+#endif

 
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;
         customWindowDefSpec.defType = kWindowDefProcPtr;
 
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;
         customWindowDefSpec.defType = kWindowDefProcPtr;

-        customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
-
-        ::CreateCustomWindow( &customWindowDefSpec, wclass,
+        customWindowDefSpec.u.defProc =
+#ifdef __LP64__
+            (WindowDefUPP) wxShapedMacWindowDef;
+#else
+            NewWindowDefUPP(wxShapedMacWindowDef);
+#endif
+        err = ::CreateCustomWindow( &customWindowDefSpec, wclass,

                               attr, &theBoundsRect,
                               (WindowRef*) &m_macWindow);
     }
     else
     {
                               attr, &theBoundsRect,
                               (WindowRef*) &m_macWindow);
     }
     else
     {

-        ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
+        err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;

     }
 
     }
 

-    wxAssociateWinWithMacWindow( m_macWindow , this ) ;
-    UMASetWTitle( (WindowRef)m_macWindow , title ) ;
-    ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
-#if TARGET_CARBON
-    InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
-    InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
-        GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
+    if ( err == noErr && m_macWindow != NULL && group != NULL )
+        SetWindowGroup( (WindowRef) m_macWindow , group ) ;
+
+    wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
+
+    // setup a separate group for each window, so that overlays can be handled easily
+
+    WindowGroupRef overlaygroup = NULL;
+    verify_noerr( CreateWindowGroup( kWindowGroupAttrMoveTogether | kWindowGroupAttrLayerTogether | kWindowGroupAttrHideOnCollapse, &overlaygroup ));
+    verify_noerr( SetWindowGroupParent( overlaygroup, GetWindowGroup( (WindowRef) m_macWindow )));
+    verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , overlaygroup ));
+
+    if ( activationScopeSet )
+    {
+        verify_noerr( SetWindowActivationScope( (WindowRef) m_macWindow , activationScope ));
+    }
+
+    // the create commands are only for content rect,
+    // so we have to set the size again as structure bounds
+    SetWindowBounds(  (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ;
+
+    wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ;
+    SetWindowTitleWithCFString( (WindowRef) m_macWindow , wxCFStringRef( title , GetFont().GetEncoding() ) );
+    m_peer = new wxMacControl(this , true /*isRootControl*/) ;
+
+    // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
+    // the content view, so we have to retrieve it explicitly
+    HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
+        m_peer->GetControlRefAddr() ) ;
+    if ( !m_peer->Ok() )
+    {
+        // compatibility mode fallback
+        GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
+    }
+
+    // the root control level handler
+    MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
+
+    // Causes the inner part of the window not to be metal
+    // if the style is used before window creation.
+#if 0 // TARGET_API_MAC_OSX
+    if ( m_macUsesCompositing && m_macWindow != NULL )
+    {
+        if ( GetExtraStyle() & wxFRAME_EX_METAL )
+            MacSetMetalAppearance( true ) ;
+    }

 #endif
 #endif

-    m_macFocus = NULL ;

 
 

+    if ( m_macWindow != NULL )
+    {
+        MacSetUnifiedAppearance( true ) ;
+    }
+
+    HIViewRef growBoxRef = 0 ;
+    err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef  );
+    if ( err == noErr && growBoxRef != 0 )
+        HIGrowBoxViewSetTransparent( growBoxRef, true ) ;
+
+    // the frame window event handler
+    InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
+    MacInstallTopLevelWindowEventHandler() ;
+
+    DoSetWindowVariant( m_windowVariant ) ;
+
+    m_macFocus = NULL ;

 
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         // default shape matches the window size
 
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         // default shape matches the window size

-        wxRegion rgn(0, 0, m_width, m_height);
-        SetShape(rgn);
+        wxRegion rgn( 0, 0, w, h );
+        SetShape( rgn );

     }
     }

+
+    wxWindowCreateEvent event(this);
+    HandleWindowEvent(event);

 }
 
 }
 

-void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin)
+void wxTopLevelWindowMac::ClearBackground()

 {
 {

-    ((Point*)localOrigin)->h = 0;
-    ((Point*)localOrigin)->v = 0;
-    ((Rect*)clipRect)->left = 0;
-    ((Rect*)clipRect)->top = 0;
-    ((Rect*)clipRect)->right = m_width;
-    ((Rect*)clipRect)->bottom = m_height;
-    *window = m_macWindow ;
-    *rootwin = this ;
+    wxWindow::ClearBackground() ;

 }
 
 }
 

-void wxTopLevelWindowMac::Clear()
+// Raise the window to the top of the Z order
+void wxTopLevelWindowMac::Raise()

 {
 {

-    wxWindow::Clear() ;
+    ::SelectWindow( (WindowRef)m_macWindow ) ;

 }
 
 }
 

-WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
+// Lower the window to the bottom of the Z order
+void wxTopLevelWindowMac::Lower()

 {
 {

-    return m_macRootControl ;
+    ::SendBehind( (WindowRef)m_macWindow , NULL ) ;

 }
 
 }
 

-
-void wxTopLevelWindowMac::MacUpdate( long timestamp)
+void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)

 {
 {

-    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
-
-    BeginUpdate( (WindowRef)m_macWindow ) ;
-
-    RgnHandle       updateRgn = NewRgn();
-    RgnHandle       diffRgn = NewRgn() ;
-    if ( updateRgn && diffRgn )
+    if (s_macDeactivateWindow)

     {
     {

-#if 1
-        // macos internal control redraws clean up areas we'd like to redraw ourselves
-        // therefore we pick the boundary rect and make sure we can redraw it
-        RgnHandle trueUpdateRgn = NewRgn() ;
-        Rect trueUpdateRgnBoundary ;
-        GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
-        GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
-        RectRgn( (RgnHandle) updateRgn , &trueUpdateRgnBoundary ) ;
-        if ( trueUpdateRgn )
-            DisposeRgn( trueUpdateRgn ) ;
-        SetPortVisibleRegion(  GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;
-#else
-        GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
-#endif
-        DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
-        if ( !EmptyRgn( updateRgn ) )
-        {
-            MacRedraw( updateRgn , timestamp , m_macNeedsErasing || !EmptyRgn( diffRgn )  ) ;
-        }
+        wxLogTrace(TRACE_ACTIVATE,
+                   wxT("Doing delayed deactivation of %p"),
+                   s_macDeactivateWindow);
+
+        s_macDeactivateWindow->MacActivate(timestamp, false);

     }
     }

-    if ( updateRgn )
-        DisposeRgn( updateRgn );
-    if ( diffRgn )
-        DisposeRgn( diffRgn );
-    EndUpdate( (WindowRef)m_macWindow ) ;
-    SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
-    m_macNeedsErasing = false ;

 }
 
 }
 

+void wxTopLevelWindowMac::MacActivate( long timestamp , bool WXUNUSED(inIsActivating) )
+{
+    wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this);

 
 

-// Raise the window to the top of the Z order
-void wxTopLevelWindowMac::Raise()
+    if (s_macDeactivateWindow == this)
+        s_macDeactivateWindow = NULL;
+
+    MacDelayedDeactivation(timestamp);
+}
+
+void wxTopLevelWindowMac::SetTitle(const wxString& title)

 {
 {

-    ::SelectWindow( (WindowRef)m_macWindow ) ;
+    wxWindow::SetLabel( title ) ;
+    SetWindowTitleWithCFString( (WindowRef) m_macWindow , wxCFStringRef( title , GetFont().GetEncoding() ) ) ;

 }
 
 }
 

-// Lower the window to the bottom of the Z order
-void wxTopLevelWindowMac::Lower()
+wxString wxTopLevelWindowMac::GetTitle() const

 {
 {

-    ::SendBehind( (WindowRef)m_macWindow , NULL ) ;
+    return wxWindow::GetLabel();

 }
 
 }
 

-void wxTopLevelWindowMac::MacFireMouseEvent(
-    wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp )
+bool wxTopLevelWindowMac::Show(bool show)

 {
 {

-    wxMouseEvent event(wxEVT_LEFT_DOWN);
-    bool isDown = !(modifiers & btnState) ; // 1 is for up
-    bool controlDown = modifiers & controlKey ; // for simulating right mouse
+    if ( !wxTopLevelWindowBase::Show(show) )
+        return false;

 
 

-    event.m_leftDown = isDown && !controlDown;
+    bool plainTransition = true;

 
 

-    event.m_middleDown = FALSE;
-    event.m_rightDown = isDown && controlDown;
+#if wxUSE_SYSTEM_OPTIONS
+    if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
+        plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
+#endif

 
 

-    if ( kind == mouseDown )
+    if (show)

     {
     {

-        if ( controlDown )
-            event.SetEventType(wxEVT_RIGHT_DOWN ) ;
+        if ( plainTransition )
+           ::ShowWindow( (WindowRef)m_macWindow );

         else
         else

-            event.SetEventType(wxEVT_LEFT_DOWN ) ;
+           ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
+
+        ::SelectWindow( (WindowRef)m_macWindow ) ;
+
+        // because apps expect a size event to occur at this moment
+        wxSizeEvent event(GetSize() , m_windowId);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);

     }
     }

-    else if ( kind == mouseUp )
+    else

     {
     {

-        if ( controlDown )
-            event.SetEventType(wxEVT_RIGHT_UP ) ;
+        if ( plainTransition )
+           ::HideWindow( (WindowRef)m_macWindow );

         else
         else

-            event.SetEventType(wxEVT_LEFT_UP ) ;
+           ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL );

     }
     }

-    else
+
+    return true ;
+}
+
+bool wxTopLevelWindowMac::ShowWithEffect(wxShowEffect effect,
+                            unsigned timeout,
+                            wxDirection dir)
+{
+    // TODO factor common code
+    if ( !wxTopLevelWindowBase::Show(true) )
+        return false;
+ 
+    WindowTransitionEffect transition = 0 ;
+    switch( effect )
+    {
+        case wxSHOW_EFFECT_ROLL :
+        case wxSHOW_EFFECT_SLIDE :
+            transition = kWindowGenieTransitionEffect;
+            break;
+        case wxSHOW_EFFECT_BLEND :
+            transition = kWindowFadeTransitionEffect;
+            break;
+        case wxSHOW_EFFECT_EXPAND :
+        default :
+            // having sheets would be fine, but this might lead to a repositioning
+#if 0
+            if ( GetParent() )
+                transition = kWindowSheetTransitionEffect;
+            else
+#endif
+                transition = kWindowZoomTransitionEffect;
+            break;
+    }
+    
+    TransitionWindowOptions options;
+    options.version = 0;
+    options.duration = timeout / 1000.0;
+    options.window = transition == kWindowSheetTransitionEffect ? (WindowRef) GetParent()->MacGetTopLevelWindowRef() :0;
+    options.userData = 0;
+    
+    wxSize size = wxGetDisplaySize();
+    Rect bounds;
+    GetWindowBounds( (WindowRef)m_macWindow, kWindowStructureRgn, &bounds );
+    CGRect hiBounds = CGRectMake( bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top );
+
+    if ( dir & wxRIGHT )
+    {
+        hiBounds.origin.x = size.x;
+        hiBounds.size.width = 0;
+    }
+    if ( dir & wxUP )
+    {
+        hiBounds.origin.y = 0;
+        hiBounds.size.height = 0;
+    }
+    if ( dir & wxDOWN )
+    {
+        hiBounds.origin.y = size.y;
+        hiBounds.size.height = 0;
+    }
+    if ( dir & wxLEFT )

     {
     {

-        event.SetEventType(wxEVT_MOTION ) ;
+        hiBounds.origin.x = 0;
+        hiBounds.size.width = 0;

     }
     }

+    
+    ::TransitionWindowWithOptions( (WindowRef)m_macWindow, transition, kWindowShowTransitionAction, transition == kWindowGenieTransitionEffect ? &hiBounds : NULL  ,  
+                                  false, &options );

 
 

-    event.m_shiftDown = modifiers & shiftKey;
-    event.m_controlDown = modifiers & controlKey;
-    event.m_altDown = modifiers & optionKey;
-    event.m_metaDown = modifiers & cmdKey;
+    ::SelectWindow( (WindowRef)m_macWindow ) ;
+    
+    // because apps expect a size event to occur at this moment
+    wxSizeEvent event(GetSize() , m_windowId);
+    event.SetEventObject(this);
+    HandleWindowEvent(event);
+    
+    return true;
+}

 
 

-    Point       localwhere ;
-    localwhere.h = x ;
-    localwhere.v = y ;
+bool wxTopLevelWindowMac::HideWithEffect(wxShowEffect effect,
+                            unsigned timeout ,
+                            wxDirection dir )
+{
+    if ( !wxTopLevelWindowBase::Show(false) )
+        return false;
+    
+    WindowTransitionEffect transition = 0 ;
+    switch( effect )
+    {
+        case wxSHOW_EFFECT_ROLL :
+        case wxSHOW_EFFECT_SLIDE :
+            transition = kWindowGenieTransitionEffect;
+            break;
+        case wxSHOW_EFFECT_BLEND :
+            transition = kWindowFadeTransitionEffect;
+            break;
+        case wxSHOW_EFFECT_EXPAND :
+        default:
+#if 0
+            if ( GetParent() )
+                transition = kWindowSheetTransitionEffect;
+            else
+#endif
+                transition = kWindowZoomTransitionEffect;
+            break;
+    }
+    TransitionWindowOptions options;
+    options.version = 0;
+    options.duration = timeout / 1000.0;
+    options.window = transition == kWindowSheetTransitionEffect ? (WindowRef) GetParent()->MacGetTopLevelWindowRef() :0;
+    options.userData = 0;
+    
+    wxSize size = wxGetDisplaySize();
+    Rect bounds;
+    GetWindowBounds( (WindowRef)m_macWindow, kWindowStructureRgn, &bounds );
+    CGRect hiBounds = CGRectMake( bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top );
+    
+    if ( dir & wxRIGHT )
+    {
+        hiBounds.origin.x = size.x;
+        hiBounds.size.width = 0;
+    }
+    if ( dir & wxUP )
+    {
+        hiBounds.origin.y = 0;
+        hiBounds.size.height = 0;
+    }
+    if ( dir & wxDOWN )
+    {
+        hiBounds.origin.y = size.y;
+        hiBounds.size.height = 0;
+    }
+    if ( dir & wxLEFT )
+    {
+        hiBounds.origin.x = 0;
+        hiBounds.size.width = 0;
+    }
+    ::TransitionWindowWithOptions( (WindowRef)m_macWindow, transition, kWindowHideTransitionAction, transition == kWindowGenieTransitionEffect ? &hiBounds : NULL  ,  
+                                  false, &options );

 
 

-    GrafPtr     port ;
-    ::GetPort( &port ) ;
-    ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
-    ::GlobalToLocal( &localwhere ) ;
-    ::SetPort( port ) ;
+    return true;
+}

 
 

-    if ( kind == mouseDown )
+bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
+{
+    if ( show )

     {
     {

-        if ( timestamp - gs_lastWhen <= GetDblTime() )
+        FullScreenData *data = (FullScreenData *)m_macFullScreenData ;
+        delete data ;
+        data = new FullScreenData() ;
+
+        m_macFullScreenData = data ;
+        data->m_position = GetPosition() ;
+        data->m_size = GetSize() ;
+        data->m_wasResizable = MacGetWindowAttributes() & kWindowResizableAttribute ;
+
+        if ( style & wxFULLSCREEN_NOMENUBAR )
+            HideMenuBar() ;
+
+        wxRect client = wxGetClientDisplayRect() ;
+
+        int left , top , right , bottom ;
+        int x, y, w, h ;
+
+        x = client.x ;
+        y = client.y ;
+        w = client.width ;
+        h = client.height ;
+
+        MacGetContentAreaInset( left , top , right , bottom ) ;
+
+        if ( style & wxFULLSCREEN_NOCAPTION )

         {
         {

-            if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
-            {
-                // This is not right if the second mouse down
-                // event occured in a differen window. We
-                // correct this in MacDispatchMouseEvent.
-                if ( controlDown )
-                    event.SetEventType(wxEVT_RIGHT_DCLICK ) ;
-                else
-                    event.SetEventType(wxEVT_LEFT_DCLICK ) ;
-            }
-            gs_lastWhen = 0 ;
+            y -= top ;
+            h += top ;

         }
         }

-        else
+
+        if ( style & wxFULLSCREEN_NOBORDER )

         {
         {

-            gs_lastWhen = timestamp ;
+            x -= left ;
+            w += left + right ;
+            h += bottom ;

         }
         }

-        gs_lastWhere = localwhere ;
-    }

 
 

-    event.m_x = localwhere.h;
-    event.m_y = localwhere.v;
-    event.m_x += m_x;
-    event.m_y += m_y;
+        if ( style & wxFULLSCREEN_NOTOOLBAR )
+        {
+            // TODO
+        }

 
 

-    event.m_timeStamp = timestamp;
-    event.SetEventObject(this);
-    if ( wxTheApp->s_captureWindow )
-    {
-        int x = event.m_x ;
-        int y = event.m_y ;
-        wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ;
-        event.m_x = x ;
-        event.m_y = y ;
-        event.SetEventObject( wxTheApp->s_captureWindow ) ;
-        wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
-
-        if ( kind == mouseUp )
+        if ( style & wxFULLSCREEN_NOSTATUSBAR )

         {
         {

-            wxTheApp->s_captureWindow = NULL ;
-            if ( !wxIsBusy() )
-            {
-                m_cursor.MacInstall() ;
-            }
+            // TODO

         }
         }

+
+        SetSize( x , y , w, h ) ;
+        if ( data->m_wasResizable )
+            MacChangeWindowAttributes( kWindowNoAttributes , kWindowResizableAttribute ) ;

     }
     else
     {
     }
     else
     {

-        MacDispatchMouseEvent( event ) ;
+        ShowMenuBar() ;
+        FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+        if ( data->m_wasResizable )
+            MacChangeWindowAttributes( kWindowResizableAttribute ,  kWindowNoAttributes ) ;
+        SetPosition( data->m_position ) ;
+        SetSize( data->m_size ) ;
+
+        delete data ;
+        m_macFullScreenData = NULL ;

     }
     }

-}

 
 

-#if !TARGET_CARBON
+    return false;
+}

 
 

-void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
+bool wxTopLevelWindowMac::IsFullScreen() const

 {
 {

-    MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-        ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
+    return m_macFullScreenData != NULL ;

 }
 
 }
 

-void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
+
+bool wxTopLevelWindowMac::SetTransparent(wxByte alpha)

 {
 {

-    switch (part)
-    {
-        case inContent:
-            {
-                MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-                    ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
-            }
-            break ;
-    }
+    OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, float(alpha)/255.0);
+    return result == noErr;

 }
 
 }
 

-void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
+
+bool wxTopLevelWindowMac::CanSetTransparent()

 {
 {

-    switch (part)
-    {
-        case inContent:
-            {
-                MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-                    ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
-            }
-            break ;
-    }
+    return true;

 }
 
 }
 

-#endif

 
 

-void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
+void wxTopLevelWindowMac::SetExtraStyle(long exStyle)

 {
 {

-    wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
-    event.m_timeStamp = timestamp ;
-    event.SetEventObject(this);
-
-    GetEventHandler()->ProcessEvent(event);
+    if ( GetExtraStyle() == exStyle )
+        return ;

 
 

-    UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
+    wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;

 
 

-    // Early versions of MacOS X don't refresh backgrounds properly,
-    // so refresh the whole window on activation and deactivation.
-    long osVersion = UMAGetSystemVersion();
-    if (osVersion >= 0x1000 && osVersion < 0x1020)
+    if ( m_macWindow != NULL )

     {
     {

-        Refresh(TRUE);
+        bool metal = GetExtraStyle() & wxFRAME_EX_METAL ;
+
+        if ( MacGetMetalAppearance() != metal )
+        {
+            if ( MacGetUnifiedAppearance() )
+                MacSetUnifiedAppearance( !metal ) ;
+
+            MacSetMetalAppearance( metal ) ;
+        }

     }
     }

-    else
+}
+
+bool wxTopLevelWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
+{
+    if ( !wxTopLevelWindowBase::SetBackgroundStyle(style) )
+        return false ;
+
+    WindowRef windowRef = HIViewGetWindow( (HIViewRef)GetHandle() );
+
+    if ( GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )

     {
     {

-        // for the moment we have to resolve some redrawing issues like this
-        // the OS is stealing some redrawing areas as soon as it draws a control
-        Refresh(TRUE);
+        OSStatus err = HIWindowChangeFeatures( windowRef, 0, kWindowIsOpaque );
+        verify_noerr( err );
+        err = ReshapeCustomWindow( windowRef );
+        verify_noerr( err );

     }
     }

-}

 
 

-#if !TARGET_CARBON
+    return true ;
+}

 
 

-void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
+// TODO: switch to structure bounds -
+// we are still using coordinates of the content view
+//
+void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )

 {
 {

+    Rect content, structure ;
+
+    GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ;
+    GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ;
+
+    left = content.left - structure.left ;
+    top = content.top  - structure.top ;
+    right = structure.right - content.right ;
+    bottom = structure.bottom - content.bottom ;

 }
 
 }
 

-#endif
+void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
+{
+    m_cachedClippedRectValid = false ;
+    Rect bounds = { y , x , y + height , x + width } ;
+    verify_noerr(SetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+    wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+}

 
 

-void wxTopLevelWindowMac::SetTitle(const wxString& title)
+void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const

 {
 {

-    wxWindow::SetTitle( title ) ;
-    UMASetWTitle( (WindowRef)m_macWindow , title ) ;
+    Rect bounds ;
+
+    verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+
+    if (x)
+       *x = bounds.left ;
+    if (y)
+       *y = bounds.top ;

 }
 
 }
 

-bool wxTopLevelWindowMac::Show(bool show)
+void wxTopLevelWindowMac::DoGetSize( int *width, int *height ) const

 {
 {

-    if ( !wxWindow::Show(show) )
-        return FALSE;
+    Rect bounds ;

 
 

-    if (show)
-    {
-      // this is leading to incorrect window layering in some situations
-      // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
-      ::ShowWindow( (WindowRef)m_macWindow ) ;
-      ::SelectWindow( (WindowRef)m_macWindow ) ;
-      // no need to generate events here, they will get them triggered by macos
-      // actually they should be , but apparently they are not
-      wxSize size(m_width, m_height);
-      wxSizeEvent event(size, m_windowId);
-      event.SetEventObject(this);
-      GetEventHandler()->ProcessEvent(event);
-    }
-    else
-    {
-      // this is leading to incorrect window layering in some situations
-      // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
-      ::HideWindow( (WindowRef)m_macWindow ) ;
-    }
+    verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;

 
 

-    if ( !show )
-    {
-    }
-    else
-    {
-        Refresh() ;
-    }
+    if (width)
+       *width = bounds.right - bounds.left ;
+    if (height)
+       *height = bounds.bottom - bounds.top ;
+}

 
 

-    return TRUE;
+void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const
+{
+    Rect bounds ;
+
+    verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowContentRgn , &bounds )) ;
+
+    if (width)
+       *width = bounds.right - bounds.left ;
+    if (height)
+       *height = bounds.bottom - bounds.top ;

 }
 
 }
 

-void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
+void wxTopLevelWindowMac::DoCentre(int dir)

 {
 {

-    int former_x = m_x ;
-    int former_y = m_y ;
-    int former_w = m_width ;
-    int former_h = m_height ;
-
-    int actualWidth = width;
-    int actualHeight = height;
-    int actualX = x;
-    int actualY = y;
-
-    if ((m_minWidth != -1) && (actualWidth < m_minWidth))
-        actualWidth = m_minWidth;
-    if ((m_minHeight != -1) && (actualHeight < m_minHeight))
-        actualHeight = m_minHeight;
-    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
-        actualWidth = m_maxWidth;
-    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
-        actualHeight = m_maxHeight;
-
-    bool doMove = false ;
-    bool doResize = false ;
-
-    if ( actualX != former_x || actualY != former_y )
-    {
-        doMove = true ;
-    }
-    if ( actualWidth != former_w || actualHeight != former_h )
-    {
-        doResize = true ;
-    }
+    if ( m_macWindow != 0 )
+        wxTopLevelWindowBase::DoCentre(dir);
+}

 
 

-    if ( doMove || doResize )
-    {
-        m_x = actualX ;
-        m_y = actualY ;
-        m_width = actualWidth ;
-        m_height = actualHeight ;
+void wxTopLevelWindowMac::MacSetMetalAppearance( bool set )
+{
+    if ( MacGetUnifiedAppearance() )
+        MacSetUnifiedAppearance( false ) ;

 
 

-        if ( doMove )
-            ::MoveWindow((WindowRef)m_macWindow, m_x, m_y  , false); // don't make frontmost
+    MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes ,
+        set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
+}

 
 

-        if ( doResize )
-            ::SizeWindow((WindowRef)m_macWindow, m_width, m_height  , true);
+bool wxTopLevelWindowMac::MacGetMetalAppearance() const
+{
+    return MacGetWindowAttributes() & kWindowMetalAttribute ;
+}

 
 

-        // the OS takes care of invalidating and erasing the new area so we only have to
-        // take care of refreshing for full repaints
+void wxTopLevelWindowMac::MacSetUnifiedAppearance( bool set )
+{
+    if ( MacGetMetalAppearance() )
+        MacSetMetalAppearance( false ) ;
+
+    MacChangeWindowAttributes( set ? kWindowUnifiedTitleAndToolbarAttribute : kWindowNoAttributes ,
+        set ? kWindowNoAttributes : kWindowUnifiedTitleAndToolbarAttribute) ;
+
+    // For some reason, Tiger uses white as the background color for this appearance,
+    // while most apps using it use the typical striped background. Restore that behavior
+    // for wx.
+    // TODO: Determine if we need this on Leopard as well. (should be harmless either way,
+    // though)
+    SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
+}

 
 

-        if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
-            Refresh() ;
+bool wxTopLevelWindowMac::MacGetUnifiedAppearance() const
+{
+    return MacGetWindowAttributes() & kWindowUnifiedTitleAndToolbarAttribute ;
+}

 
 

+void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear )
+{
+    ChangeWindowAttributes( (WindowRef)m_macWindow, attributesToSet, attributesToClear ) ;
+}

 
 

-        if ( IsKindOf( CLASSINFO( wxFrame ) ) )
-        {
-            wxFrame* frame = (wxFrame*) this ;
-            frame->PositionStatusBar();
-            frame->PositionToolBar();
-        }
-        if ( doMove )
-            wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified
+wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const
+{
+    UInt32 attr = 0 ;
+    GetWindowAttributes( (WindowRef) m_macWindow, &attr ) ;

 
 

-        MacRepositionScrollBars() ;
-        if ( doMove )
-        {
-            wxPoint point(m_x, m_y);
-            wxMoveEvent event(point, m_windowId);
-            event.SetEventObject(this);
-            GetEventHandler()->ProcessEvent(event) ;
-        }
-        if ( doResize )
-        {
-             MacRepositionScrollBars() ;
-             wxSize size(m_width, m_height);
-             wxSizeEvent event(size, m_windowId);
-             event.SetEventObject(this);
-             GetEventHandler()->ProcessEvent(event);
-        }
-    }
+    return attr ;
+}

 
 

+void wxTopLevelWindowMac::MacPerformUpdates()
+{
+    // for composited windows this also triggers a redraw of all
+    // invalid views in the window
+    HIWindowFlush((WindowRef) m_macWindow) ;

 }
 
 }
 

-/*
- * Invalidation Mechanism
- *
- * The update mechanism reflects exactely the windows mechanism
- * the rect gets added to the window invalidate region, if the eraseBackground flag
- * has been true for any part of the update rgn the background is erased in the entire region
- * not just in the specified rect.
- *
- * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have
- * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event
- * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window
- * will get the eraseBackground event first
- */
-
-void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )
-{
-    GrafPtr formerPort ;
-    GetPort( &formerPort ) ;
-    SetPortWindowPort( (WindowRef)m_macWindow ) ;
-
-    m_macNeedsErasing |= eraseBackground ;
-
-    // if we already know that we will have to erase, there's no need to track the rest
-    if ( !m_macNeedsErasing)
-    {
-        // we end only here if eraseBackground is false
-        // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
-        // we will have to erase anyway
+// Attracts the users attention to this window if the application is
+// inactive (should be called when a background event occurs)

 
 

-        RgnHandle       updateRgn = NewRgn();
-        RgnHandle       diffRgn = NewRgn() ;
-        if ( updateRgn && diffRgn )
-        {
-            GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn );
-            Point pt = {0,0} ;
-            LocalToGlobal( &pt ) ;
-            OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
-            DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
-            if ( !EmptyRgn( diffRgn ) )
-            {
-                m_macNeedsErasing = true ;
-            }
-        }
-        if ( updateRgn )
-            DisposeRgn( updateRgn );
-        if ( diffRgn )
-            DisposeRgn( diffRgn );
+static pascal void wxMacNMResponse( NMRecPtr ptr )
+{
+    NMRemove( ptr ) ;
+    DisposePtr( (Ptr)ptr ) ;
+}

 
 

-        if ( !m_macNeedsErasing )
-        {
-            RgnHandle rectRgn = NewRgn() ;
-            SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ;
-            UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ;
-            DisposeRgn( rectRgn ) ;
-        }
-    }
-    InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ;
-    // turn this on to debug the refreshing cycle
-#if wxMAC_DEBUG_REDRAW
-    PaintRect( rect ) ;
-#endif
-    SetPort( formerPort ) ;
+void wxTopLevelWindowMac::RequestUserAttention(int WXUNUSED(flags))
+{
+    NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ;
+    static wxMacNMUPP nmupp( wxMacNMResponse );
+
+    memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ;
+    notificationRequest->qType = nmType ;
+    notificationRequest->nmMark = 1 ;
+    notificationRequest->nmIcon = 0 ;
+    notificationRequest->nmSound = 0 ;
+    notificationRequest->nmStr = NULL ;
+    notificationRequest->nmResp = nmupp ;
+
+    verify_noerr( NMInstall( notificationRequest ) ) ;

 }
 
 }
 

+// ---------------------------------------------------------------------------
+// Shape implementation
+// ---------------------------------------------------------------------------
+

 
 bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
 {
 
 bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
 {

-    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
+    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 

-    // The empty region signifies that the shape should be removed from the
-    // window.
+    // The empty region signifies that the shape
+    // should be removed from the window.

     if ( region.IsEmpty() )
     {
         wxSize sz = GetClientSize();
         wxRegion rgn(0, 0, sz.x, sz.y);
     if ( region.IsEmpty() )
     {
         wxSize sz = GetClientSize();
         wxRegion rgn(0, 0, sz.x, sz.y);

-        return SetShape(rgn);
+        if ( rgn.IsEmpty() )
+            return false ;
+        else
+            return SetShape(rgn);

     }
 
     // Make a copy of the region
     RgnHandle  shapeRegion = NewRgn();
     }
 
     // Make a copy of the region
     RgnHandle  shapeRegion = NewRgn();

-    CopyRgn( (RgnHandle)region.GetWXHRGN(), shapeRegion );
+    HIShapeGetAsQDRgn( region.GetWXHRGN(), shapeRegion );

 
     // Dispose of any shape region we may already have
     RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef)MacGetWindowRef() );
 
     // Dispose of any shape region we may already have
     RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef)MacGetWindowRef() );


@@ -1088,51 +1803,49 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
         DisposeRgn(oldRgn);
 
     // Save the region so we can use it later
         DisposeRgn(oldRgn);
 
     // Save the region so we can use it later

-    SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
+    SetWRefCon((WindowRef)MacGetWindowRef(), (URefCon)shapeRegion);

 
 

-    // Tell the window manager that the window has changed shape
+    // inform the window manager that the window has changed shape

     ReshapeCustomWindow((WindowRef)MacGetWindowRef());
     ReshapeCustomWindow((WindowRef)MacGetWindowRef());

-    return TRUE;
-}
-

 
 

+    return true;
+}

 
 // ---------------------------------------------------------------------------
 // Support functions for shaped windows, based on Apple's CustomWindow sample at
 // http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // Support functions for shaped windows, based on Apple's CustomWindow sample at
 // http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
 // ---------------------------------------------------------------------------
 

-

 static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
 {
     GetWindowPortBounds(window, inRect);
 static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
 {
     GetWindowPortBounds(window, inRect);

-    Point pt = {inRect->left, inRect->top};
-    SetPort((GrafPtr) GetWindowPort(window));
-    LocalToGlobal(&pt);
+    Point pt = { inRect->top ,inRect->left };
+    wxMacLocalToGlobal( window, &pt ) ;
+    inRect->bottom += pt.v - inRect->top;
+    inRect->right += pt.h - inRect->left;

     inRect->top = pt.v;
     inRect->left = pt.h;
     inRect->top = pt.v;
     inRect->left = pt.h;

-    inRect->bottom += pt.v;
-    inRect->right += pt.h;

 }
 
 }
 

-
-static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
+static SInt32 wxShapedMacWindowGetFeatures(WindowRef WXUNUSED(window), SInt32 param)

 {
     /*------------------------------------------------------
         Define which options your custom window supports.
     --------------------------------------------------------*/
     //just enable everything for our demo
 {
     /*------------------------------------------------------
         Define which options your custom window supports.
     --------------------------------------------------------*/
     //just enable everything for our demo

-    *(OptionBits*)param=//kWindowCanGrow|
-                        //kWindowCanZoom|
-                        //kWindowCanCollapse|
-                        //kWindowCanGetWindowRegion|
-                        //kWindowHasTitleBar|
-                        //kWindowSupportsDragHilite|
-                        kWindowCanDrawInCurrentPort|
-                        //kWindowCanMeasureTitle|
-                        kWindowWantsDisposeAtProcessDeath|
-                        kWindowSupportsSetGrowImageRegion|
-                        kWindowDefSupportsColorGrafPort;
+    *(OptionBits*)param =
+        //kWindowCanGrow |
+        //kWindowCanZoom |
+        kWindowCanCollapse |
+        //kWindowCanGetWindowRegion |
+        //kWindowHasTitleBar |
+        //kWindowSupportsDragHilite |
+        kWindowCanDrawInCurrentPort |
+        //kWindowCanMeasureTitle |
+        kWindowWantsDisposeAtProcessDeath |
+        kWindowSupportsGetGrowImageRegion |
+        kWindowDefSupportsColorGrafPort;
+

     return 1;
 }
 
     return 1;
 }
 


@@ -1145,8 +1858,9 @@ static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
     wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window);
     if (win)
     {
     wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window);
     if (win)
     {

-        wxRect r = win->GetRect();
-        SetRectRgn(rgn, r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
+        Rect r ;
+        wxShapedMacWindowGetPos( window, &r ) ;
+        RectRgn( rgn , &r ) ;

     }
 }
 
     }
 }
 


@@ -1159,73 +1873,77 @@ static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
     if (cachedRegion)
     {
         Rect windowRect;
     if (cachedRegion)
     {
         Rect windowRect;

-        wxShapedMacWindowGetPos(window, &windowRect);  //how big is the window
-        CopyRgn(cachedRegion, rgn);            //make a copy of our cached region
+        wxShapedMacWindowGetPos(window, &windowRect);    // how big is the window
+        CopyRgn(cachedRegion, rgn);                      // make a copy of our cached region

         OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window
         OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window

-        //MapRgn(rgn, &mMaskSize, &windowRect);        //scale it to our actual window size
+        //MapRgn(rgn, &mMaskSize, &windowRect);          //scale it to our actual window size

     }
 }
 
     }
 }
 

-
-

 static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
 {
 static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
 {

-    GetWindowRegionPtr rgnRec=(GetWindowRegionPtr)param;
+    GetWindowRegionPtr rgnRec = (GetWindowRegionPtr)param;

 
 

-    switch(rgnRec->regionCode)
+    if (rgnRec == NULL)
+        return paramErr;
+
+    switch (rgnRec->regionCode)

     {
         case kWindowStructureRgn:
             wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
             break;
     {
         case kWindowStructureRgn:
             wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
             break;

+

         case kWindowContentRgn:
             wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
             break;
         case kWindowContentRgn:
             wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
             break;

+

         default:
             SetEmptyRgn(rgnRec->winRgn);
         default:
             SetEmptyRgn(rgnRec->winRgn);

-    }  //switch
+            break;
+    }

 
     return noErr;
 }
 
 
     return noErr;
 }
 

-
-static SInt32 wxShapedMacWindowHitTest(WindowRef window,SInt32 param)
+// Determine the region of the window which was hit
+//
+static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param)

 {
 {

-    /*------------------------------------------------------
-        Determine the region of the window which was hit
-    --------------------------------------------------------*/

     Point hitPoint;
     Point hitPoint;

-    static RgnHandle tempRgn=nil;
+    static RgnHandle tempRgn = NULL;

 
 

-    if(!tempRgn)
-       tempRgn=NewRgn();
+    if (tempRgn == NULL)
+        tempRgn = NewRgn();

 
 

-    SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked
+    // get the point clicked
+    SetPt( &hitPoint, LoWord(param), HiWord(param) );

 
 

-     //Mac OS 8.5 or later
+     // Mac OS 8.5 or later

     wxShapedMacWindowStructureRegion(window, tempRgn);
     wxShapedMacWindowStructureRegion(window, tempRgn);

-    if (PtInRgn(hitPoint, tempRgn)) //in window content region?
+    if (PtInRgn( hitPoint, tempRgn )) //in window content region?

         return wInContent;
 
         return wInContent;
 

-    return wNoHit;//no significant area was hit.
+    // no significant area was hit
+    return wNoHit;

 }
 
 }
 

-
-static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param)
+static pascal long wxShapedMacWindowDef(short WXUNUSED(varCode), WindowRef window, SInt16 message, SInt32 param)

 {
 {

-    switch(message)
+    switch (message)

     {
         case kWindowMsgHitTest:
     {
         case kWindowMsgHitTest:

-            return wxShapedMacWindowHitTest(window,param);
+            return wxShapedMacWindowHitTest(window, param);

 
         case kWindowMsgGetFeatures:
 
         case kWindowMsgGetFeatures:

-            return wxShapedMacWindowGetFeatures(window,param);
+            return wxShapedMacWindowGetFeatures(window, param);

 
         // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
         case kWindowMsgGetRegion:
 
         // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
         case kWindowMsgGetRegion:

-            return wxShapedMacWindowGetRegion(window,param);
+            return wxShapedMacWindowGetRegion(window, param);
+
+        default:
+            break;

     }
 
     return 0;
 }
     }
 
     return 0;
 }

-
-// ---------------------------------------------------------------------------