Fixed display issues for Panther now that wxTextCtrl has been fixed there.

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 528f9f4f7c7ddb7bb38754b98d198b1f6790d66c..6f21c231bb47b97876f69a92a436bbb5b997d11c 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -84,7 +84,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
 // TODO    EVT_PAINT(wxWindowMac::OnPaint)
     EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
     EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
 // 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()
 


@@ -95,7 +96,7 @@ 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

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


@@ -209,7 +210,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) ;
                 }


@@ -504,14 +505,10 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
                 wxWindow*  wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ;
                 if ( wx != NULL )
                 {
                 wxWindow*  wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ;
                 if ( wx != NULL )
                 {

-                    /*

                     const wxBrush &brush = wx->MacGetBackgroundBrush() ;
                     if  ( brush.Ok() )
                     {
                     const wxBrush &brush = wx->MacGetBackgroundBrush() ;
                     if  ( brush.Ok() )
                     {

-                        

                         wxDC::MacSetupBackgroundForCurrentPort( brush ) ;
                         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;


@@ -523,7 +520,6 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
                         DisposeRgn( clip ) ;
 
                         status = noErr ;
                         DisposeRgn( clip ) ;
 
                         status = noErr ;

-                        /*

                     }
                     else if ( wx->MacIsUserPane() )
                     {
                     }
                     else if ( wx->MacIsUserPane() )
                     {


@@ -531,7 +527,6 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
                         // setup of our parent ourselves
                         status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ;
                     }
                         // setup of our parent ourselves
                         status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ;
                     }

-                    */

                 }
             }
             break ;
                 }
             }
             break ;


@@ -559,8 +554,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;


@@ -573,8 +585,6 @@ void wxWindowMac::Init()
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 

-       m_macControl = NULL ;
-

     m_macIsUserPane = TRUE;
     
     // make sure all proc ptrs are available
     m_macIsUserPane = TRUE;
     
     // make sure all proc ptrs are available


@@ -636,13 +646,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 )


@@ -667,14 +677,19 @@ 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(),
+    wxAssociateControlWithMacControl( (ControlRef) control  , this ) ;
+    InstallControlEventHandler( (ControlRef)  control , GetwxMacWindowEventHandlerUPP(),

         GetEventTypeCount(eventList), eventList, this, 
         (EventHandlerRef *)&m_macControlEventHandler);
 
         GetEventTypeCount(eventList), eventList, this, 
         (EventHandlerRef *)&m_macControlEventHandler);
 


@@ -711,26 +726,20 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
 //                     | kControlWantsIdle
                        ; 
 
 //                     | kControlWantsIdle
                        ; 
 

-        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl); 
+        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);
+        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__
 #endif        
     }
 #ifndef __WXUNIVERSAL__


@@ -750,15 +759,15 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
 
 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 ) ;

 
 

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

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


@@ -766,10 +775,9 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 #if !TARGET_API_MAC_OSX
     // eventually we can fix some clipping issues be reactivating this hook 
     //if ( m_macIsUserPane )
 #if !TARGET_API_MAC_OSX
     // eventually we can fix some clipping issues be reactivating this hook 
     //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) ) ;

 
     if (!m_macIsUserPane)
     {
 
     if (!m_macIsUserPane)
     {


@@ -783,11 +791,11 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created
 {
     // 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;
 
        ControlSize size ;
         return;
 
        ControlSize size ;


@@ -828,7 +836,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }
             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 ) ;
 
     wxFont font ;
     font.MacCreateThemeFont( themeFont ) ;


@@ -837,38 +845,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 
 void wxWindowMac::MacUpdateControlFont() 
 {
 
 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 );
+    m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;

        Refresh() ;
 }
 
        Refresh() ;
 }
 


@@ -897,17 +874,18 @@ 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 ) ; 
     } 
     else
     {
     {
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; 
     } 
     else
     {

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

     }
     MacSetBackgroundBrush( brush ) ;
         
     }
     MacSetBackgroundBrush( brush ) ;
         


@@ -919,14 +897,13 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 
 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 ) ;
+    m_peer->GetFeatures( & features ) ;

     return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; 
     return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; 

-#endif
-    return true ;

 }
 
 
 }
 
 


@@ -937,7 +914,7 @@ void wxWindowMac::SetFocus()
 #if !TARGET_API_MAC_OSX
         wxWindow* former = FindFocus() ;
 #endif
 #if !TARGET_API_MAC_OSX
         wxWindow* former = FindFocus() ;
 #endif

-        OSStatus err = SetKeyboardFocus(  (WindowRef) MacGetTopLevelWindowRef() , (ControlRef) GetHandle()  , kControlFocusNextPart ) ;
+        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 )


@@ -1018,7 +995,7 @@ void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
                                            int& w, int& h) const 
 {
     Rect bounds ;
                                            int& w, int& h) const 
 {
     Rect bounds ;

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

 
 
     x = bounds.left ;
 
 
     x = bounds.left ;


@@ -1030,11 +1007,7 @@ void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
     if ( tlw )
     {
         Point tlworigin =  { 0 , 0  } ;
     if ( tlw )
     {
         Point tlworigin =  { 0 , 0  } ;

-        GrafPtr port ;
-        bool swapped = QDSwapPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &port ) ;
-        ::LocalToGlobal( &tlworigin ) ;
-        if ( swapped )
-            ::SetPort( port ) ;
+        QDLocalToGlobalPoint( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &tlworigin ) ;

         x = tlworigin.h ;
         y = tlworigin.v ;    
     }
         x = tlworigin.h ;
         y = tlworigin.v ;    
     }


@@ -1045,6 +1018,8 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
                                        int& x, int& y,
                                        int& w, int& h , bool adjustOrigin ) const 
 {
                                        int& x, int& y,
                                        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


@@ -1053,6 +1028,12 @@ 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 ) ;
     return true ;
     if ( adjustOrigin )
         AdjustForParentClientOrigin( x , y ) ;
     return true ;


@@ -1061,18 +1042,22 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
 // Get total size
 void wxWindowMac::DoGetSize(int *x, int *y) const
 {
 // Get total size
 void wxWindowMac::DoGetSize(int *x, int *y) const
 {

-#if TARGET_API_MAC_OSX
+    // take the size of the control and add the borders that have to be drawn outside

     int x1 , y1 , w1 ,h1 ;
     int x1 , y1 , w1 ,h1 ;

+#if TARGET_API_MAC_OSX

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

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

     
 #else
     Rect bounds ;
     
 #else
     Rect bounds ;

-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
-    if(x)   *x = bounds.right - bounds.left ;
-    if(y)   *y = bounds.bottom - bounds.top ;
+    m_peer->GetRect( &bounds ) ;   
+    w1 = bounds.right - bounds.left ;
+    h1 = bounds.bottom - bounds.top ;

 #endif
 #endif

+    w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+    
+    if(x)   *x = w1 ;
+    if(y)   *y = h1 ;

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


@@ -1080,6 +1065,8 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
  #if TARGET_API_MAC_OSX
     int x1 , y1 , w1 ,h1 ;
     MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
  #if TARGET_API_MAC_OSX
     int x1 , y1 , w1 ,h1 ;
     MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;

+    x1 -= MacGetLeftBorderSize() ;
+    y1 -= MacGetTopBorderSize() ;

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


@@ -1094,11 +1081,13 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
     if(y)   *y = y1 ;
  #else
     Rect bounds ;
     if(y)   *y = y1 ;
  #else
     Rect bounds ;

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

     wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
     
     int xx = bounds.left ;
     int yy = bounds.top ;
     wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
     
     int xx = bounds.left ;
     int yy = bounds.top ;

+    xx -= MacGetLeftBorderSize() ;
+    yy -= MacGetTopBorderSize() ;

     
     if ( !GetParent()->IsTopLevel() )
     {
     
     if ( !GetParent()->IsTopLevel() )
     {


@@ -1129,8 +1118,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
         if(x) localwhere.h = * x ;
         if(y) localwhere.v = * y ;
         
         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 ;
 
         if(x)   *x = localwhere.h ;
         if(y)   *y = localwhere.v ;
 


@@ -1157,9 +1145,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 ;
     }


@@ -1186,12 +1172,20 @@ 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 ;
     
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;


@@ -1199,7 +1193,7 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
     if ( !IsTopLevel() )
     {
         Rect bounds ;
     if ( !IsTopLevel() )
     {
         Rect bounds ;

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

         if(x)   *x += bounds.left ;
         if(y)   *y += bounds.top ;
     }
         if(x)   *x += bounds.left ;
         if(y)   *y += bounds.top ;
     }


@@ -1219,12 +1213,16 @@ 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 ;
     
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;


@@ -1232,7 +1230,7 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
     if ( !IsTopLevel() )
     {
         Rect bounds ;
     if ( !IsTopLevel() )
     {
         Rect bounds ;

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

         if(x)   *x -= bounds.left ;
         if(y)   *y -= bounds.top ;
     }
         if(x)   *x -= bounds.left ;
         if(y)   *y -= bounds.top ;
     }


@@ -1253,17 +1251,17 @@ 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 ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {
     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {

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

     }
     Rect structure ;
     }
     Rect structure ;

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

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


@@ -1281,17 +1279,17 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
 
     Rect content ;
     
 
     Rect content ;
     

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

     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {
     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {

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

     }
     Rect structure ;
     }
     Rect structure ;

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

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


@@ -1313,18 +1311,18 @@ 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 ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {
     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {

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

     }
 #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 ) ;
 #endif 
     ww = content.right - content.left ;
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif 
     ww = content.right - content.left ;


@@ -1398,27 +1396,30 @@ 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() ;
     }


@@ -1431,7 +1432,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) ;


@@ -1480,6 +1490,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     DoGetSize( &former_w , &former_h ) ;
 #else
     MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ;
     DoGetSize( &former_w , &former_h ) ;
 #else
     MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ;

+    former_x -= MacGetLeftBorderSize() ;
+    former_y -= MacGetTopBorderSize() ;
+    former_w += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    former_h += MacGetTopBorderSize() + MacGetBottomBorderSize() ;

 #endif
 
     int actualWidth = width;
 #endif
 
     int actualWidth = width;


@@ -1512,22 +1526,15 @@ 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();
+

         // 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 )
         {


@@ -1554,13 +1561,11 @@ wxSize wxWindowMac::DoGetBestSize() const
         return wxWindowBase::DoGetBestSize() ;
         
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
         return wxWindowBase::DoGetBestSize() ;
         
     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 ;


@@ -1584,7 +1589,6 @@ wxSize wxWindowMac::DoGetBestSize() const
         bestHeight = 13 ;
         
     return wxSize(bestWidth, bestHeight);
         bestHeight = 13 ;
         
     return wxSize(bestWidth, bestHeight);

-//    return wxWindowBase::DoGetBestSize() ;

 }
 
 
 }
 
 


@@ -1663,7 +1667,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


@@ -1672,7 +1676,7 @@ 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 ) ;
     }
 #endif 
         OffsetRect( &content , -structure.left , -structure.top ) ;
     }
 #endif 


@@ -1699,9 +1703,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() ;
 }


@@ -1719,7 +1723,7 @@ bool wxWindowMac::Show(bool show)
     // TODO use visibilityChanged Carbon Event for OSX
     bool former = MacIsReallyShown() ;
     
     // TODO use visibilityChanged Carbon Event for OSX
     bool former = MacIsReallyShown() ;
     

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

     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
     return TRUE;
     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
     return TRUE;


@@ -1727,22 +1731,12 @@ bool wxWindowMac::Show(bool show)
 
 bool wxWindowMac::Enable(bool enable)
 {
 
 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() ;
 
     if ( former != MacIsReallyEnabled() )
         MacPropagateEnabledStateChanged() ;


@@ -1825,8 +1819,9 @@ bool wxWindowMac::MacIsReallyShown()
 {
     // only under OSX the visibility of the TLW is taken into account
 #if TARGET_API_MAC_OSX
 {
     // only under OSX the visibility of the TLW is taken into account
 #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()  )
     {
     wxWindow* win = this ;
     while( win->IsShown()  )
     {


@@ -1839,21 +1834,23 @@ bool wxWindowMac::MacIsReallyShown()
             
     } ;
     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() 
 {
 }
 
 bool wxWindowMac::MacIsReallyHilited() 
 {

-    return IsControlActive( (ControlRef) m_macControl ) ;
+    return m_peer->IsActive();
+}
+
+void wxWindowMac::MacFlashInvalidAreas() 
+{
+#if TARGET_API_MAC_OSX
+    HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
+#endif

 }
 
 //
 }
 
 //


@@ -1901,15 +1898,15 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
 #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 ) ;    
+        m_peer->SetNeedsDisplay( true , update) ;    

     }
 #else
 /*
     }
 #else
 /*


@@ -1926,16 +1923,16 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
         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 ) )
+    if ( !m_peer->IsVisible())

        return ;
  
      wxPoint client = GetClientAreaOrigin();
        return ;
  
      wxPoint client = GetClientAreaOrigin();


@@ -1979,31 +1976,11 @@ void wxWindowMac::Freeze()
 #if TARGET_API_MAC_OSX
     if ( !m_frozenness++ )
     {
 #if TARGET_API_MAC_OSX
     if ( !m_frozenness++ )
     {

-        HIViewSetDrawingEnabled( (HIViewRef) m_macControl , false ) ;
+        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()
 {


@@ -2012,9 +1989,8 @@ void wxWindowMac::Thaw()
 
     if ( !--m_frozenness )
     {
 
     if ( !--m_frozenness )
     {

-        HIViewSetDrawingEnabled( (HIViewRef) m_macControl , true ) ;
-        InvalidateControlAndChildren( (HIViewRef) m_macControl )  ;
-        // HIViewSetNeedsDisplay( (HIViewRef) m_macControl , true ) ;
+        m_peer->SetDrawingEnabled( true ) ;
+        m_peer->InvalidateWithChildren() ;

     }
 #endif
 }
     }
 #endif
 }


@@ -2022,7 +1998,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() ;


@@ -2031,7 +2007,7 @@ 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
     }
 */


@@ -2058,11 +2034,13 @@ 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() ;
 }
 


@@ -2143,9 +2121,6 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     int major,minor;
     wxGetOsVersion( &major, &minor );
 
     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:
     RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ;
     RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ;
     // OS X has lighter border edges than classic:


@@ -2163,19 +2138,18 @@ void wxWindowMac::MacPaintBorders( int left , int top )
 
     int w , h ;
     GetSize( &w , &h ) ;
 
     int w , h ;
     GetSize( &w , &h ) ;

+    Rect rect = { top , left , h + top , w + left } ;

     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_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 } ;

         SInt32 border = 0 ;
         SInt32 border = 0 ;

-        /*
-        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+        GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;

         InsetRect( &rect , border , border );
         InsetRect( &rect , border , border );

-        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-        */
-
-        DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+        DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;

 #else
 #else

+        RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
+        RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
+    

         bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
         RGBForeColor( &face );
         MoveTo( left + 0 , top + h - 2 );
         bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
         RGBForeColor( &face );
         MoveTo( left + 0 , top + h - 2 );


@@ -2274,8 +2248,35 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         
 
     {
         
 
     {

+

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

+#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()  , MacGetLeftBorderSize() + width , MacGetTopBorderSize() + height ) ;
+        if ( rect ) 
+        {
+            scrollrect.Intersect( *rect ) ;
+        }
+        if ( m_peer->GetNeedsDisplay() )
+        {
+            // 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) ;
+#endif
+        }
+        m_peer->ScrollRect( scrollrect , dx , dy ) ;
+#else

 
         wxPoint pos;
         pos.x = pos.y = 0; 
 
         wxPoint pos;
         pos.x = pos.y = 0; 


@@ -2283,20 +2284,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         Rect scrollrect;
         RgnHandle updateRgn = NewRgn() ;
 
         Rect scrollrect;
         RgnHandle updateRgn = NewRgn() ;
 

-#if TARGET_API_MAC_OSX
-        // if there is already a pending redraw event, we first must flush that, as we don't have
-        // means to retrieve the dirty region of a HIView
-        if ( HIViewGetNeedsDisplay( (ControlRef) m_macControl ) )
-            Update() ;
-#endif
-        {
+       {

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

-            GetControlBounds( (ControlRef) m_macControl, &scrollrect);
-#if TARGET_API_MAC_OSX
-            GetParent()->MacWindowToRootWindow( &scrollrect.left , &scrollrect.top ) ;
-#endif
+            m_peer->GetRect( &scrollrect ) ;

             scrollrect.top += MacGetTopBorderSize() ;
             scrollrect.left += MacGetLeftBorderSize() ;
             scrollrect.bottom = scrollrect.top + height ;
             scrollrect.top += MacGetTopBorderSize() ;
             scrollrect.left += MacGetLeftBorderSize() ;
             scrollrect.bottom = scrollrect.top + height ;


@@ -2311,11 +2303,6 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
             ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         }
         // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy ,  kScrollWindowInvalidate, updateRgn ) ;
             ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         }
         // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy ,  kScrollWindowInvalidate, updateRgn ) ;

-#if TARGET_API_MAC_OSX
-        HIViewConvertRegion( updateRgn , (ControlRef) MacGetTopLevelWindow()->GetHandle() , (ControlRef) m_macControl ) ;
-        HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , updateRgn , true ) ;
-#else
-        // TODO TEST

 #endif
     }
 
 #endif
     }
 


@@ -2341,9 +2328,6 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
             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 )


@@ -2397,6 +2381,25 @@ 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 ) ;
+//        wxWindowDC dc(this) ;
+//        wxMacPortSetter helper(&dc) ;
+
+        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 ) ;
+    }
+

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


@@ -2411,17 +2414,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 ) ;

 }
 
 
 }
 
 


@@ -2510,10 +2509,10 @@ void wxWindowMac::Update()
             status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
         }
         else
             status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
         }
         else

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

     }
 #else
     }
 #else

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

 #endif
 }
 
 #endif
 }
 


@@ -2533,9 +2532,14 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
     Rect r ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;
     Rect r ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;

-    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    if ( 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 ) ;


@@ -2659,7 +2663,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
     if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
     { 
         Rect bounds;
     if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
     { 
         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
         RgnHandle controlRgn = NewRgn();
         RectRgn( controlRgn, &bounds );
         //KO: This sets the ownUpdateRgn to the area of this control that is inside


@@ -2844,7 +2848,7 @@ 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
+#if 0 // wxMAC_USE_THEME_BORDER

           GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
 #endif
           return border ;
           GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
 #endif
           return border ;


@@ -2852,8 +2856,8 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
     else if (  m_windowStyle &wxDOUBLE_BORDER)
     {
           SInt32 border = 3 ;
     else if (  m_windowStyle &wxDOUBLE_BORDER)
     {
           SInt32 border = 3 ;

-#if wxMAC_USE_THEME_BORDER
-          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#if 0 // wxMAC_USE_THEME_BORDER
+          GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;

 #endif
           return border ;
     }
 #endif
           return border ;
     }