X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..673dfcfac1a56da3cdcedecae59e327613ca2f66:/src/mac/uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 6eea3bd062..f34db6bc39 100644
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -80,10 +80,14 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 #endif
 		
 #ifndef __UNIX__
+#if TARGET_CARBON
+// Call currently implicitely done :		InitFloatingWindows() ;
+#else
 	if ( sUMAHasWindowManager )
 		InitFloatingWindows() ;
 	else
 		InitWindows();
+#endif
 #endif
 
 	if ( NavServicesAvailable() )
@@ -663,11 +667,11 @@ void UMAHideControl						(ControlHandle 			theControl)
 {
 	if ( UMAHasAppearance() )
 	{
-   	::HideControl( theControl ) ;
+   		::HideControl( theControl ) ;
    }
    else
    {
-   	::HideControl( theControl ) ;
+   		::HideControl( theControl ) ;
    }
 }
 
@@ -830,6 +834,7 @@ OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
 	}
 #endif
 	SetPort( port ) ;
+	wxDC::MacInvalidateSetup() ;
 	return err ;
 }
 
@@ -1354,16 +1359,26 @@ 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 ) ;
+		wxDC::MacInvalidateSetup() ;
 	}
 }
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )