corrected hiding/showing of native mac controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -667,11 +667,11 @@ void UMAHideControl (ControlHandle theControl)
|
||||
{
|
||||
if ( UMAHasAppearance() )
|
||||
{
|
||||
::HideControl( theControl ) ;
|
||||
::HideControl( theControl ) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
::HideControl( theControl ) ;
|
||||
::HideControl( theControl ) ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1359,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 )
|
||||
|
Reference in New Issue
Block a user