Added wxSizerItem::SetUserData

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 0a17b278dca4f442f6e42b509a601805f55bfa70..7116cf645fe9271df3943caedcb6ac4a07e09e7a 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        windows.cpp
+// Name:        src/mac/carbon/window.cpp

 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,11 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "window.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"

 #include "wx/menu.h"
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/menu.h"
 #include "wx/window.h"
 #include "wx/dc.h"


@@ -35,27 +32,30 @@
 #include "wx/spinctrl.h"
 #include "wx/log.h"
 #include "wx/geometry.h"
 #include "wx/spinctrl.h"
 #include "wx/log.h"
 #include "wx/geometry.h"

+#include "wx/textctrl.h"

 
 #include "wx/toolbar.h"
 #include "wx/dc.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"
 
 #include "wx/toolbar.h"
 #include "wx/dc.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"

-#endif // wxUSE_CARET
+#endif

 
 

-#define wxWINDOW_HSCROLL 5998
-#define wxWINDOW_VSCROLL 5997
-#define MAC_SCROLLBAR_SIZE 16
+#define MAC_SCROLLBAR_SIZE 15
+#define MAC_SMALL_SCROLLBAR_SIZE 11

 
 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"

+

 #ifndef __DARWIN__
 #include <Windows.h>
 #include <ToolUtils.h>
 #ifndef __DARWIN__
 #include <Windows.h>
 #include <ToolUtils.h>

+#include <Scrap.h>
+#include <MacTextEditor.h>

 #endif
 
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__
 #endif
 
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__

-       #include <HIToolbox/HIView.h>
+    #include <HIToolbox/HIView.h>

 #endif
 #endif
 
 #endif
 #endif
 


@@ -66,51 +66,113 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
 #include <string.h>
 
 extern wxList wxPendingDelete;

-wxWindowMac* gFocusWindow = NULL ;

 
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)

-#else // __WXMAC__
+#else

     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)

-#endif // __WXUNIVERSAL__/__WXMAC__
-
-#if !USE_SHARED_LIBRARY
+#endif

 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)

-// TODO    EVT_PAINT(wxWindowMac::OnPaint)
-    EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
-    EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+#if TARGET_API_MAC_OSX
+    EVT_PAINT(wxWindowMac::OnPaint)
+#endif

     EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
     EVT_SET_FOCUS(wxWindowMac::OnSetFocus)

+    EVT_KILL_FOCUS(wxWindowMac::OnSetFocus)

     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 

-#endif
-

 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 
 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 

-#define wxMAC_USE_THEME_BORDER 0
+#define wxMAC_USE_THEME_BORDER 1
+
+// ---------------------------------------------------------------------------
+// Utility Routines to move between different coordinate systems
+// ---------------------------------------------------------------------------
+
+/*
+ * Right now we have the following setup :
+ * a border that is not part of the native control is always outside the
+ * control's border (otherwise we loose all native intelligence, future ways
+ * may be to have a second embedding control responsible for drawing borders
+ * and backgrounds eventually)
+ * so all this border calculations have to be taken into account when calling
+ * native methods or getting native oriented data
+ * so we have three coordinate systems here
+ * wx client coordinates
+ * wx window coordinates (including window frames)
+ * native coordinates
+ */
+
+//
+// originating from native control
+//
+
+
+void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle )
+{
+    OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
+}
+
+void wxMacNativeToWindow( const wxWindow* window , Rect *rect )
+{
+    OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
+}
+
+//
+// directed towards native control
+//
+
+void wxMacWindowToNative( const wxWindow* window , RgnHandle handle )
+{
+    OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+}
+
+void wxMacWindowToNative( const wxWindow* window , Rect *rect )
+{
+    OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
+}

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

- 
+

 extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ;
 
 extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ;
 

+#if TARGET_API_MAC_OSX
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3
+enum
+{
+    kEventControlVisibilityChanged = 157
+};
+#endif
+
+#endif
+

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

+    { kEventClassControl , kEventControlHit } ,
+

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-       { kEventClassControl , kEventControlDraw } ,
-//     { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
-//  { kEventClassControl , kEventControlBoundsChanged } ,
-// kEventControlEnabledStateChanged , kEventControlVisibilityChanged , kEventControlHiliteChanged
-#else
-    {}
+    { kEventClassControl , kEventControlDraw } ,
+    { kEventClassControl , kEventControlVisibilityChanged } ,
+    { kEventClassControl , kEventControlEnabledStateChanged } ,
+    { kEventClassControl , kEventControlHiliteChanged } ,
+    { kEventClassControl , kEventControlSetFocusPart } ,
+
+    { kEventClassService , kEventServiceGetTypes },
+    { kEventClassService , kEventServiceCopy },
+    { kEventClassService , kEventServicePaste },
+
+//    { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+//    { kEventClassControl , kEventControlBoundsChanged } ,

 #endif
 } ;
 
 #endif
 } ;
 


@@ -119,44 +181,314 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;

-    
+

     ControlRef controlRef ;
     wxWindowMac* thisWindow = (wxWindowMac*) data ;
 
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 
     ControlRef controlRef ;
     wxWindowMac* thisWindow = (wxWindowMac*) data ;
 
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 

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

     {
     {

+#if TARGET_API_MAC_OSX

         case kEventControlDraw :
             {
         case kEventControlDraw :
             {

-                RgnHandle updateRgn = cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle) ;
-                // GrafPtr myport = cEvent.GetParameter<GrafPtr>(kEventParamGrafPort,typeGrafPtr) ;
+                RgnHandle updateRgn = NULL ;
+                RgnHandle allocatedRgn = NULL ;
+                wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+                Rect controlBounds ;
+
+                if ( ! thisWindow->GetPeer()->IsCompositing() )
+                {
+                    if ( thisWindow->GetPeer()->IsRootControl() )
+                        thisWindow->GetPeer()->GetRect( &controlBounds ) ;
+                    else
+                        GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ;
+                }
+
+                if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+                {
+                    updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+                }
+                else
+                {
+                    if ( ! thisWindow->GetPeer()->IsCompositing() )
+                    {
+                        allocatedRgn = NewRgn() ;
+                        CopyRgn( updateRgn , allocatedRgn ) ;
+                        OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ;
+
+                        // hide the given region by the new region that must be shifted
+                        wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
+                        updateRgn = allocatedRgn ;
+                    }
+                    else
+                    {
+                        if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
+                        {
+                            // as this update region is in native window locals we must adapt it to wx window local
+                            allocatedRgn = NewRgn() ;
+                            CopyRgn( updateRgn , allocatedRgn ) ;
+
+                            // hide the given region by the new region that must be shifted
+                            wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
+                            updateRgn = allocatedRgn ;
+                        }
+                    }
+                }

 
 

-#if 0 // in case we would need a coregraphics compliant background erase first
-                CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+                Rect rgnBounds ;
+                GetRegionBounds( updateRgn , &rgnBounds ) ;
+
+#if wxMAC_DEBUG_REDRAW

                 if ( thisWindow->MacIsUserPane() )
                 {
                 if ( thisWindow->MacIsUserPane() )
                 {

-                       HIRect bounds;
-                       err = HIViewGetBounds( controlRef, &bounds );
-                                   CGContextSetRGBFillColor( cgContext, 1 , 1 , 1 , 1 );
-//                                 CGContextSetRGBFillColor( cgContext, .95, .95, .95, 1 );
-                                   CGContextFillRect( cgContext, bounds );
+                    static float color = 0.5 ;
+                    static channel = 0 ;
+                    HIRect bounds;
+                    CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+
+                    HIViewGetBounds( controlRef, &bounds );
+                    CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 ,
+                        channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 );
+                    CGContextFillRect( cgContext, bounds );
+                    color += 0.1 ;
+                    if ( color > 0.9 )
+                    {
+                        color = 0.5 ;
+                        channel++ ;
+                        if ( channel == 3 )
+                            channel = 0 ;
+                    }

                 }
 #endif
                 }
 #endif

-                if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
-                    result = noErr ;
+
+                {
+#if wxMAC_USE_CORE_GRAPHICS
+                    bool created = false ;
+                    CGContextRef cgContext = NULL ;
+                    if ( cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) != noErr )
+                    {
+                        wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ;
+
+                        // this parameter is not provided on non-composited windows
+                        created = true ;
+
+                        // rest of the code expects this to be already transformed and clipped for local
+                        CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ;
+                        Rect bounds ;
+                        GetPortBounds( port , &bounds ) ;
+                        CreateCGContextForPort( port , &cgContext ) ;
+
+                        wxMacWindowToNative( thisWindow , updateRgn ) ;
+                        OffsetRgn( updateRgn , controlBounds.left , controlBounds.top ) ;
+                        ClipCGContextToRegion( cgContext , &bounds , updateRgn ) ;
+                        wxMacNativeToWindow( thisWindow , updateRgn ) ;
+                        OffsetRgn( updateRgn , -controlBounds.left , -controlBounds.top ) ;
+
+                        CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
+                        CGContextScaleCTM( cgContext , 1 , -1 ) ;
+
+                        CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ;
+
+#if 0
+                        CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ;
+                        CGContextFillRect( cgContext ,
+                            CGRectMake( 0 , 0 ,
+                                controlBounds.right - controlBounds.left ,
+                                controlBounds.bottom - controlBounds.top ) );
+#endif
+                    }
+
+                    thisWindow->MacSetCGContextRef( cgContext ) ;
+
+                    {
+                        wxMacCGContextStateSaver sg( cgContext ) ;
+#endif
+                        if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
+                            result = noErr ;
+
+#if wxMAC_USE_CORE_GRAPHICS
+                        thisWindow->MacSetCGContextRef( NULL ) ;
+                    }
+
+                    if ( created )
+                        CGContextRelease( cgContext ) ;
+#endif
+                }
+
+                if ( allocatedRgn )
+                    DisposeRgn( allocatedRgn ) ;
+            }
+            break ;
+
+        case kEventControlVisibilityChanged :
+            thisWindow->MacVisibilityChanged() ;
+            break ;
+
+        case kEventControlEnabledStateChanged :
+            thisWindow->MacEnabledStateChanged() ;
+            break ;
+
+        case kEventControlHiliteChanged :
+            thisWindow->MacHiliteChanged() ;
+            break ;
+#endif
+
+        // we emulate this event under Carbon CFM
+        case kEventControlSetFocusPart :
+            {
+                Boolean focusEverything = false ;
+                ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+
+#ifdef __WXMAC_OSX__
+                if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
+                {
+                }
+#endif
+
+                if ( controlPart == kControlFocusNoPart )
+                {
+#if wxUSE_CARET
+                    if ( thisWindow->GetCaret() )
+                        thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+                    static bool inKillFocusEvent = false ;
+
+                    if ( !inKillFocusEvent )
+                    {
+                        inKillFocusEvent = true ;
+                        wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+                        event.SetEventObject(thisWindow);
+                        thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                        inKillFocusEvent = false ;
+                    }
+                }

                 else
                 else

-                    result = eventNotHandledErr; 
+                {
+                    // panel wants to track the window which was the last to have focus in it
+                    wxChildFocusEvent eventFocus(thisWindow);
+                    thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
+
+#if wxUSE_CARET
+                    if ( thisWindow->GetCaret() )
+                        thisWindow->GetCaret()->OnSetFocus();
+#endif
+
+                    wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+                    event.SetEventObject(thisWindow);
+                    thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                }
+
+                if ( thisWindow->MacIsUserPane() )
+                    result = noErr ;

             }
             break ;
             }
             break ;

+
+        case kEventControlHit :
+            result = thisWindow->MacControlHit( handler , event ) ;
+            break ;
+

         default :
             break ;
     }
         default :
             break ;
     }

+
+    return result ;
+}
+
+static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+
+    ControlRef controlRef ;
+    wxWindowMac* thisWindow = (wxWindowMac*) data ;
+    wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
+    cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+    switch ( GetEventKind( event ) )
+    {
+        case kEventServiceGetTypes :
+            if ( textCtrl )
+            {
+                long from, to ;
+                textCtrl->GetSelection( &from , &to ) ;
+
+                CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;
+                if ( from != to )
+                    copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
+                if ( textCtrl->IsEditable() )
+                    pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;
+
+                static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt', 'PICT', 'MooV', 'AIFF' */  };
+                for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i )
+                {
+                    CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]);
+                    if ( typestring )
+                    {
+                        if ( copyTypes )
+                            CFArrayAppendValue(copyTypes, typestring) ;
+                        if ( pasteTypes )
+                            CFArrayAppendValue(pasteTypes, typestring) ;
+
+                        CFRelease( typestring ) ;
+                    }
+                }
+
+                result = noErr ;
+            }
+            break ;
+
+        case kEventServiceCopy :
+            if ( textCtrl )
+            {
+                long from, to ;
+
+                textCtrl->GetSelection( &from , &to ) ;
+                wxString val = textCtrl->GetValue() ;
+                val = val.Mid( from , to - from ) ;
+                ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
+                verify_noerr( ClearScrap( &scrapRef ) ) ;
+                verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.length() , val.c_str() ) ) ;
+                result = noErr ;
+            }
+            break ;
+
+        case kEventServicePaste :
+            if ( textCtrl )
+            {
+                ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
+                Size textSize, pastedSize ;
+                verify_noerr( GetScrapFlavorSize(scrapRef, kTXNTextData, &textSize) ) ;
+                textSize++ ;
+                char *content = new char[textSize] ;
+                GetScrapFlavorData(scrapRef, kTXNTextData, &pastedSize, content );
+                content[textSize - 1] = 0 ;
+
+#if wxUSE_UNICODE
+                textCtrl->WriteText( wxString( content , wxConvLocal ) );
+#else
+                textCtrl->WriteText( wxString( content ) ) ;
+#endif
+
+                delete[] content ;
+                result = noErr ;
+            }
+            break ;
+
+        default:
+            break ;
+    }
+

     return result ;
 }
 
 pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     return result ;
 }
 
 pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {

+    EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+    EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+    wxTheApp->MacSetCurrentEvent( event , handler ) ;

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


@@ -164,132 +496,179 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
         case kEventClassControl :
             result = wxMacWindowControlEventHandler( handler, event, data ) ;
             break ;
         case kEventClassControl :
             result = wxMacWindowControlEventHandler( handler, event, data ) ;
             break ;

+
+        case kEventClassService :
+            result = wxMacWindowServiceEventHandler( handler, event , data ) ;
+            break ;
+

         default :
             break ;
     }
         default :
             break ;
     }

+
+    wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+

     return result ;
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 
     return result ;
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 

+#if !TARGET_API_MAC_OSX
+

 // ---------------------------------------------------------------------------
 // UserPane events for non OSX builds
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // UserPane events for non OSX builds
 // ---------------------------------------------------------------------------

- 
+

 static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
-    win->MacControlUserPaneDrawProc(part) ;
+    if ( win )
+        win->MacControlUserPaneDrawProc(part) ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ;

 
 static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
-    return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+    if ( win )
+        return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+    else
+        return kControlNoPart ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneHitTestUPP , wxMacControlUserPaneHitTestProc ) ;

 
 static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
-    return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+    if ( win )
+        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+    else
+        return kControlNoPart ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneTrackingUPP , wxMacControlUserPaneTrackingProc ) ;

 
 static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
-    win->MacControlUserPaneIdleProc() ;
+    if ( win )
+        win->MacControlUserPaneIdleProc() ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneIdleUPP , wxMacControlUserPaneIdleProc ) ;

 
 static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
-    return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
+    if ( win )
+        return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
+    else
+        return kControlNoPart ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneKeyDownUPP , wxMacControlUserPaneKeyDownProc ) ;

 
 static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
-    win->MacControlUserPaneActivateProc(activating) ;
+    if ( win )
+        win->MacControlUserPaneActivateProc(activating) ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ;

 
 static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
-    return win->MacControlUserPaneFocusProc(action) ;
+    if ( win )
+        return win->MacControlUserPaneFocusProc(action) ;
+    else
+        return kControlNoPart ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneFocusUPP , wxMacControlUserPaneFocusProc ) ;

 
 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;
 
 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxWindow * win = wxFindControlFromMacControl(control) ;

-    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
-    win->MacControlUserPaneBackgroundProc(info) ;
+    if ( win )
+        win->MacControlUserPaneBackgroundProc(info) ;

 }
 }

+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ;

 
 

-void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) 
+void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)

 {
 {

-    MacDoRedraw( MacGetVisibleRegion().GetWXHRGN() , 0 ) ;
+    int x = 0 , y = 0;
+    RgnHandle rgn = NewRgn() ;
+    GetClip( rgn ) ;
+    MacWindowToRootWindow( &x, &y ) ;
+    OffsetRgn( rgn , -x , -y ) ;
+    wxMacWindowStateSaver sv( this ) ;
+    SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ;
+    MacDoRedraw( rgn , 0 ) ;
+    DisposeRgn( rgn ) ;

 }
 
 }
 

-wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) 
+wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)

 {
     return kControlNoPart ;
 }
 
 {
     return kControlNoPart ;
 }
 

-wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) 
+wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc)

 {
     return kControlNoPart ;
 }
 
 {
     return kControlNoPart ;
 }
 

-void wxWindowMac::MacControlUserPaneIdleProc() 
+void wxWindowMac::MacControlUserPaneIdleProc()

 {
 }
 
 {
 }
 

-wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) 
+wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)

 {
     return kControlNoPart ;
 }
 
 {
     return kControlNoPart ;
 }
 

-void wxWindowMac::MacControlUserPaneActivateProc(bool activating) 
+void wxWindowMac::MacControlUserPaneActivateProc(bool activating)

 {
 }
 
 {
 }
 

-wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) 
+wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)

 {
 {

-    return kControlNoPart ;
+    if ( AcceptsFocus() )
+        return 1 ;
+    else
+        return kControlNoPart ;

 }
 
 }
 

-void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) 
+void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)

 {
 }
 
 {
 }
 

-ControlUserPaneDrawUPP gControlUserPaneDrawUPP = NULL ;
-ControlUserPaneHitTestUPP gControlUserPaneHitTestUPP = NULL ;
-ControlUserPaneTrackingUPP gControlUserPaneTrackingUPP = NULL ;
-ControlUserPaneIdleUPP gControlUserPaneIdleUPP = NULL ;
-ControlUserPaneKeyDownUPP gControlUserPaneKeyDownUPP = NULL ;
-ControlUserPaneActivateUPP gControlUserPaneActivateUPP = NULL ;
-ControlUserPaneFocusUPP gControlUserPaneFocusUPP = NULL ;
-ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ;
+#endif
+
+// ---------------------------------------------------------------------------
+// Scrollbar Tracking for all
+// ---------------------------------------------------------------------------
+
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
+{
+    if ( partCode != 0)
+    {
+        wxWindow*  wx = wxFindControlFromMacControl( control ) ;
+        if ( wx )
+            wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
+    }
+}
+wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;

 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 

-wxList wxWinMacControlList(wxKEY_INTEGER);
+WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
+
+static MacControlMap wxWinMacControlList;

 
 wxWindow *wxFindControlFromMacControl(ControlRef inControl )
 {
 
 wxWindow *wxFindControlFromMacControl(ControlRef inControl )
 {

-    wxNode *node = wxWinMacControlList.Find((long)inControl);
-    if (!node)
-        return NULL;
-    return (wxControl *)node->GetData();
+    MacControlMap::iterator node = wxWinMacControlList.find(inControl);
+
+    return (node == wxWinMacControlList.end()) ? NULL : node->second;

 }
 
 void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
 }
 
 void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)


@@ -298,83 +677,28 @@ void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
     // (secondly) breaks native event processing
     wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
 
     // (secondly) breaks native event processing
     wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
 

-    if ( !wxWinMacControlList.Find((long)inControl) )
-        wxWinMacControlList.Append((long)inControl, control);
+    wxWinMacControlList[inControl] = control;

 }
 
 void wxRemoveMacControlAssociation(wxWindow *control)
 {
 }
 
 void wxRemoveMacControlAssociation(wxWindow *control)
 {

-    wxWinMacControlList.DeleteObject(control);
-}
+   // iterate over all the elements in the class
+    // is the iterator stable ? as we might have two associations pointing to the same wxWindow
+    // we should go on...

 
 

-// UPP functions
-ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
-
-ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
-
-// we have to setup the brush in the current port and return noErr
-// or return an error code so that the control manager walks further up the 
-// hierarchy to find a correct background
-
-pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )
-{
-    OSStatus status = paramErr ;
-    switch( iMessage )
+    bool found = true ;
+    while ( found )

     {
     {

-        case kControlMsgApplyTextColor :
-            break ;
-        case kControlMsgSetUpBackground :
+        found = false ;
+        MacControlMap::iterator it;
+        for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
+        {
+            if ( it->second == control )

             {
             {

-                wxWindow*  wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ;
-                if ( wx != NULL )
-                {
-                    /*
-                    const wxBrush &brush = wx->MacGetBackgroundBrush() ;
-                    if  ( brush.Ok() )
-                    {
-                        
-                        wxDC::MacSetupBackgroundForCurrentPort( brush ) ;
-                        */
-                        // this clipping is only needed for non HIView
-                        
-                        RgnHandle clip = NewRgn() ;
-                        int x = 0 , y = 0;
-
-                        wx->MacWindowToRootWindow( &x,&y ) ;
-                        CopyRgn( (RgnHandle) wx->MacGetVisibleRegion().GetWXHRGN() , clip ) ;
-                        OffsetRgn( clip , x , y ) ;
-                        SetClip( clip ) ;
-                        DisposeRgn( clip ) ;
-
-                        status = noErr ;
-                        /*
-                    }
-                    else if ( wx->MacIsUserPane() )
-                    {
-                        // if we don't have a valid brush for such a control, we have to call the
-                        // setup of our parent ourselves
-                        status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ;
-                    }
-                    */
-                }
+                wxWinMacControlList.erase(it);
+                found = true ;
+                break;

             }
             }

-            break ;
-        default :
-            break ;
-    }
-    return status ;
-}
-
-
-pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
-pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
-{
-    if ( partCode != 0)
-    {
-        wxWindow*  wx = wxFindControlFromMacControl( control ) ;
-        if ( wx )
-        {
-            wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;

         }
     }
 }
         }
     }
 }


@@ -383,44 +707,48 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
  // constructors and such
 // ----------------------------------------------------------------------------
 
  // constructors and such
 // ----------------------------------------------------------------------------
 

+wxWindowMac::wxWindowMac()
+{
+    Init();
+}
+
+wxWindowMac::wxWindowMac(wxWindowMac *parent,
+            wxWindowID id,
+            const wxPoint& pos ,
+            const wxSize& size ,
+            long style ,
+            const wxString& name )
+{
+    Init();
+    Create(parent, id, pos, size, style, name);
+}
+

 void wxWindowMac::Init()
 {
 void wxWindowMac::Init()
 {

-    m_backgroundTransparent = FALSE;
+    m_peer = NULL ;
+    m_frozenness = 0 ;
+
+#if WXWIN_COMPATIBILITY_2_4
+    m_backgroundTransparent = false;
+#endif
+
+#if wxMAC_USE_CORE_GRAPHICS
+    m_cgContextRef = NULL ;
+#endif

 
     // as all windows are created with WS_VISIBLE style...
 
     // as all windows are created with WS_VISIBLE style...

-    m_isShown = TRUE;
+    m_isShown = true;

 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 

-       m_macControl = NULL ;
-
-    m_macIsUserPane = TRUE;
-    
-    // make sure all proc ptrs are available
-    
-    if ( gControlUserPaneDrawUPP == NULL )
-    {
-        gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ;
-        gControlUserPaneHitTestUPP = NewControlUserPaneHitTestUPP( wxMacControlUserPaneHitTestProc ) ;
-        gControlUserPaneTrackingUPP = NewControlUserPaneTrackingUPP( wxMacControlUserPaneTrackingProc ) ;
-        gControlUserPaneIdleUPP = NewControlUserPaneIdleUPP( wxMacControlUserPaneIdleProc ) ;
-        gControlUserPaneKeyDownUPP = NewControlUserPaneKeyDownUPP( wxMacControlUserPaneKeyDownProc ) ;
-        gControlUserPaneActivateUPP = NewControlUserPaneActivateUPP( wxMacControlUserPaneActivateProc ) ;
-        gControlUserPaneFocusUPP = NewControlUserPaneFocusUPP( wxMacControlUserPaneFocusProc ) ;
-        gControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundUPP( wxMacControlUserPaneBackgroundProc ) ;
-    }
-    if ( wxMacLiveScrollbarActionUPP == NULL )
-    {
-        wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
-    }
-
-    if ( wxMacSetupControlBackgroundUPP == NULL )
-    {
-        wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
-    }
+    m_macIsUserPane = true;
+    m_clipChildren = false ;
+    m_cachedClippedRectValid = false ;

 
 

+    // we need a valid font for the encodings
+    wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 }
 
 // Destructor
 }
 
 // Destructor


@@ -428,7 +756,9 @@ wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();
 
 {
     SendDestroyEvent();
 

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
+
+    MacInvalidateBorders() ;

 
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
 
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:


@@ -438,14 +768,15 @@ wxWindowMac::~wxWindowMac()
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )

-            {

                 frame->SetLastFocus((wxWindow*)NULL);
                 frame->SetLastFocus((wxWindow*)NULL);

-            }

             break;
         }
     }
 #endif // __WXUNIVERSAL__
             break;
         }
     }
 #endif // __WXUNIVERSAL__

-    
+
+    // destroy children before destroying this window itself
+    DestroyChildren();
+

     // wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
     // wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.


@@ -455,19 +786,19 @@ wxWindowMac::~wxWindowMac()
         if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }
         if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }

-    if ( (ControlRef) m_macControl )
+
+    if ( m_peer && m_peer->Ok() )

     {
         // in case the callback might be called during destruction
         wxRemoveMacControlAssociation( this) ;
     {
         // in case the callback might be called during destruction
         wxRemoveMacControlAssociation( this) ;

-        ::SetControlColorProc( (ControlRef) m_macControl , NULL ) ;
-        ::DisposeControl( (ControlRef) m_macControl ) ;
-        m_macControl = NULL ;
+        ::RemoveEventHandler( (EventHandlerRef ) m_macControlEventHandler ) ;
+        // we currently are not using this hook
+        // ::SetControlColorProc( *m_peer , NULL ) ;
+        m_peer->Dispose() ;

     }
 
     if ( g_MacLastWindow == this )
     }
 
     if ( g_MacLastWindow == this )

-    {

         g_MacLastWindow = NULL ;
         g_MacLastWindow = NULL ;

-    }

 
     wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
     if ( frame )
 
     wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
     if ( frame )


@@ -476,13 +807,6 @@ wxWindowMac::~wxWindowMac()
             frame->SetLastFocus( NULL ) ;
     }
 
             frame->SetLastFocus( NULL ) ;
     }
 

-    if ( gFocusWindow == this )
-    {
-        gFocusWindow = NULL ;
-    }
-
-    DestroyChildren();
-

     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )


@@ -490,67 +814,79 @@ wxWindowMac::~wxWindowMac()
         delete m_dropTarget;
         m_dropTarget = NULL;
     }
         delete m_dropTarget;
         m_dropTarget = NULL;
     }

-#endif // wxUSE_DRAG_AND_DROP
+#endif
+
+    delete m_peer ;

 }
 
 }
 

-//
+WXWidget wxWindowMac::GetHandle() const
+{
+    return (WXWidget) m_peer->GetControlRef() ;
+}

 
 

-void wxWindowMac::MacInstallEventHandler()
+void wxWindowMac::MacInstallEventHandler( WXWidget control )

 {
 {

-    InstallControlEventHandler( (ControlRef) m_macControl, GetwxMacWindowEventHandlerUPP(),
-        GetEventTypeCount(eventList), eventList, this, 
+    wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
+    InstallControlEventHandler( (ControlRef)control , GetwxMacWindowEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this,

         (EventHandlerRef *)&m_macControlEventHandler);
 
         (EventHandlerRef *)&m_macControlEventHandler);
 

+#if !TARGET_API_MAC_OSX
+    if ( (ControlRef) control == m_peer->GetControlRef() )
+    {
+        m_peer->SetData<ControlUserPaneDrawUPP>(kControlEntireControl, kControlUserPaneDrawProcTag, GetwxMacControlUserPaneDrawProc()) ;
+        m_peer->SetData<ControlUserPaneHitTestUPP>(kControlEntireControl, kControlUserPaneHitTestProcTag, GetwxMacControlUserPaneHitTestProc()) ;
+        m_peer->SetData<ControlUserPaneTrackingUPP>(kControlEntireControl, kControlUserPaneTrackingProcTag, GetwxMacControlUserPaneTrackingProc()) ;
+        m_peer->SetData<ControlUserPaneIdleUPP>(kControlEntireControl, kControlUserPaneIdleProcTag, GetwxMacControlUserPaneIdleProc()) ;
+        m_peer->SetData<ControlUserPaneKeyDownUPP>(kControlEntireControl, kControlUserPaneKeyDownProcTag, GetwxMacControlUserPaneKeyDownProc()) ;
+        m_peer->SetData<ControlUserPaneActivateUPP>(kControlEntireControl, kControlUserPaneActivateProcTag, GetwxMacControlUserPaneActivateProc()) ;
+        m_peer->SetData<ControlUserPaneFocusUPP>(kControlEntireControl, kControlUserPaneFocusProcTag, GetwxMacControlUserPaneFocusProc()) ;
+        m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl, kControlUserPaneBackgroundProcTag, GetwxMacControlUserPaneBackgroundProc()) ;
+    }
+#endif

 }
 
 // Constructor
 }
 
 // Constructor

-bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+bool wxWindowMac::Create(wxWindowMac *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name)

 {
 {

-    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
+    wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );

 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
-
-    parent->AddChild(this);
+        return false;

 
     m_windowVariant = parent->GetWindowVariant() ;
 
     m_windowVariant = parent->GetWindowVariant() ;

-        
+

     if ( m_macIsUserPane )
     {
         Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     if ( m_macIsUserPane )
     {
         Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-        
-        UInt32 features = kControlSupportsEmbedding | kControlSupportsLiveFeedback /*| kControlHasSpecialBackground */ | kControlSupportsCalcBestRect | kControlHandlesTracking | kControlSupportsFocus | kControlWantsActivate | kControlWantsIdle; 

 
 

-        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features, (ControlRef*) &m_macControl); 
+        UInt32 features = 0
+            | kControlSupportsEmbedding
+            | kControlSupportsLiveFeedback
+            | kControlGetsFocusOnClick
+//            | kControlHasSpecialBackground
+//            | kControlSupportsCalcBestRect
+            | kControlHandlesTracking
+            | kControlSupportsFocus
+            | kControlWantsActivate
+            | kControlWantsIdle ;

 
 

-        MacPostControlCreate(pos,size) ;
-#if !TARGET_API_MAC_OSX
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneDrawProcTag, 
-               sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneHitTestProcTag, 
-               sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneTrackingProcTag, 
-               sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneIdleProcTag, 
-               sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneKeyDownProcTag, 
-               sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneActivateProcTag, 
-               sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneFocusProcTag, 
-               sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP);
-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneBackgroundProcTag, 
-               sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP);
-#endif        
+        m_peer = new wxMacControl(this) ;
+        OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+        verify_noerr( err );
+
+        MacPostControlCreate(pos, size) ;

     }
     }

+

 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them

-    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
-         (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))
+    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+         || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))

     {
         MacCreateScrollBars( style ) ;
     }
     {
         MacCreateScrollBars( style ) ;
     }


@@ -559,156 +895,126 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     wxWindowCreateEvent event(this);
     GetEventHandler()->AddPendingEvent(event);
 
     wxWindowCreateEvent event(this);
     GetEventHandler()->AddPendingEvent(event);
 

-    return TRUE;
+    return true;
+}
+
+void wxWindowMac::MacChildAdded()
+{
+    if ( m_vScrollBar )
+        m_vScrollBar->Raise() ;
+    if ( m_hScrollBar )
+        m_hScrollBar->Raise() ;

 }
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 {
 }
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 {

-    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;

 
 

-    wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ;
-    ::SetControlReference( (ControlRef) m_macControl , (long) this ) ;
+    m_peer->SetReference( (long)this ) ;
+    GetParent()->AddChild( this );

 
 

-    MacInstallEventHandler();
+    MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );

 
     ControlRef container = (ControlRef) GetParent()->GetHandle() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
 
     ControlRef container = (ControlRef) GetParent()->GetHandle() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;

-    ::EmbedControl( (ControlRef) m_macControl , container ) ;
+    ::EmbedControl( m_peer->GetControlRef() , container ) ;
+    GetParent()->MacChildAdded() ;

 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 

-#if !TARGET_API_MAC_OSX
-    // eventually we can fix some clipping issues be reactivating this hook 
-    //if ( m_macIsUserPane )
-    // SetControlColorProc( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ;
-#endif
-    
-    UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+    m_peer->SetLabel( wxStripMenuCodes(m_label) ) ;

 
 

-    wxSize new_size = size ;

     if (!m_macIsUserPane)
     if (!m_macIsUserPane)

-    {    
-        wxSize best_size( DoGetBestSize() );
-        
-        if (size.x == -1) {
-            new_size.x = best_size.x;
-        }
-        if (size.y == -1) {
-            new_size.y = best_size.y;
-        }
-        SetSize( pos.x, pos.y , new_size.x, new_size.y,wxSIZE_USE_EXISTING );
-    }
+        SetInitialBestSize(size);

 
     SetCursor( *wxSTANDARD_CURSOR ) ;
 
     SetCursor( *wxSTANDARD_CURSOR ) ;

-

 }
 
 void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
 }
 
 void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {

-    wxASSERT( m_macControl != NULL ) ;
+    // Don't assert, in case we set the window variant before
+    // the window is created
+    // wxASSERT( m_peer->Ok() ) ;

 
 

-    m_windowVariant = variant ; 
+    m_windowVariant = variant ;

 
 

-       ControlSize size ;
+    if (m_peer == NULL || !m_peer->Ok())
+        return;
+
+    ControlSize size ;

     ThemeFontID themeFont = kThemeSystemFont ;
 
     // we will get that from the settings later
     ThemeFontID themeFont = kThemeSystemFont ;
 
     // we will get that from the settings later

-    // and make this NORMAL later, but first 
+    // and make this NORMAL later, but first

     // we have a few calculations that we must fix
     // we have a few calculations that we must fix

-    
+

     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :

-            size = kControlSizeNormal; 
-               themeFont = kThemeSystemFont ;
+            size = kControlSizeNormal;
+            themeFont = kThemeSystemFont ;

             break ;
             break ;

+

         case wxWINDOW_VARIANT_SMALL :
         case wxWINDOW_VARIANT_SMALL :

-            size = kControlSizeSmall; 
-               themeFont = kThemeSmallSystemFont ;
+            size = kControlSizeSmall;
+            themeFont = kThemeSmallSystemFont ;

             break ;
             break ;

+

         case wxWINDOW_VARIANT_MINI :
            if (UMAGetSystemVersion() >= 0x1030 )
             {
         case wxWINDOW_VARIANT_MINI :
            if (UMAGetSystemVersion() >= 0x1030 )
             {

-                // not always defined in the headers 
-                size = 3 ; 
-                   themeFont = 109 ;
+                // not always defined in the headers
+                size = 3 ;
+                themeFont = 109 ;

             }
             else
             {
             }
             else
             {

-                size = kControlSizeSmall; 
-                   themeFont = kThemeSmallSystemFont ;
+                size = kControlSizeSmall;
+                themeFont = kThemeSmallSystemFont ;

             }
             break ;
             }
             break ;

+

         case wxWINDOW_VARIANT_LARGE :
         case wxWINDOW_VARIANT_LARGE :

-            size = kControlSizeLarge; 
-               themeFont = kThemeSystemFont ;
+            size = kControlSizeLarge;
+            themeFont = kThemeSystemFont ;

             break ;
             break ;

+

         default:
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }
         default:
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }

-       ::SetControlData( (ControlRef) m_macControl , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size );
+
+    m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;

 
     wxFont font ;
     font.MacCreateThemeFont( themeFont ) ;
     SetFont( font ) ;
 }
 
 
     wxFont font ;
     font.MacCreateThemeFont( themeFont ) ;
     SetFont( font ) ;
 }
 

-void wxWindowMac::MacUpdateControlFont() 
-{
-       ControlFontStyleRec     fontStyle;
-       if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
-       {
-           switch( m_font.MacGetThemeFontID() )
-           {
-               case kThemeSmallSystemFont :    fontStyle.font = kControlFontSmallSystemFont ;  break ;
-               case 109 /*mini font */ :       fontStyle.font = -5 ;                           break ;
-               case kThemeSystemFont :         fontStyle.font = kControlFontBigSystemFont ;    break ;
-               default :                       fontStyle.font = kControlFontBigSystemFont ;    break ;
-           }
-           fontStyle.flags = kControlUseFontMask ; 
-       }
-       else
-       {
-           fontStyle.font = m_font.MacGetFontNum() ;
-           fontStyle.style = m_font.MacGetFontStyle() ;
-           fontStyle.size = m_font.MacGetFontSize() ;
-           fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
-       }
-
-    fontStyle.just = teJustLeft ;
-    fontStyle.flags |= kControlUseJustMask ;
-    if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
-        fontStyle.just = teJustCenter ;
-    else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT )
-        fontStyle.just = teJustRight ;
-
-    
-    fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
-    fontStyle.flags |= kControlUseForeColorMask ;
-       
-       ::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle );
-       Refresh() ;
+void wxWindowMac::MacUpdateControlFont()
+{
+    m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
+    Refresh() ;

 }
 
 bool wxWindowMac::SetFont(const wxFont& font)
 {
 }
 
 bool wxWindowMac::SetFont(const wxFont& font)
 {

-    bool retval = !wxWindowBase::SetFont( font ) ;
-    
+    bool retval = wxWindowBase::SetFont( font );
+

     MacUpdateControlFont() ;
     MacUpdateControlFont() ;

-    
+

     return retval;
 }
 
 bool wxWindowMac::SetForegroundColour(const wxColour& col )
 {
     return retval;
 }
 
 bool wxWindowMac::SetForegroundColour(const wxColour& col )
 {

-    if ( !wxWindowBase::SetForegroundColour(col) )
-        return false ;
-        
-    MacUpdateControlFont() ;
-    
-    return true ;
+    bool retval = wxWindowBase::SetForegroundColour( col );
+
+    if (retval)
+        MacUpdateControlFont();
+
+    return retval;

 }
 
 bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 }
 
 bool wxWindowMac::SetBackgroundColour(const wxColour& col )


@@ -717,126 +1023,120 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
         return false ;
 
     wxBrush brush ;
         return false ;
 
     wxBrush brush ;

-    if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
-    {
+    wxColour newCol(GetBackgroundColour());
+
+    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) )

         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;

-    }
-    else if (  col == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
-    {
-        brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; 
-    } 
+    else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
+        brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;

     else
     else

-    {
-        brush.SetColour( col ) ;
-    }
+        brush.SetColour( newCol ) ;
+

     MacSetBackgroundBrush( brush ) ;
     MacSetBackgroundBrush( brush ) ;

-        

     MacUpdateControlFont() ;
     MacUpdateControlFont() ;

-    
+

     return true ;
 }
 
     return true ;
 }
 

+void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
+{
+    m_macBackgroundBrush = brush ;
+    m_peer->SetBackground( brush ) ;
+}

 
 bool wxWindowMac::MacCanFocus() const
 {
 
 bool wxWindowMac::MacCanFocus() const
 {

-    wxASSERT( m_macControl != NULL ) ;
+    // there is currently no way to determine whether the window is running in full keyboard
+    // access mode, therefore we cannot rely on these features, yet the only other way would be
+    // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems
+    // in event handlers...
+    UInt32 features = 0 ;
+    m_peer->GetFeatures( &features ) ;

 
 

-    return true ; 
+    return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;

 }
 
 }
 

-

 void wxWindowMac::SetFocus()
 {
 void wxWindowMac::SetFocus()
 {

-    if ( gFocusWindow == this )
+    if ( !AcceptsFocus() )
+            return ;
+
+    wxWindow* former = FindFocus() ;
+    if ( former == this )

         return ;
 
         return ;
 

-    if ( AcceptsFocus() )
+    // as we cannot rely on the control features to find out whether we are in full keyboard mode,
+    // we can only leave in case of an error
+    OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
+    if ( err == errCouldntSetFocus )
+        return ;
+
+    SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
+
+#if !TARGET_API_MAC_OSX
+    // emulate carbon events when running under CarbonLib where they are not natively available
+    if ( former )

     {
     {

-        if (gFocusWindow )
-        {
-#if wxUSE_CARET
-                // Deal with caret
-                if ( gFocusWindow->m_caret )
-                {
-                      gFocusWindow->m_caret->OnKillFocus();
-                }
-#endif // wxUSE_CARET
-#ifndef __WXUNIVERSAL__
-            wxWindow* control = wxDynamicCast( gFocusWindow , wxWindow ) ;
-            // TODO we must use the built-in focusing
-            if ( control && control->GetHandle() /* && control->MacIsReallyShown() */ )
-            {
-                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetTopLevelWindowRef() , (ControlRef) control->GetHandle()  , kControlFocusNoPart ) ;
-                control->MacRedrawControl() ;
-            }
-#endif
-            // Without testing the window id, for some reason
-            // a kill focus event can still be sent to
-            // the control just being focussed.
-            int thisId = this->m_windowId;
-            int gFocusWindowId = gFocusWindow->m_windowId;
-            if (gFocusWindowId != thisId)
-            {
-                wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
-                event.SetEventObject(gFocusWindow);
-                gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
-            }
-        }
-        gFocusWindow = this ;
-        {
-            #if wxUSE_CARET
-            // Deal with caret
-            if ( m_caret )
-            {
-                m_caret->OnSetFocus();
-            }
-            #endif // wxUSE_CARET
-            // panel wants to track the window which was the last to have focus in it
-            wxChildFocusEvent eventFocus(this);
-            GetEventHandler()->ProcessEvent(eventFocus);
-
-      #ifndef __WXUNIVERSAL__
-            wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
-            if ( control && control->GetHandle() )
-            {
-                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetTopLevelWindowRef() , (ControlRef) control->GetHandle()  , kControlFocusNextPart ) ;
-            }
-      #endif
-            wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
-            event.SetEventObject(this);
-            GetEventHandler()->ProcessEvent(event) ;
-        }
+        EventRef evRef = NULL ;
+
+        err = MacCreateEvent(
+            NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
+            kEventAttributeUserEvent , &evRef );
+        verify_noerr( err );
+
+        wxMacCarbonEvent cEvent( evRef ) ;
+        cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
+        cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
+
+        wxMacWindowEventHandler( NULL , evRef , former ) ;
+        ReleaseEvent( evRef ) ;

     }
     }

-}

 
 

+    // send new focus event
+    {
+        EventRef evRef = NULL ;
+
+        err = MacCreateEvent(
+            NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
+            kEventAttributeUserEvent , &evRef );
+        verify_noerr( err );
+
+        wxMacCarbonEvent cEvent( evRef ) ;
+        cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
+        cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+
+        wxMacWindowEventHandler( NULL , evRef , this ) ;
+        ReleaseEvent( evRef ) ;
+    }
+#endif
+}

 
 void wxWindowMac::DoCaptureMouse()
 {
 
 void wxWindowMac::DoCaptureMouse()
 {

-    wxTheApp->s_captureWindow = this ;
+    wxApp::s_captureWindow = this ;

 }
 
 wxWindow* wxWindowBase::GetCapture()
 {
 }
 
 wxWindow* wxWindowBase::GetCapture()
 {

-    return wxTheApp->s_captureWindow ;
+    return wxApp::s_captureWindow ;

 }
 
 void wxWindowMac::DoReleaseMouse()
 {
 }
 
 void wxWindowMac::DoReleaseMouse()
 {

-    wxTheApp->s_captureWindow = NULL ;
+    wxApp::s_captureWindow = NULL ;

 }
 
 }
 

-#if    wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {

-    if ( m_dropTarget != 0 ) {
+    if ( m_dropTarget != NULL )

         delete m_dropTarget;
         delete m_dropTarget;

-    }

 
     m_dropTarget = pDropTarget;
 
     m_dropTarget = pDropTarget;

-    if ( m_dropTarget != 0 )
+    if ( m_dropTarget != NULL )

     {
     {

-        // TODO
+        // TODO:

     }
 }
 
     }
 }
 


@@ -845,164 +1145,168 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 // Old style file-manager drag&drop
 void wxWindowMac::DragAcceptFiles(bool accept)
 {
 // Old style file-manager drag&drop
 void wxWindowMac::DragAcceptFiles(bool accept)
 {

-    // TODO
+    // TODO:

 }
 
 }
 

+// Returns the size of the native control. In the case of the toplevel window
+// this is the content area root control
+

 void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
 void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,

-                                           int& w, int& h) const 
+                                           int& w, int& h) const

 {
 {

-    Rect bounds ;
-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    wxFAIL_MSG( wxT("Not currently supported") ) ;
+}

 
 

+// From a wx position / size calculate the appropriate size of the native control

 
 

-    x = bounds.left ;
-    y = bounds.top ;
-    w = bounds.right - bounds.left ;
-    h = bounds.bottom - bounds.top ;
+bool wxWindowMac::MacGetBoundsForControl(
+    const wxPoint& pos,
+    const wxSize& size,
+    int& x, int& y,
+    int& w, int& h , bool adjustOrigin ) const
+{
+    bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;

 
 

-    wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ;
-    if ( tlw )
-    {
-        Point tlworigin =  { 0 , 0  } ;
-        GrafPtr port ;
-        ::GetPort( &port ) ;
-        ::SetPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) ) ;
-        ::LocalToGlobal( &tlworigin ) ;
-        ::SetPort( port ) ;
-        x = tlworigin.h ;
-        y = tlworigin.v ;    
-    }
-}
+    // the desired size, minus the border pixels gives the correct size of the control

 
 

-bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
-                                       const wxSize& size,
-                                       int& x, int& y,
-                                       int& w, int& h) const 
-{

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

-    // todo the default calls may be used as soon as PostCreateControl Is moved here
-    w = size.x ; // WidthDefault( size.x );
-    h = size.y ; // HeightDefault( size.y ) ;
-#if !TARGET_API_MAC_OSX
-    GetParent()->MacWindowToRootWindow( &x , &y ) ;
-#endif
+
+    // TODO: the default calls may be used as soon as PostCreateControl Is moved here
+    w = wxMax(size.x, 0) ; // WidthDefault( size.x );
+    h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
+
+    if ( !isCompositing )
+        GetParent()->MacWindowToRootWindow( &x , &y ) ;
+
+    x += MacGetLeftBorderSize() ;
+    y += MacGetTopBorderSize() ;
+    w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+
+    if ( adjustOrigin )
+        AdjustForParentClientOrigin( x , y ) ;
+
+    // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
+    if ( !GetParent()->IsTopLevel() )
+    {
+        x -= GetParent()->MacGetLeftBorderSize() ;
+        y -= GetParent()->MacGetTopBorderSize() ;
+    }

 
     return true ;
 }
 
 
     return true ;
 }
 

-// Get total size
+// Get window size (not client size)

 void wxWindowMac::DoGetSize(int *x, int *y) const
 {
 void wxWindowMac::DoGetSize(int *x, int *y) const
 {

-#if TARGET_API_MAC_OSX
-    int x1 , y1 , w1 ,h1 ;
-    MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
-    if(x)   *x = w1 ;
-    if(y)   *y = h1 ;
-    
-#else

     Rect bounds ;
     Rect bounds ;

-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
-    if(x)   *x = bounds.right - bounds.left ;
-    if(y)   *y = bounds.bottom - bounds.top ;
-#endif
+    m_peer->GetRect( &bounds ) ;
+
+    if (x)
+       *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    if (y)
+       *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ;

 }
 
 }
 

+// get the position of the bounds of this window in client coordinates of its parent

 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {

- #if TARGET_API_MAC_OSX
-    int x1 , y1 , w1 ,h1 ;
-    MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+    Rect bounds ;
+    m_peer->GetRect( &bounds ) ;
+
+    int x1 = bounds.left ;
+    int y1 = bounds.top ;
+
+    // get the wx window position from the native one
+    x1 -= MacGetLeftBorderSize() ;
+    y1 -= MacGetTopBorderSize() ;
+

     if ( !IsTopLevel() )
     {
         wxWindow *parent = GetParent();
         if ( parent )
         {
     if ( !IsTopLevel() )
     {
         wxWindow *parent = GetParent();
         if ( parent )
         {

+            // we must first adjust it to be in window coordinates of the parent,
+            // as otherwise it gets lost by the ClientAreaOrigin fix
+            x1 += parent->MacGetLeftBorderSize() ;
+            y1 += parent->MacGetTopBorderSize() ;
+
+            // and now to client coordinates

             wxPoint pt(parent->GetClientAreaOrigin());
             x1 -= pt.x ;
             y1 -= pt.y ;
         }
     }
             wxPoint pt(parent->GetClientAreaOrigin());
             x1 -= pt.x ;
             y1 -= pt.y ;
         }
     }

-    if(x)   *x = x1 ;
-    if(y)   *y = y1 ;
- #else
-    Rect bounds ;
-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
-    wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
-    
-    int xx = bounds.left ;
-    int yy = bounds.top ;
-    
-    if ( !GetParent()->IsTopLevel() )
-    {
-        GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ;
-    
-        xx -= bounds.left ;
-        yy -= bounds.top ;
-    }
-    
-    wxPoint pt(GetParent()->GetClientAreaOrigin());
-    xx -= pt.x;
-    yy -= pt.y;

 
 

-    if(x)   *x = xx;
-    if(y)   *y = yy;
-#endif
+    if (x)
+       *x = x1 ;
+    if (y)
+       *y = y1 ;

 }
 
 void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
 }
 
 void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;

-    
-    wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
-    
-    {
-        Point localwhere = {0,0} ;
+    wxCHECK_RET( window , wxT("TopLevel Window missing") ) ;

 
 

-        if(x) localwhere.h = * x ;
-        if(y) localwhere.v = * y ;
-        
-        wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
-        ::GlobalToLocal( &localwhere ) ;
-        if(x)   *x = localwhere.h ;
-        if(y)   *y = localwhere.v ;
+    Point localwhere = { 0, 0 } ;
+
+    if (x)
+        localwhere.h = *x ;
+    if (y)
+        localwhere.v = *y ;
+
+    QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;
+
+    if (x)
+       *x = localwhere.h ;
+    if (y)
+       *y = localwhere.v ;

 
 

-    }

     MacRootWindowToWindow( x , y ) ;
     MacRootWindowToWindow( x , y ) ;

-    
+

     wxPoint origin = GetClientAreaOrigin() ;
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x -= origin.x ;
-    if(y)   *y -= origin.y ;
+    if (x)
+       *x -= origin.x ;
+    if (y)
+       *y -= origin.y ;

 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;

-    wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+    wxCHECK_RET( window , wxT("TopLevel window missing") ) ;

 
     wxPoint origin = GetClientAreaOrigin() ;
 
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x += origin.x ;
-    if(y)   *y += origin.y ;
+    if (x)
+       *x += origin.x ;
+    if (y)
+       *y += origin.y ;

 
     MacWindowToRootWindow( x , y ) ;
 
 
     MacWindowToRootWindow( x , y ) ;
 

-    {
-        Point localwhere = { 0,0 };
-        if(x)   localwhere.h = * x ;
-        if(y)   localwhere.v = * y ;
+    Point localwhere = { 0, 0 };
+    if (x)
+       localwhere.h = *x ;
+    if (y)
+       localwhere.v = *y ;

 
 

-        wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
-        ::LocalToGlobal( &localwhere ) ;
-        if(x)   *x = localwhere.h ;
-        if(y)   *y = localwhere.v ;
-    }
+    QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;
+
+    if (x)
+       *x = localwhere.h ;
+    if (y)
+       *y = localwhere.v ;

 }
 
 void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
 {
     wxPoint origin = GetClientAreaOrigin() ;
 }
 
 void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
 {
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x += origin.x ;
-    if(y)   *y += origin.y ;
+    if (x)
+       *x += origin.x ;
+    if (y)
+       *y += origin.y ;

 
     MacWindowToRootWindow( x , y ) ;
 }
 
     MacWindowToRootWindow( x , y ) ;
 }


@@ -1012,225 +1316,222 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
     MacRootWindowToWindow( x , y ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;
     MacRootWindowToWindow( x , y ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x -= origin.x ;
-    if(y)   *y -= origin.y ;
+    if (x)
+       *x -= origin.x ;
+    if (y)
+       *y -= origin.y ;

 }
 
 void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
 {
 }
 
 void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
 {

- #if TARGET_API_MAC_OSX
-    HIPoint pt ;
-    if ( x ) pt.x = *x ;
-    if ( y ) pt.y = *y ;
+    wxPoint pt ;
+
+    if (x)
+        pt.x = *x ;
+    if (y)
+        pt.y = *y ;

 
 

-    HIViewConvertPoint( &pt , (ControlRef) m_macControl , (ControlRef) MacGetTopLevelWindow()->GetHandle()  ) ;
-    
-    if ( x ) *x = (int) pt.x ;
-    if ( y ) *y = (int) pt.y ;
- #else

     if ( !IsTopLevel() )
     {
     if ( !IsTopLevel() )
     {

-        Rect bounds ;
-        GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
-        if(x)   *x += bounds.left ;
-        if(y)   *y += bounds.top ;
+        wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+        if (top)
+        {
+            pt.x -= MacGetLeftBorderSize() ;
+            pt.y -= MacGetTopBorderSize() ;
+            wxMacControl::Convert( &pt , m_peer , top->m_peer ) ;
+        }

     }
     }

-#endif
+
+    if (x)
+        *x = (int) pt.x ;
+    if (y)
+        *y = (int) pt.y ;

 }
 
 void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
 {
     int x1 , y1 ;
 }
 
 void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
 {
     int x1 , y1 ;

-    if ( x ) x1 = *x ;
-    if ( y ) y1 = *y ;
+
+    if (x)
+        x1 = *x ;
+    if (y)
+        y1 = *y ;
+

     MacWindowToRootWindow( &x1 , &y1 ) ;
     MacWindowToRootWindow( &x1 , &y1 ) ;

-    if ( x ) *x = x1 ;
-    if ( y ) *y = y1 ;
+
+    if (x)
+        *x = x1 ;
+    if (y)
+        *y = y1 ;

 }
 
 void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 {
 }
 
 void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 {

- #if TARGET_API_MAC_OSX
-    HIPoint pt ;
-    if ( x ) pt.x = *x ;
-    if ( y ) pt.y = *y ;
+    wxPoint pt ;
+
+    if (x)
+        pt.x = *x ;
+    if (y)
+        pt.y = *y ;

 
 

-    HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle()  , (ControlRef) m_macControl ) ;
-    
-    if ( x ) *x = (int) pt.x ;
-    if ( y ) *y = (int) pt.y ;
- #else

     if ( !IsTopLevel() )
     {
     if ( !IsTopLevel() )
     {

-        Rect bounds ;
-        GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
-        if(x)   *x -= bounds.left ;
-        if(y)   *y -= bounds.top ;
+        wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+        if (top)
+        {
+            wxMacControl::Convert( &pt , top->m_peer , m_peer ) ;
+            pt.x += MacGetLeftBorderSize() ;
+            pt.y += MacGetTopBorderSize() ;
+        }

     }
     }

-#endif
+
+    if (x)
+        *x = (int) pt.x ;
+    if (y)
+        *y = (int) pt.y ;

 }
 
 void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
 {
     int x1 , y1 ;
 }
 
 void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
 {
     int x1 , y1 ;

-    if ( x ) x1 = *x ;
-    if ( y ) y1 = *y ;
+
+    if (x)
+        x1 = *x ;
+    if (y)
+        y1 = *y ;
+

     MacRootWindowToWindow( &x1 , &y1 ) ;
     MacRootWindowToWindow( &x1 , &y1 ) ;

-    if ( x ) *x = x1 ;
-    if ( y ) *y = y1 ;
+
+    if (x)
+        *x = x1 ;
+    if (y)
+        *y = y1 ;

 }
 
 }
 

-wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
+void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )

 {
 {

-    wxSize sizeTotal = size;
-

     RgnHandle rgn = NewRgn() ;
 
     RgnHandle rgn = NewRgn() ;
 

-    Rect content ;
-    
-    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+    if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )

     {
     {

+        Rect structure, content ;
+

         GetRegionBounds( rgn , &content ) ;
         GetRegionBounds( rgn , &content ) ;

-        DisposeRgn( rgn ) ;
+        m_peer->GetRect( &structure ) ;
+        OffsetRect( &structure, -structure.left , -structure.top ) ;
+
+        left = content.left - structure.left ;
+        top = content.top - structure.top ;
+        right = structure.right - content.right ;
+        bottom = structure.bottom - content.bottom ;

     }
     else
     {
     }
     else
     {

-        GetControlBounds( (ControlRef) m_macControl , &content ) ;
+        left = top = right = bottom = 0 ;

     }
     }

-    Rect structure ;
-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
-#if !TARGET_API_MAC_OSX    
-    OffsetRect( &content , -structure.left , -structure.top ) ;
-#endif

 
 

-    sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
-    sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; 
+    DisposeRgn( rgn ) ;
+}
+
+wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
+{
+    wxSize sizeTotal = size;
+
+    RgnHandle rgn = NewRgn() ;
+    if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
+    {
+        Rect content, structure ;
+        GetRegionBounds( rgn , &content ) ;
+        m_peer->GetRect( &structure ) ;
+
+        // structure is in parent coordinates, but we only need width and height, so it's ok
+
+        sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
+        sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top) ;
+    }
+
+    DisposeRgn( rgn ) ;

 
 

-    sizeTotal.x += MacGetLeftBorderSize(  ) + MacGetRightBorderSize( ) ;
-    sizeTotal.y += MacGetTopBorderSize(  ) + MacGetBottomBorderSize( ) ;
+    sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;

 
     return sizeTotal;
 }
 
 
     return sizeTotal;
 }
 

-

 // Get size *available for subwindows* i.e. excluding menu bar etc.
 // Get size *available for subwindows* i.e. excluding menu bar etc.

-void wxWindowMac::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize( int *x, int *y ) const

 {
     int ww, hh;
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 {
     int ww, hh;
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;

-    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
-    {
+    if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )

         GetRegionBounds( rgn , &content ) ;
         GetRegionBounds( rgn , &content ) ;

-        DisposeRgn( rgn ) ;
-    }

     else
     else

-    {
-        GetControlBounds( (ControlRef) m_macControl , &content ) ;
-    }
-#if !TARGET_API_MAC_OSX
-    Rect structure ;
-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
-    OffsetRect( &content , -structure.left , -structure.top ) ;
-#endif 
+        m_peer->GetRect( &content ) ;
+    DisposeRgn( rgn ) ;
+

     ww = content.right - content.left ;
     hh = content.bottom - content.top ;
     ww = content.right - content.left ;
     hh = content.bottom - content.top ;

-    
-    ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
-    hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
-
-    if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
-    {
-        int x1 = 0 ;
-        int y1 = 0 ;
-        int w  ;
-        int h  ;
-        GetSize( &w , &h ) ;
-        
-        MacClientToRootWindow( &x1 , &y1 ) ;
-        MacClientToRootWindow( &w , &h ) ;
-
-        wxWindowMac *iter = (wxWindowMac*)this ;
-
-        int totW = 10000 , totH = 10000;
-        while( iter )
-        {
-            if ( iter->IsTopLevel() )
-            {
-                iter->GetSize( &totW , &totH ) ;
-                break ;
-            }

 
 

-            iter = iter->GetParent() ;
-        }
+    if (m_hScrollBar  && m_hScrollBar->IsShown() )
+        hh -= m_hScrollBar->GetSize().y ;

 
 

-        if (m_hScrollBar  && m_hScrollBar->IsShown() )
-        {
-            hh -= MAC_SCROLLBAR_SIZE;
-            if ( h-y1 >= totH )
-            {
-                hh += 1 ;
-            }
-        }
-        if (m_vScrollBar  && m_vScrollBar->IsShown() )
-        {
-            ww -= MAC_SCROLLBAR_SIZE;
-            if ( w-x1 >= totW )
-            {
-                ww += 1 ;
-            }
-        }
-    }
-    if(x)   *x = ww;
-    if(y)   *y = hh;
+    if (m_vScrollBar  && m_vScrollBar->IsShown() )
+        ww -= m_vScrollBar->GetSize().x ;

 
 

+    if (x)
+       *x = ww;
+    if (y)
+       *y = hh;

 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)
 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)

-        return FALSE;
+        return false;

 
     if (wxNullCursor == cursor)
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
 
     if (wxNullCursor == cursor)
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )

-            return FALSE ;
+            return false ;

     }
     else
     {
         if ( ! wxWindowBase::SetCursor( cursor ) )
     }
     else
     {
         if ( ! wxWindowBase::SetCursor( cursor ) )

-            return FALSE ;
+            return false ;

     }
 
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 
     }
 
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 

-    /*
-    
-    TODO why do we have to use current coordinates ?
-    
-    Point pt ;
-    wxWindowMac *mouseWin ;
-    GetMouse( &pt ) ;
+    wxWindowMac *mouseWin = 0 ;
+    {
+        wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ;
+        WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ;
+        CGrafPtr savePort ;
+        Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
+
+        // TODO: If we ever get a GetCurrentEvent... replacement
+        // for the mouse position, use it...
+
+        Point pt ;
+        ControlPartCode part ;
+        ControlRef control ;

 
 

-    // Change the cursor NOW if we're within the correct window
+        GetMouse( &pt ) ;
+        control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ;
+        if ( control )
+            mouseWin = wxFindControlFromMacControl( control ) ;

 
 

-    
-    if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
-    {
-        if ( mouseWin == this && !wxIsBusy() )
-        {
-            m_cursor.MacInstall() ;
-        }
+        if ( swapped )
+            QDSwapPort( savePort , NULL ) ;

     }
     }

-    */
-    if ( !wxIsBusy() )
-    {
+
+    if ( mouseWin == this && !wxIsBusy() )

         m_cursor.MacInstall() ;
         m_cursor.MacInstall() ;

-    }

 
 

-    return TRUE ;
+    return true ;

 }
 
 #if wxUSE_MENUS
 }
 
 #if wxUSE_MENUS


@@ -1238,28 +1539,37 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 {
     menu->SetInvokingWindow(this);
     menu->UpdateUI();

-    ClientToScreen( &x , &y ) ;
+
+    if ( x == -1 && y == -1 )
+    {
+        wxPoint mouse = wxGetMousePosition();
+        x = mouse.x;
+        y = mouse.y;
+    }
+    else
+    {
+        ClientToScreen( &x , &y ) ;
+    }

 
     menu->MacBeforeDisplay( true ) ;
 
     menu->MacBeforeDisplay( true ) ;

-    long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
+    long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;

     if ( HiWord(menuResult) != 0 )
     {
         MenuCommand id ;
         GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
         wxMenuItem* item = NULL ;
         wxMenu* realmenu ;
     if ( HiWord(menuResult) != 0 )
     {
         MenuCommand id ;
         GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
         wxMenuItem* item = NULL ;
         wxMenu* realmenu ;

-        item = menu->FindItem(id, &realmenu) ;
+        item = menu->FindItem( id, &realmenu ) ;

         if (item->IsCheckable())
         if (item->IsCheckable())

-        {

             item->Check( !item->IsChecked() ) ;
             item->Check( !item->IsChecked() ) ;

-        }
+

         menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
     }
         menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
     }

-    menu->MacAfterDisplay( true ) ;

 
 

-    menu->SetInvokingWindow(NULL);
+    menu->MacAfterDisplay( true ) ;
+    menu->SetInvokingWindow( NULL );

 
 

-  return TRUE;
+  return true;

 }
 #endif
 
 }
 #endif
 


@@ -1277,20 +1587,71 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
         m_tooltip->SetWindow(this);
 }
 
         m_tooltip->SetWindow(this);
 }
 

-#endif // wxUSE_TOOLTIPS
+#endif
+
+void wxWindowMac::MacInvalidateBorders()
+{
+    if ( m_peer == NULL )
+        return ;
+
+    bool vis = MacIsReallyShown() ;
+    if ( !vis )
+        return ;
+
+    int outerBorder = MacGetLeftBorderSize() ;
+    if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
+        outerBorder += 4 ;
+
+    if ( outerBorder == 0 )
+        return ;
+
+    // now we know that we have something to do at all
+
+    // as the borders are drawn on the parent we have to properly invalidate all these areas
+    RgnHandle updateInner , updateOuter;
+    Rect rect ;
+
+    // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon
+    updateInner = NewRgn() ;
+    updateOuter = NewRgn() ;
+
+    m_peer->GetRect( &rect ) ;
+    RectRgn( updateInner, &rect ) ;
+    InsetRect( &rect , -outerBorder , -outerBorder ) ;
+    RectRgn( updateOuter, &rect ) ;
+    DiffRgn( updateOuter, updateInner , updateOuter ) ;
+
+#ifdef __WXMAC_OSX__
+    GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
+#else
+    WindowRef tlw = (WindowRef) MacGetTopLevelWindowRef() ;
+    if ( tlw )
+        InvalWindowRgn( tlw , updateOuter ) ;
+#endif
+
+    DisposeRgn( updateOuter ) ;
+    DisposeRgn( updateInner ) ;
+}

 
 void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 {

+    // this is never called for a toplevel window, so we know we have a parent

     int former_x , former_y , former_w, former_h ;
     int former_x , former_y , former_w, former_h ;

-#if !TARGET_API_MAC_OSX
+
+    // Get true coordinates of former position

     DoGetPosition( &former_x , &former_y ) ;
     DoGetSize( &former_w , &former_h ) ;
     DoGetPosition( &former_x , &former_y ) ;
     DoGetSize( &former_w , &former_h ) ;

-#else
-    MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ;
-#endif

 
 

-    int actualWidth = width;
-    int actualHeight = height;
+    wxWindow *parent = GetParent();
+    if ( parent )
+    {
+        wxPoint pt(parent->GetClientAreaOrigin());
+        former_x += pt.x ;
+        former_y += pt.y ;
+    }
+
+    int actualWidth = width ;
+    int actualHeight = height ;

     int actualX = x;
     int actualY = y;
 
     int actualX = x;
     int actualY = y;
 


@@ -1303,37 +1664,46 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;
 
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;
 

-    bool doMove = false ;
-    bool doResize = false ;
+    bool doMove = false, doResize = false ;

 
     if ( actualX != former_x || actualY != former_y )
 
     if ( actualX != former_x || actualY != former_y )

-    {

         doMove = true ;
         doMove = true ;

-    }
+

     if ( actualWidth != former_w || actualHeight != former_h )
     if ( actualWidth != former_w || actualHeight != former_h )

-    {

         doResize = true ;
         doResize = true ;

-    }

 
     if ( doMove || doResize )
     {
 
     if ( doMove || doResize )
     {

-        Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) ) ;
-#if TARGET_API_MAC_OSX
-        SetControlBounds( (ControlRef) m_macControl , &r ) ;
-#else
-        if ( doMove )
-            MoveControl( (ControlRef) m_macControl , r.left , r.top ) ;
-        if ( doSize )
-            SizeControl( (ControlRef) m_macControl , r.right-r.left , r.bottom-r.top ) ;
-#endif
+        // as the borders are drawn outside the native control, we adjust now
+
+        wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ),
+            wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
+                actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
+
+        Rect r ;
+        wxMacRectToNative( &bounds , &r ) ;
+
+        if ( !GetParent()->IsTopLevel() )
+            wxMacWindowToNative( GetParent() , &r ) ;
+
+        MacInvalidateBorders() ;
+
+        m_cachedClippedRectValid = false ;
+        m_peer->SetRect( &r ) ;
+
+        wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+
+        MacInvalidateBorders() ;
+

         MacRepositionScrollBars() ;
         if ( doMove )
         {
         MacRepositionScrollBars() ;
         if ( doMove )
         {

-            wxPoint point(actualX,actualY);
+            wxPoint point(actualX, actualY);

             wxMoveEvent event(point, m_windowId);
             event.SetEventObject(this);
             GetEventHandler()->ProcessEvent(event) ;
         }
             wxMoveEvent event(point, m_windowId);
             event.SetEventObject(this);
             GetEventHandler()->ProcessEvent(event) ;
         }

+

         if ( doResize )
         {
             MacRepositionScrollBars() ;
         if ( doResize )
         {
             MacRepositionScrollBars() ;


@@ -1343,34 +1713,37 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
             GetEventHandler()->ProcessEvent(event);
         }
     }
             GetEventHandler()->ProcessEvent(event);
         }
     }

-

 }
 
 wxSize wxWindowMac::DoGetBestSize() const
 {
 }
 
 wxSize wxWindowMac::DoGetBestSize() const
 {

-    /*
+    if ( m_macIsUserPane || IsTopLevel() )
+        return wxWindowBase::DoGetBestSize() ;
+

     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;

-    short   baselineoffset ;

     int bestWidth, bestHeight ;
     int bestWidth, bestHeight ;

-    ::GetBestControlRect( (ControlRef) m_macControl , &bestsize , &baselineoffset ) ;

 
 

+    m_peer->GetBestRect( &bestsize ) ;

     if ( EmptyRect( &bestsize ) )
     {
     if ( EmptyRect( &bestsize ) )
     {

-        baselineoffset = 0;
-        bestsize.left = bestsize.top = 0 ;
-        bestsize.right = 16 ;
+        bestsize.left =
+        bestsize.top = 0 ;
+        bestsize.right =

         bestsize.bottom = 16 ;
         bestsize.bottom = 16 ;

+

         if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
         {
             bestsize.bottom = 16 ;
         }
         if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
         {
             bestsize.bottom = 16 ;
         }

+#if wxUSE_SPINBTN

         else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
         {
         else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
         {

-            bestsize.bottom = 24 ; 
+            bestsize.bottom = 24 ;

         }
         }

+#endif

         else
         {
         else
         {

-            // return wxWindowBase::DoGetBestSize() ;  
+            // return wxWindowBase::DoGetBestSize() ;

         }
     }
 
         }
     }
 


@@ -1378,13 +1751,10 @@ wxSize wxWindowMac::DoGetBestSize() const
     bestHeight = bestsize.bottom - bestsize.top ;
     if ( bestHeight < 10 )
         bestHeight = 13 ;
     bestHeight = bestsize.bottom - bestsize.top ;
     if ( bestHeight < 10 )
         bestHeight = 13 ;

-        
+

     return wxSize(bestWidth, bestHeight);
     return wxSize(bestWidth, bestHeight);

-    */
-    return wxWindowBase::DoGetBestSize() ;

 }
 
 }
 

-

 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in


@@ -1397,29 +1767,33 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     // get the current size and position...
     int currentX, currentY;
 {
     // get the current size and position...
     int currentX, currentY;

-    GetPosition(&currentX, &currentY);
+    int currentW, currentH;

 
 

-    int currentW,currentH;
+    GetPosition(&currentX, &currentY);

     GetSize(&currentW, &currentH);
 
     // ... and don't do anything (avoiding flicker) if it's already ok
     if ( x == currentX && y == currentY &&
     GetSize(&currentW, &currentH);
 
     // ... and don't do anything (avoiding flicker) if it's already ok
     if ( x == currentX && y == currentY &&

-        width == currentW && height == currentH )
+        width == currentW && height == currentH && ( height != -1 && width != -1 ) )

     {
     {

-        // TODO REMOVE
+        // TODO: REMOVE

         MacRepositionScrollBars() ; // we might have a real position shift
         MacRepositionScrollBars() ; // we might have a real position shift

+

         return;
     }
 
         return;
     }
 

-    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-        x = currentX;
-    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-        y = currentY;
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    {
+        if ( x == wxDefaultCoord )
+            x = currentX;
+        if ( y == wxDefaultCoord )
+            y = currentY;
+    }

 
 

-    AdjustForParentClientOrigin(x, y, sizeFlags);
+    AdjustForParentClientOrigin( x, y, sizeFlags );

 
 

-    wxSize size(-1, -1);
-    if ( width == -1 )
+    wxSize size = wxDefaultSize;
+    if ( width == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {


@@ -1433,15 +1807,13 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    if ( height == -1 )
+    if ( height == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
         {
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
         {

-            if ( size.x == -1 )
-            {
+            if ( size.x == wxDefaultCoord )

                 size = DoGetBestSize();
                 size = DoGetBestSize();

-            }
-            //else: already called DoGetBestSize() above
+            // else: already called DoGetBestSize() above

 
             height = size.y;
         }
 
             height = size.y;
         }


@@ -1452,29 +1824,31 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    DoMoveWindow(x, y, width, height);
-
+    DoMoveWindow( x, y, width, height );

 }
 
 wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 }
 
 wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;

-    GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) ;
-    GetRegionBounds( rgn , &content ) ;
+    if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
+    {
+        GetRegionBounds( rgn , &content ) ;
+    }
+    else
+    {
+        content.left =
+        content.top = 0 ;
+    }
+

     DisposeRgn( rgn ) ;
     DisposeRgn( rgn ) ;

-#if !TARGET_API_MAC_OSX
-    Rect structure ;
-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
-    OffsetRect( &content , -structure.left , -structure.top ) ;
-#endif 

 
 

-    return wxPoint( content.left + MacGetLeftBorderSize(  ) , content.top + MacGetTopBorderSize(  ) );
+    return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() );

 }
 
 void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 {
 }
 
 void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 {

-    if ( clientheight != -1 || clientheight != -1 )
+    if ( clientheight != wxDefaultCoord || clientheight != wxDefaultCoord )

     {
         int currentclientwidth , currentclientheight ;
         int currentwidth , currentheight ;
     {
         int currentclientwidth , currentclientheight ;
         int currentwidth , currentheight ;


@@ -1482,129 +1856,188 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
         GetClientSize( &currentclientwidth , &currentclientheight ) ;
         GetSize( &currentwidth , &currentheight ) ;
 
         GetClientSize( &currentclientwidth , &currentclientheight ) ;
         GetSize( &currentwidth , &currentheight ) ;
 

-        DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+        DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth ,

             currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
     }
 }
 
             currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
     }
 }
 

-void wxWindowMac::SetTitle(const wxString& title)
+void wxWindowMac::SetLabel(const wxString& title)

 {
     m_label = wxStripMenuCodes(title) ;
 
 {
     m_label = wxStripMenuCodes(title) ;
 

-    if ( m_macControl )
-    {
-               UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ;
-    }
+    if ( m_peer && m_peer->Ok() )
+        m_peer->SetLabel( m_label ) ;
+

     Refresh() ;
 }
 
     Refresh() ;
 }
 

-wxString wxWindowMac::GetTitle() const
+wxString wxWindowMac::GetLabel() const

 {
     return m_label ;
 }
 
 {
     return m_label ;
 }
 

+bool wxWindowMac::Show(bool show)
+{
+    bool former = MacIsReallyShown() ;
+    if ( !wxWindowBase::Show(show) )
+        return false;
+
+    // TODO: use visibilityChanged Carbon Event for OSX
+    if ( m_peer )
+        m_peer->SetVisibility( show , true ) ;
+
+    if ( former != MacIsReallyShown() )
+        MacPropagateVisibilityChanged() ;
+
+    return true;
+}
+
+bool wxWindowMac::Enable(bool enable)
+{
+    wxASSERT( m_peer->Ok() ) ;
+    bool former = MacIsReallyEnabled() ;
+    if ( !wxWindowBase::Enable(enable) )
+        return false;
+
+    m_peer->Enable( enable ) ;
+
+    if ( former != MacIsReallyEnabled() )
+        MacPropagateEnabledStateChanged() ;
+
+    return true;
+}
+
+//
+// status change propagations (will be not necessary for OSX later )
+//
+

 void wxWindowMac::MacPropagateVisibilityChanged()
 {
 void wxWindowMac::MacPropagateVisibilityChanged()
 {

+#if !TARGET_API_MAC_OSX

     MacVisibilityChanged() ;
     MacVisibilityChanged() ;

-    
-    wxWindowListNode *node = GetChildren().GetFirst();
+
+    wxWindowMac *child;
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         if ( child->IsShown() )
         if ( child->IsShown() )

-            child->MacPropagateVisibilityChanged(  ) ;
+            child->MacPropagateVisibilityChanged() ;
+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

+#endif

 }
 
 }
 

-bool wxWindowMac::Show(bool show)
+void wxWindowMac::MacPropagateEnabledStateChanged()

 {
 {

-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
-    
-    // TODO use visibilityChanged Carbon Event for OSX
-    bool former = MacIsReallyShown() ;
-    
-    SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
-    if ( former != MacIsReallyShown() )
-        MacPropagateVisibilityChanged() ;
-    return TRUE;
-}
+#if !TARGET_API_MAC_OSX
+    MacEnabledStateChanged() ;

 
 

-bool wxWindowMac::MacIsReallyShown() 
-{
-    // only under OSX the visibility of the TLW is taken into account
-#if TARGET_API_MAC_OSX
-    return IsControlVisible( (ControlRef) m_macControl ) ;
-#else
-    wxWindow* win = this ;
-    while( win->IsShown()  )
+    wxWindowMac *child;
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )

     {
     {

-        if ( win->IsTopLevel() )
-            return true ;
-        
-        win = win->GetParent() ;
-        if ( win == NULL )
-            return true ;
-            
-    } ;
-    return false ;
+        child = node->GetData();
+        if ( child->IsEnabled() )
+            child->MacPropagateEnabledStateChanged() ;
+
+        node = node->GetNext();
+    }

 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::MacVisibilityChanged() 
+void wxWindowMac::MacPropagateHiliteChanged()

 {
 {

-}
+#if !TARGET_API_MAC_OSX
+    MacHiliteChanged() ;

 
 

-void wxWindowMac::MacPropagateEnabledStateChanged( )
-{
-    MacEnabledStateChanged() ;
-    
-    wxWindowListNode *node = GetChildren().GetFirst();
+    wxWindowMac *child;
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
-        if ( child->IsEnabled() )
-            child->MacPropagateEnabledStateChanged() ;
+        child = node->GetData();
+        if (child /* && child->IsEnabled() */)
+            child->MacPropagateHiliteChanged() ;
+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

+#endif

 }
 
 }
 

-bool wxWindowMac::Enable(bool enable)
+//
+// status change notifications
+//
+
+void wxWindowMac::MacVisibilityChanged()

 {
 {

-    wxASSERT( m_macControl != NULL ) ;
-    if ( !wxWindowBase::Enable(enable) )
-        return FALSE;
+}

 
 

-    bool former = MacIsReallyEnabled() ;
-    if ( enable )
-        UMAActivateControl( (ControlRef) m_macControl ) ;
-    else
-        UMADeactivateControl( (ControlRef) m_macControl ) ;
+void wxWindowMac::MacHiliteChanged()
+{
+}

 
 

-    if ( former != MacIsReallyEnabled() )
-        MacPropagateEnabledStateChanged() ;
-    return TRUE;
+void wxWindowMac::MacEnabledStateChanged()
+{
+}
+
+//
+// status queries on the inherited window's state
+//
+
+bool wxWindowMac::MacIsReallyShown()
+{
+    // only under OSX the visibility of the TLW is taken into account
+    if ( m_isBeingDeleted )
+        return false ;
+
+#if TARGET_API_MAC_OSX
+    if ( m_peer && m_peer->Ok() )
+        return m_peer->IsVisible();
+#endif
+
+    wxWindow* win = this ;
+    while ( win->IsShown() )
+    {
+        if ( win->IsTopLevel() )
+            return true ;
+
+        win = win->GetParent() ;
+        if ( win == NULL )
+            return true ;
+    }
+
+    return false ;
+}
+
+bool wxWindowMac::MacIsReallyEnabled()
+{
+    return m_peer->IsEnabled() ;

 }
 
 }
 

-bool wxWindowMac::MacIsReallyEnabled() 
+bool wxWindowMac::MacIsReallyHilited()

 {
 {

-    return IsControlEnabled( (ControlRef) m_macControl ) ;
+    return m_peer->IsActive();

 }
 
 }
 

-void wxWindowMac::MacEnabledStateChanged() 
+void wxWindowMac::MacFlashInvalidAreas()

 {
 {

+#if TARGET_API_MAC_OSX
+    HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
+#endif

 }
 
 int wxWindowMac::GetCharHeight() const
 {
 }
 
 int wxWindowMac::GetCharHeight() const
 {

-    wxClientDC dc ( (wxWindowMac*)this ) ;
+    wxClientDC dc( (wxWindowMac*)this ) ;
+

     return dc.GetCharHeight() ;
 }
 
 int wxWindowMac::GetCharWidth() const
 {
     return dc.GetCharHeight() ;
 }
 
 int wxWindowMac::GetCharWidth() const
 {

-    wxClientDC dc ( (wxWindowMac*)this ) ;
+    wxClientDC dc( (wxWindowMac*)this ) ;
+

     return dc.GetCharWidth() ;
 }
 
     return dc.GetCharWidth() ;
 }
 


@@ -1635,81 +2068,51 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
 
 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
 
 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {

-#if TARGET_API_MAC_OSX
-    HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; 
-#else
-    if ( IsControlVisible( (ControlRef) m_macControl ) )
-    {
-        SetControlVisibility( (ControlRef) m_macControl , false , false ) ;
-        SetControlVisibility( (ControlRef) m_macControl , true , true ) ;
-    }
-    /*
-    if ( MacGetTopLevelWindow() == NULL )
+    if ( m_peer == NULL )

         return ;
 
         return ;
 

-    if ( !IsControlVisible( (ControlRef) m_macControl ) )
-       return ;
- 
-     wxPoint client = GetClientAreaOrigin();
-    int x1 = -client.x;
-    int y1 = -client.y;
-    int x2 = m_width - client.x;
-    int y2 = m_height - client.y;
+    if ( !MacIsReallyShown() )
+        return ;

 
 

-    if (IsKindOf( CLASSINFO(wxButton)))
+    if ( rect )

     {
     {

-        // buttons have an "aura"
-        y1 -= 5;
-        x1 -= 5;
-        y2 += 5;
-        x2 += 5;
-    }
-
-    Rect clientrect = { y1, x1, y2, x2 };
+        Rect r ;

 
 

-    if ( rect )
+        wxMacRectToNative( rect , &r ) ;
+        m_peer->SetNeedsDisplay( &r ) ;
+    }
+    else

     {
     {

-        Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
-        SectRect( &clientrect , &r , &clientrect ) ;
+        m_peer->SetNeedsDisplay() ;

     }
     }

+}

 
 

-    if ( !EmptyRect( &clientrect ) )
+void wxWindowMac::Freeze()
+{
+#if TARGET_API_MAC_OSX
+    if ( !m_frozenness++ )

     {
     {

-      int top = 0 , left = 0 ;
-
-      MacClientToRootWindow( &left , &top ) ;
-      OffsetRect( &clientrect , left , top ) ;
-
-      MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
+        if ( m_peer && m_peer->Ok() )
+            m_peer->SetDrawingEnabled( false ) ;

     }
     }

-    */

 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::MacRedrawControl()
+void wxWindowMac::Thaw()

 {
 {

-/*
-    if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) )
+#if TARGET_API_MAC_OSX
+    wxASSERT_MSG( m_frozenness > 0, wxT("Thaw() without matching Freeze()") );
+
+    if ( !--m_frozenness )

     {
     {

-#if TARGET_API_MAC_CARBON
-        Update() ;
-#else
-        wxClientDC dc(this) ;
-        wxMacPortSetter helper(&dc) ;
-        wxMacWindowClipper clipper(this) ;
-        wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
-        UMADrawControl( (ControlRef) m_macControl ) ;
-#endif
+        if ( m_peer && m_peer->Ok() )
+        {
+            m_peer->SetDrawingEnabled( true ) ;
+            m_peer->InvalidateWithChildren() ;
+        }

     }
     }

-*/
-}
- 
-/* TODO
-void wxWindowMac::OnPaint(wxPaintEvent& event)
-{
-    // why don't we skip that here ?
+#endif

 }
 }

-*/

 
 wxWindowMac *wxGetActiveWindow()
 {
 
 wxWindowMac *wxGetActiveWindow()
 {


@@ -1718,27 +2121,31 @@ wxWindowMac *wxGetActiveWindow()
 }
 
 // Coordinates relative to the window
 }
 
 // Coordinates relative to the window

-void wxWindowMac::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer(int x_pos, int y_pos)

 {
     // We really don't move the mouse programmatically under Mac.
 }
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
 {
     // We really don't move the mouse programmatically under Mac.
 }
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {

-    if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
+    if ( MacGetTopLevelWindow() == NULL )
+        return ;
+
+#if TARGET_API_MAC_OSX
+    if ( MacGetTopLevelWindow()->MacUsesCompositing() && (!m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) )

     {
         event.Skip() ;
     }
     else
     {
         event.Skip() ;
     }
     else

+#endif
+    {

         event.GetDC()->Clear() ;
         event.GetDC()->Clear() ;

+    }

 }
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {
 }
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {

-    wxWindowDC dc(this) ;
-    wxMacPortSetter helper(&dc) ;
-
-    MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
+    event.Skip() ;

 }
 
 int wxWindowMac::GetScrollPos(int orient) const
 }
 
 int wxWindowMac::GetScrollPos(int orient) const


@@ -1753,6 +2160,7 @@ int wxWindowMac::GetScrollPos(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbPosition() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbPosition() ;
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -1770,6 +2178,7 @@ int wxWindowMac::GetScrollRange(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -1785,6 +2194,7 @@ int wxWindowMac::GetScrollThumb(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -1802,83 +2212,96 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
     }
 }
 
     }
 }
 

-void wxWindowMac::MacPaintBorders( int left , int top )
+//
+// we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef
+// our own window origin is at leftOrigin/rightOrigin
+//
+
+void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )

 {
 {

-    if( IsTopLevel() )
+    if ( IsTopLevel() )

         return ;
         return ;

-        
-    int major,minor;
-    wxGetOsVersion( &major, &minor );
-
-    RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
-    RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
-    
-    RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ;
-    RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ;
-    // OS X has lighter border edges than classic:
-    if (major >= 10) 
-    {
-        darkShadow.red                 = 0x8E8E;
-        darkShadow.green       = 0x8E8E;
-        darkShadow.blue        = 0x8E8E;
-        lightShadow.red        = 0xBDBD;
-        lightShadow.green      = 0xBDBD;
-        lightShadow.blue       = 0xBDBD;
-       }
-    
-    PenNormal() ;
-
-    int w , h ;
-    GetSize( &w , &h ) ;
-    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+
+    Rect rect ;
+    bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
+    bool hasBothScrollbars = (m_hScrollBar && m_hScrollBar->IsShown()) && (m_vScrollBar && m_vScrollBar->IsShown()) ;
+
+    // back to the surrounding frame rectangle
+    m_peer->GetRect( &rect ) ;
+    InsetRect( &rect, -1 , -1 ) ;
+
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+    if ( UMAGetSystemVersion() >= 0x1030 )

     {
     {

-#if wxMAC_USE_THEME_BORDER
-        Rect rect = { top , left , m_height + top , m_width + left } ;
-        SInt32 border = 0 ;
-        /*
-        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-        InsetRect( &rect , border , border );
-        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-        */
+        CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
+            rect.bottom - rect.top ) ;

 
 

-        DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-#else
-        bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
-        RGBForeColor( &face );
-        MoveTo( left + 0 , top + h - 2 );
-        LineTo( left + 0 , top + 0 );
-        LineTo( left + w - 2 , top + 0 );
-
-        MoveTo( left + 2 , top + h - 3 );
-        LineTo( left + w - 3 , top + h - 3 );
-        LineTo( left + w - 3 , top + 2 );
-
-        RGBForeColor( sunken ? &face : &darkShadow );
-        MoveTo( left + 0 , top + h - 1 );
-        LineTo( left + w - 1 , top + h - 1 );
-        LineTo( left + w - 1 , top + 0 );
-
-        RGBForeColor( sunken ? &lightShadow : &white );
-        MoveTo( left + 1 , top + h - 3 );
-        LineTo( left + 1, top + 1 );
-        LineTo( left + w - 3 , top + 1 );
-
-        RGBForeColor( sunken ? &white : &lightShadow );
-        MoveTo( left + 1 , top + h - 2 );
-        LineTo( left + w - 2 , top + h - 2 );
-        LineTo( left + w - 2 , top + 1 );
-
-        RGBForeColor( sunken ? &darkShadow : &face );
-        MoveTo( left + 2 , top + h - 4 );
-        LineTo( left + 2 , top + 2 );
-        LineTo( left + w - 4 , top + 2 );
-#endif
+        HIThemeFrameDrawInfo info ;
+        memset( &info, 0 , sizeof(info) ) ;
+
+        info.version = 0 ;
+        info.kind = 0 ;
+        info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+        info.isFocused = hasFocus ;
+
+        CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
+        wxASSERT( cgContext ) ;
+
+        if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+        {
+            info.kind = kHIThemeFrameTextFieldSquare ;
+            HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+        }
+        else if ( HasFlag(wxSIMPLE_BORDER) )
+        {
+            info.kind = kHIThemeFrameListBox ;
+            HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+        }
+        else if ( hasFocus )
+        {
+            HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
+        }
+
+        m_peer->GetRect( &rect ) ;
+        if ( hasBothScrollbars )
+        {
+            int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ;
+            CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
+            CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
+            HIThemeGrowBoxDrawInfo info ;
+            memset( &info, 0, sizeof(info) ) ;
+            info.version = 0 ;
+            info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+            info.kind = kHIThemeGrowBoxKindNone ;
+            info.size = kHIThemeGrowBoxSizeNormal ;
+            info.direction = kThemeGrowRight | kThemeGrowDown ;
+            HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
+        }

     }
     }

-    else if (HasFlag(wxSIMPLE_BORDER))
+    else
+#endif

     {
     {

-        Rect rect = { top , left , h + top , w + left } ;
-        RGBForeColor( &darkShadow ) ;
-        FrameRect( &rect ) ;
+        wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+        if ( top )
+        {
+            wxPoint pt(0, 0) ;
+            wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
+            OffsetRect( &rect , pt.x , pt.y ) ;
+        }
+
+        if ( HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+            DrawThemeEditTextFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ;
+        else if ( HasFlag(wxSIMPLE_BORDER) )
+            DrawThemeListBoxFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ;
+
+        if ( hasFocus )
+            DrawThemeFocusRect( &rect , true ) ;
+
+        if ( hasBothScrollbars )
+        {
+            // GetThemeStandaloneGrowBoxBounds
+            // DrawThemeStandaloneNoGrowBox
+        }

     }
 }
 
     }
 }
 


@@ -1896,181 +2319,263 @@ void wxWindowMac::RemoveChild( wxWindowBase *child )
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {

+    bool showScroller;
+

     if ( orient == wxHORIZONTAL )
     {
         if ( m_hScrollBar )
         {
     if ( orient == wxHORIZONTAL )
     {
         if ( m_hScrollBar )
         {

-            if ( range == 0 || thumbVisible >= range )
-            {
-                if ( m_hScrollBar->IsShown() )
-                    m_hScrollBar->Show(false) ;
-            }
-            else
-            {
-                if ( !m_hScrollBar->IsShown() )
-                    m_hScrollBar->Show(true) ;
-                m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
-            }
+            showScroller = ((range != 0) && (range > thumbVisible));
+            if ( m_hScrollBar->IsShown() != showScroller )
+                m_hScrollBar->Show( showScroller ) ;
+
+            m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

         }
     }
     else
     {
         if ( m_vScrollBar )
         {
         }
     }
     else
     {
         if ( m_vScrollBar )
         {

-            if ( range == 0 || thumbVisible >= range )
-            {
-                if ( m_vScrollBar->IsShown() )
-                    m_vScrollBar->Show(false) ;
-            }
-            else
-            {
-                if ( !m_vScrollBar->IsShown() )
-                    m_vScrollBar->Show(true) ;
-                m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
-            }
+            showScroller = ((range != 0) && (range > thumbVisible));
+            if ( m_vScrollBar->IsShown() != showScroller )
+                m_vScrollBar->Show( showScroller ) ;
+
+            m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

         }
     }
         }
     }

+

     MacRepositionScrollBars() ;
 }
 
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     MacRepositionScrollBars() ;
 }
 
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {

-    if( dx == 0 && dy ==0 )
+    if ( dx == 0 && dy == 0 )

         return ;
         return ;

-        

 
 

+    int width , height ;
+    GetClientSize( &width , &height ) ;
+
+#if TARGET_API_MAC_OSX
+    if ( true /* m_peer->IsCompositing() */ )

     {
     {

-        wxClientDC dc(this) ;
-        wxMacPortSetter helper(&dc) ;
+        // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
+        // area is scrolled, this does not occur if width and height are 2 pixels less,
+        // TODO: write optimal workaround
+        wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
+        if ( rect )
+            scrollrect.Intersect( *rect ) ;

 
 

-        int width , height ;
-        GetClientSize( &width , &height ) ;
+        if ( m_peer->GetNeedsDisplay() )
+        {
+            // because HIViewScrollRect does not scroll the already invalidated area we have two options:
+            // either immediate redraw or full invalidate
+#if 1
+            // is the better overall solution, as it does not slow down scrolling
+            m_peer->SetNeedsDisplay() ;
+#else
+            // this would be the preferred version for fast drawing controls
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+            if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
+                HIViewRender(m_peer->GetControlRef()) ;
+            else
+#endif
+                Update() ;
+#endif
+        }

 
 

+        // as the native control might be not a 0/0 wx window coordinates, we have to offset
+        scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
+        m_peer->ScrollRect( &scrollrect , dx , dy ) ;
+
+        // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
+        // either immediate redraw or full invalidate
+#if 0
+        // is the better overall solution, as it does not slow down scrolling
+        m_peer->SetNeedsDisplay() ;
+#else
+        // this would be the preferred version for fast drawing controls

 
 

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+            if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
+                HIViewRender(m_peer->GetControlRef()) ;
+            else
+#endif
+                Update() ;
+#endif
+    }
+    else
+#endif
+    {

         wxPoint pos;
         wxPoint pos;

-        pos.x = pos.y = 0; 
- 
+        pos.x =
+        pos.y = 0;
+

         Rect scrollrect;
         Rect scrollrect;

-        // TODO take out the boundaries
-        GetControlBounds( (ControlRef) m_macControl, &scrollrect);
-        

         RgnHandle updateRgn = NewRgn() ;
         RgnHandle updateRgn = NewRgn() ;

-        if ( rect )
-        {
-            Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
-                dc.XLOG2DEVMAC(rect->x + rect->width) } ;
-            SectRect( &scrollrect , &r , &scrollrect ) ;
-        }
-        ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
-#if TARGET_CARBON
-        //KO: The docs say ScrollRect creates an update region, which thus calls an update event
-        // but it seems the update only refreshes the background of the control, rather than calling 
-        // kEventControlDraw, so we need to force a proper update here. There has to be a better 
-        // way of doing this... (Note that code below under !TARGET_CARBON does not work either...)
-        Update();
-#endif        
-        // we also have to scroll the update rgn in this rectangle 
-        // in order not to loose updates
-#if !TARGET_CARBON
-        WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
-        RgnHandle formerUpdateRgn = NewRgn() ;
-        RgnHandle scrollRgn = NewRgn() ;
-        RectRgn( scrollRgn , &scrollrect ) ;
-        GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
-        Point pt = {0,0} ;
-        LocalToGlobal( &pt ) ;
-        OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
-        SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
-        if ( !EmptyRgn( formerUpdateRgn ) )
+

         {
         {

-            MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
+            wxClientDC dc(this) ;
+            wxMacPortSetter helper(&dc) ;
+
+            m_peer->GetRectInWindowCoords( &scrollrect ) ;
+            //scrollrect.top += MacGetTopBorderSize() ;
+            //scrollrect.left += MacGetLeftBorderSize() ;
+            scrollrect.bottom = scrollrect.top + height ;
+            scrollrect.right = scrollrect.left + width ;
+
+            if ( rect )
+            {
+                Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
+                    dc.XLOG2DEVMAC(rect->x + rect->width) } ;
+                SectRect( &scrollrect , &r , &scrollrect ) ;
+            }
+
+            ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
+
+            // now scroll the former update region as well and add the new update region
+            WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
+            RgnHandle formerUpdateRgn = NewRgn() ;
+            RgnHandle scrollRgn = NewRgn() ;
+            RectRgn( scrollRgn , &scrollrect ) ;
+            GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
+            Point pt = {0, 0} ;
+            LocalToGlobal( &pt ) ;
+            OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;

             SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
             SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;

-            InvalWindowRgn(rootWindow  ,  formerUpdateRgn ) ;
+
+            if ( !EmptyRgn( formerUpdateRgn ) )
+            {
+                MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
+                SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+                InvalWindowRgn( rootWindow, formerUpdateRgn ) ;
+            }
+
+            InvalWindowRgn(rootWindow, updateRgn ) ;
+            DisposeRgn( updateRgn ) ;
+            DisposeRgn( formerUpdateRgn ) ;
+            DisposeRgn( scrollRgn ) ;

         }
         }

-        InvalWindowRgn(rootWindow  ,  updateRgn ) ;
-        DisposeRgn( updateRgn ) ;
-        DisposeRgn( formerUpdateRgn ) ;
-        DisposeRgn( scrollRgn ) ;
-#endif
+
+        Update() ;

     }
 
     }
 

-    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
+    wxWindowMac *child;
+    int x, y, w, h;
+    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())

     {
     {

-        wxWindowMac *child = node->GetData();
-        if (child == m_vScrollBar) continue;
-        if (child == m_hScrollBar) continue;
-        if (child->IsTopLevel()) continue;
+        child = node->GetData();
+        if (child == NULL)
+            continue;
+        if (child == m_vScrollBar)
+            continue;
+        if (child == m_hScrollBar)
+            continue;
+        if (child->IsTopLevel())
+            continue;

 
 

-        int x,y;

         child->GetPosition( &x, &y );
         child->GetPosition( &x, &y );

-        int w,h;

         child->GetSize( &w, &h );
         if (rect)
         {
         child->GetSize( &w, &h );
         if (rect)
         {

-            wxRect rc(x,y,w,h);
-            if (rect->Intersects(rc))
-                child->SetSize( x+dx, y+dy, w, h );
+            wxRect rc( x, y, w, h );
+            if (rect->Intersects( rc ))
+                child->SetSize( x + dx, y + dy, w, h );

         }
         else
         {
         }
         else
         {

-            child->SetSize( x+dx, y+dy, w, h );                
-        }        
+            child->SetSize( x + dx, y + dy, w, h );
+        }

     }
     }

-    
-// TODO remove, was moved higher up    Update() ;
-

 }
 
 }
 

-void wxWindowMac::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll( wxScrollEvent &event )

 {
 {

-    if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
+    if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )

     {
         wxScrollWinEvent wevent;
         wevent.SetPosition(event.GetPosition());
         wevent.SetOrientation(event.GetOrientation());
     {
         wxScrollWinEvent wevent;
         wevent.SetPosition(event.GetPosition());
         wevent.SetOrientation(event.GetOrientation());

-        wevent.m_eventObject = this;
-
-        if (event.m_eventType == wxEVT_SCROLL_TOP)
-            wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
-        else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
-            wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
-        else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
-            wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
-        else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
-            wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
-        else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
-            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
-        else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
-            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
-        else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
-            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
-        else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
-            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+        wevent.SetEventObject(this);
+
+        if (event.GetEventType() == wxEVT_SCROLL_TOP)
+            wevent.SetEventType( wxEVT_SCROLLWIN_TOP );
+        else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
+            wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM );
+        else if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
+            wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP );
+        else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
+            wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN );
+        else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
+            wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP );
+        else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
+            wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN );
+        else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK)
+            wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK );
+        else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
+            wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );

 
         GetEventHandler()->ProcessEvent(wevent);
     }
 }
 
 // Get the window with the focus
 
         GetEventHandler()->ProcessEvent(wevent);
     }
 }
 
 // Get the window with the focus

-wxWindowMac *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::DoFindFocus()

 {
 {

-    return gFocusWindow ;
+    ControlRef control ;
+    GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+    return wxFindControlFromMacControl( control ) ;

 }
 
 }
 

-void wxWindowMac::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus( wxFocusEvent& event )

 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
     //
 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
     //

-    // notice that it's also important to do it upwards the tree becaus
+    // notice that it's also important to do it upwards the tree because

     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
 
     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
 

-    // CS:don't know if this is still needed:
+    // CS: don't know if this is still needed:

     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 

+    if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
+    {
+#if wxMAC_USE_CORE_GRAPHICS
+        GetParent()->Refresh() ;
+#else
+        wxMacWindowStateSaver sv( this ) ;
+        Rect rect ;
+
+        m_peer->GetRect( &rect ) ;
+        // auf den umgebenden Rahmen zur\9fck
+        InsetRect( &rect, -1 , -1 ) ;
+
+        wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+        if ( top )
+        {
+            wxPoint pt(0, 0) ;
+            wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
+            rect.left += pt.x ;
+            rect.right += pt.x ;
+            rect.top += pt.y ;
+            rect.bottom += pt.y ;
+        }
+
+        bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
+        DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
+        if ( !bIsFocusEvent )
+        {
+            // as this erases part of the frame we have to redraw borders
+            // and because our z-ordering is not always correct (staticboxes)
+            // we have to invalidate things, we cannot simple redraw
+            MacInvalidateBorders() ;
+        }
+#endif
+    }
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -2085,17 +2590,18 @@ void wxWindowMac::OnInternalIdle()
 // Raise the window to the top of the Z order
 void wxWindowMac::Raise()
 {
 // Raise the window to the top of the Z order
 void wxWindowMac::Raise()
 {

+    m_peer->SetZOrder( true , NULL ) ;

 }
 
 // Lower the window to the bottom of the Z order
 void wxWindowMac::Lower()
 {
 }
 
 // Lower the window to the bottom of the Z order
 void wxWindowMac::Lower()
 {

+    m_peer->SetZOrder( false , NULL ) ;

 }
 
 }
 

-

 // static wxWindow *gs_lastWhich = NULL;
 
 // static wxWindow *gs_lastWhich = NULL;
 

-bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt )

 {
     // first trigger a set cursor event
 
 {
     // first trigger a set cursor event
 


@@ -2113,45 +2619,46 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
         }
         else
         {
         }
         else
         {

-

             // the test for processedEvtSetCursor is here to prevent using m_cursor
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             if ( !processedEvtSetCursor && m_cursor.Ok() )
             // the test for processedEvtSetCursor is here to prevent using m_cursor
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             if ( !processedEvtSetCursor && m_cursor.Ok() )

-            {

                 cursor = m_cursor ;
                 cursor = m_cursor ;

-            }
-            if ( wxIsBusy() )
-            {
-            }
-            else
-            {
-                if ( !GetParent() )
-                    cursor = *wxSTANDARD_CURSOR  ;
-            }
+
+            if ( !wxIsBusy() && !GetParent() )
+                cursor = *wxSTANDARD_CURSOR ;

         }
         }

+

         if ( cursor.Ok() )
             cursor.MacInstall() ;
     }
         if ( cursor.Ok() )
             cursor.MacInstall() ;
     }

+

     return cursor.Ok() ;
 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {
     return cursor.Ok() ;
 }
 
 wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {

+#if wxUSE_TOOLTIPS

     if ( m_tooltip )
     if ( m_tooltip )

-    {

         return m_tooltip->GetTip() ;
         return m_tooltip->GetTip() ;

-    }
+#endif
+

     return wxEmptyString ;
 }
 
     return wxEmptyString ;
 }
 

+void wxWindowMac::ClearBackground()
+{
+    Refresh() ;
+    Update() ;
+}
+

 void wxWindowMac::Update()
 {
 #if TARGET_API_MAC_OSX
 void wxWindowMac::Update()
 {
 #if TARGET_API_MAC_OSX

-    HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+    MacGetTopLevelWindow()->MacPerformUpdates() ;

 #else
 #else

-    ::Draw1Control( (ControlRef) m_macControl ) ;
+    ::Draw1Control( m_peer->GetControlRef() ) ;

 #endif
 }
 
 #endif
 }
 


@@ -2160,172 +2667,264 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
     if ( window )
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
     if ( window )

-    {

         win = wxFindWinFromMacWindow( window ) ;
         win = wxFindWinFromMacWindow( window ) ;

-    }
+

     return win ;
 }
     return win ;
 }

-wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
+
+const wxRect& wxWindowMac::MacGetClippedClientRect() const
+{
+    MacUpdateClippedRects() ;
+
+    return m_cachedClippedClientRect ;
+}
+
+const wxRect& wxWindowMac::MacGetClippedRect() const
+{
+    MacUpdateClippedRects() ;
+
+    return m_cachedClippedRect ;
+}
+
+const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const
+{
+    MacUpdateClippedRects() ;
+
+    return m_cachedClippedRectWithOuterStructure ;
+}
+
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
+{
+    static wxRegion emptyrgn ;
+
+    if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ )
+    {
+        MacUpdateClippedRects() ;
+        if ( includeOuterStructures )
+            return m_cachedClippedRegionWithOuterStructure ;
+        else
+            return m_cachedClippedRegion ;
+    }
+    else
+    {
+        return emptyrgn ;
+    }
+}
+
+void wxWindowMac::MacUpdateClippedRects() const

 {
 {

+    if ( m_cachedClippedRectValid )
+        return ;
+
+    // includeOuterStructures is true if we try to draw somthing like a focus ring etc.
+    // also a window dc uses this, in this case we only clip in the hierarchy for hard
+    // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
+    // to add focus borders everywhere
+
+    Rect r, rIncludingOuterStructures ;
+
+    m_peer->GetRect( &r ) ;
+    r.left -= MacGetLeftBorderSize() ;
+    r.top -= MacGetTopBorderSize() ;
+    r.bottom += MacGetBottomBorderSize() ;
+    r.right += MacGetRightBorderSize() ;
+
+    r.right -= r.left ;
+    r.bottom -= r.top ;
+    r.left = 0 ;
+    r.top = 0 ;
+
+    rIncludingOuterStructures = r ;
+    InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;

 
 

-    Rect r ;
-    RgnHandle visRgn = NewRgn() ;
-    RgnHandle tempRgn = NewRgn() ;
-    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    wxRect cl = GetClientRect() ;
+    Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;
+
+    int x , y ;
+    wxSize size ;
+    const wxWindow* child = this ;
+    const wxWindow* parent = NULL ;
+
+    while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )

     {
     {

-        GetControlBounds( (ControlRef) m_macControl , &r ) ;
-        if (! MacGetTopLevelWindow()->MacUsesCompositing() )
+        if ( parent->MacIsChildOfClientArea(child) )

         {
         {

-            MacRootWindowToWindow( &r.left , & r.top ) ;
-            MacRootWindowToWindow( &r.right , & r.bottom ) ;
+            size = parent->GetClientSize() ;
+            wxPoint origin = parent->GetClientAreaOrigin() ;
+            x = origin.x ;
+            y = origin.y ;

         }
         else
         {
         }
         else
         {

-            r.right -= r.left ;
-            r.bottom -= r.top ;
-            r.left = 0 ;
-            r.top = 0 ;
+            // this will be true for scrollbars, toolbars etc.
+            size = parent->GetSize() ;
+            y = parent->MacGetTopBorderSize() ;
+            x = parent->MacGetLeftBorderSize() ;
+            size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ;
+            size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ;

         }
         }

-        if ( includeOuterStructures )
-            InsetRect( &r , -3 , -3 ) ;
-        RectRgn( visRgn , &r ) ;
-        if ( !IsTopLevel() )
+
+        parent->MacWindowToRootWindow( &x, &y ) ;
+        MacRootWindowToWindow( &x , &y ) ;
+
+        Rect rparent = { y , x , y + size.y , x + size.x } ;
+
+        // the wxwindow and client rects will always be clipped
+        SectRect( &r , &rparent , &r ) ;
+        SectRect( &rClient , &rparent , &rClient ) ;
+
+        // the structure only at 'hard' borders
+        if ( parent->MacClipChildren() ||
+            ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) )

         {
         {

-            wxWindow* child = this ;
-            wxWindow* parent = child->GetParent() ;
-            while( parent )
-            {
-                int x , y ;
-                wxSize size ;
-                // we have to find a better clipping algorithm here, in order not to clip things
-                // positioned like status and toolbar
-                if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ )
-                {
-                    size = parent->GetSize() ;
-                    x = y = 0 ;
-                }
-                else
-                {
-                    size = parent->GetClientSize() ;
-                    wxPoint origin = parent->GetClientAreaOrigin() ;
-                    x = origin.x ;
-                    y = origin.y ;
-                }
-                parent->MacWindowToRootWindow( &x, &y ) ;
-                MacRootWindowToWindow( &x , &y ) ;
-
-                SetRectRgn( tempRgn ,
-                    x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
-                    x + size.x - parent->MacGetRightBorderSize(),
-                    y + size.y - parent->MacGetBottomBorderSize()) ;
-
-                SectRgn( visRgn , tempRgn , visRgn ) ;
-                if ( parent->IsTopLevel() )
-                    break ;
-                child = parent ;
-                parent = child->GetParent() ;
-            }
+            SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;

         }
         }

+
+        child = parent ;

     }
 
     }
 

-    wxRegion vis = visRgn ;
-    DisposeRgn( visRgn ) ;
-    DisposeRgn( tempRgn ) ;
-    return vis ;
+    m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;
+    m_cachedClippedClientRect = wxRect( rClient.left , rClient.top ,
+        rClient.right - rClient.left , rClient.bottom - rClient.top ) ;
+    m_cachedClippedRectWithOuterStructure = wxRect(
+        rIncludingOuterStructures.left , rIncludingOuterStructures.top ,
+        rIncludingOuterStructures.right - rIncludingOuterStructures.left ,
+        rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;
+
+    m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
+    m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
+    m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;
+
+    m_cachedClippedRectValid = true ;

 }
 
 /*
     This function must not change the updatergn !
  */
 }
 
 /*
     This function must not change the updatergn !
  */

-bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) 
+bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )

 {
 {

-    RgnHandle updatergn = (RgnHandle) updatergnr ;

     bool handled = false ;
     bool handled = false ;

-    
-    // calculate a client-origin version of the update rgn and set m_updateRegion to that
+    Rect updatebounds ;
+    RgnHandle updatergn = (RgnHandle) updatergnr ;
+    GetRegionBounds( updatergn , &updatebounds ) ;
+
+    // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+
+    if ( !EmptyRgn(updatergn) )

     {
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;
     {
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;

-        SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
+        SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;

         SectRgn( newupdate , updatergn , newupdate ) ;
         SectRgn( newupdate , updatergn , newupdate ) ;

+
+        // first send an erase event to the entire update area
+        {
+            // for the toplevel window this really is the entire area
+            // for all the others only their client area, otherwise they
+            // might be drawing with full alpha and eg put blue into
+            // the grow-box area of a scrolled window (scroll sample)
+            wxDC* dc = new wxWindowDC(this);
+            if ( IsTopLevel() )
+                dc->SetClippingRegion(wxRegion(updatergn));
+            else
+                dc->SetClippingRegion(wxRegion(newupdate));
+
+            wxEraseEvent eevent( GetId(), dc );
+            eevent.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( eevent );
+            delete dc ;
+        }
+
+        // calculate a client-origin version of the update rgn and set m_updateRegion to that

         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;

-        DisposeRgn( newupdate ) ; 
-    }
+        DisposeRgn( newupdate ) ;

 
 

-    if ( !EmptyRgn(updatergn) )
-    {
-        wxWindowDC dc(this);
-        if (!EmptyRgn(updatergn))
-            dc.SetClippingRegion(wxRegion(updatergn));
-        
-        wxEraseEvent eevent( GetId(), &dc );
-        eevent.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( eevent );
- 

         if ( !m_updateRegion.Empty() )
         {
             // paint the window itself
         if ( !m_updateRegion.Empty() )
         {
             // paint the window itself

+

             wxPaintEvent event;
             wxPaintEvent event;

-            event.m_timeStamp = time ;
+            event.SetTimestamp(time);

             event.SetEventObject(this);
             event.SetEventObject(this);

-            handled = GetEventHandler()->ProcessEvent(event); 
+            GetEventHandler()->ProcessEvent(event);
+            handled = true ;
+        }

 
 

-            // paint custom borders
-            wxNcPaintEvent eventNc( GetId() );
-            eventNc.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( eventNc );
+        // now we cannot rely on having its borders drawn by a window itself, as it does not
+        // get the updateRgn wide enough to always do so, so we do it from the parent
+        // this would also be the place to draw any custom backgrounds for native controls
+        // in Composited windowing
+        wxPoint clientOrigin = GetClientAreaOrigin() ;
+
+        wxWindowMac *child;
+        int x, y, w, h;
+        for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+        {
+            child = node->GetData();
+            if (child == NULL)
+                continue;
+            if (child == m_vScrollBar)
+                continue;
+            if (child == m_hScrollBar)
+                continue;
+            if (child->IsTopLevel())
+                continue;
+            if (!child->IsShown())
+                continue;
+
+            // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
+
+            child->GetPosition( &x, &y );
+            child->GetSize( &w, &h );
+            Rect childRect = { y , x , y + h , x + w } ;
+            OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
+            InsetRect( &childRect , -10 , -10) ;
+
+            if ( RectInRgn( &childRect , updatergn ) )
+            {
+                // paint custom borders
+                wxNcPaintEvent eventNc( child->GetId() );
+                eventNc.SetEventObject( child );
+                if ( !child->GetEventHandler()->ProcessEvent( eventNc ) )
+                {
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+                    if ( UMAGetSystemVersion() >= 0x1030 )
+                    {
+                        child->MacPaintBorders(0, 0) ;
+                    }
+                    else
+#endif
+                    {
+                        wxWindowDC dc(this) ;
+                        dc.SetClippingRegion(wxRegion(updatergn));
+                        wxMacPortSetter helper(&dc) ;
+                        child->MacPaintBorders(0, 0) ;
+                    }
+                }
+            }

         }
     }
         }
     }

+

     return handled ;
 }
 
     return handled ;
 }
 

-void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
-{
-    RgnHandle updatergn = (RgnHandle) updatergnr ;
-    // updatergn is always already clipped to our boundaries
-    // if we are in compositing mode then it is in relative to the upper left of the control
-    // if we are in non-compositing, then it is relatvie to the uppder left of the content area
-    // of the toplevel window
-    // it is in window coordinates, not in client coordinates
-
-    // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
-    RgnHandle ownUpdateRgn = NewRgn() ;
-    CopyRgn( updatergn , ownUpdateRgn ) ;
-
-    if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
-    { 
-        Rect bounds;
-        UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &bounds );
-        RgnHandle controlRgn = NewRgn();
-        RectRgn( controlRgn, &bounds );
-        //KO: This sets the ownUpdateRgn to the area of this control that is inside
-        // the window update region
-        SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); 
-        DisposeRgn( controlRgn );
-    
-        //KO: convert ownUpdateRgn to local coordinates
-        OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); 
-    }
-        
-    MacDoRedraw( ownUpdateRgn , time ) ;
-    DisposeRgn( ownUpdateRgn ) ;
-
-}

 
 WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 
 
 WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 

-    while( iter )
+    while ( iter )

     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;
     }
     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;
     }

+

     wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
     wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;

+

     return NULL ;
 }
 
     return NULL ;
 }
 


@@ -2333,64 +2932,68 @@ void wxWindowMac::MacCreateScrollBars( long style )
 {
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
 {
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 

-    bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
-    int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
-    int width, height ;
-    GetClientSize( &width , &height ) ;
+    if ( style & ( wxVSCROLL | wxHSCROLL ) )
+    {
+        bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
+        int scrlsize = MAC_SCROLLBAR_SIZE ;
+        wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ;
+        if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+        {
+            scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
+            variant = wxWINDOW_VARIANT_SMALL ;
+        }

 
 

-    wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
-    wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
-    wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
-    wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
+        int adjust = hasBoth ? scrlsize - 1: 0 ;
+        int width, height ;
+        GetClientSize( &width , &height ) ;

 
 

-    m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
-        vSize , wxVERTICAL);
+        wxPoint vPoint(width - scrlsize, 0) ;
+        wxSize vSize(scrlsize, height - adjust) ;
+        wxPoint hPoint(0, height - scrlsize) ;
+        wxSize hSize(width - adjust, scrlsize) ;

 
 

-    if ( style & wxVSCROLL )
-    {
+        if ( style & wxVSCROLL )
+            m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL);

 
 

-    }
-    else
-    {
-        m_vScrollBar->Show(false) ;
-    }
-    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
-        hSize , wxHORIZONTAL);
-    if ( style  & wxHSCROLL )
-    {
-    }
-    else
-    {
-        m_hScrollBar->Show(false) ;
+        if ( style  & wxHSCROLL )
+            m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);

     }
 
     // because the create does not take into account the client area origin
     }
 
     // because the create does not take into account the client area origin

-    MacRepositionScrollBars() ; // we might have a real position shift
+    // we might have a real position shift
+    MacRepositionScrollBars() ;
+}
+
+bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
+{
+    bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+
+    return result ;

 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {

-    bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
-    int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
+    if ( !m_hScrollBar && !m_vScrollBar )
+        return ;

 
 

-    // get real client area
+    bool hasBoth = (m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+    int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+    int adjust = hasBoth ? scrlsize - 1 : 0 ;

 
 

-    int width  ;
-    int height  ;
-    GetSize( &width , &height ) ;
+    // get real client area
+    int width, height ;
+    GetSize( &width , &height );

 
     width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
     height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
 
 
     width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
     height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
 

-    wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
-    wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
-    wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
-    wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
+    wxPoint vPoint( width - scrlsize, 0 ) ;
+    wxSize vSize( scrlsize, height - adjust ) ;
+    wxPoint hPoint( 0 , height - scrlsize ) ;
+    wxSize hSize( width - adjust, scrlsize ) ;

 
 

-    int x = 0 ;
-    int y = 0 ;
-    int w ;
-    int h ;
+#if 0
+    int x = 0, y = 0, w, h ;

     GetSize( &w , &h ) ;
 
     MacClientToRootWindow( &x , &y ) ;
     GetSize( &w , &h ) ;
 
     MacClientToRootWindow( &x , &y ) ;


@@ -2399,7 +3002,7 @@ void wxWindowMac::MacRepositionScrollBars()
     wxWindowMac *iter = (wxWindowMac*)this ;
 
     int totW = 10000 , totH = 10000;
     wxWindowMac *iter = (wxWindowMac*)this ;
 
     int totW = 10000 , totH = 10000;

-    while( iter )
+    while ( iter )

     {
         if ( iter->IsTopLevel() )
         {
     {
         if ( iter->IsTopLevel() )
         {


@@ -2421,26 +3024,22 @@ void wxWindowMac::MacRepositionScrollBars()
         vSize.y += 1 ;
     }
 
         vSize.y += 1 ;
     }
 

-    if ( w-x >= totW )
+    if ( w - x >= totW )

     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }
     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }

-
-    if ( h-y >= totH )
+    if ( h - y >= totH )

     {
         vSize.y += 1 ;
         hPoint.y += 1 ;
     }
     {
         vSize.y += 1 ;
         hPoint.y += 1 ;
     }

+#endif

 
     if ( m_vScrollBar )
 
     if ( m_vScrollBar )

-    {
-        m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
-    }
+        m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );

     if ( m_hScrollBar )
     if ( m_hScrollBar )

-    {
-        m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
-    }
+        m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );

 }
 
 bool wxWindowMac::AcceptsFocus() const
 }
 
 bool wxWindowMac::AcceptsFocus() const


@@ -2452,11 +3051,15 @@ void wxWindowMac::MacSuperChangedPosition()
 {
     // only window-absolute structures have to be moved i.e. controls
 
 {
     // only window-absolute structures have to be moved i.e. controls
 

-    wxWindowListNode *node = GetChildren().GetFirst();
+    m_cachedClippedRectValid = false ;
+
+    wxWindowMac *child;
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         child->MacSuperChangedPosition() ;
         child->MacSuperChangedPosition() ;

+

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -2465,56 +3068,53 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 

-    wxWindowListNode *node = GetChildren().GetFirst();
+    wxWindowMac *child;
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         child->MacTopLevelWindowChangedPosition() ;
         child->MacTopLevelWindowChangedPosition() ;

+

         node = node->GetNext();
     }
 }
 
         node = node->GetNext();
     }
 }
 

-long wxWindowMac::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize() const

 {
 {

-    if( IsTopLevel() )
+    if ( IsTopLevel() )

         return 0 ;
 
         return 0 ;
 

-    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
-    {
-        SInt32 border = 3 ;
-#if wxMAC_USE_THEME_BORDER
-          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
-          return border ;
-    }
-    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    SInt32 border = 0 ;
+
+    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))

     {
     {

-          SInt32 border = 3 ;
-#if wxMAC_USE_THEME_BORDER
-          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
-          return border ;
+        // this metric is only the 'outset' outside the simple frame rect
+        GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+        border += 1 ;

     }
     }

-    else if (m_windowStyle &wxSIMPLE_BORDER)
+    else if (HasFlag(wxSIMPLE_BORDER))

     {
     {

-        return 1 ;
+        // this metric is only the 'outset' outside the simple frame rect
+        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+        border += 1 ;

     }
     }

-    return 0 ;
+
+    return border ;

 }
 
 }
 

-long wxWindowMac::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize() const

 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 
 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 

-long wxWindowMac::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize() const

 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 
 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 

-long wxWindowMac::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize() const

 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;


@@ -2522,15 +3122,16 @@ long wxWindowMac::MacGetBottomBorderSize( ) const
 
 long wxWindowMac::MacRemoveBordersFromStyle( long style )
 {
 
 long wxWindowMac::MacRemoveBordersFromStyle( long style )
 {

-    return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
+    return style & ~wxBORDER_MASK ;

 }
 
 // Find the wxWindowMac at the current mouse position, returning the mouse
 // position.
 }
 
 // Find the wxWindowMac at the current mouse position, returning the mouse
 // position.

-wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac * wxFindWindowAtPointer( wxPoint& pt )

 {
     pt = wxGetMousePosition();
     wxWindowMac* found = wxFindWindowAtPoint(pt);
 {
     pt = wxGetMousePosition();
     wxWindowMac* found = wxFindWindowAtPoint(pt);

+

     return found;
 }
 
     return found;
 }
 


@@ -2538,15 +3139,19 @@ wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
 wxPoint wxGetMousePosition()
 {
     int x, y;
 wxPoint wxGetMousePosition()
 {
     int x, y;

-    wxGetMousePosition(& x, & y);
+
+    wxGetMousePosition( &x, &y );
+

     return wxPoint(x, y);
 }
 
 void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
 {
     return wxPoint(x, y);
 }
 
 void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
 {

-       if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
-       {
-               // copied from wxGTK : CS
+    if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
+    {
+        // copied from wxGTK : CS
+        // VZ: shouldn't we move this to base class then?
+

         // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
         // except that:
         //
         // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
         // except that:
         //


@@ -2558,81 +3163,52 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
                                   this->ClientToScreen(event.GetPosition()));
         if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
             event.Skip() ;
                                   this->ClientToScreen(event.GetPosition()));
         if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
             event.Skip() ;

-       }
-    else if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
-    {
-            
-        int x = event.m_x ;
-        int y = event.m_y ;
-
-        if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
-        {
-            // OS Needs it in tlw content area coordinates
-            MacClientToRootWindow( &x , &y ) ;
-        }
-        else
-        {
-            // OS Needs it in window not client coordinates
-            wxPoint origin = GetClientAreaOrigin() ;
-            x += origin.x ;
-            y += origin.y ;
-        }
-        Point       localwhere ;
-        SInt16      controlpart ;
-        
-        localwhere.h = x ;
-        localwhere.v = y ;
-    
-        short modifiers = 0;
-        
-        if ( !event.m_leftDown && !event.m_rightDown )
-            modifiers  |= btnState ;
-    
-        if ( event.m_shiftDown )
-            modifiers |= shiftKey ;
-            
-        if ( event.m_controlDown )
-            modifiers |= controlKey ;
-    
-        if ( event.m_altDown )
-            modifiers |= optionKey ;
-    
-        if ( event.m_metaDown )
-            modifiers |= cmdKey ;
-
-        bool handled = false ;
-
-        if ( ::IsControlActive( (ControlRef) m_macControl ) )
-        {
-            controlpart = ::HandleControlClick( (ControlRef) m_macControl , localwhere , modifiers , (ControlActionUPP) -1 ) ;
-            wxTheApp->s_lastMouseDown = 0 ;
-            if ( controlpart != kControlNoPart ) 
-            {
-                MacHandleControlClick((WXWidget)  (ControlRef) m_macControl , controlpart , false /* mouse not down anymore */ ) ;
-                handled = true ;
-            }
-        }
-        if ( !handled )
-            event.Skip() ;

     }
     else
     {
     }
     else
     {

-       event.Skip() ;
+        event.Skip() ;

     }
 }
 
     }
 }
 

-void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) 
+void wxWindowMac::OnPaint( wxPaintEvent & event )
+{
+    if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
+        CallNextEventHandler(
+            (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
+            (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
+}
+
+void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )

 {
 {

-    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;

 }
 
 }
 

-Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size ) 
+Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )

 {
 {

-    int x ,y , w ,h ;
-    
-    window->MacGetBoundsForControl( pos , size , x , y, w, h ) ;
-    Rect bounds =  { y , x , y+h , x+w  };
+    int x, y, w, h ;
+
+    window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
+    Rect bounds = { y, x, y + h, x + w };
+

     return bounds ;
 }
 
     return bounds ;
 }
 

+wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+    return eventNotHandledErr ;
+}
+
+bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
+{
+    wxWindowMac *newParent = (wxWindowMac *)newParentBase;
+    if ( !wxWindowBase::Reparent(newParent) )
+        return false;
+
+    // copied from MacPostControlCreate
+    ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+
+    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+
+    ::EmbedControl( m_peer->GetControlRef() , container ) ;

 
 

+    return true;
+}