comment out unused stuff for warning fixing

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index b5f98056e438d291f4840ca7011ec6ab2f26e365..7f8e6417d83b030329774b43a75fa00ba5095801 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "window.h"
 #endif
 
 #pragma implementation "window.h"
 #endif
 

-#include "wx/setup.h"
+#include "wx/wxprec.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"


@@ -44,19 +45,20 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

-#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"
 #ifndef __DARWIN__
 #include <Windows.h>
 #include <ToolUtils.h>
 
 #include "wx/mac/uma.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
 


@@ -80,9 +82,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
 // TODO    EVT_PAINT(wxWindowMac::OnPaint)
     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)
-//    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()
 


@@ -93,18 +94,66 @@ END_EVENT_TABLE()
 #define wxMAC_DEBUG_REDRAW 0
 #endif
 
 #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 ) ;
 
 #if TARGET_API_MAC_OSX
 
 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 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3

 enum {
   kEventControlVisibilityChanged = 157
 };
 enum {
   kEventControlVisibilityChanged = 157
 };


@@ -121,12 +170,12 @@ static const EventTypeSpec eventList[] =
     { kEventClassControl , kEventControlEnabledStateChanged } ,
     { kEventClassControl , kEventControlHiliteChanged } ,
     { kEventClassControl , kEventControlSetFocusPart } ,
     { kEventClassControl , kEventControlEnabledStateChanged } ,
     { kEventClassControl , kEventControlHiliteChanged } ,
     { kEventClassControl , kEventControlSetFocusPart } ,

-  
-    { kEventClassService , kEventServiceGetTypes },         
-    { kEventClassService , kEventServiceCopy },         
-    { kEventClassService , kEventServicePaste },  
-    
- //    { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+
+    { kEventClassService , kEventServiceGetTypes },
+    { kEventClassService , kEventServiceCopy },
+    { kEventClassService , kEventServicePaste },
+
+ //    { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only

 //  { kEventClassControl , kEventControlBoundsChanged } ,
 #endif
 } ;
 //  { kEventClassControl , kEventControlBoundsChanged } ,
 #endif
 } ;


@@ -136,7 +185,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;

-    
+

     ControlRef controlRef ;
     wxWindowMac* thisWindow = (wxWindowMac*) data ;
 
     ControlRef controlRef ;
     wxWindowMac* thisWindow = (wxWindowMac*) data ;
 


@@ -148,15 +197,25 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
         case kEventControlDraw :
             {
                 RgnHandle updateRgn = NULL ;
         case kEventControlDraw :
             {
                 RgnHandle updateRgn = NULL ;

-
+                RgnHandle allocatedRgn = NULL ;

                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;

-                if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr ) 
+                if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )

                 {
                     updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
                 }
                 {
                     updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
                 }

-                // GrafPtr myport = cEvent.GetParameter<GrafPtr>(kEventParamGrafPort,typeGrafPtr) ;
+                else
+                {
+                    if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
+                    {
+                        allocatedRgn = NewRgn() ;
+                        CopyRgn( updateRgn , allocatedRgn ) ;
+                        // hide the given region by the new region that must be shifted
+                        wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
+                        updateRgn = allocatedRgn ;
+                    }
+                }

 
 

-#if 0 
+#if 0

               // in case we would need a coregraphics compliant background erase first
                 // now usable to track redraws
                 CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
               // in case we would need a coregraphics compliant background erase first
                 // now usable to track redraws
                 CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;


@@ -164,23 +223,25 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 {
                     static float color = 0.5 ;
                     static channel = 0 ;
                 {
                     static float color = 0.5 ;
                     static channel = 0 ;

-                       HIRect bounds;
-                       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 ;
-                                   }
+                     HIRect bounds;
+                       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
                 if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
                     result = noErr ;
                 }
 #endif
                 if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
                     result = noErr ;

+                if ( allocatedRgn )
+                    DisposeRgn( allocatedRgn ) ;

             }
             break ;
         case kEventControlVisibilityChanged :
             }
             break ;
         case kEventControlVisibilityChanged :


@@ -207,7 +268,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                         thisWindow->GetCaret()->OnKillFocus();
                     }
         #endif // wxUSE_CARET
                         thisWindow->GetCaret()->OnKillFocus();
                     }
         #endif // wxUSE_CARET

-                    wxFocusEvent event(wxEVT_KILL_FOCUS, thisWindow->GetId());
+                    wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());

                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }


@@ -216,7 +277,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     // panel wants to track the window which was the last to have focus in it
                     wxChildFocusEvent eventFocus(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
                     // 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() )
                     {
         #if wxUSE_CARET
                     if ( thisWindow->GetCaret() )
                     {


@@ -228,6 +289,8 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }

+                if ( thisWindow->MacIsUserPane() )
+                    result = noErr ;

             }
             break ;
 #endif
             }
             break ;
 #endif


@@ -247,7 +310,7 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;

-    
+

     ControlRef controlRef ;
     wxWindowMac* thisWindow = (wxWindowMac*) data ;
     wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
     ControlRef controlRef ;
     wxWindowMac* thisWindow = (wxWindowMac*) data ;
     wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;


@@ -261,13 +324,13 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
                 long from, to ;
                 textCtrl->GetSelection( &from , &to ) ;
 
                 long from, to ;
                 textCtrl->GetSelection( &from , &to ) ;
 

-                CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;                 
+                CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;

                 if( from != to )
                     copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
                 if ( textCtrl->IsEditable() )
                     pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;
                 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' */  }; 
+
+                static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt' ,  'PICT', 'MooV',     'AIFF' */  };

                 for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i )
                 {
                     CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]);
                 for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i )
                 {
                     CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]);


@@ -304,20 +367,27 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
                 verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ;
                 textSize++ ;
                 char *content = new char[textSize] ;
                 verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ;
                 textSize++ ;
                 char *content = new char[textSize] ;

-                GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content );  
+                GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content );

                 content[textSize-1] = 0 ;
                 content[textSize-1] = 0 ;

+#if wxUSE_UNICODE
+                textCtrl->WriteText( wxString( content , wxConvLocal )  );
+#else

                 textCtrl->WriteText( wxString( content ) ) ;
                 textCtrl->WriteText( wxString( content ) ) ;

+#endif

                 delete[] content ;
                 result = noErr ;
             }
             break ;
     }
                 delete[] content ;
                 result = noErr ;
             }
             break ;
     }

-    
+

     return result ;
     return result ;

-} 
+}

 
 pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
 
 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 ) )


@@ -330,6 +400,7 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
         default :
             break ;
     }
         default :
             break ;
     }

+    wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;

     return result ;
 }
 
     return result ;
 }
 


@@ -338,7 +409,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 // ---------------------------------------------------------------------------
 // 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) ;


@@ -395,7 +466,7 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
     win->MacControlUserPaneBackgroundProc(info) ;
 }
 
     win->MacControlUserPaneBackgroundProc(info) ;
 }
 

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

 {
     RgnHandle rgn = NewRgn() ;
     GetClip( rgn ) ;
 {
     RgnHandle rgn = NewRgn() ;
     GetClip( rgn ) ;


@@ -405,35 +476,35 @@ void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
     DisposeRgn( rgn ) ;
 }
 
     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 ;
 }
 
 {
     return kControlNoPart ;
 }
 

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

 {
 }
 
 {
 }
 


@@ -450,6 +521,7 @@ ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ;
 // implementation
 // ===========================================================================
 
 // implementation
 // ===========================================================================
 

+#if KEY_wxList_DEPRECATED

 wxList wxWinMacControlList(wxKEY_INTEGER);
 
 wxWindow *wxFindControlFromMacControl(ControlRef inControl )
 wxList wxWinMacControlList(wxKEY_INTEGER);
 
 wxWindow *wxFindControlFromMacControl(ControlRef inControl )


@@ -474,6 +546,42 @@ void wxRemoveMacControlAssociation(wxWindow *control)
 {
     wxWinMacControlList.DeleteObject(control);
 }
 {
     wxWinMacControlList.DeleteObject(control);
 }

+#else
+
+WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
+
+static MacControlMap wxWinMacControlList;
+
+wxWindow *wxFindControlFromMacControl(ControlRef inControl )
+{
+    MacControlMap::iterator node = wxWinMacControlList.find(inControl);
+
+    return (node == wxWinMacControlList.end()) ? NULL : node->second;
+}
+
+void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
+{
+    // adding NULL ControlRef is (first) surely a result of an error and
+    // (secondly) breaks native event processing
+    wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+
+    wxWinMacControlList[inControl] = control;
+}
+
+void wxRemoveMacControlAssociation(wxWindow *control)
+{
+   // iterate over all the elements in the class
+    MacControlMap::iterator it;
+    for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
+    {
+        if ( it->second == control )
+        {
+            wxWinMacControlList.erase(it);
+            break;
+        }
+    }
+}
+#endif // deprecated wxList

 
 // UPP functions
 ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
 
 // UPP functions
 ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;


@@ -481,7 +589,7 @@ ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
 ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
 
 // we have to setup the brush in the current port and return noErr
 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 
+// 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 )
 // hierarchy to find a correct background
 
 pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )


@@ -500,11 +608,10 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
                     const wxBrush &brush = wx->MacGetBackgroundBrush() ;
                     if  ( brush.Ok() )
                     {
                     const wxBrush &brush = wx->MacGetBackgroundBrush() ;
                     if  ( brush.Ok() )
                     {

-                        

                         wxDC::MacSetupBackgroundForCurrentPort( brush ) ;
                         */
                         // this clipping is only needed for non HIView
                         wxDC::MacSetupBackgroundForCurrentPort( brush ) ;
                         */
                         // this clipping is only needed for non HIView

-                        
+

                         RgnHandle clip = NewRgn() ;
                         int x = 0 , y = 0;
 
                         RgnHandle clip = NewRgn() ;
                         int x = 0 , y = 0;
 


@@ -551,8 +658,25 @@ 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_peer = NULL ;

     m_frozenness = 0 ;
 #if WXWIN_COMPATIBILITY_2_4
     m_backgroundTransparent = FALSE;
     m_frozenness = 0 ;
 #if WXWIN_COMPATIBILITY_2_4
     m_backgroundTransparent = FALSE;


@@ -565,12 +689,10 @@ void wxWindowMac::Init()
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 

-       m_macControl = NULL ;
-

     m_macIsUserPane = TRUE;
     m_macIsUserPane = TRUE;

-    
+

     // make sure all proc ptrs are available
     // make sure all proc ptrs are available

-    
+

     if ( gControlUserPaneDrawUPP == NULL )
     {
         gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ;
     if ( gControlUserPaneDrawUPP == NULL )
     {
         gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ;


@@ -603,6 +725,39 @@ wxWindowMac::~wxWindowMac()
 
     m_isBeingDeleted = TRUE;
 
 
     m_isBeingDeleted = TRUE;
 

+    if ( m_peer )
+    {
+        // deleting a window while it is shown invalidates the region occupied by border or
+        // focus
+        int outerBorder = MacGetLeftBorderSize() ;
+        if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
+            outerBorder += 4 ;
+
+        if ( IsShown() && ( outerBorder > 0 ) )
+        {
+            // as the borders are drawn on the parent we have to properly invalidate all these areas
+            RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ;
+
+            Rect rect ;
+
+            m_peer->GetRect( &rect ) ;
+            RectRgn( updateInner , &rect ) ;
+            InsetRect( &rect , -outerBorder , -outerBorder ) ;
+            RectRgn( updateOuter , &rect ) ;
+            DiffRgn( updateOuter , updateInner ,updateOuter ) ;
+            wxPoint parent(0,0);
+            GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
+            parent -= GetParent()->GetClientAreaOrigin() ;
+            OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
+            CopyRgn( updateOuter , updateTotal ) ;
+
+            GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ;
+            DisposeRgn(updateOuter) ;
+            DisposeRgn(updateInner) ;
+            DisposeRgn(updateTotal) ;
+        }
+    }
+

 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )


@@ -618,7 +773,10 @@ wxWindowMac::~wxWindowMac()
         }
     }
 #endif // __WXUNIVERSAL__
         }
     }
 #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.


@@ -628,13 +786,13 @@ 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 ;
+        // we currently are not using this hook
+        // ::SetControlColorProc( *m_peer , NULL ) ;
+        m_peer->Dispose() ;

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


@@ -649,8 +807,6 @@ wxWindowMac::~wxWindowMac()
             frame->SetLastFocus( NULL ) ;
     }
 
             frame->SetLastFocus( 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 )


@@ -659,15 +815,20 @@ wxWindowMac::~wxWindowMac()
         m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP
         m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP

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

 }
 
 }
 

-//

 
 

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

 {
 {

-    wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ;
-    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);
 
 }


@@ -684,46 +845,38 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 

-    parent->AddChild(this);
-

     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 = 0
         UInt32 features = 0

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

 
         MacPostControlCreate(pos,size) ;
 #if !TARGET_API_MAC_OSX
 
         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->SetData<ControlUserPaneDrawUPP>(kControlEntireControl,kControlUserPaneDrawProcTag,&gControlUserPaneDrawUPP) ;
+        m_peer->SetData<ControlUserPaneHitTestUPP>(kControlEntireControl,kControlUserPaneHitTestProcTag,&gControlUserPaneHitTestUPP) ;
+        m_peer->SetData<ControlUserPaneTrackingUPP>(kControlEntireControl,kControlUserPaneTrackingProcTag,&gControlUserPaneTrackingUPP) ;
+        m_peer->SetData<ControlUserPaneIdleUPP>(kControlEntireControl,kControlUserPaneIdleProcTag,&gControlUserPaneIdleUPP) ;
+        m_peer->SetData<ControlUserPaneKeyDownUPP>(kControlEntireControl,kControlUserPaneKeyDownProcTag,&gControlUserPaneKeyDownUPP) ;
+        m_peer->SetData<ControlUserPaneActivateUPP>(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ;
+        m_peer->SetData<ControlUserPaneFocusUPP>(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ;
+        m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ;
+#endif

     }
 #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


@@ -740,138 +893,119 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     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") ) ;

 
 

-    ::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 ) ;
 
 #if !TARGET_API_MAC_OSX
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
 #if !TARGET_API_MAC_OSX

-    // eventually we can fix some clipping issues be reactivating this hook 
+    // eventually we can fix some clipping issues be reactivating this hook

     //if ( m_macIsUserPane )
     //if ( m_macIsUserPane )

-    // SetControlColorProc( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ;
+    // SetControlColorProc( m_peer->GetControlRef() , wxMacSetupControlBackgroundUPP ) ;

 #endif
 #endif

-    
-    UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+    m_peer->SetTitle( wxStripMenuCodes(m_label) ) ;

 
 

-    wxSize new_size = size ;

     if (!m_macIsUserPane)
     {
         SetInitialBestSize(size);
     }
 
     SetCursor( *wxSTANDARD_CURSOR ) ;
     if (!m_macIsUserPane)
     {
         SetInitialBestSize(size);
     }
 
     SetCursor( *wxSTANDARD_CURSOR ) ;

-

 }
 
 void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created
 }
 
 void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created

-    // wxASSERT( m_macControl != NULL ) ;
+    // wxASSERT( m_peer->Ok() ) ;

 
     m_windowVariant = variant ;
 
 
     m_windowVariant = variant ;
 

-    if (!m_macControl)
+    if (m_peer == NULL || !m_peer->Ok())

         return;
 
         return;
 

-       ControlSize size ;
+    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 ;
         case wxWINDOW_VARIANT_SMALL :
             break ;
         case wxWINDOW_VARIANT_SMALL :

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

             break ;
         case wxWINDOW_VARIANT_MINI :
            if (UMAGetSystemVersion() >= 0x1030 )
             {
             break ;
         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 ;
         case wxWINDOW_VARIANT_LARGE :
             }
             break ;
         case wxWINDOW_VARIANT_LARGE :

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

             break ;
         default:
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }
             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;
 }
 
     return retval;
 }
 


@@ -879,9 +1013,9 @@ bool wxWindowMac::SetForegroundColour(const wxColour& col )
 {
     if ( !wxWindowBase::SetForegroundColour(col) )
         return false ;
 {
     if ( !wxWindowBase::SetForegroundColour(col) )
         return false ;

-        
+

     MacUpdateControlFont() ;
     MacUpdateControlFont() ;

-    
+

     return true ;
 }
 
     return true ;
 }
 


@@ -891,36 +1025,41 @@ 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 ) )
+    else if (  newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )

     {
     {

-        brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; 
-    } 
+        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
 {

-#if 0
-    // there is currently no way to determinate whether the window is running in full keyboard
-    // access mode, therefore we cannot rely on these features yet
+    // 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 ;
     UInt32 features = 0 ;

-    GetControlFeatures( (ControlRef) m_macControl , &features ) ;
-    return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; 
-#endif
-    return true ;
+    m_peer->GetFeatures( & features ) ;
+    return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;

 }
 
 
 }
 
 


@@ -928,10 +1067,12 @@ void wxWindowMac::SetFocus()
 {
     if ( AcceptsFocus() )
     {
 {
     if ( AcceptsFocus() )
     {

-#if !TARGET_API_MAC_OSX
+

         wxWindow* former = FindFocus() ;
         wxWindow* former = FindFocus() ;

-#endif
-        OSStatus err = SetKeyboardFocus(  (WindowRef) MacGetTopLevelWindowRef() , (ControlRef) GetHandle()  , kControlFocusNextPart ) ;
+        if ( former == this )
+            return ;
+
+        OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;

         // 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
         if ( err == errCouldntSetFocus )
         // 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
         if ( err == errCouldntSetFocus )


@@ -948,7 +1089,7 @@ void wxWindowMac::SetFocus()
             wxMacCarbonEvent cEvent( evRef ) ;
             cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
             cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
             wxMacCarbonEvent cEvent( evRef ) ;
             cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
             cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;

-            
+

             wxMacWindowEventHandler( NULL , evRef , former ) ;
             ReleaseEvent(evRef) ;
         }
             wxMacWindowEventHandler( NULL , evRef , former ) ;
             ReleaseEvent(evRef) ;
         }


@@ -961,7 +1102,7 @@ void wxWindowMac::SetFocus()
             wxMacCarbonEvent cEvent( evRef ) ;
             cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
             cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
             wxMacCarbonEvent cEvent( evRef ) ;
             cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
             cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;

-            
+

             wxMacWindowEventHandler( NULL , evRef , this ) ;
             ReleaseEvent(evRef) ;
         }
             wxMacWindowEventHandler( NULL , evRef , this ) ;
             ReleaseEvent(evRef) ;
         }


@@ -1008,37 +1149,31 @@ 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 ;
 {
     Rect bounds ;

-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    m_peer->GetRect( &bounds ) ;

 
 
     x = bounds.left ;
     y = bounds.top ;
     w = bounds.right - bounds.left ;
     h = bounds.bottom - bounds.top ;
 
 
     x = bounds.left ;
     y = bounds.top ;
     w = bounds.right - bounds.left ;
     h = bounds.bottom - bounds.top ;

-
-    wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ;
-    if ( tlw )
-    {
-        Point tlworigin =  { 0 , 0  } ;
-        GrafPtr port ;
-        bool swapped = QDSwapPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &port ) ;
-        ::LocalToGlobal( &tlworigin ) ;
-        if ( swapped )
-            ::SetPort( port ) ;
-        x = tlworigin.h ;
-        y = tlworigin.v ;    
-    }

 }
 
 }
 

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

 bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
                                        const wxSize& size,
                                        int& x, int& y,
 bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
                                        const wxSize& size,
                                        int& x, int& y,

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

 {
 {

+    // the desired size, minus the border pixels gives the correct size of the control
+

     x = (int)pos.x;
     y = (int)pos.y;
     // todo the default calls may be used as soon as PostCreateControl Is moved here
     x = (int)pos.x;
     y = (int)pos.y;
     // todo the default calls may be used as soon as PostCreateControl Is moved here


@@ -1047,38 +1182,66 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
 #if !TARGET_API_MAC_OSX
     GetParent()->MacWindowToRootWindow( &x , &y ) ;
 #endif
 #if !TARGET_API_MAC_OSX
     GetParent()->MacWindowToRootWindow( &x , &y ) ;
 #endif

+
+    x += MacGetLeftBorderSize() ;
+    y += MacGetTopBorderSize() ;
+    w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+

     if ( adjustOrigin )
         AdjustForParentClientOrigin( x , y ) ;
     if ( adjustOrigin )
         AdjustForParentClientOrigin( x , y ) ;

+#if TARGET_API_MAC_OSX
+    // 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() ;
+    }
+#endif

     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 ;
+    // take the size of the control and add the borders that have to be drawn outside
+    int x1 , y1 , w1 , h1 ;
+

     MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
     MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;

+
+    w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+

     if(x)   *x = w1 ;
     if(y)   *y = h1 ;
     if(x)   *x = w1 ;
     if(y)   *y = h1 ;

-    
-#else
-    Rect bounds ;
-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
-    if(x)   *x = bounds.right - bounds.left ;
-    if(y)   *y = bounds.bottom - bounds.top ;
-#endif

 }
 
 }
 

+// 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 ) ;
     int x1 , y1 , w1 ,h1 ;
     MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;

+    x1 -= MacGetLeftBorderSize() ;
+    y1 -= MacGetTopBorderSize() ;
+    // to non-client
+ #if !TARGET_API_MAC_OSX
+    if ( !GetParent()->IsTopLevel() )
+    {
+        Rect bounds ;
+        GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ;
+        x1 -= bounds.left ;
+        y1 -= bounds.top ;
+    }
+#endif

     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 ;


@@ -1086,51 +1249,27 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
     }
     if(x)   *x = x1 ;
     if(y)   *y = y1 ;
     }
     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

 }
 
 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") ) ;
     wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;

-    
+

     {
         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 )) ;
-        ::GlobalToLocal( &localwhere ) ;
+
+        QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;

         if(x)   *x = localwhere.h ;
         if(y)   *y = localwhere.v ;
 
     }
     MacRootWindowToWindow( x , y ) ;
         if(x)   *x = localwhere.h ;
         if(y)   *y = localwhere.v ;
 
     }
     MacRootWindowToWindow( x , y ) ;

-    
+

     wxPoint origin = GetClientAreaOrigin() ;
     if(x)   *x -= origin.x ;
     if(y)   *y -= origin.y ;
     wxPoint origin = GetClientAreaOrigin() ;
     if(x)   *x -= origin.x ;
     if(y)   *y -= origin.y ;


@@ -1151,9 +1290,7 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
         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 ) ;
+        QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;

         if(x)   *x = localwhere.h ;
         if(y)   *y = localwhere.v ;
     }
         if(x)   *x = localwhere.h ;
         if(y)   *y = localwhere.v ;
     }


@@ -1180,22 +1317,30 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
 void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
 {
  #if TARGET_API_MAC_OSX
 void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
 {
  #if TARGET_API_MAC_OSX

-    HIPoint pt ;
+    wxPoint pt ;

     if ( x ) pt.x = *x ;
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )
     if ( x ) pt.x = *x ;
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )

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

     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;
  #else
     if ( !IsTopLevel() )
     {
         Rect bounds ;
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;
  #else
     if ( !IsTopLevel() )
     {
         Rect bounds ;

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

     }
 #endif
 }
     }
 #endif
 }


@@ -1213,22 +1358,26 @@ void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
 void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 {
  #if TARGET_API_MAC_OSX
 void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 {
  #if TARGET_API_MAC_OSX

-    HIPoint pt ;
+    wxPoint pt ;

     if ( x ) pt.x = *x ;
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )
     if ( x ) pt.x = *x ;
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )

-        HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle()  , (ControlRef) m_macControl ) ;
-    
+    {
+        wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ;
+        pt.x += MacGetLeftBorderSize() ;
+        pt.y += MacGetTopBorderSize() ;
+    }
+

     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;
  #else
     if ( !IsTopLevel() )
     {
         Rect bounds ;
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;
  #else
     if ( !IsTopLevel() )
     {
         Rect bounds ;

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

     }
 #endif
 }
     }
 #endif
 }


@@ -1247,18 +1396,18 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 {
     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 ) ;
+        m_peer->GetRect( &content ) ;

     }
     }

+    DisposeRgn( rgn ) ;

     Rect structure ;
     Rect structure ;

-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
-#if !TARGET_API_MAC_OSX    
+    m_peer->GetRect( &structure ) ;
+#if !TARGET_API_MAC_OSX

     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif
     left = content.left - structure.left ;
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif
     left = content.left - structure.left ;


@@ -1274,24 +1423,24 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     RgnHandle rgn = NewRgn() ;
 
     Rect content ;
     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 ) ;
+        m_peer->GetRect( &content ) ;

     }
     }

+    DisposeRgn( rgn ) ;

     Rect structure ;
     Rect structure ;

-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
-#if !TARGET_API_MAC_OSX    
+    m_peer->GetRect( &structure ) ;
+#if !TARGET_API_MAC_OSX

     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif
 
     sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
     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 ) ; 
+    sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ;

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


@@ -1307,26 +1456,27 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 
     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 ) ;
+        m_peer->GetRect( &content ) ;

     }
     }

+    DisposeRgn( rgn ) ;

 #if !TARGET_API_MAC_OSX
     Rect structure ;
 #if !TARGET_API_MAC_OSX
     Rect structure ;

-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+    m_peer->GetRect( &structure ) ;

     OffsetRect( &content , -structure.left , -structure.top ) ;
     OffsetRect( &content , -structure.left , -structure.top ) ;

-#endif 
+#endif

     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( );
     ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
     hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );

-
+    */
+    /*

     if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
     {
         int x1 = 0 ;
     if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
     {
         int x1 = 0 ;


@@ -1334,7 +1484,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
         int w  ;
         int h  ;
         GetSize( &w , &h ) ;
         int w  ;
         int h  ;
         GetSize( &w , &h ) ;

-        
+

         MacClientToRootWindow( &x1 , &y1 ) ;
         MacClientToRootWindow( &w , &h ) ;
 
         MacClientToRootWindow( &x1 , &y1 ) ;
         MacClientToRootWindow( &w , &h ) ;
 


@@ -1354,7 +1504,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 
         if (m_hScrollBar  && m_hScrollBar->IsShown() )
         {
 
         if (m_hScrollBar  && m_hScrollBar->IsShown() )
         {

-            hh -= MAC_SCROLLBAR_SIZE;
+            hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ;

             if ( h-y1 >= totH )
             {
                 hh += 1 ;
             if ( h-y1 >= totH )
             {
                 hh += 1 ;


@@ -1362,13 +1512,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
         }
         if (m_vScrollBar  && m_vScrollBar->IsShown() )
         {
         }
         if (m_vScrollBar  && m_vScrollBar->IsShown() )
         {

-            ww -= MAC_SCROLLBAR_SIZE;
+            ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE;

             if ( w-x1 >= totW )
             {
                 ww += 1 ;
             }
         }
     }
             if ( w-x1 >= totW )
             {
                 ww += 1 ;
             }
         }
     }

+    */
+    if (m_hScrollBar  && m_hScrollBar->IsShown() )
+    {
+        hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ;
+    }
+    if (m_vScrollBar  && m_vScrollBar->IsShown() )
+    {
+        ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE;
+    }

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


@@ -1393,26 +1552,29 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
     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 ) ;
-
-    // Change the cursor NOW if we're within the correct window

 
 

-    
-    if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
+    wxWindowMac *mouseWin = 0 ;

     {
     {

-        if ( mouseWin == this && !wxIsBusy() )
-        {
-            m_cursor.MacInstall() ;
-        }
+        WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+        CGrafPtr savePort ;
+        Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
+
+        // TODO If we ever get a GetCurrentEvent.. replacement for the mouse
+        // position, use it...
+
+        Point pt ;
+        GetMouse( &pt ) ;
+        ControlPartCode part ;
+        ControlRef control ;
+        control = wxMacFindControlUnderMouse( pt , window , &part ) ;
+        if ( control )
+            mouseWin = wxFindControlFromMacControl( control ) ;
+
+        if ( swapped )
+            QDSwapPort( savePort , NULL ) ;

     }
     }

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

     {
         m_cursor.MacInstall() ;
     }
     {
         m_cursor.MacInstall() ;
     }


@@ -1425,7 +1587,16 @@ 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 ) ;
     long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
 
     menu->MacBeforeDisplay( true ) ;
     long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;


@@ -1468,13 +1639,20 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 
 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
+
+    wxWindow *parent = GetParent();
+    if ( parent )
+    {
+        wxPoint pt(parent->GetClientAreaOrigin());
+        former_x += pt.x ;
+        former_y += pt.y ;
+    }

 
     int actualWidth = width;
     int actualHeight = height;
 
     int actualWidth = width;
     int actualHeight = height;


@@ -1506,22 +1684,53 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         // we don't adjust twice for the origin
         Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
     {
         // we don't adjust twice for the origin
         Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;

-        bool vis = IsControlVisible( (ControlRef) m_macControl ) ;
-#if TARGET_API_MAC_OSX
+        bool vis = m_peer->IsVisible();
+
+        int outerBorder = MacGetLeftBorderSize() ;
+        if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
+            outerBorder += 4 ;
+
+        if ( vis && ( outerBorder > 0 ) )
+        {
+            // as the borders are drawn on the parent we have to properly invalidate all these areas
+            RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ;
+
+            Rect rect ;
+
+            m_peer->GetRect( &rect ) ;
+            RectRgn( updateInner , &rect ) ;
+            InsetRect( &rect , -outerBorder , -outerBorder ) ;
+            RectRgn( updateOuter , &rect ) ;
+            DiffRgn( updateOuter , updateInner ,updateOuter ) ;
+            wxPoint parent(0,0);
+            GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
+            parent -= GetParent()->GetClientAreaOrigin() ;
+            OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
+            CopyRgn( updateOuter , updateTotal ) ;
+
+            rect = r ;
+            RectRgn( updateInner , &rect ) ;
+            InsetRect( &rect , -outerBorder , -outerBorder ) ;
+            RectRgn( updateOuter , &rect ) ;
+            DiffRgn( updateOuter , updateInner ,updateOuter ) ;
+
+            OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
+            UnionRgn( updateOuter , updateTotal , updateTotal ) ;
+
+            GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ;
+            DisposeRgn(updateOuter) ;
+            DisposeRgn(updateInner) ;
+            DisposeRgn(updateTotal) ;
+        }
+

         // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
         if ( vis )
         // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
         if ( vis )

-            SetControlVisibility(  (ControlRef)m_macControl , false , true ) ;
-        HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ;
-        HIViewSetFrame ( (ControlRef) m_macControl , &hir ) ;
-        if ( vis )
-            SetControlVisibility(  (ControlRef)m_macControl , true , true ) ;
-#else
-        if ( vis )
-            SetControlVisibility(  (ControlRef)m_macControl , false , true ) ;
-        SetControlBounds( (ControlRef) m_macControl , &r ) ;
+            m_peer->SetVisibility( false , true ) ;
+
+        m_peer->SetRect( &r ) ;

         if ( vis )
         if ( vis )

-            SetControlVisibility(  (ControlRef)m_macControl , true , true ) ;
-#endif
+            m_peer->SetVisibility( true , true ) ;
+

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


@@ -1546,15 +1755,13 @@ wxSize wxWindowMac::DoGetBestSize() const
 {
     if ( m_macIsUserPane || IsTopLevel() )
         return wxWindowBase::DoGetBestSize() ;
 {
     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.bottom = 16 ;
         bestsize.left = bestsize.top = 0 ;
         bestsize.right = 16 ;
         bestsize.bottom = 16 ;


@@ -1562,13 +1769,15 @@ wxSize wxWindowMac::DoGetBestSize() const
         {
             bestsize.bottom = 16 ;
         }
         {
             bestsize.bottom = 16 ;
         }

+#if wxUSE_SPINBTN 

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

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

         }
         }

+#endif // wxUSE_SPINBTN 

         else
         {
         else
         {

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

         }
     }
 
         }
     }
 


@@ -1576,9 +1785,8 @@ 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() ;

 }
 
 
 }
 
 


@@ -1657,7 +1865,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;

-    GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) ;
+    m_peer->GetRegion( kControlContentMetaPart , rgn ) ;

     GetRegionBounds( rgn , &content ) ;
     DisposeRgn( rgn ) ;
 #if !TARGET_API_MAC_OSX
     GetRegionBounds( rgn , &content ) ;
     DisposeRgn( rgn ) ;
 #if !TARGET_API_MAC_OSX


@@ -1666,10 +1874,10 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
     if (!::EmptyRect( &content ) )
     {
         Rect structure ;
     if (!::EmptyRect( &content ) )
     {
         Rect structure ;

-        GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+        m_peer->GetRect( &structure ) ;

         OffsetRect( &content , -structure.left , -structure.top ) ;
     }
         OffsetRect( &content , -structure.left , -structure.top ) ;
     }

-#endif 
+#endif

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


@@ -1693,9 +1901,9 @@ void wxWindowMac::SetTitle(const wxString& title)
 {
     m_label = wxStripMenuCodes(title) ;
 
 {
     m_label = wxStripMenuCodes(title) ;
 

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

     {
     {

-               UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ;
+        m_peer->SetTitle( m_label ) ;

     }
     Refresh() ;
 }
     }
     Refresh() ;
 }


@@ -1709,41 +1917,34 @@ bool wxWindowMac::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;

-    
+

     // TODO use visibilityChanged Carbon Event for OSX
     // TODO use visibilityChanged Carbon Event for OSX

-    bool former = MacIsReallyShown() ;
-    
-    SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
-    if ( former != MacIsReallyShown() )
-        MacPropagateVisibilityChanged() ;
+    if ( m_peer )
+    {
+        bool former = MacIsReallyShown() ;
+
+        m_peer->SetVisibility( show , true ) ;
+        if ( former != MacIsReallyShown() )
+            MacPropagateVisibilityChanged() ;
+    }

     return TRUE;
 }
 
 bool wxWindowMac::Enable(bool enable)
 {
     return TRUE;
 }
 
 bool wxWindowMac::Enable(bool enable)
 {

-    wxASSERT( m_macControl != NULL ) ;
+    wxASSERT( m_peer->Ok() ) ;

     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 
     bool former = MacIsReallyEnabled() ;
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 
     bool former = MacIsReallyEnabled() ;

-#if TARGET_API_MAC_OSX
-    if ( enable )
-        EnableControl( (ControlRef) m_macControl ) ;
-    else
-        DisableControl( (ControlRef) m_macControl ) ;
-#else
-    if ( enable )
-        ActivateControl( (ControlRef) m_macControl ) ;
-    else
-        DeactivateControl( (ControlRef) m_macControl ) ;
-#endif
+    m_peer->Enable( enable ) ;

 
     if ( former != MacIsReallyEnabled() )
         MacPropagateEnabledStateChanged() ;
     return TRUE;
 }
 
 
     if ( former != MacIsReallyEnabled() )
         MacPropagateEnabledStateChanged() ;
     return TRUE;
 }
 

-//  
+//

 // status change propagations (will be not necessary for OSX later )
 //
 
 // status change propagations (will be not necessary for OSX later )
 //
 


@@ -1751,8 +1952,8 @@ void wxWindowMac::MacPropagateVisibilityChanged()
 {
 #if !TARGET_API_MAC_OSX
     MacVisibilityChanged() ;
 {
 #if !TARGET_API_MAC_OSX
     MacVisibilityChanged() ;

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

     while ( node )
     {
         wxWindowMac *child = node->GetData();
     while ( node )
     {
         wxWindowMac *child = node->GetData();


@@ -1767,8 +1968,8 @@ void wxWindowMac::MacPropagateEnabledStateChanged( )
 {
 #if !TARGET_API_MAC_OSX
     MacEnabledStateChanged() ;
 {
 #if !TARGET_API_MAC_OSX
     MacEnabledStateChanged() ;

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

     while ( node )
     {
         wxWindowMac *child = node->GetData();
     while ( node )
     {
         wxWindowMac *child = node->GetData();


@@ -1783,8 +1984,8 @@ void wxWindowMac::MacPropagateHiliteChanged( )
 {
 #if !TARGET_API_MAC_OSX
     MacHiliteChanged() ;
 {
 #if !TARGET_API_MAC_OSX
     MacHiliteChanged() ;

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

     while ( node )
     {
         wxWindowMac *child = node->GetData();
     while ( node )
     {
         wxWindowMac *child = node->GetData();


@@ -1797,17 +1998,17 @@ void wxWindowMac::MacPropagateHiliteChanged( )
 
 //
 // status change notifications
 
 //
 // status change notifications

-// 
+//

 
 

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

 {
 }
 
 {
 }
 

-void wxWindowMac::MacHiliteChanged() 
+void wxWindowMac::MacHiliteChanged()

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 


@@ -1815,39 +2016,45 @@ void wxWindowMac::MacEnabledStateChanged()
 // status queries on the inherited window's state
 //
 
 // status queries on the inherited window's state
 //
 

-bool wxWindowMac::MacIsReallyShown() 
+bool wxWindowMac::MacIsReallyShown()

 {
     // only under OSX the visibility of the TLW is taken into account
 {
     // only under OSX the visibility of the TLW is taken into account

+    if ( m_isBeingDeleted )
+        return false ;
+        

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-    return IsControlVisible( (ControlRef) m_macControl ) ;
-#else
+    if ( m_peer && m_peer->Ok() )
+        return m_peer->IsVisible();
+#endif

     wxWindow* win = this ;
     while( win->IsShown()  )
     {
         if ( win->IsTopLevel() )
             return true ;
     wxWindow* win = this ;
     while( win->IsShown()  )
     {
         if ( win->IsTopLevel() )
             return true ;

-        
+

         win = win->GetParent() ;
         if ( win == NULL )
             return true ;
         win = win->GetParent() ;
         if ( win == NULL )
             return true ;

-            
+

     } ;
     return false ;
     } ;
     return false ;

-#endif

 }
 
 }
 

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

 {
 {

-#if TARGET_API_MAC_OSX
-    return IsControlEnabled( (ControlRef) m_macControl ) ;
-#else
-    return IsControlActive( (ControlRef) m_macControl ) ;
-#endif
+    return m_peer->IsEnabled() ;
+}
+
+bool wxWindowMac::MacIsReallyHilited()
+{
+    return m_peer->IsActive();

 }
 
 }
 

-bool wxWindowMac::MacIsReallyHilited() 
+void wxWindowMac::MacFlashInvalidAreas()

 {
 {

-    return IsControlActive( (ControlRef) m_macControl ) ;
+#if TARGET_API_MAC_OSX
+    HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
+#endif

 }
 
 //
 }
 
 //


@@ -1893,17 +2100,24 @@ 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 ( m_peer == NULL )
+        return ;
+

 #if TARGET_API_MAC_OSX
     if ( rect == NULL )
 #if TARGET_API_MAC_OSX
     if ( rect == NULL )

-        HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; 
+        m_peer->SetNeedsDisplay( true ) ;

     else
     {
         RgnHandle update = NewRgn() ;
         SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
         SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
         wxPoint origin = GetClientAreaOrigin() ;
     else
     {
         RgnHandle update = NewRgn() ;
         SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
         SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
         wxPoint origin = GetClientAreaOrigin() ;

-        OffsetRgn( update, origin.x , origin.y ) ;        
-        HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , update , true ) ;
+        OffsetRgn( update, origin.x , origin.y ) ;
+        // right now this is wx' window coordinates, as our native peer does not have borders, this is
+        // inset
+        OffsetRgn( update , -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
+        m_peer->SetNeedsDisplay( true , update) ;
+        DisposeRgn( update ) ;

     }
 #else
 /*
     }
 #else
 /*


@@ -1915,23 +2129,23 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
         else
         {
             SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
         else
         {
             SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;

-            SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ;        
+            SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ;

         }
         InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ;
         DisposeRgn(updateRgn) ;
 */
         }
         InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ;
         DisposeRgn(updateRgn) ;
 */

-    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    if ( m_peer->IsVisible())

     {
     {

-        SetControlVisibility( (ControlRef) m_macControl , false , false ) ;
-        SetControlVisibility( (ControlRef) m_macControl , true , true ) ;
+        m_peer->SetVisibility( false , false ) ;
+        m_peer->SetVisibility( true , true ) ;

     }
     /*
     if ( MacGetTopLevelWindow() == NULL )
         return ;
 
     }
     /*
     if ( MacGetTopLevelWindow() == NULL )
         return ;
 

-    if ( !IsControlVisible( (ControlRef) m_macControl ) )
-       return ;
- 
+    if ( !m_peer->IsVisible())
+        return ;
+

      wxPoint client = GetClientAreaOrigin();
     int x1 = -client.x;
     int y1 = -client.y;
      wxPoint client = GetClientAreaOrigin();
     int x1 = -client.x;
     int y1 = -client.y;


@@ -1973,31 +2187,12 @@ void wxWindowMac::Freeze()
 #if TARGET_API_MAC_OSX
     if ( !m_frozenness++ )
     {
 #if TARGET_API_MAC_OSX
     if ( !m_frozenness++ )
     {

-        HIViewSetDrawingEnabled( (HIViewRef) m_macControl , false ) ;
+        if ( m_peer && m_peer->Ok() )
+            m_peer->SetDrawingEnabled( false ) ;

     }
 #endif
 }
 
     }
 #endif
 }
 

-#if TARGET_API_MAC_OSX
-static void InvalidateControlAndChildren( HIViewRef control )
-{
-    HIViewSetNeedsDisplay( control , true ) ;
-    UInt16 childrenCount = 0 ;
-    OSStatus err = CountSubControls( control , &childrenCount ) ; 
-    if ( err == errControlIsNotEmbedder )
-        return ;
-    wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
-
-    for ( UInt16 i = childrenCount ; i >=1  ; --i )
-    {
-        HIViewRef child ;
-        err = GetIndexedSubControl( control , i , & child ) ;
-        if ( err == errControlIsNotEmbedder )
-            return ;
-        InvalidateControlAndChildren( child ) ;
-    }
-}
-#endif

 
 void wxWindowMac::Thaw()
 {
 
 void wxWindowMac::Thaw()
 {


@@ -2006,9 +2201,11 @@ void wxWindowMac::Thaw()
 
     if ( !--m_frozenness )
     {
 
     if ( !--m_frozenness )
     {

-        HIViewSetDrawingEnabled( (HIViewRef) m_macControl , true ) ;
-        InvalidateControlAndChildren( (HIViewRef) m_macControl )  ;
-        // HIViewSetNeedsDisplay( (HIViewRef) m_macControl , true ) ;
+        if ( m_peer && m_peer->Ok() )
+        {
+            m_peer->SetDrawingEnabled( true ) ;
+            m_peer->InvalidateWithChildren() ;
+        }

     }
 #endif
 }
     }
 #endif
 }


@@ -2016,7 +2213,7 @@ void wxWindowMac::Thaw()
 void wxWindowMac::MacRedrawControl()
 {
 /*
 void wxWindowMac::MacRedrawControl()
 {
 /*

-    if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) )
+    if ( *m_peer && MacGetTopLevelWindowRef() && m_peer->IsVisible())

     {
 #if TARGET_API_MAC_CARBON
         Update() ;
     {
 #if TARGET_API_MAC_CARBON
         Update() ;


@@ -2025,12 +2222,12 @@ void wxWindowMac::MacRedrawControl()
         wxMacPortSetter helper(&dc) ;
         wxMacWindowClipper clipper(this) ;
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         wxMacPortSetter helper(&dc) ;
         wxMacWindowClipper clipper(this) ;
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;

-        UMADrawControl( (ControlRef) m_macControl ) ;
+        UMADrawControl( *m_peer ) ;

 #endif
     }
 */
 }
 #endif
     }
 */
 }

- 
+

 /* TODO
 void wxWindowMac::OnPaint(wxPaintEvent& event)
 {
 /* TODO
 void wxWindowMac::OnPaint(wxPaintEvent& event)
 {


@@ -2052,20 +2249,21 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {

+#if TARGET_API_MAC_OSX

     if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
     {
         event.Skip() ;
     }
     else
     if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
     {
         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


@@ -2133,79 +2331,40 @@ void wxWindowMac::MacPaintBorders( int left , int top )
 {
     if( IsTopLevel() )
         return ;
 {
     if( IsTopLevel() )
         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 ) ;
+
+    Rect rect ;
+    m_peer->GetRect( &rect ) ;
+    InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
+
+    if ( !IsTopLevel() )
+    {
+        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 ;
+        }
+    }
+

     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {

-#if wxMAC_USE_THEME_BORDER
-        Rect rect = { top , left , m_height + top , m_width + left } ;
+        Rect srect = rect ;

         SInt32 border = 0 ;
         SInt32 border = 0 ;

-        /*
-        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-        InsetRect( &rect , border , border );
-        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-        */
-
-        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
+        GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+        InsetRect( &srect , border , border );
+        DrawThemeEditTextFrame(&srect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;

     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

-        Rect rect = { top , left , h + top , w + left } ;
-        RGBForeColor( &darkShadow ) ;
-        FrameRect( &rect ) ;
+        Rect srect = rect ;
+        SInt32 border = 0 ;
+        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+        InsetRect( &srect , border , border );
+        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;

     }
 }
 
     }
 }
 


@@ -2236,8 +2395,8 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
             {
                 if ( !m_hScrollBar->IsShown() )
                     m_hScrollBar->Show(true) ;
             {
                 if ( !m_hScrollBar->IsShown() )
                     m_hScrollBar->Show(true) ;

-                m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

             }
             }

+            m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

         }
     }
     else
         }
     }
     else


@@ -2253,8 +2412,8 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
             {
                 if ( !m_vScrollBar->IsShown() )
                     m_vScrollBar->Show(true) ;
             {
                 if ( !m_vScrollBar->IsShown() )
                     m_vScrollBar->Show(true) ;

-                m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

             }
             }

+            m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

         }
     }
     MacRepositionScrollBars() ;
         }
     }
     MacRepositionScrollBars() ;


@@ -2265,64 +2424,70 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     if( dx == 0 && dy ==0 )
         return ;
 {
     if( dx == 0 && dy ==0 )
         return ;

-        
+

 
     {
 
     {

-        wxClientDC dc(this) ;
-        wxMacPortSetter helper(&dc) ;

 
         int width , height ;
         GetClientSize( &width , &height ) ;
 
         int width , height ;
         GetClientSize( &width , &height ) ;

-
-
-        wxPoint pos;
-        pos.x = pos.y = 0; 
- 
-        Rect scrollrect;
-        // TODO take out the boundaries
-        GetControlBounds( (ControlRef) m_macControl, &scrollrect);
-        
-        RgnHandle updateRgn = NewRgn() ;
+#if TARGET_API_MAC_OSX
+        // 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 )
         {
         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.Intersect( *rect ) ;

         }
         }

-        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 ) )
+        if ( m_peer->GetNeedsDisplay() )

         {
         {

-            MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
-            SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
-            InvalWindowRgn(rootWindow  ,  formerUpdateRgn ) ;
+            // becuase 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( true ) ;
+#else
+            // this would be the preferred version for fast drawing controls
+            if( UMAGetSystemVersion() < 0x1030 )
+                Update() ;
+            else
+                HIViewRender(m_peer->GetControlRef()) ;
+#endif

         }
         }

-        InvalWindowRgn(rootWindow  ,  updateRgn ) ;
-        DisposeRgn( updateRgn ) ;
-        DisposeRgn( formerUpdateRgn ) ;
-        DisposeRgn( scrollRgn ) ;
+        // 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 ) ;
+#else
+
+        wxPoint pos;
+        pos.x = pos.y = 0;
+
+        Rect scrollrect;
+        RgnHandle updateRgn = NewRgn() ;
+
+       {
+            wxClientDC dc(this) ;
+            wxMacPortSetter helper(&dc) ;
+
+            m_peer->GetRect( &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 ) ;
+        }
+        // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy ,  kScrollWindowInvalidate, updateRgn ) ;

 #endif
     }
 
 #endif
     }
 

-    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
+    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())

     {
         wxWindowMac *child = node->GetData();
         if (child == m_vScrollBar) continue;
     {
         wxWindowMac *child = node->GetData();
         if (child == m_vScrollBar) continue;


@@ -2341,46 +2506,43 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         }
         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()

 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;


@@ -2400,6 +2562,41 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 

+    if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
+    {
+        wxMacWindowStateSaver sv( this ) ;
+
+        int w , h ;
+        int x , y ;
+        x = y = 0 ;
+        MacWindowToRootWindow( &x , &y ) ;
+        GetSize( &w , &h ) ;
+        Rect rect = {y , x , h + y , w + x } ;
+
+        if ( event.GetEventType() == wxEVT_SET_FOCUS )
+            DrawThemeFocusRect( &rect , true ) ;
+        else
+        {
+            DrawThemeFocusRect( &rect , false ) ;
+
+            // 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
+            RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ;
+            RectRgn( updateInner , &rect ) ;
+            InsetRect( &rect , -4 , -4 ) ;
+            RectRgn( updateOuter , &rect ) ;
+            DiffRgn( updateOuter , updateInner ,updateOuter ) ;
+            wxPoint parent(0,0);
+            GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
+            parent -= GetParent()->GetClientAreaOrigin() ;
+            OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
+            GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ;
+            DisposeRgn(updateOuter) ;
+            DisposeRgn(updateInner) ;
+        }
+    }
+

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


@@ -2414,17 +2611,13 @@ 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()
 {

-#if TARGET_API_MAC_OSX
-    HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderAbove, NULL) ;
-#endif
+    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()
 {

-#if TARGET_API_MAC_OSX
-    HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderBelow, NULL) ;
-#endif
+    m_peer->SetZOrder( false , NULL ) ;

 }
 
 
 }
 
 


@@ -2484,9 +2677,41 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 void wxWindowMac::Update()
 {
 #if TARGET_API_MAC_OSX
 void wxWindowMac::Update()
 {
 #if TARGET_API_MAC_OSX

-    HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+    WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ;
+
+    // for composited windows this also triggers a redraw of all
+    // invalid views in the window
+    if( UMAGetSystemVersion() >= 0x1030 )
+        HIWindowFlush(window) ;
+    else
+#endif
+    {
+        // the only way to trigger the redrawing on earlier systems is to call
+        // ReceiveNextEvent
+
+        EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+        UInt32 currentEventClass = 0 ;
+        UInt32 currentEventKind = 0 ;
+        if ( currentEvent != NULL )
+        {
+            currentEventClass = ::GetEventClass( currentEvent ) ;
+            currentEventKind = ::GetEventKind( currentEvent ) ;
+        }
+        if ( currentEventClass != kEventClassMenu )
+        {
+            // when tracking a menu, strange redraw errors occur if we flush now, so leave..
+
+            EventRef theEvent;
+            OSStatus status = noErr ;
+            status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
+        }
+        else
+            m_peer->SetNeedsDisplay( true ) ;
+    }

 #else
 #else

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

 #endif
 }
 
 #endif
 }
 


@@ -2502,13 +2727,22 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
 }
 wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
 {
 }
 wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
 {

+    // 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 ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;
 
     Rect r ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;

-    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    if ( !m_isBeingDeleted && m_peer->IsVisible())

     {
     {

-        GetControlBounds( (ControlRef) m_macControl , &r ) ;
+        m_peer->GetRect( &r ) ;
+        r.left -= MacGetLeftBorderSize() ;
+        r.top -= MacGetTopBorderSize() ;
+        r.bottom += MacGetBottomBorderSize() ;
+        r.right += MacGetRightBorderSize() ;
+

         if (! MacGetTopLevelWindow()->MacUsesCompositing() )
         {
             MacRootWindowToWindow( &r.left , & r.top ) ;
         if (! MacGetTopLevelWindow()->MacUsesCompositing() )
         {
             MacRootWindowToWindow( &r.left , & r.top ) ;


@@ -2522,8 +2756,9 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
             r.top = 0 ;
         }
         if ( includeOuterStructures )
             r.top = 0 ;
         }
         if ( includeOuterStructures )

-            InsetRect( &r , -3 , -3 ) ;
+            InsetRect( &r , -4 , -4 ) ;

         RectRgn( visRgn , &r ) ;
         RectRgn( visRgn , &r ) ;

+

         if ( !IsTopLevel() )
         {
             wxWindow* child = this ;
         if ( !IsTopLevel() )
         {
             wxWindow* child = this ;


@@ -2549,12 +2784,18 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
                 parent->MacWindowToRootWindow( &x, &y ) ;
                 MacRootWindowToWindow( &x , &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()) ;
+                if ( !includeOuterStructures || (
+                    parent->MacClipChildren() ||
+                    ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() )
+                    ) )
+                {
+                    SetRectRgn( tempRgn ,
+                        x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
+                        x + size.x - parent->MacGetRightBorderSize(),
+                        y + size.y - parent->MacGetBottomBorderSize()) ;

 
 

-                SectRgn( visRgn , tempRgn , visRgn ) ;
+                    SectRgn( visRgn , tempRgn , visRgn ) ;
+                }

                 if ( parent->IsTopLevel() )
                     break ;
                 child = parent ;
                 if ( parent->IsTopLevel() )
                     break ;
                 child = parent ;


@@ -2572,45 +2813,100 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
 /*
     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 ;
 {
     RgnHandle updatergn = (RgnHandle) updatergnr ;
     bool handled = false ;

-    
-    // calculate a client-origin version of the update rgn and set m_updateRegion to that
+    Rect updatebounds ;
+    GetRegionBounds( updatergn , &updatebounds ) ;
+//    wxLogDebug("update for %s bounds %d , %d , %d , %d",typeid(*this).name() , updatebounds.left , updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+    if ( !EmptyRgn(updatergn) )

     {
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;
         SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
         SectRgn( newupdate , updatergn , newupdate ) ;
     {
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;
         SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
         SectRgn( newupdate , updatergn , newupdate ) ;

+
+        // first send an erase event to the entire update area
+        {
+            wxWindowDC dc(this);
+            dc.SetClippingRegion(wxRegion(updatergn));
+            wxEraseEvent eevent( GetId(), &dc );
+            eevent.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( eevent );
+        }
+
+        // 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
             wxPaintEvent event;
         if ( !m_updateRegion.Empty() )
         {
             // paint the window itself
             wxPaintEvent event;

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

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

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

 
 

-            // paint custom borders
-            wxNcPaintEvent eventNc( GetId() );
-            eventNc.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( eventNc );
+            // we have to call the default built-in handler, as otherwise our frames will be drawn and immediately erased afterwards
+            if ( !handled )
+            {
+                if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
+                {
+                    CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
+                    handled = true ;
+                }
+            }
+
+        }
+
+        // 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() ;
+
+        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;
+            if (!child->IsShown()) continue;
+
+            int x,y;
+            child->GetPosition( &x, &y );
+            int w,h;
+            child->GetSize( &w, &h );
+            Rect childRect = { y , x , y + h , x + w } ;
+            OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
+            if ( child->MacGetTopBorderSize() )
+            {
+                if ( RectInRgn( &childRect , updatergn ) )
+                {
+                    // paint custom borders
+                    wxNcPaintEvent eventNc( child->GetId() );
+                    eventNc.SetEventObject( child );
+                    if ( !child->GetEventHandler()->ProcessEvent( eventNc ) )
+                    {
+                        wxWindowDC dc(this) ;
+                        dc.SetClippingRegion(wxRegion(updatergn));
+                        wxMacPortSetter helper(&dc) ;
+                        child->MacPaintBorders( dc.m_macLocalOrigin.x + childRect.left , dc.m_macLocalOrigin.y + childRect.top)  ;
+                    }
+                }
+            }
+            if ( child->m_peer->NeedsFocusRect() && child->m_peer->HasFocus() )
+            {
+                wxWindowDC dc(this) ;
+                dc.SetClippingRegion(wxRegion(updatergn));
+                wxMacPortSetter helper(&dc) ;
+                Rect r = childRect ;
+                OffsetRect( &r , dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y ) ;
+                DrawThemeFocusRect( &r , true ) ;
+            }

         }
     }
     return handled ;
         }
     }
     return handled ;


@@ -2630,20 +2926,20 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
     CopyRgn( updatergn , ownUpdateRgn ) ;
 
     if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
     CopyRgn( updatergn , ownUpdateRgn ) ;
 
     if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )

-    { 
+    {

         Rect bounds;
         Rect bounds;

-        UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &bounds );
+        m_peer->GetRectInWindowCoords( &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
         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 ); 
+        SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn );

         DisposeRgn( controlRgn );
         DisposeRgn( controlRgn );

-    
+

         //KO: convert ownUpdateRgn to local coordinates
         //KO: convert ownUpdateRgn to local coordinates

-        OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); 
+        OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top );

     }
     }

-        
+

     MacDoRedraw( ownUpdateRgn , time ) ;
     DisposeRgn( ownUpdateRgn ) ;
 
     MacDoRedraw( ownUpdateRgn , time ) ;
     DisposeRgn( ownUpdateRgn ) ;
 


@@ -2668,45 +2964,53 @@ 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 )
-    {

 
 

-    }
-    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 & wxVSCROLL )
+        {
+            m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint,
+                vSize , wxVERTICAL);
+        }
+
+        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
     MacRepositionScrollBars() ; // we might have a real position shift
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {
     // because the create does not take into account the client area origin
     MacRepositionScrollBars() ; // we might have a real position shift
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {

+    if ( !m_hScrollBar && !m_vScrollBar )
+        return ;
+

     bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
     bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;

-    int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
+    int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+    int adjust = hasBoth ? scrlsize - 1 : 0 ;

 
     // get real client area
 
 
     // get real client area
 


@@ -2721,7 +3025,7 @@ void wxWindowMac::MacRepositionScrollBars()
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;

-
+/*

     int x = 0 ;
     int y = 0 ;
     int w ;
     int x = 0 ;
     int y = 0 ;
     int w ;


@@ -2767,7 +3071,7 @@ void wxWindowMac::MacRepositionScrollBars()
         vSize.y += 1 ;
         hPoint.y += 1 ;
     }
         vSize.y += 1 ;
         hPoint.y += 1 ;
     }

-
+*/

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


@@ -2787,7 +3091,7 @@ 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();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         wxWindowMac *child = node->GetData();
     while ( node )
     {
         wxWindowMac *child = node->GetData();


@@ -2800,7 +3104,7 @@ 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();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         wxWindowMac *child = node->GetData();
     while ( node )
     {
         wxWindowMac *child = node->GetData();


@@ -2817,17 +3121,11 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
     if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
     {
         SInt32 border = 3 ;
     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 = 3 ;
           return border ;
     }
     else if (  m_windowStyle &wxDOUBLE_BORDER)
     {
           SInt32 border = 3 ;

-#if wxMAC_USE_THEME_BORDER
-          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif

           return border ;
     }
     else if (m_windowStyle &wxSIMPLE_BORDER)
           return border ;
     }
     else if (m_windowStyle &wxSIMPLE_BORDER)


@@ -2857,7 +3155,7 @@ 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
 }
 
 // Find the wxWindowMac at the current mouse position, returning the mouse


@@ -2879,9 +3177,9 @@ wxPoint wxGetMousePosition()
 
 void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
 {
 
 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

         // 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:
         //


@@ -2893,27 +3191,27 @@ 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
     {
     else
     {

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

     }
 }
 
     }
 }
 

-void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) 
+void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )

 {
 }
 
 {
 }
 

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

 {
     int x ,y , w ,h ;
 {
     int x ,y , w ,h ;

-    
+

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

-wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
+wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
     return eventNotHandledErr ;
 }
 {
     return eventNotHandledErr ;
 }