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

redraw fixes for OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-04-12 18:05:17 +00:00
parent 2027c6db5b
commit 732b3a752b
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/carbon/toplevel.cpp
View File

@@ -635,7 +635,20 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
RgnHandle diffRgn = NewRgn() ; RgnHandle diffRgn = NewRgn() ;
if ( updateRgn && diffRgn ) if ( updateRgn && diffRgn )
{ {
#if 1
// macos internal control redraws clean up areas we'd like to redraw ourselves
// therefore we pick the boundary rect and make sure we can redraw it
RgnHandle trueUpdateRgn = NewRgn() ;
Rect trueUpdateRgnBoundary ;
GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
RectRgn( (RgnHandle) updateRgn , &trueUpdateRgnBoundary ) ;
if ( trueUpdateRgn )
DisposeRgn( trueUpdateRgn ) ;
SetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;
#else
GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ); GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
#endif
DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ; DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
if ( !EmptyRgn( updateRgn ) ) if ( !EmptyRgn( updateRgn ) )
{ {
@@ -815,9 +828,15 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
// so refresh the whole window on activation and deactivation. // so refresh the whole window on activation and deactivation.
long osVersion = UMAGetSystemVersion(); long osVersion = UMAGetSystemVersion();
if (osVersion >= 0x1000 && osVersion < 0x1020) if (osVersion >= 0x1000 && osVersion < 0x1020)
{
Refresh(TRUE); Refresh(TRUE);
}
else else
MacSuperEnabled( inIsActivating ) ; {
// for the moment we have to resolve some redrawing issues like this
// the OS is stealing some redrawing areas as soon as it draws a control
Refresh(TRUE);
}
} }
#if !TARGET_CARBON #if !TARGET_CARBON

21
src/mac/toplevel.cpp
View File

@@ -635,7 +635,20 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
RgnHandle diffRgn = NewRgn() ; RgnHandle diffRgn = NewRgn() ;
if ( updateRgn && diffRgn ) if ( updateRgn && diffRgn )
{ {
#if 1
// macos internal control redraws clean up areas we'd like to redraw ourselves
// therefore we pick the boundary rect and make sure we can redraw it
RgnHandle trueUpdateRgn = NewRgn() ;
Rect trueUpdateRgnBoundary ;
GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
RectRgn( (RgnHandle) updateRgn , &trueUpdateRgnBoundary ) ;
if ( trueUpdateRgn )
DisposeRgn( trueUpdateRgn ) ;
SetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;
#else
GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ); GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
#endif
DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ; DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
if ( !EmptyRgn( updateRgn ) ) if ( !EmptyRgn( updateRgn ) )
{ {
@@ -815,9 +828,15 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
// so refresh the whole window on activation and deactivation. // so refresh the whole window on activation and deactivation.
long osVersion = UMAGetSystemVersion(); long osVersion = UMAGetSystemVersion();
if (osVersion >= 0x1000 && osVersion < 0x1020) if (osVersion >= 0x1000 && osVersion < 0x1020)
{
Refresh(TRUE); Refresh(TRUE);
}
else else
MacSuperEnabled( inIsActivating ) ; {
// for the moment we have to resolve some redrawing issues like this
// the OS is stealing some redrawing areas as soon as it draws a control
Refresh(TRUE);
}
} }
#if !TARGET_CARBON #if !TARGET_CARBON