cleanup - reformat

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 878c27f2a9231ae355861ed6684d67b093e89e5e..c3b1feab50b7f3b944a7e2f643bd672b457fbce4 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        mac/toplevel.cpp
+// Name:        src/mac/carbon/toplevel.cpp

 // Purpose:     implements wxTopLevelWindow for Mac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     implements wxTopLevelWindow for Mac
 // Author:      Stefan Csomor
 // Modified by:


@@ -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"
 


@@ -35,6 +31,9 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.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"
 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"


@@ -42,17 +41,24 @@
 #include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 #include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"

+

 #if wxUSE_SYSTEM_OPTIONS
     #include "wx/sysopt.h"
 #endif
 
 #if wxUSE_SYSTEM_OPTIONS
     #include "wx/sysopt.h"
 #endif
 

+#ifndef __DARWIN__

 #include <ToolUtils.h>
 #include <ToolUtils.h>

+#endif

 
 

+// for targeting OSX
+#include "wx/mac/private.h"

 
 

-#define wxMAC_DEBUG_REDRAW 0
-#ifndef wxMAC_DEBUG_REDRAW
-#define wxMAC_DEBUG_REDRAW 0
-#endif
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// trace mask for activation tracing messages
+static const wxChar *TRACE_ACTIVATE = _T("activation");

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


@@ -61,98 +67,101 @@
 // 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;
-
-
-#if TARGET_CARBON

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

-#endif

 
 // ============================================================================
 // wxTopLevelWindowMac implementation
 // ============================================================================
 
 
 // ============================================================================
 // 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[] =
 {
 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 } ,
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 
     { kEventClassKeyboard, kEventRawKeyDown } ,
     { kEventClassKeyboard, kEventRawKeyRepeat } ,
     { kEventClassKeyboard, kEventRawKeyUp } ,
     { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,

+#endif

 
     { kEventClassWindow , kEventWindowShown } ,
 
     { kEventClassWindow , kEventWindowShown } ,

-    { kEventClassWindow , kEventWindowUpdate } ,

     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,
     { kEventClassWindow , kEventWindowBoundsChanging } ,
     { kEventClassWindow , kEventWindowBoundsChanged } ,
     { kEventClassWindow , kEventWindowClose } ,
 
     { 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 } ,
     { kEventClassMouse , kEventMouseDown } ,
     { kEventClassMouse , kEventMouseUp } ,
     { kEventClassMouse , kEventMouseWheelMoved } ,
     { kEventClassMouse , kEventMouseMoved } ,
     { kEventClassMouse , kEventMouseDragged } ,

-

 } ;
 
 static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 } ;
 
 static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;

-
-    wxWindow* focus = wxWindow::FindFocus() ;
-    char charCode ;
-    UInt32 keyCode ;
-    UInt32 modifiers ;
+    wxWindow* focus ;
+    UInt32 keyCode, modifiers ;

     Point point ;
     Point point ;

-

     EventRef rawEvent ;
     EventRef rawEvent ;

+    unsigned char charCode ;
+
+    GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;

 
 

-    GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ;
+    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 );

 
 

-    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 );
+    focus = wxWindow::FindFocus() ;

 
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
 
     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 )

             {
             {

-                ControlHandle macControl = (ControlHandle) control->GetMacControl() ;
-                if ( macControl )
+                // this is only called when no default handler has jumped in, e.g. a wxControl on a floater window does not
+                // get its own kEventTextInputUnicodeForKeyEvent, so we reroute the event back to the control
+                wxControl* control = wxDynamicCast( focus , wxControl ) ;
+                if ( control )
+                {
+                    ControlRef macControl = (ControlRef) control->GetHandle() ;
+                    if ( macControl )
+                    {
+                        ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
+                        result = noErr ;
+                    }
+                }
+
+#if 0
+                // 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 ) )

                 {
                 {

-                    ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;

                     result = noErr ;
                 }
                     result = noErr ;
                 }

+#endif

             }
             }

-            /*
-            // 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;
+            break ;

 
 

-            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
-                focus , message , modifiers , when , point.h , point.v ) )
-            {
-                result = noErr ;
-            }
-            */
+        default:

             break ;
     }
 
             break ;
     }
 


@@ -162,22 +171,50 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
 static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;

-
-    wxWindow* focus = wxWindow::FindFocus() ;
-    char charCode ;
+    // 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 = 0 ;

     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
     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 );
+#if wxUSE_UNICODE
+    UInt32 dataSize = 0 ;
+    if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
+    {
+        UniChar buf[2] ;
+
+        UniChar* charBuf = buf ;
+
+        if ( dataSize > 4 )
+            charBuf = new UniChar[ dataSize / sizeof( UniChar) ] ;
+        GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
+
+#if SIZEOF_WCHAR_T == 2
+        uniChar = charBuf[0] ;
+#else
+        wxMBConvUTF16 converter ;
+        converter.MB2WC( &uniChar , (const char*)charBuf , 1 ) ;
+#endif
+
+        if ( dataSize > 4 )
+            delete[] charBuf ;
+    }
+#endif
+
+    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 :


@@ -185,21 +222,23 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
                 WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                 wxTheApp->MacSetCurrentEvent( event , handler ) ;
                 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 ) )
+                if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
+                    focus , message , modifiers , when , point.h , point.v , uniChar ) )

                 {
                     result = noErr ;
                 }
                 wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
             }
             break ;
                 {
                     result = noErr ;
                 }
                 wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
             }
             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 ) )

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

+

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


@@ -208,233 +247,616 @@ 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 ;
+#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 ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                 {
                     event.m_keyCode = WXK_CONTROL ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( 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 ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                 {
                     event.m_keyCode = WXK_SHIFT ;
                     event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( 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 ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                 {
                     event.m_keyCode = WXK_ALT ;
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }

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

                 {
                     event.m_keyCode = WXK_COMMAND ;
                     event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                 {
                     event.m_keyCode = WXK_COMMAND ;
                     event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }

-                wxTheApp->s_lastModifiers = modifiers ;
+
+                wxApp::s_lastModifiers = modifiers ;

             }
             }

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

     }
 
     return result ;
 }
 
     }
 
     return result ;
 }
 

-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
+//
+// This handler can also be called from app level where data (ie target window) may be null or a non wx window

 
 

-    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
-    Point point ;
-    UInt32 modifiers = 0;
-    EventMouseButton button = 0 ;
-    UInt32 click = 0 ;
-
-    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 );
-
-    if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
-        modifiers += btnState ;
-
-       // temporary hack to support true two button mouse
-       if ( button == kEventMouseButtonSecondary )
-       {
-               modifiers |= controlKey ;
-       }
-    WindowRef window ;
-    short windowPart = ::FindWindow(point, &window);
+wxWindow* g_MacLastWindow = NULL ;
+
+static EventMouseButton lastButton = 0 ;

 
 

-    // either we really are active or we are capturing mouse events
+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) || 
-        (wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindow() == toplevelWindow) )
+    // 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 ;
+
+    // otherwise we report double clicks by connecting a left click with a ctrl-left click
+    if ( clickCount > 1 && button != 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 )
+        lastButton = button ;
+
+    if ( button == 0 )
+        lastButton = 0 ;
+    else if ( lastButton )
+        button = lastButton ;
+
+    // determine 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 ;
+            case kEventMouseButtonPrimary :
+                wxevent.m_leftDown = true ;

                 break ;
                 break ;

-            case kEventMouseUp :
-                toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
+
+            case kEventMouseButtonSecondary :
+                wxevent.m_rightDown = true ;

                 break ;
                 break ;

-            case kEventMouseMoved :
-                wxTheApp->MacHandleMouseMovedEvent( point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
+
+            case kEventMouseButtonTertiary :
+                wxevent.m_middleDown = true ;

                 break ;
                 break ;

-            case kEventMouseDragged :
-                toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                result = noErr ;
+
+            default:

                 break ;
                 break ;

-            case kEventMouseWheelMoved :
+        }
+    }
+
+    // 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, typeLongInteger) ;
+
+            wxevent.m_wheelRotation = delta;
+            wxevent.m_wheelDelta = 1;
+            wxevent.m_linesPerAction = 1;
+        }
+        break ;
+
+        default :
+            wxevent.SetEventType( wxEVT_MOTION ) ;
+            break ;
+    }
+}
+
+ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, const Point& location , ControlRef superControl , ControlPartCode *outPart )
+{
+    if ( superControl )
+    {
+        UInt16 childrenCount = 0 ;
+        ControlHandle sibling ;
+        Rect r ;
+        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 )
+        {
+            err = GetIndexedSubControl( superControl , i , & sibling ) ;
+            if ( err == errControlIsNotEmbedder )
+                return NULL ;
+
+            wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
+            if ( IsControlVisible( sibling ) )
+            {
+                UMAGetControlBoundsInWindowCoords( sibling , &r ) ;
+                if ( MacPtInRect( location , &r ) )

                 {
                 {

-                    //bClearTooltip = false;
-                    EventMouseWheelAxis axis = kEventMouseWheelAxisY;
-                    SInt32 delta = 0;
-                    Point mouseLoc = {0, 0};
-                    if (::GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis,
-                                        NULL, sizeof(EventMouseWheelAxis), NULL, &axis) == noErr &&
-                        ::GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger,
-                                        NULL, sizeof(SInt32), NULL, &delta) == noErr &&
-                        ::GetEventParameter(event, kEventParamMouseLocation, typeQDPoint,
-                                        NULL, sizeof(Point), NULL, &mouseLoc) == noErr)
+                    ControlHandle child = wxMacFindSubControl( toplevelWindow , location , sibling , outPart ) ;
+                    if ( child )
+                    {
+                        return child ;
+                    }
+                    else

                     {
                     {

-                        wxMouseEvent wheelEvent(wxEVT_MOUSEWHEEL);
-                       
-                        wheelEvent.m_x = mouseLoc.h;
-                        wheelEvent.m_y = mouseLoc.v;
-                       
-                        wheelEvent.m_wheelRotation = delta;
-                        wheelEvent.m_wheelDelta = 1;
-                        wheelEvent.m_linesPerAction = 1;
-
-                        wxWindow* currentMouseWindow = NULL;
-                        wxWindow::MacGetWindowFromPoint(wxPoint(mouseLoc.h, mouseLoc.v), &currentMouseWindow);
-                       
-                        if (currentMouseWindow)
+                        Point testLocation = location ;
+
+                        if ( toplevelWindow && toplevelWindow->MacUsesCompositing() )

                         {
                         {

-                            currentMouseWindow->GetEventHandler()->ProcessEvent(wheelEvent);
-                            result = noErr;
+                            testLocation.h -= r.left ;
+                            testLocation.v -= r.top ;

                         }
                         }

+
+                        *outPart = TestControl( sibling , testLocation ) ;
+
+                        return sibling ;

                     }
                 }
                     }
                 }

-                break ;
-            default :
-                break ;
+            }

         }
     }
 
         }
     }
 

-    return result ;
+    return NULL ;
+}
+
+ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , const Point& location , WindowRef window , ControlPartCode *outPart )
+{
+#if TARGET_API_MAC_OSX
+    if ( UMAGetSystemVersion() >= 0x1030 && ( toplevelWindow == 0 || toplevelWindow->MacUsesCompositing() ) )
+        return FindControlUnderMouse( location , window , outPart ) ;
+#endif

 
 

+    ControlRef rootControl = NULL ;
+    verify_noerr( GetRootControl( window , &rootControl ) ) ;

 
 

+    return wxMacFindSubControl( toplevelWindow , location , rootControl , outPart ) ;

 }
 }

-static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+
+#define NEW_CAPTURE_HANDLING 1
+
+pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
 {

+    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+

     OSStatus result = eventNotHandledErr ;
     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 ;
+
+    WindowRef window ;
+    short windowPart = ::FindWindow(screenMouseLocation, &window);
+
+    wxWindow* currentMouseWindow = NULL ;
+    ControlRef control = NULL ;

 
 

-    GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
-        sizeof( WindowRef ), NULL, &windowRef );
+#if NEW_CAPTURE_HANDLING
+    if ( wxApp::s_captureWindow )
+    {
+        window = (WindowRef) wxApp::s_captureWindow->MacGetTopLevelWindowRef() ;
+        windowPart = inContent ;
+    }
+#endif
+
+    if ( window )
+    {
+        QDGlobalToLocalPoint( UMAGetWindowPort(window ) ,  &windowMouseLocation ) ;
+
+        if ( wxApp::s_captureWindow
+#if !NEW_CAPTURE_HANDLING
+             && wxApp::s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent
+#endif
+             )
+        {
+            currentMouseWindow = wxApp::s_captureWindow ;
+        }
+        else if ( (IsWindowActive(window) && windowPart == inContent) )
+        {
+            ControlPartCode part ;
+            control = wxMacFindControlUnderMouse( toplevelWindow , 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 )
+                {
+#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 = wxFindControlFromMacControl( parent ) ;
+                    if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
+                        currentMouseWindow = wxParent ;
+#endif
+                }
+            }
+        }
+    }
+
+    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->GetEventHandler()->ProcessEvent(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->GetEventHandler()->ProcessEvent(evententer);
+        }
+
+        g_MacLastWindow = currentMouseWindow ;
+    }

 
 

-    switch( GetEventKind( event ) )
+    if ( windowPart == inMenuBar )

     {
     {

-        case kEventWindowUpdate :
-            if ( !wxPendingDelete.Member(toplevelWindow) )
-                toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
+        // 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 ;
             result = noErr ;

-            break ;
-        case kEventWindowActivated :
-                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
+        }
+    }
+    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
+            || wxevent.GetEventType() == wxEVT_ENTER_WINDOW
+            || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW )
+            wxToolTip::RelayEvent( currentMouseWindow , wxevent );
+#endif
+
+        if ( currentMouseWindow->GetEventHandler()->ProcessEvent(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->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
+                    currentMouseWindow->SetFocus();
+            }
+
+            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 )
+#ifdef __WXMAC_OSX__
+                &&
+                (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) !=
+                wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &dummyPart ) )
+#endif
+                )
+            {
+                if ( currentMouseWindow->MacIsReallyEnabled() )
+                {
+                    EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+                    Point clickLocation = windowMouseLocation ;
+
+                    if ( toplevelWindow->MacUsesCompositing() )
+                        currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
+
+                    HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
+                        modifiers , (ControlActionUPP ) -1 ) ;
+
+                    if ((currentMouseWindowParent != NULL) &&
+                        (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL))
+                    {
+                        currentMouseWindow = NULL;
+                    }
+                }
+
+                result = noErr ;
+            }
+        }
+
+        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 ) ;
+
+        while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+        {
+            cursorTarget = cursorTarget->GetParent() ;
+            if ( cursorTarget )
+                cursorPoint += cursorTarget->GetPosition();
+        }
+
+    } // 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
+        if ( cEvent.GetKind() == kEventMouseDown && toplevelWindow && control )
+        {
+            EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+            Point clickLocation = windowMouseLocation ;
+            if ( toplevelWindow->MacUsesCompositing() )
+            {
+#ifdef __WXMAC_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 ;
             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 ;
             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->GetEventHandler()->ProcessEvent(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 kEventWindowShown :
-               toplevelWindow->Refresh() ;
-               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 ;
-
-                GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
-                    sizeof( newContentRect ), NULL, &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
+                }

 
 

-                toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
-                    newContentRect.right - newContentRect.left ,
-                    newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
+                wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ;
+                event.SetEventObject( toplevelWindow ) ;

 
 

-                result = noErr;
+                toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
+                toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified

             }
             }

-            break ;
-        case kEventWindowBoundsChanging :
-            err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
-                        NULL, sizeof( UInt32 ), NULL, &attributes );
-            if ( err == noErr )
-            {
-                Rect newContentRect ;

 
 

-                GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
-                    sizeof( newContentRect ), NULL, &newContentRect );
+            if ( attributes & kWindowBoundsChangeOriginChanged )
+            {
+                wxMoveEvent event( r.GetLeftTop() , toplevelWindow->GetId() ) ;
+                event.SetEventObject( toplevelWindow ) ;
+                toplevelWindow->GetEventHandler()->ProcessEvent(event) ;
+            }

 
 

-                wxSize formerSize = toplevelWindow->GetSize() ;
+            result = noErr ;
+        }
+            break ;

 
 

-                if ( (attributes & kWindowBoundsChangeSizeChanged ) || 
-                    ( attributes & kWindowBoundsChangeOriginChanged ) )
-                    toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
-                        newContentRect.right - newContentRect.left ,
-                        newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
-    
-                int x , y , w , h ;
-                toplevelWindow->GetPosition( &x , &y ) ;
-                toplevelWindow->GetSize( &w , &h ) ;
-                Rect adjustedRect  = { y , x , y + h , x + w } ;
+        case kEventWindowBoundsChanging :
+        {
+            UInt32 attributes = cEvent.GetParameter<UInt32>(kEventParamAttributes,typeUInt32) ;
+            Rect newRect = cEvent.GetParameter<Rect>(kEventParamCurrentBounds) ;

 
 

-                if ( !EqualRect( &newContentRect , &adjustedRect ) )
-                {
-                    SetEventParameter( event , kEventParamCurrentBounds , typeQDRectangle, sizeof( adjustedRect ) , &adjustedRect ) ;
-                }
-                
-                if ( toplevelWindow->GetSize() != formerSize )
-                    toplevelWindow->Update() ;
-        
-                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 ) ;
+                toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified

             }
             }

+
+            result = noErr ;
+        }

             break ;
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 

-pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

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


@@ -443,24 +865,27 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
         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 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


@@ -468,52 +893,68 @@ 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)

 {
 {

-    if ( wxWinMacWindowList == NULL )
-        return NULL ;
-    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;
 wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;

-bool wxTopLevelWindowMac::s_macWindowCompositing = FALSE;
+
+typedef struct
+{
+    wxPoint m_position ;
+    wxSize m_size ;
+}
+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 ;

-    m_macUsesCompositing = FALSE ;
-#if TARGET_CARBON
+
+#if TARGET_API_MAC_OSX
+    m_macUsesCompositing = ( UMAGetSystemVersion() >= 0x1030 );
+#else
+    m_macUsesCompositing = false;
+#endif
+

     m_macEventHandler = NULL ;
     m_macEventHandler = NULL ;

- #endif
+    m_macFullScreenData = NULL ;

 }
 
 class wxMacDeferredWindowDeleter : public wxObject
 }
 
 class wxMacDeferredWindowDeleter : public wxObject


@@ -523,11 +964,13 @@ public :
     {
         m_macWindow = windowRef ;
     }
     {
         m_macWindow = windowRef ;
     }

+

     virtual ~wxMacDeferredWindowDeleter()
     {
         UMADisposeWindow( (WindowRef) m_macWindow ) ;
     }
     virtual ~wxMacDeferredWindowDeleter()
     {
         UMADisposeWindow( (WindowRef) m_macWindow ) ;
     }

- protected :
+
+protected :

     WindowRef m_macWindow ;
 } ;
 
     WindowRef m_macWindow ;
 } ;
 


@@ -544,40 +987,50 @@ 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 ) ;
+
+    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(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 ;

 }
 
 
 }
 
 


@@ -587,32 +1040,33 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {

-    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
-    wxMacWindowClipper clip (this);
-    ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
+    // TODO: check if this is still necessary
+#if 0
+    wxMacPortStateHelper help( (GrafPtr)GetWindowPort( (WindowRef)m_macWindow) ) ;
+    wxMacWindowClipper clip( this );
+#endif
+
+    if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) )
+    {
+        Rect rect;

 
 

-    Rect tempRect ;
-    GrafPtr port ;
-    GetPort( &port ) ;
-    Point pt = { 0, 0 } ;
-    SetPortWindowPort((WindowRef)m_macWindow) ;
-    LocalToGlobal( &pt ) ;
-    SetPort( port ) ;
-
-    GetWindowPortBounds((WindowRef)m_macWindow, &tempRect ) ;
-    SetSize( pt.h , pt.v , tempRect.right-tempRect.left ,
-        tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING);
+        GetWindowBounds((WindowRef)m_macWindow, kWindowGlobalPortRgn, &rect);
+        SetWindowIdealUserState((WindowRef)m_macWindow, &rect);
+        SetWindowUserState((WindowRef)m_macWindow, &rect);
+    }
+
+    ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;

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

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

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

-    if ( IsWindowCollapsable((WindowRef)m_macWindow) )
-        CollapseWindow((WindowRef)m_macWindow , iconize ) ;
+    if ( IsWindowCollapsable( (WindowRef)m_macWindow) )
+        CollapseWindow( (WindowRef)m_macWindow , iconize ) ;

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


@@ -622,50 +1076,83 @@ bool wxTopLevelWindowMac::IsIconized() const
 
 void wxTopLevelWindowMac::Restore()
 {
 
 void wxTopLevelWindowMac::Restore()
 {

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

 }
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac misc
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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::SetIcon(const wxIcon& icon)
 {
     // this sets m_icon
     wxTopLevelWindowBase::SetIcon(icon);
 }
 

-void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name )
+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;
 {
     OSStatus err = noErr ;
     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 = WidthDefault(size.x);
-    m_height = HeightDefault(size.y);
+    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 ;

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


@@ -676,24 +1163,28 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
             )
         {
             wclass = kFloatingWindowClass ;
             )
         {
             wclass = kFloatingWindowClass ;

+

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

-            {

                 attr |= kWindowSideTitlebarAttribute ;
                 attr |= kWindowSideTitlebarAttribute ;

-            }

         }
         else
         {
         }
         else
         {

-#if TARGET_CARBON

             wclass = kPlainWindowClass ;
             wclass = kPlainWindowClass ;

-#else
-            wclass = kFloatingWindowClass ;
-#endif

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

+        attr |= kWindowInWindowMenuAttribute ;
+    }
+#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;
+        // we must force compositing on a drawer
+        m_macUsesCompositing = true ;

     }
     }

+#endif  //10.2 and up

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


@@ -703,60 +1194,37 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         }
         else
         {
         }
         else
         {

-#if TARGET_CARBON

             wclass = kPlainWindowClass ;
             wclass = kPlainWindowClass ;

-#else
-            wclass = kModalWindowClass ;
-#endif

         }
     }
 
         }
     }
 

-    if ( HasFlag( wxMINIMIZE_BOX ) )
+    if ( wclass != kPlainWindowClass )

     {
     {

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

     }
 
     }
 

+    // turn on live resizing (OS X only)

     if (UMAGetSystemVersion() >= 0x1000)
     if (UMAGetSystemVersion() >= 0x1000)

-    {
-        //turn on live resizing (OS X only)

         attr |= kWindowLiveResizeAttribute;
         attr |= kWindowLiveResizeAttribute;

-    }

 
 

-#if TARGET_CARBON
-#if 0 //  having problems right now with that
-    if (HasFlag(wxSTAY_ON_TOP))
-        wclass = kUtilityWindowClass;
-#endif
-#endif
+    if ( HasFlag(wxSTAY_ON_TOP) )
+        group = GetWindowGroupOfClass(kUtilityWindowClass) ;

 
 

-    //this setup lets us have compositing and non-compositing 
-    //windows in the same application. 
-  
-#if UNIVERSAL_INTERFACES_VERSION >= 0x0400  
-    if ( wxTopLevelWindowMac::s_macWindowCompositing )
-    {
+#if TARGET_API_MAC_OSX
+    if ( m_macUsesCompositing )

         attr |= kWindowCompositingAttribute;
         attr |= kWindowCompositingAttribute;

-        m_macUsesCompositing = TRUE;
-    }
-    else

 #endif
 #endif

-    {
-        m_macUsesCompositing = FALSE;
-    }
-    
-#if TARGET_CARBON
+

     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;
     if ( HasFlag(wxFRAME_SHAPED) )
     {
         WindowDefSpec customWindowDefSpec;


@@ -768,542 +1236,445 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
                               (WindowRef*) &m_macWindow);
     }
     else
                               (WindowRef*) &m_macWindow);
     }
     else

-#endif

     {
         err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     }
 
     {
         err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     }
 

+    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") );
     wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );

-    wxAssociateWinWithMacWindow( m_macWindow , this ) ;
-    UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
-    if ( wxTopLevelWindowMac::s_macWindowCompositing )
+
+    // 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(this , true /*isRootControl*/) ;
+
+#if TARGET_API_MAC_OSX
+    if ( m_macUsesCompositing )

     {
     {

-        ::GetRootControl( (WindowRef)m_macWindow, (ControlHandle*)&m_macRootControl ) ;
+        // 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() ) ;
+        }

     }
     }

-    else
+#endif

     {
     {

-        ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
+        ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
+    }
+
+    // the root control level handler
+    MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
+
+#if TARGET_API_MAC_OSX
+    if ( m_macUsesCompositing && m_macWindow != NULL )
+    {
+        if ( GetExtraStyle() & wxFRAME_EX_METAL )
+            MacSetMetalAppearance( true ) ;

     }
     }

-#if TARGET_CARBON
-    InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
-    InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
-        GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);

 #endif
 #endif

-    m_macFocus = NULL ;

 
 

+    // the frame window event handler
+    InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
+    MacInstallTopLevelWindowEventHandler() ;
+
+    DoSetWindowVariant( m_windowVariant ) ;
+
+    m_macFocus = NULL ;

 
 

-#if TARGET_CARBON

     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 );

     }
     }

-#endif

 
     wxWindowCreateEvent event(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
 
     wxWindowCreateEvent event(this);
     GetEventHandler()->ProcessEvent(event);
 }
 

-bool wxTopLevelWindowMac::MacEnableCompositing( bool useCompositing )
+void wxTopLevelWindowMac::ClearBackground()

 {
 {

-    bool oldval = s_macWindowCompositing;
-    s_macWindowCompositing = useCompositing; 
-    return oldval; 
+    wxWindow::ClearBackground() ;

 }
 
 }
 

-void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin)
+// Raise the window to the top of the Z order
+void wxTopLevelWindowMac::Raise()

 {
 {

-    ((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 ;
+    ::SelectWindow( (WindowRef)m_macWindow ) ;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
+void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)

 {
 {

-    return m_macRootControl ;
-}
+    if (s_macDeactivateWindow)
+    {
+        wxLogTrace(TRACE_ACTIVATE,
+                   wxT("Doing delayed deactivation of %p"),
+                   s_macDeactivateWindow);

 
 

+        s_macDeactivateWindow->MacActivate(timestamp, false);
+    }
+}

 
 

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

 {
 {

-    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
+    wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this);

 
 

-    RgnHandle       visRgn = NewRgn() ;
-    GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), visRgn );
-    BeginUpdate( (WindowRef)m_macWindow ) ;
+    if (s_macDeactivateWindow == this)
+        s_macDeactivateWindow = NULL;

 
 

-    RgnHandle       updateRgn = NewRgn();
-    RgnHandle       diffRgn = NewRgn() ;
-
-    if ( updateRgn && diffRgn )
-    {
-#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 )  ) ;
-        }
-    }
-    if ( updateRgn )
-        DisposeRgn( updateRgn );
-    if ( diffRgn )
-        DisposeRgn( diffRgn );
-    if ( visRgn )
-        DisposeRgn( visRgn ) ;
-
-    EndUpdate( (WindowRef)m_macWindow ) ;
-    SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
-    m_macNeedsErasing = false ;
+    MacDelayedDeactivation(timestamp);
+    MacPropagateHiliteChanged() ;

 }
 
 }
 

-
-// Raise the window to the top of the Z order
-void wxTopLevelWindowMac::Raise()
+void wxTopLevelWindowMac::SetTitle(const wxString& title)

 {
 {

-    ::SelectWindow( (WindowRef)m_macWindow ) ;
+    wxWindow::SetLabel( title ) ;
+    UMASetWTitle( (WindowRef)m_macWindow , title , m_font.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 = false;

 
 

-    event.m_middleDown = FALSE;
-    event.m_rightDown = isDown && controlDown;
+#if wxUSE_SYSTEM_OPTIONS
+    // code contributed by Ryan Wilcox December 18, 2003
+    plainTransition = UMAGetSystemVersion() >= 0x1000 ;
+    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);
+        GetEventHandler()->ProcessEvent(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
+
+    MacPropagateVisibilityChanged() ;
+
+    return true ;
+}
+
+bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
+{
+    if ( show )

     {
     {

-        event.SetEventType(wxEVT_MOTION ) ;
-    }
+        FullScreenData *data = (FullScreenData *)m_macFullScreenData ;
+        delete data ;
+        data = new FullScreenData() ;

 
 

-    event.m_shiftDown = modifiers & shiftKey;
-    event.m_controlDown = modifiers & controlKey;
-    event.m_altDown = modifiers & optionKey;
-    event.m_metaDown = modifiers & cmdKey;
+        m_macFullScreenData = data ;
+        data->m_position = GetPosition() ;
+        data->m_size = GetSize() ;

 
 

-    Point       localwhere ;
-    localwhere.h = x ;
-    localwhere.v = y ;
+        if ( style & wxFULLSCREEN_NOMENUBAR )
+            HideMenuBar() ;

 
 

-    GrafPtr     port ;
-    ::GetPort( &port ) ;
-    ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
-    ::GlobalToLocal( &localwhere ) ;
-    ::SetPort( port ) ;
+        wxRect client = wxGetClientDisplayRect() ;

 
 

-    if ( kind == mouseDown )
-    {
-        if ( timestamp - gs_lastWhen <= (long) GetDblTime() )
+        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 ) ;

     }
     else
     {
     }
     else
     {

-        MacDispatchMouseEvent( event ) ;
+        ShowMenuBar() ;
+        FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+        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)
+void wxTopLevelWindowMac::SetExtraStyle(long exStyle) 

 {
 {

-    switch (part)
+    if ( GetExtraStyle() == exStyle )
+        return ;
+    
+    wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;
+
+#if TARGET_API_MAC_OSX
+    if ( m_macUsesCompositing && m_macWindow != NULL )

     {
     {

-        case inContent:
-            {
-                MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
-                    ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
-            }
-            break ;
+        bool metal = GetExtraStyle() & wxFRAME_EX_METAL ;
+        if ( MacGetMetalAppearance() != metal )
+            MacSetMetalAppearance( metal ) ;

     }
     }

+#endif

 }
 
 }
 

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

 {
 {

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

 
 

-#endif
+    GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ;
+    GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ;

 
 

-void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
+    left = content.left - structure.left ;
+    top = content.top  - structure.top ;
+    right = structure.right - content.right ;
+    bottom = structure.bottom - content.bottom ;
+}
+
+void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)

 {
 {

-    if(s_macDeactivateWindow)
-    {
-        wxLogDebug(wxT("Doing delayed deactivation of %p"),s_macDeactivateWindow);
-        s_macDeactivateWindow->MacActivate(timestamp, false);
-    }
+    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::MacActivate( long timestamp , bool inIsActivating )
+void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const

 {
 {

-    // wxLogDebug(wxT("TopLevel=%p::MacActivate"),this);
+    Rect bounds ;

 
 

-    if(s_macDeactivateWindow==this)
-        s_macDeactivateWindow=NULL;
-    MacDelayedDeactivation(timestamp);
-    wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
-    event.m_timeStamp = timestamp ;
-    event.SetEventObject(this);
+    verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;

 
 

-    GetEventHandler()->ProcessEvent(event);
+    if (x)
+       *x = bounds.left ;
+    if (y)
+       *y = bounds.top ;
+}

 
 

-    UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
+void wxTopLevelWindowMac::DoGetSize( int *width, int *height ) const
+{
+    Rect bounds ;

 
 

-    // 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);
-    }
+    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::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::MacKeyDown( WXEVENTREF ev )
+void wxTopLevelWindowMac::MacSetMetalAppearance( bool set )

 {
 {

+#if TARGET_API_MAC_OSX
+    wxASSERT_MSG( m_macUsesCompositing ,
+        wxT("Cannot set metal appearance on a non-compositing window") ) ;
+
+    MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes ,
+        set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
+#endif

 }
 
 }
 

+bool wxTopLevelWindowMac::MacGetMetalAppearance() const
+{
+#if TARGET_API_MAC_OSX
+    return MacGetWindowAttributes() & kWindowMetalAttribute ;
+#else
+    return false ;

 #endif
 #endif

+}

 
 

-void wxTopLevelWindowMac::SetTitle(const wxString& title)
+void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear )

 {
 {

-    wxWindow::SetTitle( title ) ;
-    UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
+    ChangeWindowAttributes( (WindowRef)m_macWindow, attributesToSet, attributesToClear ) ;

 }
 
 }
 

-bool wxTopLevelWindowMac::Show(bool show)
+wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const

 {
 {

-    if ( !wxWindow::Show(show) )
-        return FALSE;
+    UInt32 attr = 0 ;
+    GetWindowAttributes( (WindowRef) m_macWindow, &attr ) ;

 
 

-    if (show)
-    {
-        #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
-        #endif
-        {
-           ::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
+    return attr ;
+}
+
+void wxTopLevelWindowMac::MacPerformUpdates()
+{
+#if TARGET_API_MAC_OSX
+    if ( m_macUsesCompositing )

     {
     {

-        #if wxUSE_SYSTEM_OPTIONS
-        if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) )
-        {
-           ::HideWindow((WindowRef) m_macWindow );
-        }
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+        // for composited windows this also triggers a redraw of all
+        // invalid views in the window
+        if ( UMAGetSystemVersion() >= 0x1030 )
+            HIWindowFlush((WindowRef) m_macWindow) ;

         else
         else

-        #endif
+#endif

         {
         {

-           ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
-        }
-    }
+            // the only way to trigger the redrawing on earlier systems is to call
+            // ReceiveNextEvent

 
 

-    if ( !show )
-    {
-    }
-    else
-    {
-        Refresh() ;
-    }
-
-    return TRUE;
-}
+            EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+            UInt32 currentEventClass = 0 ;
+            UInt32 currentEventKind = 0 ;
+            if ( currentEvent != NULL )
+            {
+                currentEventClass = ::GetEventClass( currentEvent ) ;
+                currentEventKind = ::GetEventKind( currentEvent ) ;
+            }

 
 

-void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
-{
-    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
-    wxMacWindowClipper clip (this);
-
-    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 ( currentEventClass != kEventClassMenu )
+            {
+                // when tracking a menu, strange redraw errors occur if we flush now, so leave..
+                EventRef theEvent;
+                OSStatus status = noErr ;
+                status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
+            }
+        }

     }
     }

-
-    if ( doMove || doResize )
+    else
+#endif

     {
     {

-        m_x = actualX ;
-        m_y = actualY ;
-
-        if ( doMove )
-            ::MoveWindow((WindowRef)m_macWindow, m_x, m_y  , false); // don't make frontmost
-
-        m_width = actualWidth ;
-        m_height = actualHeight ;
-
-        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
+        BeginUpdate( (WindowRef) m_macWindow ) ;

 
 

-        if ( doResize && HasFlag(wxFULL_REPAINT_ON_RESIZE) )
-            Refresh() ;
+        RgnHandle updateRgn = NewRgn();
+        if ( updateRgn )
+        {
+            GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
+            UpdateControls(  (WindowRef)m_macWindow , updateRgn ) ;

 
 

+            // if ( !EmptyRgn( updateRgn ) )
+            //    MacDoRedraw( updateRgn , 0 , true) ;

 
 

-        if ( IsKindOf( CLASSINFO( wxFrame ) ) )
-        {
-            wxFrame* frame = (wxFrame*) this ;
-#if wxUSE_STATUSBAR
-            frame->PositionStatusBar();
-#endif            
-#if wxUSE_TOOLBAR
-            frame->PositionToolBar();
-#endif            
+            DisposeRgn( updateRgn );

         }
         }

-        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);
-        }
+        EndUpdate( (WindowRef)m_macWindow ) ;
+        QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ;

     }
     }

-

 }
 
 }
 

-/*
- * 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 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."));
 

-#if TARGET_CARBON
-    // 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
     }
 
     // Make a copy of the region


@@ -1318,12 +1689,10 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
     // Save the region so we can use it later
     SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
 
     // Save the region so we can use it later
     SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)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;
-#else
-    return FALSE;
-#endif
+
+    return true;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1331,38 +1700,37 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
 // http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
 // ---------------------------------------------------------------------------
 
 // 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);
 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->left, inRect->top };
+
+    QDLocalToGlobalPoint( GetWindowPort(window), &pt ) ;

     inRect->top = pt.v;
     inRect->left = pt.h;
     inRect->bottom += pt.v;
     inRect->right += 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)
 {
     /*------------------------------------------------------
         Define which options your custom window supports.
     --------------------------------------------------------*/
     //just enable everything for our demo
 static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
 {
     /*------------------------------------------------------
         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;
 }
 


@@ -1375,8 +1743,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 ) ;

     }
 }
 
     }
 }
 


@@ -1389,75 +1758,78 @@ 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;
+
+    if (rgnRec == NULL)
+        return paramErr;

 
 

-    switch(rgnRec->regionCode)
+    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 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;
 }
 

-#endif
-// ---------------------------------------------------------------------------
-