X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abfe4a841551e1b06bb6eb409b946dff1c835ce5..fd4bc54da06b4191dff7d4bc6d80ccbba22b2566:/src/mac/control.cpp?ds=sidebyside

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 8c19e3cec2..1f62d46592 100644
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -34,9 +34,9 @@
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
-	EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
-	EVT_CHAR( wxControl::OnKeyDown ) 
-	EVT_PAINT( wxControl::OnPaint ) 
+    EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
+    EVT_CHAR( wxControl::OnKeyDown ) 
+    EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
 #endif
 
@@ -49,35 +49,35 @@ ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
 pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode ) ;
 pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode )
 {
-	if ( partCode != 0)
-	{
-		wxControl*	wx = (wxControl*) GetControlReference( control ) ;
-		if ( wx )
-		{
-			wx->MacHandleControlClick( control , partCode ) ;
-		}
-	}
+    if ( partCode != 0)
+    {
+        wxControl*  wx = (wxControl*) GetControlReference( control ) ;
+        if ( wx )
+        {
+            wx->MacHandleControlClick( control , partCode ) ;
+        }
+    }
 }
 
 wxControl::wxControl()
 {
-	m_macControl = NULL ;
-	m_macHorizontalBorder = 0 ; // additional pixels around the real control
-	m_macVerticalBorder = 0 ;
+    m_macControl = NULL ;
+    m_macHorizontalBorder = 0 ; // additional pixels around the real control
+    m_macVerticalBorder = 0 ;
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 #if WXWIN_COMPATIBILITY
   m_callback = 0;
 #endif // WXWIN_COMPATIBILITY
 
-	if ( wxMacLiveScrollbarActionUPP == NULL )
-	{
+    if ( wxMacLiveScrollbarActionUPP == NULL )
+    {
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
-		wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
+        wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
 #endif
-	}
+    }
 }
 
 bool wxControl::Create(wxWindow *parent, wxWindowID id,
@@ -86,9 +86,9 @@ bool wxControl::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
-	m_macControl = NULL ;
-	m_macHorizontalBorder = 0 ; // additional pixels around the real control
-	m_macVerticalBorder = 0 ;
+    m_macControl = NULL ;
+    m_macHorizontalBorder = 0 ; // additional pixels around the real control
+    m_macVerticalBorder = 0 ;
     bool rval = wxWindow::Create(parent, id, pos, size, style, name);
     if (rval) {
 #if wxUSE_VALIDATORS
@@ -103,89 +103,89 @@ wxControl::~wxControl()
     m_isBeingDeleted = TRUE;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    if ( panel )
+    wxWindow *parent = GetParent() ;
+    if ( parent )
     {
-        if (panel->GetDefaultItem() == (wxButton*) this)
-            panel->SetDefaultItem(NULL);
+        if (parent->GetDefaultItem() == (wxButton*) this)
+            parent->SetDefaultItem(NULL);
     }
     if ( m_macControl )
     {
-    	::DisposeControl( m_macControl ) ;
-    	m_macControl = NULL ;
+        ::DisposeControl( m_macControl ) ;
+        m_macControl = NULL ;
     }
 }
 
 void wxControl::SetLabel(const wxString& title)
 {
-	m_label = title ;
-
-	if ( m_macControl )
-	{
-		Str255 maclabel ;
-		wxString label ;
-	
-		if( wxApp::s_macDefaultEncodingIsPC )
-			label = wxMacMakeMacStringFromPC( title ) ;
-		else
-			label = title ;
-		
+    m_label = title ;
+
+    if ( m_macControl )
+    {
+        Str255 maclabel ;
+        wxString label ;
+    
+        if( wxApp::s_macDefaultEncodingIsPC )
+            label = wxMacMakeMacStringFromPC( title ) ;
+        else
+            label = title ;
+        
 #if TARGET_CARBON
-		c2pstrcpy( (StringPtr) maclabel , label ) ;
+        c2pstrcpy( (StringPtr) maclabel , label ) ;
 #else
-		strcpy( (char *) maclabel , label ) ;
-		c2pstr( (char *) maclabel ) ;
+        strcpy( (char *) maclabel , label ) ;
+        c2pstr( (char *) maclabel ) ;
 #endif
-		::SetControlTitle( m_macControl , maclabel ) ;
-	}
-	Refresh() ;
+        ::SetControlTitle( m_macControl , maclabel ) ;
+    }
+    Refresh() ;
 }
 
 wxSize wxControl::DoGetBestSize() const
 {
-	Rect 	bestsize = { 0 , 0 , 0 , 0 } ;
-	short	baselineoffset ;
-	int bestWidth, bestHeight ;
-	::GetBestControlRect( m_macControl , &bestsize , &baselineoffset ) ;
-
-	if ( EmptyRect( &bestsize ) )
-	{
-		baselineoffset = 0;
-		bestsize.left = bestsize.top = 0 ;
-		bestsize.right = 16 ;
-		bestsize.bottom = 16 ;
-		if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
-		{
-			bestsize.bottom = 16 ;
-		}
-		else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
-		{
-			bestsize.bottom = 24 ; 
-		}
-	}
-
-	if ( IsKindOf( CLASSINFO( wxButton ) ) )
-	{
-		bestWidth = m_label.Length() * 8 + 12 ;
-		if ( bestWidth < 70 )
-		  bestWidth = 70 ;
-	}
-	else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
-	{
-		bestWidth = m_label.Length() * 8 ;
-	}
-	else
-		bestWidth = bestsize.right - bestsize.left ;
-		
-	bestWidth += 2 * m_macHorizontalBorder ;
-
-	bestHeight = bestsize.bottom - bestsize.top ;
-	if ( bestHeight < 10 )
-		bestHeight = 13 ;
-
-	bestHeight += 2 * m_macVerticalBorder;
-
-		
+    Rect    bestsize = { 0 , 0 , 0 , 0 } ;
+    short   baselineoffset ;
+    int bestWidth, bestHeight ;
+    ::GetBestControlRect( m_macControl , &bestsize , &baselineoffset ) ;
+
+    if ( EmptyRect( &bestsize ) )
+    {
+        baselineoffset = 0;
+        bestsize.left = bestsize.top = 0 ;
+        bestsize.right = 16 ;
+        bestsize.bottom = 16 ;
+        if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+        {
+            bestsize.bottom = 16 ;
+        }
+        else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+        {
+            bestsize.bottom = 24 ; 
+        }
+    }
+
+    if ( IsKindOf( CLASSINFO( wxButton ) ) )
+    {
+        bestWidth = m_label.Length() * 8 + 12 ;
+        if ( bestWidth < 70 )
+          bestWidth = 70 ;
+    }
+    else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
+    {
+        bestWidth = m_label.Length() * 8 ;
+    }
+    else
+        bestWidth = bestsize.right - bestsize.left ;
+        
+    bestWidth += 2 * m_macHorizontalBorder ;
+
+    bestHeight = bestsize.bottom - bestsize.top ;
+    if ( bestHeight < 10 )
+        bestHeight = 13 ;
+
+    bestHeight += 2 * m_macVerticalBorder;
+
+        
     return wxSize(bestWidth, bestHeight);
 }
 
@@ -235,15 +235,15 @@ void wxRemoveMacControlAssociation(wxControl *control)
 }
 
 void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
-			 const wxPoint& pos,
-			 const wxSize& size, long style,
-			 const wxValidator& validator,
-			 const wxString& name , Rect *outBounds , StringPtr maclabel ) 
+             const wxPoint& pos,
+             const wxSize& size, long style,
+             const wxValidator& validator,
+             const wxString& name , Rect *outBounds , StringPtr maclabel ) 
 {
-	m_label = label ;
+    m_label = label ;
   SetName(name);
   if ( &validator )
-  	SetValidator(validator);
+    SetValidator(validator);
 
   m_windowStyle = style;
   parent->AddChild(this);
@@ -258,61 +258,61 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
 
    // These sizes will be adjusted in MacPostControlCreate
 
-	m_width = size.x ;
-	m_height = size.y ;
-	m_x = pos.x ;
-	m_y = pos.y ;
-		
- 	outBounds->top = -10;
- 	outBounds->left = -10;
- 	outBounds->bottom = 0;
- 	outBounds->right = 0;
-
-	char c_text[255];
-	strcpy( c_text , label ) ;
-	if( wxApp::s_macDefaultEncodingIsPC )
-	{
-		wxMacConvertFromPCForControls( c_text ) ;
-	}
+    m_width = size.x ;
+    m_height = size.y ;
+    m_x = pos.x ;
+    m_y = pos.y ;
+        
+    outBounds->top = -10;
+    outBounds->left = -10;
+    outBounds->bottom = 0;
+    outBounds->right = 0;
+
+    char c_text[255];
+    strcpy( c_text , label ) ;
+    if( wxApp::s_macDefaultEncodingIsPC )
+    {
+        wxMacConvertFromPCForControls( c_text ) ;
+    }
 
 #if TARGET_CARBON
-	c2pstrcpy( (StringPtr) maclabel , c_text ) ;
+    c2pstrcpy( (StringPtr) maclabel , c_text ) ;
 #else
-	strcpy( (char *) maclabel , c_text ) ;
-	c2pstr( (char *) maclabel ) ;
+    strcpy( (char *) maclabel , c_text ) ;
+    c2pstr( (char *) maclabel ) ;
 #endif
 }
 
 void wxControl::MacPostControlCreate()
 {
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
-	
-	if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
-	{
-		// no font
-	}
-	else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )
-	{
-		ControlFontStyleRec		controlstyle ;
-		controlstyle.flags = kControlUseFontMask ;
-		controlstyle.font = kControlFontSmallBoldSystemFont ;
-		
-		::SetControlFontStyle( m_macControl , &controlstyle ) ;
-	}
-	else
-	{
-		ControlFontStyleRec		controlstyle ;
-		controlstyle.flags = kControlUseFontMask ;
-		controlstyle.font = kControlFontSmallSystemFont ;
-		
-		::SetControlFontStyle( m_macControl , &controlstyle ) ;
-	}
-	ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
-	wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
-	::EmbedControl( m_macControl , container ) ;
-	m_macControlIsShown  = true ;
-
-	wxAssociateControlWithMacControl( m_macControl , this ) ;
+    wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+    
+    if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+    {
+        // no font
+    }
+    else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )
+    {
+        ControlFontStyleRec     controlstyle ;
+        controlstyle.flags = kControlUseFontMask ;
+        controlstyle.font = kControlFontSmallBoldSystemFont ;
+        
+        ::SetControlFontStyle( m_macControl , &controlstyle ) ;
+    }
+    else
+    {
+        ControlFontStyleRec     controlstyle ;
+        controlstyle.flags = kControlUseFontMask ;
+        controlstyle.font = kControlFontSmallSystemFont ;
+        
+        ::SetControlFontStyle( m_macControl , &controlstyle ) ;
+    }
+    ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
+    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+    ::EmbedControl( m_macControl , container ) ;
+    m_macControlIsShown  = true ;
+
+    wxAssociateControlWithMacControl( m_macControl , this ) ;
 
  
      // Adjust the controls size and position
@@ -332,184 +332,151 @@ void wxControl::MacPostControlCreate()
      SetSize(pos.x, pos.y, new_size.x, new_size.y);
  
      UMAShowControl( m_macControl ) ;
+     Refresh() ;
 }
 
 void wxControl::MacAdjustControlRect() 
 {
-	wxASSERT_MSG( m_macControl != NULL , wxT("No valid mac control") ) ;
-	if ( m_width == -1 || m_height == -1 )
-	{
-		Rect 	bestsize = { 0 , 0 , 0 , 0 } ;
-		short	baselineoffset ;
-		
-		::GetBestControlRect( m_macControl , &bestsize , &baselineoffset ) ;
-
-		if ( EmptyRect( &bestsize ) )
-		{
-			baselineoffset = 0;
-			bestsize.left = bestsize.top = 0 ;
-			bestsize.right = 16 ;
-			bestsize.bottom = 16 ;
-			if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
-			{
-				bestsize.bottom = 16 ;
-			}
-			else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
-			{
-				bestsize.bottom = 24 ; 
-			}
-		}
-
-		if ( m_width == -1 )
-		{
-			if ( IsKindOf( CLASSINFO( wxButton ) ) )
-			{
-				m_width = m_label.Length() * 8 + 12 ;
-				if ( m_width < 70 )
-				  m_width = 70 ;
-			}
-			else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
-			{
-				m_width = m_label.Length() * 8 ;
-			}
-			else
-				m_width = bestsize.right - bestsize.left ;
-			
-			m_width += 2 * m_macHorizontalBorder ;
-		}
-		if ( m_height == -1 )
-		{
-			m_height = bestsize.bottom - bestsize.top ;
-			if ( m_height < 10 )
-				m_height = 13 ;
-
-			m_height += 2 * m_macVerticalBorder;
-		}
-		
-		wxMacDrawingHelper helper ( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
-		if ( helper.Ok() )
-		{
-	    	UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
-  		}
-	}
+    wxASSERT_MSG( m_macControl != NULL , wxT("No valid mac control") ) ;
+    if ( m_width == -1 || m_height == -1 )
+    {
+        Rect    bestsize = { 0 , 0 , 0 , 0 } ;
+        short   baselineoffset ;
+        
+        ::GetBestControlRect( m_macControl , &bestsize , &baselineoffset ) ;
+
+        if ( EmptyRect( &bestsize ) )
+        {
+            baselineoffset = 0;
+            bestsize.left = bestsize.top = 0 ;
+            bestsize.right = 16 ;
+            bestsize.bottom = 16 ;
+            if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+            {
+                bestsize.bottom = 16 ;
+            }
+            else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+            {
+                bestsize.bottom = 24 ; 
+            }
+        }
+
+        if ( m_width == -1 )
+        {
+            if ( IsKindOf( CLASSINFO( wxButton ) ) )
+            {
+                m_width = m_label.Length() * 8 + 12 ;
+                if ( m_width < 70 )
+                  m_width = 70 ;
+            }
+            else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
+            {
+                m_width = m_label.Length() * 8 ;
+            }
+            else
+                m_width = bestsize.right - bestsize.left ;
+            
+            m_width += 2 * m_macHorizontalBorder ;
+        }
+        if ( m_height == -1 )
+        {
+            m_height = bestsize.bottom - bestsize.top ;
+            if ( m_height < 10 )
+                m_height = 13 ;
+
+            m_height += 2 * m_macVerticalBorder;
+        }
+        
+        wxMacDrawingHelper helper ( wxFindWinFromMacWindow( MacGetRootWindow() ) ) ;
+        if ( helper.Ok() )
+        {
+            UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
+        }
+    }
 }
 ControlHandle wxControl::MacGetContainerForEmbedding() 
 {
-	if ( m_macControl )
-		return m_macControl ;
+    if ( m_macControl )
+        return m_macControl ;
 
-	return wxWindow::MacGetContainerForEmbedding() ;
+    return wxWindow::MacGetContainerForEmbedding() ;
 }
 
 void wxControl::MacSuperChangedPosition() 
 {
-	if ( m_macControl )
-	{
-		Rect contrlRect ;		
-		GetControlBounds( m_macControl , &contrlRect ) ; 
-		int former_mac_x = contrlRect.left ;
-		int former_mac_y = contrlRect.top ;
-		int mac_x = m_x ;
-		int mac_y = m_y ;
-		GetParent()->MacClientToRootWindow( & mac_x , & mac_y ) ;
-		
-		WindowRef rootwindow = GetMacRootWindow() ;
-		wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-		::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-		wxMacDrawingHelper focus( wxrootwindow ) ;
-	
-		if ( mac_x != former_mac_x || mac_y != former_mac_y )
-		{
- 			{
- 				Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
- 				InvalWindowRect( rootwindow , &inval ) ;
- 			}
-	  		UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
- 			{
- 				Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
- 				InvalWindowRect( rootwindow , &inval ) ;
- 			}
-		}
-		if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-		{
-		}
-		else
-		{
-			::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
-		}
-	}
-
-	wxWindow::MacSuperChangedPosition() ;
+    if ( m_macControl )
+    {
+        Rect contrlRect ;       
+        GetControlBounds( m_macControl , &contrlRect ) ; 
+        int former_mac_x = contrlRect.left ;
+        int former_mac_y = contrlRect.top ;
+        int mac_x = m_x ;
+        int mac_y = m_y ;
+        GetParent()->MacWindowToRootWindow( & mac_x , & mac_y ) ;
+        
+        WindowRef rootwindow = MacGetRootWindow() ;
+        wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
+
+        wxMacDrawingHelper focus( wxrootwindow ) ;
+    
+        if ( mac_x + m_macHorizontalBorder != former_mac_x || 
+            mac_y + m_macVerticalBorder != former_mac_y )
+        {
+            {
+                Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
+                InvalWindowRect( rootwindow , &inval ) ;
+            }
+            UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
+            {
+                Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
+                InvalWindowRect( rootwindow , &inval ) ;
+            }
+        }
+    }
+
+    wxWindow::MacSuperChangedPosition() ;
 }
 
 void wxControl::MacSuperEnabled( bool enabled ) 
 {
-/*
-	if ( m_macControl )
-	{
-		if ( UMAHasAppearance() )
-		{
-			if ( !enabled )
-			{
-				::DeactivateControl( m_macControl ) ; 
-			}
-			else
-			{
-				if ( m_macEnabled )
-					::ActivateControl( m_macControl ) ;
-			}
-		}
-		else
-		{
-			if ( !enabled )
-			{
-				::HiliteControl( m_macControl , 255 ) ;
-			}
-			else
-			{
-				if ( m_macEnabled )
-					::HiliteControl( m_macControl , 0 ) ;
-			}
-		}
-	}
-	wxWindow::MacSuperEnabled( enabled ) ;
-*/
+    Refresh(FALSE) ;
+    wxWindow::MacSuperEnabled( enabled ) ;
 }
 
 void  wxControl::MacSuperShown( bool show ) 
 {
-	if ( m_macControl )
-	{
-		if ( !show )
-		{
-			if ( m_macControlIsShown )
-			{
-				::HideControl( m_macControl ) ;
-				m_macControlIsShown = false ;
-			}
-		}
-		else
-		{
-			if ( MacIsReallyShown() && !m_macControlIsShown )
-			{
-				::UMAShowControl( m_macControl ) ;
-				m_macControlIsShown = true ;
-			}
-		}
-	}
-		
-	wxWindow::MacSuperShown( show ) ;
+    if ( m_macControl )
+    {
+        if ( !show )
+        {
+            if ( m_macControlIsShown )
+            {
+                ::UMAHideControl( m_macControl ) ;
+                m_macControlIsShown = false ;
+            }
+        }
+        else
+        {
+            if ( MacIsReallyShown() && !m_macControlIsShown )
+            {
+                ::UMAShowControl( m_macControl ) ;
+                m_macControlIsShown = true ;
+            }
+        }
+    }
+        
+    wxWindow::MacSuperShown( show ) ;
 }
 
 void  wxControl::DoSetSize(int x, int y,
             int width, int height,
             int sizeFlags )
 {
-	if ( m_macControl == NULL )
-	{
-		wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
-		return ;
-	}
+    if ( m_macControl == NULL )
+    {
+        wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
+        return ;
+    }
 
      Rect oldbounds, newbounds;
      int new_x, new_y, new_width, new_height;
@@ -552,7 +519,7 @@ void  wxControl::DoSetSize(int x, int y,
      mac_x = new_x;
      mac_y = new_y;
      if(GetParent()) {
-         GetParent()->MacClientToRootWindow(&mac_x, &mac_y);
+         GetParent()->MacWindowToRootWindow(&mac_x, &mac_y);
      }
      GetControlBounds(m_macControl, &oldbounds);
      oldbounds.right = oldbounds.left + m_width;
@@ -574,6 +541,8 @@ void  wxControl::DoSetSize(int x, int y,
  
      if ( doMove || doResize )
      {
+         Refresh() ;
+     
          // Ensure resize is within constraints
          if ((m_minWidth != -1) && (new_width < m_minWidth)) {
              new_width = m_minWidth;
@@ -595,7 +564,7 @@ void  wxControl::DoSetSize(int x, int y,
  
              UMAMoveControl(m_macControl,
                             mac_x + m_macHorizontalBorder, mac_y + m_macVerticalBorder);
- 
+
              wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
              event.SetEventObject(this);
              GetEventHandler()->ProcessEvent(event) ;
@@ -615,51 +584,35 @@ void  wxControl::DoSetSize(int x, int y,
              GetEventHandler()->ProcessEvent(event);
          }
  
-         // Set up port
-         WindowRef rootwindow = GetMacRootWindow() ;
-         wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-         wxMacDrawingHelper focus( wxrootwindow );
- 
-         ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-         // Update window at old and new positions
-         SetRect(&newbounds, m_x, m_y, m_x + m_width, m_y + m_height);
-         InvalWindowRect( rootwindow , &oldbounds );
-         InvalWindowRect( rootwindow , &newbounds );
- 
-         MacRepositionScrollBars() ;
- 
-         if ( !wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-         {
-             ::SetThemeWindowBackground( rootwindow, kThemeBrushDocumentWindowBackground, false );
-         }
+          Refresh() ;
      }
 }
 
 bool  wxControl::Show(bool show) 
 {
-	if ( !wxWindow::Show( show ) )
-		return FALSE ;
-		
-	if ( m_macControl )
-	{
-		if ( !show )
-		{
-			if ( m_macControlIsShown )
-			{
-				::HideControl( m_macControl ) ;
-				m_macControlIsShown = false ;
-			}
-		}
-		else
-		{
-			if ( MacIsReallyShown() && !m_macControlIsShown )
-			{
-				::UMAShowControl( m_macControl ) ;
-				m_macControlIsShown = true ;
-			}
-		}
-	}
-	return TRUE ;
+    if ( !wxWindow::Show( show ) )
+        return FALSE ;
+        
+    if ( m_macControl )
+    {
+        if ( !show )
+        {
+            if ( m_macControlIsShown )
+            {
+                ::UMAHideControl( m_macControl ) ;
+                m_macControlIsShown = false ;
+            }
+        }
+        else
+        {
+            if ( MacIsReallyShown() && !m_macControlIsShown )
+            {
+                ::UMAShowControl( m_macControl ) ;
+                m_macControlIsShown = true ;
+            }
+        }
+    }
+    return TRUE ;
 }
 
 bool  wxControl::Enable(bool enable) 
@@ -667,217 +620,165 @@ bool  wxControl::Enable(bool enable)
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 
-	if ( m_macControl )
-	{
-		if ( enable )
-		    UMAActivateControl( m_macControl ) ;
-		else
-		    UMADeactivateControl( m_macControl ) ;
-	}
-	return TRUE ;
+    if ( m_macControl )
+    {
+        if ( enable )
+            UMAActivateControl( m_macControl ) ;
+        else
+            UMADeactivateControl( m_macControl ) ;
+    }
+    return TRUE ;
 }
 
 void wxControl::Refresh(bool eraseBack, const wxRect *rect)
 {
-  if ( m_macControl )
-  {
-  	wxWindow::Refresh( eraseBack , rect ) ;
-	}
-  else
-  {
-  	wxWindow::Refresh( eraseBack , rect ) ;
-  }
+    wxWindow::Refresh( eraseBack , rect ) ;
 }
 
 void wxControl::MacRedrawControl()
 {
-	if ( m_macControl )
-	{
-		WindowRef window = GetMacRootWindow() ;
-		if ( window )
-		{
-			wxWindow* win = wxFindWinFromMacWindow( window ) ;
-			if ( win )
-			{
-				wxMacDrawingHelper help( win ) ;
-				// the mac control manager always assumes to have the origin at 0,0
-				SetOrigin( 0 , 0 ) ;
-				
-				wxWindow* parent = GetParent() ;
-				while ( parent )
-				{
-					if( parent->MacGetWindowData() )
-					{
-						::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-						break ;
-					}
-					
-					if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-					{
-						if ( ((wxControl*)parent)->m_macControl )
-							SetUpControlBackground( ((wxControl*)parent)->m_macControl , -1 , true ) ;
-						break ;
-					}
-					
-					parent = parent->GetParent() ;
-				} 
-				
-				UMADrawControl( m_macControl ) ;
-				::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-			}
-		}
-	}
+    if ( m_macControl )
+    {
+        WindowRef window = MacGetRootWindow() ;
+        if ( window )
+        {
+            wxWindow* win = wxFindWinFromMacWindow( window ) ;
+            if ( win )
+            {
+                wxMacDrawingHelper help( win ) ;
+                // the mac control manager always assumes to have the origin at 0,0
+                wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
+                UMADrawControl( m_macControl ) ;
+            }
+        }
+    }
 }
 
 void wxControl::OnPaint(wxPaintEvent& event)
 {
-	if ( m_macControl )
-	{
-		WindowRef window = GetMacRootWindow() ;
-		if ( window )
-		{
-			wxWindow* win = wxFindWinFromMacWindow( window ) ;
-			if ( win )
-			{
-				wxMacDrawingHelper help( win ) ;
-				// the mac control manager always assumes to have the origin at 0,0
-				SetOrigin( 0 , 0 ) ;
-
-				wxWindow* parent = GetParent() ;
-				while ( parent )
-				{
-					if( parent->MacGetWindowData() )
-					{
-						::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-						break ;
-					}
-					
-					if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-					{
-						if ( ((wxControl*)parent)->m_macControl )
-							SetUpControlBackground( ((wxControl*)parent)->m_macControl , -1 , true ) ;
-						break ;
-					}
-					
-					parent = parent->GetParent() ;
-				} 
-
-				UMADrawControl( m_macControl ) ;
-				::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-			}
-		}
-	}
-	else
-	{
-		// wxWindow::OnPaint( event ) ;
-	}
+    if ( m_macControl )
+    {
+        WindowRef window = MacGetRootWindow() ;
+        if ( window )
+        {
+            wxWindow* win = wxFindWinFromMacWindow( window ) ;
+            if ( win )
+            {
+                wxMacDrawingHelper help( win ) ;
+                // the mac control manager always assumes to have the origin at 0,0
+                wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
+                UMADrawControl( m_macControl ) ;
+            }
+        }
+    }
+    else
+    {
+      event.Skip() ;
+    }
 }
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
-    // In general, you don't want to erase the background of a control,
-    // or you'll get a flicker.
-    // TODO: move this 'null' function into each control that
-    // might flicker.
+    wxWindow::OnEraseBackground( event ) ; 
 }
 
 
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {
-	if ( m_macControl == NULL )
-		return ;
-	
-	EventRecord *ev = wxTheApp->MacGetCurrentEvent() ;
-	short keycode ;
-	short keychar ;
-	keychar = short(ev->message & charCodeMask);
-	keycode = short(ev->message & keyCodeMask) >> 8 ;
-
-	::HandleControlKey( m_macControl , keycode , keychar , ev->modifiers ) ;
+    if ( m_macControl == NULL )
+        return ;
+    
+    EventRecord *ev = wxTheApp->MacGetCurrentEvent() ;
+    short keycode ;
+    short keychar ;
+    keychar = short(ev->message & charCodeMask);
+    keycode = short(ev->message & keyCodeMask) >> 8 ;
+
+    ::HandleControlKey( m_macControl , keycode , keychar , ev->modifiers ) ;
 }
 
 void  wxControl::OnMouseEvent( wxMouseEvent &event ) 
 {
-	if ( m_macControl == NULL )
-	{
-		event.Skip() ;
-		return ;
-	}
-		
-	if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
-	{
-			
-		int x = event.m_x ;
-		int y = event.m_y ;
-		
-		MacClientToRootWindow( &x , &y ) ;
-			
-		ControlHandle	control ;
-		Point		localwhere ;
-		SInt16		controlpart ;
-		WindowRef	window = GetMacRootWindow() ;
-		
-		localwhere.h = x ;
-		localwhere.v = y ;
-	
-		short modifiers = 0;
-		
-		if ( !event.m_leftDown && !event.m_rightDown )
-			modifiers  |= btnState ;
-	
-		if ( event.m_shiftDown )
-			modifiers |= shiftKey ;
-			
-		if ( event.m_controlDown )
-			modifiers |= controlKey ;
-	
-		if ( event.m_altDown )
-			modifiers |= optionKey ;
-	
-		if ( event.m_metaDown )
-			modifiers |= cmdKey ;
+    if ( m_macControl == NULL )
+    {
+        event.Skip() ;
+        return ;
+    }
+        
+    if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+    {
+            
+        int x = event.m_x ;
+        int y = event.m_y ;
+        
+        MacClientToRootWindow( &x , &y ) ;
+            
+        ControlHandle   control ;
+        Point       localwhere ;
+        SInt16      controlpart ;
+        WindowRef   window = MacGetRootWindow() ;
+        
+        localwhere.h = x ;
+        localwhere.v = y ;
+    
+        short modifiers = 0;
+        
+        if ( !event.m_leftDown && !event.m_rightDown )
+            modifiers  |= btnState ;
+    
+        if ( event.m_shiftDown )
+            modifiers |= shiftKey ;
+            
+        if ( event.m_controlDown )
+            modifiers |= controlKey ;
+    
+        if ( event.m_altDown )
+            modifiers |= optionKey ;
+    
+        if ( event.m_metaDown )
+            modifiers |= cmdKey ;
 /*
 #if TARGET_CARBON
         control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
 #else
-		controlpart = FindControl( localwhere , window , &control ) ;
+        controlpart = FindControl( localwhere , window , &control ) ;
 #endif
 */
-		{
-		/*
-			if ( AcceptsFocus() && FindFocus() != this )
-			{
-				SetFocus() ;
-			}
-		*/
-		    control = m_macControl ;
-			if ( control && ::IsControlActive( control ) )
-			{
-				{
-					controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
-					wxTheApp->s_lastMouseDown = 0 ;
-					if ( control && controlpart != kControlNoPart && 
-					    ! IsKindOf( CLASSINFO( wxScrollBar ) ) 
-					) // otherwise we will get the event twice for scrollbar
-					{
-					    MacHandleControlClick( control , controlpart ) ;
-					}
-				}
-			}
-		}
-	}
+        {
+        /*
+            if ( AcceptsFocus() && FindFocus() != this )
+            {
+                SetFocus() ;
+            }
+        */
+            control = m_macControl ;
+            if ( control && ::IsControlActive( control ) )
+            {
+                {
+                    controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+                    wxTheApp->s_lastMouseDown = 0 ;
+                    if ( control && controlpart != kControlNoPart && 
+                        ! IsKindOf( CLASSINFO( wxScrollBar ) ) 
+                    ) // otherwise we will get the event twice for scrollbar
+                    {
+                        MacHandleControlClick( control , controlpart ) ;
+                    }
+                }
+            }
+        }
+    }
 }
 
 bool wxControl::MacCanFocus() const
 {
-		{ if ( m_macControl == NULL ) 
-				return true ; 
-			else
-			return false ; 
-		}
+        { if ( m_macControl == NULL ) 
+                return true ; 
+            else
+            return false ; 
+        }
 }
 
 void wxControl::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+    wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 }