honour user scale and source offset in wxDC::Blit() (#2605)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -398,6 +398,7 @@ wxGTK:
|
|||||||
- Added gtk.tlw.can-set-transparency system option.
|
- Added gtk.tlw.can-set-transparency system option.
|
||||||
- Added support for GTK+ print backend
|
- Added support for GTK+ print backend
|
||||||
- Fix changing font/colour of label in buttons with images (Marcin Wojdyr).
|
- Fix changing font/colour of label in buttons with images (Marcin Wojdyr).
|
||||||
|
- Fix wxDC::Blit() support for user scale and source offset (Marcin Wojdyr).
|
||||||
|
|
||||||
wxMac:
|
wxMac:
|
||||||
|
|
||||||
|
@@ -127,6 +127,25 @@ public:
|
|||||||
private:
|
private:
|
||||||
void DrawingSetup(GdkGC*& gc, bool& originChanged);
|
void DrawingSetup(GdkGC*& gc, bool& originChanged);
|
||||||
|
|
||||||
|
// return true if the rectangle specified by the parameters is entirely
|
||||||
|
// outside of the current clipping region
|
||||||
|
bool IsOutsideOfClippingRegion(int x, int y, int w, int h);
|
||||||
|
|
||||||
|
// remove the current clipping mask and set the clipping region
|
||||||
|
void RemoveClipMask(GdkGC *gc);
|
||||||
|
|
||||||
|
// return the mask equal to the intersection of the original one with the
|
||||||
|
// clipping region
|
||||||
|
GdkBitmap *GetClippedMask(GdkBitmap *mask, int w, int h,
|
||||||
|
int x, int y,
|
||||||
|
int xsrcMask, int ysrcMask);
|
||||||
|
|
||||||
|
void DoDrawMonoBitmap(const wxBitmap& bitmap,
|
||||||
|
int bmp_w, int bmp_h,
|
||||||
|
int xsrc, int ysrc,
|
||||||
|
int xdest, int ydest,
|
||||||
|
int width, int height);
|
||||||
|
|
||||||
DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
|
DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -300,19 +300,18 @@ bool wxBitmap::Create( int width, int height, int depth )
|
|||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const
|
wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
|
||||||
|
int width, int height) const
|
||||||
{
|
{
|
||||||
wxBitmap bmp;
|
wxBitmap bmp;
|
||||||
|
|
||||||
wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
|
wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
|
||||||
|
|
||||||
int width = wxMax(newx, 1);
|
width = wxMax(width, 1);
|
||||||
int height = wxMax(newy, 1);
|
height = wxMax(height, 1);
|
||||||
width = wxMin(width, clipwidth);
|
|
||||||
height = wxMin(height, clipheight);
|
|
||||||
|
|
||||||
const double scale_x = double(newx) / M_BMPDATA->m_width;
|
const double scale_x = double(width) / clipwidth;
|
||||||
const double scale_y = double(newy) / M_BMPDATA->m_height;
|
const double scale_y = double(height) / clipheight;
|
||||||
|
|
||||||
// Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
|
// Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
|
||||||
// back, is faster than scaling pixmap ourselves.
|
// back, is faster than scaling pixmap ourselves.
|
||||||
@@ -335,7 +334,7 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
|
|||||||
// images, but the only one which preserves sharp edges
|
// images, but the only one which preserves sharp edges
|
||||||
gdk_pixbuf_scale(
|
gdk_pixbuf_scale(
|
||||||
pixbuf, pixbuf_scaled,
|
pixbuf, pixbuf_scaled,
|
||||||
0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
|
0, 0, width, height, -clipx*scale_x, -clipy*scale_y, scale_x, scale_y,
|
||||||
GDK_INTERP_NEAREST);
|
GDK_INTERP_NEAREST);
|
||||||
|
|
||||||
g_object_unref(pixbuf);
|
g_object_unref(pixbuf);
|
||||||
|
@@ -974,6 +974,80 @@ void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
|
|||||||
DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
|
DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// compare to current clipping region
|
||||||
|
bool wxWindowDCImpl::IsOutsideOfClippingRegion(int x, int y, int w, int h)
|
||||||
|
{
|
||||||
|
if (m_currentClippingRegion.IsNull())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
wxRegion region(x, y, w, h);
|
||||||
|
region.Intersect( m_currentClippingRegion );
|
||||||
|
return region.IsEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
void wxWindowDCImpl::RemoveClipMask(GdkGC *gc)
|
||||||
|
{
|
||||||
|
gdk_gc_set_clip_mask(gc, NULL);
|
||||||
|
gdk_gc_set_clip_origin(gc, 0, 0);
|
||||||
|
if (!m_currentClippingRegion.IsNull())
|
||||||
|
gdk_gc_set_clip_region(gc, m_currentClippingRegion.GetRegion());
|
||||||
|
}
|
||||||
|
|
||||||
|
// For drawing a mono-bitmap (XBitmap) we use the current text GC
|
||||||
|
void wxWindowDCImpl::DoDrawMonoBitmap(const wxBitmap& bitmap,
|
||||||
|
int bmp_w, int bmp_h,
|
||||||
|
int xsrc, int ysrc,
|
||||||
|
int xdest, int ydest,
|
||||||
|
int width, int height)
|
||||||
|
{
|
||||||
|
GdkPixmap *bitmap2
|
||||||
|
= gdk_pixmap_new( wxGetRootWindow()->window, bmp_w, bmp_h, -1 );
|
||||||
|
GdkGC *gc = gdk_gc_new( bitmap2 );
|
||||||
|
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
|
||||||
|
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
|
||||||
|
gdk_wx_draw_bitmap(bitmap2, gc, bitmap.GetPixmap(), 0, 0);
|
||||||
|
|
||||||
|
gdk_draw_drawable(m_gdkwindow, m_textGC, bitmap2, xsrc, ysrc, xdest, ydest,
|
||||||
|
width, height);
|
||||||
|
|
||||||
|
g_object_unref (bitmap2);
|
||||||
|
g_object_unref (gc);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns a new mask that is the intersection of the old mask
|
||||||
|
// and m_currentClippingRegion with proper offsets
|
||||||
|
GdkBitmap* wxWindowDCImpl::GetClippedMask(GdkBitmap* mask, int w, int h,
|
||||||
|
int x, int y,
|
||||||
|
int xsrcMask, int ysrcMask)
|
||||||
|
{
|
||||||
|
// create monochrome bitmap that will be used as the new mask
|
||||||
|
GdkBitmap *new_mask = gdk_pixmap_new( wxGetRootWindow()->window, w, h, 1 );
|
||||||
|
|
||||||
|
GdkColor c0, c1;
|
||||||
|
c0.pixel = 0;
|
||||||
|
c1.pixel = 1;
|
||||||
|
GdkGC *gc = gdk_gc_new( new_mask );
|
||||||
|
|
||||||
|
// zero-ing new_mask
|
||||||
|
gdk_gc_set_foreground( gc, &c0 );
|
||||||
|
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, w, h );
|
||||||
|
|
||||||
|
// clipping region
|
||||||
|
gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
|
||||||
|
gdk_gc_set_clip_origin( gc, -x, -y );
|
||||||
|
|
||||||
|
// copy the old mask to the new_mask in the clip region area
|
||||||
|
gdk_gc_set_background( gc, &c0 );
|
||||||
|
gdk_gc_set_foreground( gc, &c1 );
|
||||||
|
gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
|
||||||
|
gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask );
|
||||||
|
gdk_gc_set_stipple( gc, mask );
|
||||||
|
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, w, h );
|
||||||
|
|
||||||
|
g_object_unref (gc);
|
||||||
|
return new_mask;
|
||||||
|
}
|
||||||
|
|
||||||
void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
|
void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
|
||||||
wxCoord x, wxCoord y,
|
wxCoord x, wxCoord y,
|
||||||
bool useMask )
|
bool useMask )
|
||||||
@@ -1002,70 +1076,40 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
|
|||||||
int ww = XLOG2DEVREL(w);
|
int ww = XLOG2DEVREL(w);
|
||||||
int hh = YLOG2DEVREL(h);
|
int hh = YLOG2DEVREL(h);
|
||||||
|
|
||||||
// compare to current clipping region
|
if (IsOutsideOfClippingRegion( xx,yy,ww,hh ))
|
||||||
if (!m_currentClippingRegion.IsNull())
|
|
||||||
{
|
|
||||||
wxRegion tmp( xx,yy,ww,hh );
|
|
||||||
tmp.Intersect( m_currentClippingRegion );
|
|
||||||
if (tmp.IsEmpty())
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// scale bitmap if required
|
// scale bitmap if required
|
||||||
wxBitmap use_bitmap = bitmap;
|
wxBitmap use_bitmap = bitmap;
|
||||||
if ((w != ww) || (h != hh))
|
if ((w != ww) || (h != hh))
|
||||||
use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
|
use_bitmap = use_bitmap.Rescale( 0, 0, w, h, ww, hh );
|
||||||
|
|
||||||
// apply mask if any
|
// get mask if any
|
||||||
GdkBitmap *mask = (GdkBitmap *) NULL;
|
GdkBitmap *mask = (GdkBitmap *) NULL;
|
||||||
if (useMask && use_bitmap.GetMask())
|
if (useMask && use_bitmap.GetMask())
|
||||||
mask = use_bitmap.GetMask()->GetBitmap();
|
mask = use_bitmap.GetMask()->GetBitmap();
|
||||||
|
|
||||||
|
// for drawing a mono-bitmap we use the current text GC
|
||||||
GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
|
GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
|
||||||
|
|
||||||
GdkBitmap *new_mask = (GdkBitmap*) NULL;
|
bool mask_owned = false;
|
||||||
|
|
||||||
if (mask != NULL)
|
if (mask != NULL)
|
||||||
{
|
{
|
||||||
if (!m_currentClippingRegion.IsNull())
|
if (!m_currentClippingRegion.IsNull())
|
||||||
{
|
{
|
||||||
GdkColor col;
|
mask = GetClippedMask(mask, ww, hh, xx, yy, 0, 0);
|
||||||
new_mask = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, 1 );
|
mask_owned = true;
|
||||||
GdkGC *gc = gdk_gc_new( new_mask );
|
|
||||||
col.pixel = 0;
|
|
||||||
gdk_gc_set_foreground( gc, &col );
|
|
||||||
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
|
|
||||||
col.pixel = 0;
|
|
||||||
gdk_gc_set_background( gc, &col );
|
|
||||||
col.pixel = 1;
|
|
||||||
gdk_gc_set_foreground( gc, &col );
|
|
||||||
gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
|
|
||||||
gdk_gc_set_clip_origin( gc, -xx, -yy );
|
|
||||||
gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
|
|
||||||
gdk_gc_set_stipple( gc, mask );
|
|
||||||
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
|
|
||||||
mask = new_mask;
|
|
||||||
g_object_unref (gc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gdk_gc_set_clip_mask(use_gc, mask);
|
gdk_gc_set_clip_mask(use_gc, mask);
|
||||||
gdk_gc_set_clip_origin(use_gc, xx, yy);
|
gdk_gc_set_clip_origin(use_gc, xx, yy);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
|
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains.
|
||||||
// drawing a mono-bitmap (XBitmap) we use the current text GC
|
|
||||||
if (is_mono)
|
if (is_mono)
|
||||||
{
|
{
|
||||||
GdkPixmap *bitmap2 = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, -1 );
|
DoDrawMonoBitmap(use_bitmap, ww, hh, 0, 0, xx, yy, -1, -1);
|
||||||
GdkGC *gc = gdk_gc_new( bitmap2 );
|
|
||||||
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
|
|
||||||
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
|
|
||||||
gdk_wx_draw_bitmap(bitmap2, gc, use_bitmap.GetPixmap(), 0, 0);
|
|
||||||
|
|
||||||
gdk_draw_drawable(m_gdkwindow, use_gc, bitmap2, 0, 0, xx, yy, -1, -1);
|
|
||||||
|
|
||||||
g_object_unref (bitmap2);
|
|
||||||
g_object_unref (gc);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1087,12 +1131,9 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
|
|||||||
// remove mask again if any
|
// remove mask again if any
|
||||||
if (mask != NULL)
|
if (mask != NULL)
|
||||||
{
|
{
|
||||||
gdk_gc_set_clip_mask(use_gc, NULL);
|
RemoveClipMask(use_gc);
|
||||||
gdk_gc_set_clip_origin(use_gc, 0, 0);
|
if (mask_owned)
|
||||||
if (!m_currentClippingRegion.IsNull())
|
g_object_unref(mask);
|
||||||
gdk_gc_set_clip_region(use_gc, m_currentClippingRegion.GetRegion());
|
|
||||||
if (new_mask != NULL)
|
|
||||||
g_object_unref(new_mask);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1179,13 +1220,8 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
|
|||||||
wxCoord hh = YLOG2DEVREL(height);
|
wxCoord hh = YLOG2DEVREL(height);
|
||||||
|
|
||||||
// compare to current clipping region
|
// compare to current clipping region
|
||||||
if (!m_currentClippingRegion.IsNull())
|
if (IsOutsideOfClippingRegion( xx,yy,ww,hh ))
|
||||||
{
|
|
||||||
wxRegion tmp( xx,yy,ww,hh );
|
|
||||||
tmp.Intersect( m_currentClippingRegion );
|
|
||||||
if (tmp.IsEmpty())
|
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
|
|
||||||
int old_logical_func = m_logicalFunction;
|
int old_logical_func = m_logicalFunction;
|
||||||
SetLogicalFunction( logical_func );
|
SetLogicalFunction( logical_func );
|
||||||
@@ -1237,55 +1273,29 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
|
|||||||
|
|
||||||
GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
|
GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
|
||||||
|
|
||||||
GdkBitmap *new_mask = (GdkBitmap*) NULL;
|
bool mask_owned = false;
|
||||||
|
|
||||||
if (mask != NULL)
|
if (mask != NULL)
|
||||||
{
|
{
|
||||||
if (!m_currentClippingRegion.IsNull())
|
if (!m_currentClippingRegion.IsNull())
|
||||||
{
|
{
|
||||||
GdkColor col;
|
mask = GetClippedMask(mask, bm_ww, bm_hh, cx, cy,
|
||||||
new_mask = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, 1 );
|
xsrcMask, ysrcMask);
|
||||||
GdkGC *gc = gdk_gc_new( new_mask );
|
mask_owned = true;
|
||||||
col.pixel = 0;
|
|
||||||
gdk_gc_set_foreground( gc, &col );
|
|
||||||
gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask);
|
|
||||||
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
|
|
||||||
col.pixel = 0;
|
|
||||||
gdk_gc_set_background( gc, &col );
|
|
||||||
col.pixel = 1;
|
|
||||||
gdk_gc_set_foreground( gc, &col );
|
|
||||||
gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
|
|
||||||
// was: gdk_gc_set_clip_origin( gc, -xx, -yy );
|
|
||||||
gdk_gc_set_clip_origin( gc, -cx, -cy );
|
|
||||||
gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
|
|
||||||
gdk_gc_set_stipple( gc, mask );
|
|
||||||
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
|
|
||||||
mask = new_mask;
|
|
||||||
g_object_unref (gc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gdk_gc_set_clip_mask(use_gc, mask);
|
gdk_gc_set_clip_mask(use_gc, mask);
|
||||||
if (new_mask != NULL)
|
if (mask_owned)
|
||||||
gdk_gc_set_clip_origin(use_gc, cx, cy);
|
gdk_gc_set_clip_origin(use_gc, cx, cy);
|
||||||
else
|
else
|
||||||
gdk_gc_set_clip_origin(use_gc, cx - xsrcMask, cy - ysrcMask);
|
gdk_gc_set_clip_origin(use_gc, cx - xsrcMask, cy - ysrcMask);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
|
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains.
|
||||||
// drawing a mono-bitmap (XBitmap) we use the current text GC
|
|
||||||
|
|
||||||
if (is_mono)
|
if (is_mono)
|
||||||
{
|
{
|
||||||
GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, -1 );
|
DoDrawMonoBitmap(use_bitmap, bm_ww, bm_hh,
|
||||||
GdkGC *gc = gdk_gc_new( bitmap );
|
xsrc, ysrc, cx, cy, cw, ch);
|
||||||
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
|
|
||||||
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
|
|
||||||
gdk_wx_draw_bitmap(bitmap, gc, use_bitmap.GetPixmap(), 0, 0);
|
|
||||||
|
|
||||||
gdk_draw_drawable(m_gdkwindow, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch);
|
|
||||||
|
|
||||||
g_object_unref (bitmap);
|
|
||||||
g_object_unref (gc);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1296,31 +1306,18 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
|
|||||||
// remove mask again if any
|
// remove mask again if any
|
||||||
if (mask != NULL)
|
if (mask != NULL)
|
||||||
{
|
{
|
||||||
gdk_gc_set_clip_mask(use_gc, NULL);
|
RemoveClipMask(use_gc);
|
||||||
gdk_gc_set_clip_origin(use_gc, 0, 0);
|
if (mask_owned)
|
||||||
if (!m_currentClippingRegion.IsNull())
|
g_object_unref (mask);
|
||||||
gdk_gc_set_clip_region(use_gc, m_currentClippingRegion.GetRegion());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_mask)
|
|
||||||
g_object_unref (new_mask);
|
|
||||||
}
|
}
|
||||||
else // use_bitmap_method
|
else // use_bitmap_method
|
||||||
{
|
{
|
||||||
if (selected.IsOk() && ((width != ww) || (height != hh)))
|
if (selected.IsOk() && ((width != ww) || (height != hh)))
|
||||||
{
|
{
|
||||||
// get clip coords
|
wxBitmap bitmap = selected.Rescale( xsrc, ysrc, width, height, ww, hh );
|
||||||
wxRegion tmp( xx,yy,ww,hh );
|
|
||||||
tmp.Intersect( m_currentClippingRegion );
|
|
||||||
wxCoord cx,cy,cw,ch;
|
|
||||||
tmp.GetBox(cx,cy,cw,ch);
|
|
||||||
|
|
||||||
// rescale bitmap
|
|
||||||
wxBitmap bitmap = selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
|
|
||||||
|
|
||||||
// draw scaled bitmap
|
// draw scaled bitmap
|
||||||
// was: gdk_draw_drawable( m_gdkwindow, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
|
gdk_draw_drawable( m_gdkwindow, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
|
||||||
gdk_draw_drawable( m_gdkwindow, m_penGC, bitmap.GetPixmap(), 0, 0, cx, cy, -1, -1 );
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2179,25 +2176,7 @@ void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, w
|
|||||||
rect.x -= rect.width;
|
rect.x -= rect.width;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!m_currentClippingRegion.IsNull())
|
DoSetDeviceClippingRegion(wxRegion(rect));
|
||||||
m_currentClippingRegion.Intersect( rect );
|
|
||||||
else
|
|
||||||
m_currentClippingRegion.Union( rect );
|
|
||||||
|
|
||||||
#if USE_PAINT_REGION
|
|
||||||
if (!m_paintClippingRegion.IsNull())
|
|
||||||
m_currentClippingRegion.Intersect( m_paintClippingRegion );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
wxCoord xx, yy, ww, hh;
|
|
||||||
m_currentClippingRegion.GetBox( xx, yy, ww, hh );
|
|
||||||
wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
|
|
||||||
|
|
||||||
GdkRegion* gdkRegion = m_currentClippingRegion.GetRegion();
|
|
||||||
gdk_gc_set_clip_region(m_penGC, gdkRegion);
|
|
||||||
gdk_gc_set_clip_region(m_brushGC, gdkRegion);
|
|
||||||
gdk_gc_set_clip_region(m_textGC, gdkRegion);
|
|
||||||
gdk_gc_set_clip_region(m_bgGC, gdkRegion);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindowDCImpl::DoSetDeviceClippingRegion( const wxRegion ®ion )
|
void wxWindowDCImpl::DoSetDeviceClippingRegion( const wxRegion ®ion )
|
||||||
|
Reference in New Issue
Block a user