X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b89dac7816168bc86d4862edb394e681c161a3e3..3ce946d47ef03fcf330b0a28c0ff815ea480da55:/src/mac/carbon/uma.cpp

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 78f6706ac3..3be88ef8ec 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,15 +1,20 @@
 #include "wx/defs.h"
+#include "wx/dc.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 
 #ifdef __UNIX__
-  #include <NavigationServices/Navigation.h>
+  #include <Carbon/Carbon.h>
 #else
   #include <Navigation.h>
 #endif
 
 // init
 
+#if !TARGET_CARBON
+#define	GetControlOwner( control ) (**control).contrlOwner
+#endif
+
 static bool	sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 extern int gAGABackgroundColor ;
@@ -452,6 +457,8 @@ void			UMACloseWindow(WindowRef inWindowRef)
 
 void UMAActivateControl( ControlHandle inControl ) 
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
 #if UMA_USE_APPEARANCE
 	if ( UMAHasAppearance() )
 	{
@@ -467,10 +474,13 @@ void UMAActivateControl( ControlHandle inControl )
 	{
 	}
 #endif
+			InvalRgn( updateRgn ) ;
 }
 
 void UMADrawControl( ControlHandle inControl ) 
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
 #if UMA_USE_APPEARANCE
 	if ( UMAHasAppearance() )
 	{
@@ -486,10 +496,13 @@ void UMADrawControl( ControlHandle inControl )
 	{
 	}
 #endif
+			InvalRgn( updateRgn ) ;
 }
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) 
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
 #if UMA_USE_APPEARANCE
 	if ( UMAHasAppearance() )
 	{
@@ -505,10 +518,13 @@ void UMAMoveControl( ControlHandle inControl , short x , short y )
 	{
 	}
 #endif
+			InvalRgn( updateRgn ) ;
 }
 
 void UMASizeControl( ControlHandle inControl , short x , short y ) 
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
 #if UMA_USE_APPEARANCE
 	if ( UMAHasAppearance() )
 	{
@@ -524,10 +540,13 @@ void UMASizeControl( ControlHandle inControl , short x , short y )
 	{
 	}
 #endif
+			InvalRgn( updateRgn ) ;
 }
 
 void UMADeactivateControl( ControlHandle inControl ) 
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(inControl) , updateRgn ) ;
 #if UMA_USE_APPEARANCE
 	if ( UMAHasAppearance() )
 	{
@@ -543,6 +562,7 @@ void UMADeactivateControl( ControlHandle inControl )
 	{
 	}
 #endif
+			InvalRgn( updateRgn ) ;
 }
 
 void			UMASetThemeWindowBackground		(WindowRef 				inWindow,
@@ -639,6 +659,8 @@ void UMADisposeControl (ControlHandle 			theControl)
 void UMAHiliteControl	(ControlHandle 			theControl,
 								 ControlPartCode 		hiliteState)
 								 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(theControl) , updateRgn ) ;
 	if ( UMAHasAppearance() )
 	{
    	::HiliteControl( theControl , hiliteState ) ;
@@ -647,11 +669,14 @@ void UMAHiliteControl	(ControlHandle 			theControl,
    {
    	::HiliteControl( theControl , hiliteState ) ;
 	}
+			InvalRgn( updateRgn ) ;
 }
 
 
 void UMAShowControl						(ControlHandle 			theControl)
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( GetControlOwner(theControl) , updateRgn ) ;
 	if ( UMAHasAppearance() )
 	{
    	::ShowControl( theControl ) ;
@@ -660,6 +685,7 @@ void UMAShowControl						(ControlHandle 			theControl)
    {
    	::ShowControl( theControl ) ;
    }
+			InvalRgn( updateRgn ) ;
 }
 
 
@@ -667,11 +693,11 @@ void UMAHideControl						(ControlHandle 			theControl)
 {
 	if ( UMAHasAppearance() )
 	{
-   	::HideControl( theControl ) ;
+   		::HideControl( theControl ) ;
    }
    else
    {
-   	::HideControl( theControl ) ;
+   		::HideControl( theControl ) ;
    }
 }
 
@@ -834,7 +860,6 @@ OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
 	}
 #endif
 	SetPort( port ) ;
-	wxDC::MacInvalidateSetup() ;
 	return err ;
 }
 
@@ -913,6 +938,8 @@ void UMAIdleControls					(WindowPtr 				inWindow)
 
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
 {
+			RgnHandle updateRgn = NewRgn() ;
+			GetWindowUpdateRgn( inWindow , updateRgn ) ;
 #if UMA_USE_APPEARANCE
 	if ( UMAHasAppearance() )
 	{
@@ -928,6 +955,7 @@ void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 	{
 	}
 #endif
+			InvalRgn( updateRgn ) ;
 }
 
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) 
@@ -1359,16 +1387,25 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
 	{
 //		bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
 //		if ( inActivate != isHightlited )
-				HiliteWindow( inWindowRef , inActivate ) ;
-				ControlHandle control = NULL ;
-				UMAGetRootControl( inWindowRef , & control ) ;
-				if ( control )
-				{
-					if ( inActivate )
-						UMAActivateControl( control ) ;
-					else
-						UMADeactivateControl( control ) ;
-				}	
+		GrafPtr port ;
+		GetPort( &port ) ;
+#if TARGET_CARBON
+		SetPort( GetWindowPort( inWindowRef ) ) ;
+#else
+		SetPort( inWindowRef ) ;
+#endif
+		SetOrigin( 0 , 0 ) ;
+		HiliteWindow( inWindowRef , inActivate ) ;
+		ControlHandle control = NULL ;
+		UMAGetRootControl( inWindowRef , & control ) ;
+		if ( control )
+		{
+			if ( inActivate )
+				UMAActivateControl( control ) ;
+			else
+				UMADeactivateControl( control ) ;
+		}	
+		SetPort( port ) ;
 	}
 }
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )