X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5be55d562f584025d966980f5fc4272db60c6eae..d109c5849ed117966311a44875c97ae3d77b44e5:/src/mac/carbon/toplevel.cpp?ds=sidebyside

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index dd928635f1..d41ae760f0 100644
--- 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
+// Purpose:     implements wxTopLevelWindow for Mac
+// Author:      Stefan Csomor
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -35,6 +35,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/settings.h"
 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"
@@ -42,14 +43,14 @@
 #include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
+#if wxUSE_SYSTEM_OPTIONS
+    #include "wx/sysopt.h"
+#endif
 
-#include "ToolUtils.h"
-
+#include <ToolUtils.h>
 
-#define wxMAC_DEBUG_REDRAW 0
-#ifndef wxMAC_DEBUG_REDRAW
-#define wxMAC_DEBUG_REDRAW 0
-#endif
+//For targeting OSX
+#include "wx/mac/private.h"
 
 // ----------------------------------------------------------------------------
 // globals
@@ -58,48 +59,49 @@
 // list of all frames and modeless dialogs
 wxWindowList       wxModelessWindows;
 
-// double click testing
-static   Point     gs_lastWhere;
-static   long      gs_lastWhen = 0;
-
-
-#if TARGET_CARBON
 static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
-#endif
 
 // ============================================================================
 // wxTopLevelWindowMac implementation
 // ============================================================================
 
+BEGIN_EVENT_TABLE(wxTopLevelWindowMac, wxTopLevelWindowBase)
+END_EVENT_TABLE()
+
+
 // ---------------------------------------------------------------------------
 // Carbon Events
 // ---------------------------------------------------------------------------
 
-#if TARGET_CARBON
-
 extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 
 static const EventTypeSpec eventList[] =
 {
+    // TODO remove control related event like key and mouse (except for WindowLeave events)
+#if 1
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 
     { kEventClassKeyboard, kEventRawKeyDown } ,
     { kEventClassKeyboard, kEventRawKeyRepeat } ,
     { kEventClassKeyboard, kEventRawKeyUp } ,
     { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
+#endif
 
-    { kEventClassWindow , kEventWindowUpdate } ,
+    { kEventClassWindow , kEventWindowShown } ,
     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,
     { kEventClassWindow , kEventWindowBoundsChanging } ,
     { kEventClassWindow , kEventWindowBoundsChanged } ,
     { kEventClassWindow , kEventWindowClose } ,
 
+    // 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 , kEventMouseWheelMoved } ,
     { kEventClassMouse , kEventMouseMoved } ,
     { kEventClassMouse , kEventMouseDragged } ,
-
 } ;
 
 static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
@@ -111,7 +113,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
-    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
     EventRef rawEvent ;
 
@@ -123,16 +124,32 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 
-    UInt32 message = (keyCode << 8) + charCode;
-
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
+            // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
+            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the
+            wxControl* control = wxDynamicCast( focus , wxControl ) ;
+            if ( control )
+            {
+                ControlRef macControl = (ControlRef) control->GetHandle() ;
+                if ( macControl )
+                {
+                    ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
+                    result = noErr ;
+                }
+            }
+            /*
+            // this may lead to double events sent to a window in case all handlers have skipped the key down event
+            UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+            UInt32 message = (keyCode << 8) + charCode;
+
             if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }
+            */
             break ;
     }
 
@@ -144,6 +161,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     OSStatus result = eventNotHandledErr ;
 
     wxWindow* focus = wxWindow::FindFocus() ;
+    if ( focus == NULL )
+        return result ;
+        
     char charCode ;
     UInt32 keyCode ;
     UInt32 modifiers ;
@@ -161,10 +181,16 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     {
         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 != NULL) && wxTheApp->MacSendKeyDownEvent(
+                    focus , message , modifiers , when , point.h , point.v ) )
+                {
+                    result = noErr ;
+                }
+                wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
             }
             break ;
         case kEventRawKeyUp :
@@ -207,6 +233,12 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
+                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & cmdKey )
+                {
+                    event.m_keyCode = WXK_COMMAND ;
+                    event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+                    focus->GetEventHandler()->ProcessEvent( event ) ;
+                }
                 wxTheApp->s_lastModifiers = modifiers ;
             }
              break ;
@@ -215,115 +247,469 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     return result ;
 }
 
-static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
-    OSStatus result = eventNotHandledErr ;
+// 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
 
-    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
-    Point point ;
-    UInt32 modifiers = 0;
-    EventMouseButton button = 0 ;
-    UInt32 click = 0 ;
+// This handler can also be called from app level where data (ie target window) may be null or a non wx window
 
-    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 );
+wxWindow* g_MacLastWindow = NULL ;
 
-    if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
-        modifiers += btnState ;
+static EventMouseButton lastButton = 0 ;
 
-    WindowRef window ;
-    short windowPart = ::FindWindow(point, &window);
+static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
+{
+    UInt32 modifiers = cEvent.GetParameter<UInt32>(kEventParamKeyModifiers, typeUInt32) ;
+    Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
 
-    if ( IsWindowActive(window) && windowPart == inContent )
+    // this parameter are not given for all events 
+    EventMouseButton button = 0 ;
+    UInt32 clickCount = 0 ; 
+    cEvent.GetParameter<EventMouseButton>(kEventParamMouseButton, typeMouseButton , &button) ;
+    cEvent.GetParameter<UInt32>(kEventParamClickCount, typeUInt32 , &clickCount ) ;
+
+    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.SetTimestamp( cEvent.GetTicks() ) ;
+   // a control click is interpreted as a right click 
+    if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
+    {
+        button = kEventMouseButtonSecondary ;
+    }
+    
+    // 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 )
+        lastButton = button ;
+        
+    if ( button == 0 )
+        lastButton = 0 ;    
+    else if ( lastButton )
+        button = lastButton ;
+
+    // determinate the correct down state, wx does not want a 'down' for a mouseUp event, while mac delivers
+    // this button
+    if ( button != 0 && cEvent.GetKind() != kEventMouseUp )
     {
-        switch ( GetEventKind( event ) )
+        switch( button )
         {
-            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 ;
+            case kEventMouseButtonPrimary :
+                wxevent.m_leftDown = true ;
                 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 ;
+            case kEventMouseButtonSecondary :
+                wxevent.m_rightDown = true ;
                 break ;
-            default :
+            case kEventMouseButtonTertiary :
+                wxevent.m_middleDown = true ;
                 break ;
         }
     }
+    // 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 ;
+            }
+            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 ;
+            }
+            break ;
+     case kEventMouseWheelMoved :
+         {
+            wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ;
 
-    return result ;
+            // EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
+            SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeLongInteger) ;
 
+            wxevent.m_wheelRotation = delta;
+            wxevent.m_wheelDelta = 1;
+            wxevent.m_linesPerAction = 1;
+            break ;
+         }
+        default :
+            wxevent.SetEventType(wxEVT_MOTION ) ;
+            break ;
+    }       
+}
 
+ControlRef wxMacFindSubControl( Point location , ControlRef superControl , ControlPartCode *outPart )
+{
+    if ( superControl )
+    {
+        UInt16 childrenCount = 0 ;
+        OSStatus err = CountSubControls( superControl , &childrenCount ) ; 
+        if ( err == errControlIsNotEmbedder )
+            return NULL ;
+        wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
+            
+        for ( UInt16 i = childrenCount ; i >=1  ; --i )
+        {
+            ControlHandle sibling ;
+            err = GetIndexedSubControl( superControl , i , & sibling ) ;
+            if ( err == errControlIsNotEmbedder )
+                return NULL ;
+            
+            wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
+            if ( IsControlVisible( sibling ) )
+            {
+                Rect r ;
+                UMAGetControlBoundsInWindowCoords( sibling , &r ) ;
+                if ( MacPtInRect( location , &r ) )
+                {
+                    ControlHandle child = wxMacFindSubControl( location , sibling , outPart ) ;
+                    if ( child )
+                        return child ;
+                    else
+                    {
+                        Point testLocation = location ;
+#if TARGET_API_MAC_OSX
+                        testLocation.h -= r.left ;
+                        testLocation.v -= r.top ;
+#endif
+                        *outPart = TestControl( sibling , testLocation ) ;
+                        return sibling ;
+                    }
+                }
+            }
+        }
+    }
+    return NULL ;
 }
-static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+
+ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart )
 {
+#if TARGET_API_MAC_OSX
+    if ( UMAGetSystemVersion() >= 0x1030 )
+        return FindControlUnderMouse( location , window , outPart ) ;
+#endif
+    ControlRef rootControl = NULL ;
+    verify_noerr( GetRootControl( window , &rootControl ) ) ;
+    return wxMacFindSubControl( location , rootControl , outPart ) ;
+
+}
+pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    
     OSStatus result = eventNotHandledErr ;
-    OSStatus err = noErr ;
 
-    UInt32        attributes;
-    WindowRef windowRef ;
-    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+    wxMacCarbonEvent cEvent( event ) ;
+    
+    Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
+    Point windowMouseLocation = screenMouseLocation ;
 
-    GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
-        sizeof( WindowRef ), NULL, &windowRef );
+    WindowRef window ;
+    short windowPart = ::FindWindow(screenMouseLocation, &window);
 
-    switch( GetEventKind( event ) )
+    wxWindow* currentMouseWindow = NULL ;
+    ControlRef control = NULL ;
+    
+    if ( window )
     {
-        case kEventWindowUpdate :
-            if ( !wxPendingDelete.Member(toplevelWindow) )
-                toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
+        QDGlobalToLocalPoint( UMAGetWindowPort(window ) ,  &windowMouseLocation ) ;
+
+        if ( wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent )
+        {
+            currentMouseWindow = wxTheApp->s_captureWindow ;
+        }
+        else if ( (IsWindowActive(window) && windowPart == inContent) )
+        {
+            ControlPartCode part ;
+            control = wxMacFindControlUnderMouse( 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 = wxFindControlFromMacControl( control ) ;
+                if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved )
+                {
+                	// for wxToolBar to function we have to send certaint events to it
+                	// instead of its children (wxToolBarTools)	
+                    ControlRef parent ;
+                    GetSuperControl(control, &parent );
+                    wxWindow *wxParent = wxFindControlFromMacControl( parent ) ;
+                    if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
+                        currentMouseWindow = wxParent ;
+                }
+            }
+        }        
+    }
+    
+    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 ) ;
+
+#if wxUSE_TOOLTIPS
+            wxToolTip::RelayEvent( g_MacLastWindow , eventleave);
+#endif // wxUSE_TOOLTIPS
+            g_MacLastWindow->GetEventHandler()->ProcessEvent(eventleave);
+        }
+        if ( currentMouseWindow )
+        {
+            wxMouseEvent evententer(wxevent);
+            evententer.SetEventType( wxEVT_ENTER_WINDOW );
+            currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );
+            evententer.SetEventObject( currentMouseWindow ) ;
+#if wxUSE_TOOLTIPS
+            wxToolTip::RelayEvent( currentMouseWindow , evententer);
+#endif // wxUSE_TOOLTIPS
+            currentMouseWindow->GetEventHandler()->ProcessEvent(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 ) ;
             result = noErr ;
-            break ;
-        case kEventWindowActivated :
-                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
+        }
+    } // if ( windowPart == inMenuBar )
+    else if ( currentMouseWindow )
+    {
+        currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ;
+        
+        wxevent.SetEventObject( currentMouseWindow ) ;
+
+        // update cursor
+        
+        wxWindow* cursorTarget = currentMouseWindow ;
+        wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
+
+        while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+        {
+            cursorTarget = cursorTarget->GetParent() ;
+            if ( cursorTarget )
+                cursorPoint += cursorTarget->GetPosition() ;
+        }
+
+        // update focus
+
+        if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
+        {
+            // set focus to this window
+            if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
+                currentMouseWindow->SetFocus();
+        }
+
+        // make tooltips current
+        
+    #if wxUSE_TOOLTIPS
+        if ( wxevent.GetEventType() == wxEVT_MOTION
+            || wxevent.GetEventType() == wxEVT_ENTER_WINDOW
+            || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW )
+            wxToolTip::RelayEvent( currentMouseWindow , wxevent);
+    #endif // wxUSE_TOOLTIPS                
+        if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) )
+            result = noErr;
+        else
+        {
+            ControlPartCode dummyPart ;
+            // if built-in find control is finding the wrong control (ie static box instead of overlaid
+            // button, we cannot let the standard handler do its job, but must handle manually
+
+            if ( ( cEvent.GetKind() == kEventMouseDown ) && 
+                (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != 
+                wxMacFindControlUnderMouse( windowMouseLocation , window , &dummyPart ) ) )
+            {
+                if ( currentMouseWindow->MacIsReallyEnabled() ) 
+                {
+                    EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+                    Point clickLocation = windowMouseLocation ;
+    #if TARGET_API_MAC_OSX
+                    currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
+    #endif
+                    HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
+                        modifiers , (ControlActionUPP ) -1 ) ;
+                }
+                result = noErr ;
+            }
+        }
+        if ( cEvent.GetKind() == kEventMouseUp && wxTheApp->s_captureWindow )
+        {
+            wxTheApp->s_captureWindow = NULL ;
+            // update cursor ?
+         }
+    } // else if ( currentMouseWindow )
+    else
+    {
+        // 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
+        wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+        if ( cEvent.GetKind() == kEventMouseDown && toplevelWindow && control )
+        {
+            EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+            Point clickLocation = windowMouseLocation ;
+#if TARGET_API_MAC_OSX
+            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 ;
+#endif
+            HandleControlClick( control , clickLocation ,
+                modifiers , (ControlActionUPP ) -1 ) ;
             result = noErr ;
+        }
+    }
+    return result ;
+}
+
+static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+    
+    // WindowRef windowRef = cEvent.GetParameter<WindowRef>(kEventParamDirectObject) ;
+    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+
+    switch( GetEventKind( event ) )
+    {
+        case kEventWindowActivated :
+        {
+            toplevelWindow->MacActivate( cEvent.GetTicks() , true) ;
+            wxActivateEvent wxevent(wxEVT_ACTIVATE, true , toplevelWindow->GetId());
+            wxevent.SetTimestamp( cEvent.GetTicks() ) ;
+            wxevent.SetEventObject(toplevelWindow);
+            toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);
+            // we still sending an eventNotHandledErr in order to allow for default processing
             break ;
+        }
         case kEventWindowDeactivated :
-                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
-            result = noErr ;
+        {
+            toplevelWindow->MacActivate(cEvent.GetTicks() , false) ;
+            wxActivateEvent wxevent(wxEVT_ACTIVATE, false , toplevelWindow->GetId());
+            wxevent.SetTimestamp( cEvent.GetTicks() ) ;
+            wxevent.SetEventObject(toplevelWindow);
+            toplevelWindow->GetEventHandler()->ProcessEvent(wxevent);
+            // we still sending an eventNotHandledErr in order to allow for default processing
             break ;
+        }
+    	case kEventWindowShown :
+    		toplevelWindow->Refresh() ;
+    		result = noErr ;
+    		break ;
         case kEventWindowClose :
                 toplevelWindow->Close() ;
             result = noErr ;
             break ;
         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 ;
+                // 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 )
+                {
+        #if wxUSE_STATUSBAR
+                    frame->PositionStatusBar();
+        #endif            
+        #if wxUSE_TOOLBAR
+                    frame->PositionToolBar();
+        #endif            
+                }
 
-                GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
-                    sizeof( newContentRect ), NULL, &newContentRect );
+                wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ;
+                event.SetEventObject( toplevelWindow ) ;
 
-                toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
-                    newContentRect.right - newContentRect.left ,
-                    newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
+                toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
+            }
+            if ( attributes & kWindowBoundsChangeOriginChanged )
+            {
+                wxMoveEvent event( r.GetLeftTop() , toplevelWindow->GetId() ) ;
+                event.SetEventObject( toplevelWindow ) ;
+                toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
+            }
+            result = noErr ;
+            break ;
+        }
+        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->GetEventHandler()->ProcessEvent(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 ) ;
             }
+
+            result = noErr ;
             break ;
+        }
         default :
             break ;
     }
     return result ;
 }
 
-pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 
@@ -336,10 +722,10 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
             result = TextInputEventHandler( handler, event , data ) ;
             break ;
         case kEventClassWindow :
-            result = WindowEventHandler( handler, event , data ) ;
+            result = wxMacTopLevelWindowEventHandler( handler, event , data ) ;
             break ;
         case kEventClassMouse :
-            result = MouseEventHandler( handler, event , data ) ;
+            result = wxMacTopLevelMouseEventHandler( handler, event , data ) ;
             break ;
         default :
             break ;
@@ -347,67 +733,7 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
     return result ;
 }
 
-DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
-
-// Patch 531199 defined a window event handler, as follows.
-// TODO: merge the moving/sizing event handling with the event
-// handler above.
-#if 0
-static pascal OSStatus
-WindowHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* userData )
-{
-    Rect		bounds;
-    SInt16		height, width;
-    UInt32		attributes;
-    OSStatus	result = eventNotHandledErr;
-    
-    GetEventParameter( inEvent, kEventParamAttributes, typeUInt32, NULL, sizeof( UInt32 ), NULL, &attributes );
-    
-    if ((attributes & (kWindowBoundsChangeSizeChanged | kWindowBoundsChangeOriginChanged)) != 0)
-    {
-        // Extract the current bounds. This is the paramter you get to modify to
-        // alter the window position or size during a window resizing.
-        GetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof( bounds ), NULL, &bounds );
-        
-        wxRect rect;
-        rect.SetLeft(bounds.left);
-        rect.SetTop(bounds.top);
-        rect.SetRight(bounds.right);
-        rect.SetBottom(bounds.bottom);
-        
-        bool rc;
-        wxWindowMac *pWindow = (wxWindowMac*)userData;
-        if ((attributes & kWindowBoundsChangeSizeChanged) != 0) {
-            wxSizeEvent event(rect, pWindow->GetId());
-            event.SetEventObject(pWindow);
-            rc = pWindow->GetEventHandler()->ProcessEvent(event);
-            rect = event.GetRect();
-        }
-        else {
-            wxMoveEvent event(rect, pWindow->GetId());
-            event.SetEventObject(pWindow);
-            rc = pWindow->GetEventHandler()->ProcessEvent(event);
-            rect = event.GetRect();
-        }
-        
-        if (rc) {
-            bounds.left = rect.GetLeft();
-            bounds.top = rect.GetTop();
-            bounds.right = rect.GetRight();
-            bounds.bottom = rect.GetBottom();
-        }
-        
-        // Set the current bounds parameter to our adjusted bounds. Return
-        // noErr to indicate we handled this event.
-        SetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, sizeof( bounds ), &bounds );
-        result = noErr;
-    }
-    return result;
-}
-#endif
-    // WindowHandler
-
-#endif
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTopLevelEventHandler )
 
 // ---------------------------------------------------------------------------
 // wxWindowMac utility functions
@@ -415,28 +741,30 @@ WindowHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* userData )
 
 // Find an item given the Macintosh Window Reference
 
-wxList *wxWinMacWindowList = NULL;
-wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)
+wxList wxWinMacWindowList(wxKEY_INTEGER);
+wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
 {
-    wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
+    wxNode *node = wxWinMacWindowList.Find((long)inWindowRef);
     if (!node)
         return NULL;
     return (wxTopLevelWindowMac *)node->GetData();
 }
 
-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
     // (secondly) breaks menu command processing
     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);
+    if ( !wxWinMacWindowList.Find((long)inWindowRef) )
+        wxWinMacWindowList.Append((long)inWindowRef, win);
 }
 
+void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ;
 void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 {
-    wxWinMacWindowList->DeleteObject(win);
+    wxWinMacWindowList.DeleteObject(win);
 }
 
 
@@ -444,18 +772,26 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 // wxTopLevelWindowMac creation
 // ----------------------------------------------------------------------------
 
-WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;
+wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;
+
+typedef struct 
+{
+    wxPoint m_position ;
+    wxSize m_size ;  
+} FullScreenData ;
 
 void wxTopLevelWindowMac::Init()
 {
     m_iconized =
     m_maximizeOnShow = FALSE;
-    m_macNoEraseUpdateRgn = NewRgn() ;
-    m_macNeedsErasing = false ;
     m_macWindow = NULL ;
-#if TARGET_CARBON
+#if TARGET_API_MAC_OSX 
+    m_macUsesCompositing = TRUE;
+#else
+    m_macUsesCompositing = FALSE;
+#endif
     m_macEventHandler = NULL ;
- #endif
+    m_macFullScreenData = NULL ;
 }
 
 class wxMacDeferredWindowDeleter : public wxObject
@@ -489,6 +825,11 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
     SetName(name);
 
     m_windowId = id == -1 ? NewControlId() : id;
+    wxWindow::SetTitle( title ) ;
+
+    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     wxTopLevelWindows.Append(this);
 
@@ -506,20 +847,20 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
 
-#if TARGET_CARBON
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
         m_macEventHandler = NULL ;
     }
-#endif
 
     wxRemoveMacWindowAssociation( this ) ;
 
     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);
-
-    DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
+        
+    FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+    delete data ;
+    m_macFullScreenData = NULL ;
 }
 
 
@@ -529,23 +870,25 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {
-    // not available on mac
+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
+    wxMacWindowClipper clip (this);
+    ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
 }
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {
-    return false ;
+    return IsWindowInStandardState(  (WindowRef)m_macWindow , NULL , NULL ) ;
 }
 
 void wxTopLevelWindowMac::Iconize(bool iconize)
 {
-    // not available on mac
+    if ( IsWindowCollapsable((WindowRef)m_macWindow) )
+        CollapseWindow((WindowRef)m_macWindow , iconize ) ;
 }
 
 bool wxTopLevelWindowMac::IsIconized() const
 {
-    // mac dialogs cannot be iconized
-    return FALSE;
+    return IsWindowCollapsed((WindowRef)m_macWindow ) ;
 }
 
 void wxTopLevelWindowMac::Restore()
@@ -557,18 +900,44 @@ void wxTopLevelWindowMac::Restore()
 // wxTopLevelWindowMac misc
 // ----------------------------------------------------------------------------
 
+wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const
+{
+    return wxPoint(0,0) ;
+}
+
 void wxTopLevelWindowMac::SetIcon(const wxIcon& icon)
 {
     // this sets m_icon
     wxTopLevelWindowBase::SetIcon(icon);
 }
 
+void  wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
+{ 
+    wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ;
+
+    if ( m_macBackgroundBrush.Ok() && m_macBackgroundBrush.GetStyle() != wxTRANSPARENT && m_macBackgroundBrush.MacGetBrushKind() == kwxMacBrushTheme )
+    {
+        SetThemeWindowBackground( (WindowRef) m_macWindow , m_macBackgroundBrush.MacGetTheme() , false ) ;
+    }
+}
+
+void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler() 
+{
+    if ( m_macEventHandler != NULL )
+    {
+        verify_noerr( ::RemoveEventHandler( (EventHandlerRef) m_macEventHandler ) ) ;
+    }
+    InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacTopLevelEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);
+}
+
 void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name )
 {
+    OSStatus err = noErr ;
     SetName(name);
     m_windowStyle = style;
     m_isShown = FALSE;
@@ -577,21 +946,17 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 
     Rect theBoundsRect;
 
-    m_x = (int)pos.x;
-    m_y = (int)pos.y;
-    if ( m_y < 50 )
-        m_y = 50 ;
-    if ( m_x < 20 )
-        m_x = 20 ;
+    int x = (int)pos.x;
+    int y = (int)pos.y;
+    if ( y < 50 )
+        y = 50 ;
+    if ( x < 20 )
+        x = 20 ;
 
-    m_width = size.x;
-    if (m_width == -1)
-        m_width = 20;
-    m_height = size.y;
-    if (m_height == -1)
-        m_height = 20;
+    int w = WidthDefault(size.x);
+    int h = HeightDefault(size.y);
 
-    ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
+    ::SetRect(&theBoundsRect, x, y , x + w, y + h);
 
     // translate the window attributes in the appropriate window class and attributes
 
@@ -614,549 +979,362 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         }
         else
         {
-#if TARGET_CARBON
             wclass = kPlainWindowClass ;
-#else
-            wclass = kFloatingWindowClass ;
-#endif
         }
     }
     else if ( HasFlag( wxCAPTION ) )
     {
         wclass = kDocumentWindowClass ;
     }
+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+    else if ( HasFlag( wxFRAME_DRAWER ) )
+    {
+        wclass = kDrawerWindowClass;
+        // Should this be left for compositing check below?
+        // CreateNewWindow will fail without it, should wxDrawerWindow turn
+        // on compositing before calling MacCreateRealWindow?
+        attr |= kWindowCompositingAttribute;// | kWindowStandardHandlerAttribute;
+    }
+#endif  //10.2 and up
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
-            HasFlag( wxSYSTEM_MENU ) )
+            HasFlag( wxCLOSE_BOX ) || HasFlag( wxSYSTEM_MENU ) )
         {
             wclass = kDocumentWindowClass ;
         }
         else
         {
-#if TARGET_CARBON
             wclass = kPlainWindowClass ;
-#else
-            wclass = kModalWindowClass ;
-#endif
         }
     }
 
-    if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
+    if ( HasFlag( wxMINIMIZE_BOX ) )
     {
-        attr |= kWindowFullZoomAttribute ;
         attr |= kWindowCollapseBoxAttribute ;
     }
+    if ( HasFlag( wxMAXIMIZE_BOX ) )
+    {
+        attr |= kWindowFullZoomAttribute ;
+    }
     if ( HasFlag( wxRESIZE_BORDER ) )
     {
         attr |= kWindowResizableAttribute ;
     }
-    if ( HasFlag( wxSYSTEM_MENU ) )
+    if ( HasFlag( wxCLOSE_BOX) )
     {
         attr |= kWindowCloseBoxAttribute ;
     }
 
-#if TARGET_CARBON
-#if 0 //  having problems right now with that
+    if (UMAGetSystemVersion() >= 0x1000)
+    {
+        // turn on live resizing (OS X only)
+        attr |= kWindowLiveResizeAttribute;
+    }
+
     if (HasFlag(wxSTAY_ON_TOP))
-    	wclass = kUtilityWindowClass;
-#endif
-#endif
+        wclass = kUtilityWindowClass;
 
-#if TARGET_CARBON
+#if TARGET_API_MAC_OSX 
+    attr |= kWindowCompositingAttribute;
+#endif
+    
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;
         customWindowDefSpec.defType = kWindowDefProcPtr;
         customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
 
-        ::CreateCustomWindow( &customWindowDefSpec, wclass,
+        err = ::CreateCustomWindow( &customWindowDefSpec, wclass,
                               attr, &theBoundsRect,
                               (WindowRef*) &m_macWindow);
     }
     else
-#endif
     {
-        ::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));
-
-    // Patch 531199 also defined a window event handler, as follows:
-#if 0
-    // install a window event handler to send wxEVT_MOVING and wxEVT_SIZING events
-    EventTypeSpec events[] = { { kEventClassWindow, kEventWindowBoundsChanging } };
-    EventHandlerUPP	handlerProc = NewEventHandlerUPP( WindowHandler );
-    EventHandlerRef eventHandlerRef;
-    InstallWindowEventHandler( m_macWindowData->m_macWindow, handlerProc, GetEventTypeCount(events),
-        events, (void*)this, &eventHandlerRef);
+    wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
+
+    // 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 ) ;
+    UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ;
+    m_peer = new wxMacControl() ;
+#if TARGET_API_MAC_OSX
+    // 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 explicitely
+    HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , 
+        m_peer->GetControlRefAddr() ) ;
+    if ( !m_peer->Ok() )
+    {
+        // compatibility mode fallback
+        GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
+    }
+#else
+    ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
 #endif
+    // the root control level handleer
+    MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
 
-#endif
-    m_macFocus = NULL ;
+    // the frame window event handler
+    InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
+    MacInstallTopLevelWindowEventHandler() ;
 
+    m_macFocus = NULL ;
 
-#if TARGET_CARBON
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         // default shape matches the window size
-        wxRegion rgn(0, 0, m_width, m_height);
+        wxRegion rgn(0, 0, w, h);
         SetShape(rgn);
     }
-#endif
+
+    wxWindowCreateEvent event(this);
+    GetEventHandler()->ProcessEvent(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) ) ;
-
-    RgnHandle       visRgn = NewRgn() ;
-    GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), visRgn );
-    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
-        // this has to be intersected by the visRgn in order to avoid drawing over its own
-        // boundaries
-        RgnHandle trueUpdateRgn = NewRgn() ;
-        Rect trueUpdateRgnBoundary ;
-        GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
-        GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
-        RectRgn( updateRgn , &trueUpdateRgnBoundary ) ;
-        SectRgn( updateRgn , visRgn , updateRgn ) ;
-        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 )  ) ;
-        }
+        wxLogDebug(wxT("Doing delayed deactivation of %p"),s_macDeactivateWindow);
+        s_macDeactivateWindow->MacActivate(timestamp, false);
     }
-    if ( updateRgn )
-        DisposeRgn( updateRgn );
-    if ( diffRgn )
-        DisposeRgn( diffRgn );
-    if ( visRgn )
-        DisposeRgn( visRgn ) ;
-        
-    EndUpdate( (WindowRef)m_macWindow ) ;
-    SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
-    m_macNeedsErasing = false ;
 }
 
-
-// Raise the window to the top of the Z order
-void wxTopLevelWindowMac::Raise()
+void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 {
-    ::SelectWindow( (WindowRef)m_macWindow ) ;
+    // wxLogDebug(wxT("TopLevel=%p::MacActivate"),this);
+
+    if(s_macDeactivateWindow==this)
+        s_macDeactivateWindow=NULL;
+    MacDelayedDeactivation(timestamp);
+    MacPropagateHiliteChanged() ;
 }
 
-// Lower the window to the bottom of the Z order
-void wxTopLevelWindowMac::Lower()
+void wxTopLevelWindowMac::SetTitle(const wxString& title)
 {
-    ::SendBehind( (WindowRef)m_macWindow , NULL ) ;
+    wxWindow::SetTitle( title ) ;
+    UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
 }
 
-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
-
-    event.m_leftDown = isDown && !controlDown;
-
-    event.m_middleDown = FALSE;
-    event.m_rightDown = isDown && controlDown;
+    if ( !wxTopLevelWindowBase::Show(show) )
+        return FALSE;
 
-    if ( kind == mouseDown )
-    {
-        if ( controlDown )
-            event.SetEventType(wxEVT_RIGHT_DOWN ) ;
-        else
-            event.SetEventType(wxEVT_LEFT_DOWN ) ;
-    }
-    else if ( kind == mouseUp )
+    if (show)
     {
-        if ( controlDown )
-            event.SetEventType(wxEVT_RIGHT_UP ) ;
+        #if wxUSE_SYSTEM_OPTIONS	//code contributed by Ryan Wilcox December 18, 2003
+        if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) )
+        {
+           ::ShowWindow( (WindowRef)m_macWindow );
+        }
         else
-            event.SetEventType(wxEVT_LEFT_UP ) ;
+        #endif
+        {
+           ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
+        }
+        ::SelectWindow( (WindowRef)m_macWindow ) ;
+        // as apps expect a size event to occur at this moment
+        wxSizeEvent event( GetSize() , m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
     }
     else
     {
-        event.SetEventType(wxEVT_MOTION ) ;
-    }
-
-    event.m_shiftDown = modifiers & shiftKey;
-    event.m_controlDown = modifiers & controlKey;
-    event.m_altDown = modifiers & optionKey;
-    event.m_metaDown = modifiers & cmdKey;
-
-    Point       localwhere ;
-    localwhere.h = x ;
-    localwhere.v = y ;
-
-    GrafPtr     port ;
-    ::GetPort( &port ) ;
-    ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
-    ::GlobalToLocal( &localwhere ) ;
-    ::SetPort( port ) ;
-
-    if ( kind == mouseDown )
-    {
-        if ( timestamp - gs_lastWhen <= (long) GetDblTime() )
+        #if wxUSE_SYSTEM_OPTIONS
+        if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) )
         {
-            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 ;
+           ::HideWindow((WindowRef) m_macWindow );
         }
         else
+        #endif
         {
-            gs_lastWhen = timestamp ;
+           ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
         }
-        gs_lastWhere = localwhere ;
     }
 
-    event.m_x = localwhere.h;
-    event.m_y = localwhere.v;
-    event.m_x += m_x;
-    event.m_y += m_y;
+    MacPropagateVisibilityChanged() ;
 
-    event.m_timeStamp = timestamp;
-    event.SetEventObject(this);
-    if ( wxTheApp->s_captureWindow )
+    return TRUE ;
+}
+
+bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
+{    
+    if ( show )
     {
-        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 )
+        FullScreenData *data = (FullScreenData *)m_macFullScreenData ;
+        delete data ;
+        data = new FullScreenData() ;
+        
+        m_macFullScreenData = data ;
+        data->m_position = GetPosition() ;
+        data->m_size = GetSize() ;
+        
+        if ( style & wxFULLSCREEN_NOMENUBAR )
         {
-            wxTheApp->s_captureWindow = NULL ;
-            if ( !wxIsBusy() )
-            {
-                m_cursor.MacInstall() ;
-            }
+                HideMenuBar() ;
+        }
+        int left , top , right , bottom ;
+        wxRect client = wxGetClientDisplayRect() ;
+
+        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 )
+        {
+            y -= top ;
+            h += top ;
+        }
+        if ( style & wxFULLSCREEN_NOBORDER )
+        {
+            x -= left ;
+            w += left + right ;
+            h += bottom ;
+        }
+        if ( style & wxFULLSCREEN_NOTOOLBAR )
+        {
+            // TODO
+        }
+        if ( style & wxFULLSCREEN_NOSTATUSBAR )
+        {
+            // TODO
         }
+        SetSize( x , y , w, h ) ;
     }
     else
     {
-        MacDispatchMouseEvent( event ) ;
+        ShowMenuBar() ;
+        FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+        SetPosition( data->m_position ) ;
+        SetSize( data->m_size ) ;
+        delete data ;
+        m_macFullScreenData = NULL ;
     }
+    return FALSE; 
 }
 
-#if !TARGET_CARBON
+bool wxTopLevelWindowMac::IsFullScreen() const 
+{ 
+    return m_macFullScreenData != NULL ; 
+}
+
+// we are still using coordinates of the content view, todo switch to structure bounds
 
-void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
+void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
 {
-    MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-        ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
+    Rect content ;
+    Rect 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 ;
 }
 
-void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
+void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
 {
-    switch (part)
-    {
-        case inContent:
-            {
-                MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-                    ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
-            }
-            break ;
-    }
+    Rect bounds = { y , x , y + height , x + width } ;
+    verify_noerr(SetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
 }
 
-void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
+void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const
 {
-    switch (part)
-    {
-        case inContent:
-            {
-                MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-                    ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
-            }
-            break ;
-    }
+    Rect bounds ;
+    verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+    if(x)   *x = bounds.left ;
+    if(y)   *y = bounds.top ;
 }
-
-#endif
-
-void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
+void wxTopLevelWindowMac::DoGetSize( int *width, int *height ) const
 {
-    wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
-    event.m_timeStamp = timestamp ;
-    event.SetEventObject(this);
-
-    GetEventHandler()->ProcessEvent(event);
-
-    UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
-
-    // 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 )
-    {
-        Refresh(TRUE);
-    }
-    else
-    {
-        // 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);
-    }
+    Rect bounds ;
+    verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+    if(width)   *width = bounds.right - bounds.left ;
+    if(height)   *height = bounds.bottom - bounds.top ;
 }
 
-#if !TARGET_CARBON
-
-void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
+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 ;
 }
 
-#endif
-
-void wxTopLevelWindowMac::SetTitle(const wxString& title)
+void wxTopLevelWindowMac::MacSetMetalAppearance( bool set ) 
 {
-    wxWindow::SetTitle( title ) ;
-    UMASetWTitle( (WindowRef)m_macWindow , title ) ;
+#if TARGET_API_MAC_OSX
+    UInt32 attr = 0 ;
+    GetWindowAttributes((WindowRef) m_macWindow , &attr ) ;
+    wxASSERT_MSG( attr & kWindowCompositingAttribute ,
+        wxT("Cannot set metal appearance on a non-compositing window") ) ;
+                
+    MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes , 
+        set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
+#endif
 }
 
-bool wxTopLevelWindowMac::Show(bool show)
+bool wxTopLevelWindowMac::MacGetMetalAppearance() const 
 {
-    if ( !wxWindow::Show(show) )
-        return FALSE;
-
-    if (show)
-    {
-      ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
-      ::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
-    {
-      ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
-    }
-
-    if ( !show )
-    {
-    }
-    else
-    {
-        Refresh() ;
-    }
-
-    return TRUE;
+#if TARGET_API_MAC_OSX
+    return MacGetWindowAttributes() & kWindowMetalAttribute ;
+#else
+    return false ;
+#endif
 }
 
-void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
+void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) 
 {
-    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 ( doMove || doResize )
-    {
-        m_x = actualX ;
-        m_y = actualY ;
-        m_width = actualWidth ;
-        m_height = actualHeight ;
-
-        if ( doMove )
-            ::MoveWindow((WindowRef)m_macWindow, m_x, m_y  , false); // don't make frontmost
-
-        if ( doResize )
-            ::SizeWindow((WindowRef)m_macWindow, m_width, m_height  , true);
-
-        // the OS takes care of invalidating and erasing the new area so we only have to
-        // take care of refreshing for full repaints
-
-        if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
-            Refresh() ;
-
-
-        if ( IsKindOf( CLASSINFO( wxFrame ) ) )
-        {
-            wxFrame* frame = (wxFrame*) this ;
-            frame->PositionStatusBar();
-            frame->PositionToolBar();
-        }
-        if ( doMove )
-            wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified
-
-        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);
-        }
-    }
-
+    ChangeWindowAttributes ( (WindowRef) m_macWindow , attributesToSet, attributesToClear ) ;
 }
 
-/*
- * 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 )
+wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const 
 {
-    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
-
-        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 );
-
-        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 ) ;
+    UInt32 attr = 0 ;
+    GetWindowAttributes((WindowRef) m_macWindow , &attr ) ;
+    return attr ;
 }
 
+// ---------------------------------------------------------------------------
+// Shape implementation
+// ---------------------------------------------------------------------------
+
 
 bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
-#if TARGET_CARBON
     // The empty region signifies that the shape should be removed from the
     // window.
     if ( region.IsEmpty() )
@@ -1181,9 +1359,6 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
     // Tell the window manager that the window has changed shape
     ReshapeCustomWindow((WindowRef)MacGetWindowRef());
     return TRUE;
-#else
-    return FALSE;
-#endif
 }
 
 // ---------------------------------------------------------------------------
@@ -1191,14 +1366,11 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
 // http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
 // ---------------------------------------------------------------------------
 
-#if TARGET_CARBON
-
 static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
 {
     GetWindowPortBounds(window, inRect);
     Point pt = {inRect->left, inRect->top};
-    SetPort((GrafPtr) GetWindowPort(window));
-    LocalToGlobal(&pt);
+    QDLocalToGlobalPoint( GetWindowPort(window) , &pt ) ;
     inRect->top = pt.v;
     inRect->left = pt.h;
     inRect->bottom += pt.v;
@@ -1221,7 +1393,7 @@ static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
                         kWindowCanDrawInCurrentPort|
                         //kWindowCanMeasureTitle|
                         kWindowWantsDisposeAtProcessDeath|
-                        kWindowSupportsSetGrowImageRegion|
+                        kWindowSupportsGetGrowImageRegion|
                         kWindowDefSupportsColorGrafPort;
     return 1;
 }
@@ -1235,8 +1407,9 @@ static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
     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 ) ;
     }
 }
 
@@ -1318,6 +1491,5 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16
     return 0;
 }
 
-#endif
 // ---------------------------------------------------------------------------