Removed code duplication introduced during wxUniv merge in 1.132

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2004-01-03 17:58:51 +00:00
parent f810866394
commit 823faac334
2 changed files with 10 additions and 20 deletions

View File

@ -2342,17 +2342,12 @@ wxPaintDC::wxPaintDC( wxWindow *win )
GdkRegion *region = m_paintClippingRegion.GetRegion(); GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region ) if ( region )
{ {
m_paintClippingRegion = win->GetUpdateRegion(); m_currentClippingRegion.Union( m_paintClippingRegion );
GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region )
{
m_currentClippingRegion.Union( m_paintClippingRegion );
gdk_gc_set_clip_region( m_penGC, region ); gdk_gc_set_clip_region( m_penGC, region );
gdk_gc_set_clip_region( m_brushGC, region ); gdk_gc_set_clip_region( m_brushGC, region );
gdk_gc_set_clip_region( m_textGC, region ); gdk_gc_set_clip_region( m_textGC, region );
gdk_gc_set_clip_region( m_bgGC, region ); gdk_gc_set_clip_region( m_bgGC, region );
}
} }
#endif // USE_PAINT_REGION #endif // USE_PAINT_REGION
} }

View File

@ -2342,17 +2342,12 @@ wxPaintDC::wxPaintDC( wxWindow *win )
GdkRegion *region = m_paintClippingRegion.GetRegion(); GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region ) if ( region )
{ {
m_paintClippingRegion = win->GetUpdateRegion(); m_currentClippingRegion.Union( m_paintClippingRegion );
GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region )
{
m_currentClippingRegion.Union( m_paintClippingRegion );
gdk_gc_set_clip_region( m_penGC, region ); gdk_gc_set_clip_region( m_penGC, region );
gdk_gc_set_clip_region( m_brushGC, region ); gdk_gc_set_clip_region( m_brushGC, region );
gdk_gc_set_clip_region( m_textGC, region ); gdk_gc_set_clip_region( m_textGC, region );
gdk_gc_set_clip_region( m_bgGC, region ); gdk_gc_set_clip_region( m_bgGC, region );
}
} }
#endif // USE_PAINT_REGION #endif // USE_PAINT_REGION
} }