Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clipping before redraw in the setbackground callback

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-01-28 08:25:53 +00:00
parent 1dd85cc3d6
commit 64820d33a1
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mac/carbon/control.cpp
View File

@@ -115,7 +115,17 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) ) if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
{ {
wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ; wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
// SetThemeBackground( iDepth , iIsColor ) ; #if TARGET_CARBON
// under classic this would lead to partial redraws
RgnHandle clip = NewRgn() ;
int x = 0 , y = 0;
wx->MacWindowToRootWindow( &x,&y ) ;
CopyRgn( (RgnHandle) wx->MacGetVisibleRegion(false).GetWXHRGN() , clip ) ;
OffsetRgn( clip , x , y ) ;
SetClip( clip ) ;
DisposeRgn( clip ) ;
#endif
} }
else else
{ {
@@ -594,6 +604,23 @@ void wxControl::DoSetSize(int x, int y,
int sizeFlags ) int sizeFlags )
{ {
wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ; wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
#if 0
{
Rect meta , control ;
GetControlBounds( (ControlHandle) m_macControl , &control ) ;
RgnHandle rgn = NewRgn() ;
GetControlRegion( (ControlHandle) m_macControl , kControlStructureMetaPart , rgn ) ;
GetRegionBounds( rgn , &meta ) ;
if ( !EmptyRect( &meta ) )
{
wxASSERT( meta.left >= control.left - m_macHorizontalBorder ) ;
wxASSERT( meta.right <= control.right + m_macHorizontalBorder ) ;
wxASSERT( meta.top >= control.top - m_macVerticalBorder ) ;
wxASSERT( meta.bottom <= control.bottom + m_macVerticalBorder ) ;
}
DisposeRgn( rgn ) ;
}
#endif
return ; return ;
/* /*

29
src/mac/control.cpp
View File

@@ -115,7 +115,17 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) ) if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
{ {
wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ; wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
// SetThemeBackground( iDepth , iIsColor ) ; #if TARGET_CARBON
// under classic this would lead to partial redraws
RgnHandle clip = NewRgn() ;
int x = 0 , y = 0;
wx->MacWindowToRootWindow( &x,&y ) ;
CopyRgn( (RgnHandle) wx->MacGetVisibleRegion(false).GetWXHRGN() , clip ) ;
OffsetRgn( clip , x , y ) ;
SetClip( clip ) ;
DisposeRgn( clip ) ;
#endif
} }
else else
{ {
@@ -594,6 +604,23 @@ void wxControl::DoSetSize(int x, int y,
int sizeFlags ) int sizeFlags )
{ {
wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ; wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
#if 0
{
Rect meta , control ;
GetControlBounds( (ControlHandle) m_macControl , &control ) ;
RgnHandle rgn = NewRgn() ;
GetControlRegion( (ControlHandle) m_macControl , kControlStructureMetaPart , rgn ) ;
GetRegionBounds( rgn , &meta ) ;
if ( !EmptyRect( &meta ) )
{
wxASSERT( meta.left >= control.left - m_macHorizontalBorder ) ;
wxASSERT( meta.right <= control.right + m_macHorizontalBorder ) ;
wxASSERT( meta.top >= control.top - m_macVerticalBorder ) ;
wxASSERT( meta.bottom <= control.bottom + m_macVerticalBorder ) ;
}
DisposeRgn( rgn ) ;
}
#endif
return ; return ;
/* /*