suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable Windows on-paint clipping for non-transparent canvases, just in case

Browse Source 
svn: r9835
This commit is contained in:
Matthew Flatt 2008-05-14 20:42:48 +00:00
parent 40d7afd81c
commit 07c618d3e1
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/wxwindow/src/msw/wx_canvs.cxx
View File

@ -509,7 +509,7 @@ wxCanvasWnd::wxCanvasWnd (wxWnd * parent, wxWindow * wx_win,
static HBRUSH btnface_brush; static HBRUSH btnface_brush;
BOOL wxCanvasWnd::OnEraseBkgnd (HDC pDC) static void DoErase(wxWindow *wx_window, HDC pDC)
{ {
long wstyle; long wstyle;
@ -553,6 +553,11 @@ BOOL wxCanvasWnd::OnEraseBkgnd (HDC pDC)
SetWindowExtEx(pDC, canvas->wx_dc->window_ext_x, canvas->wx_dc->window_ext_y, NULL); SetWindowExtEx(pDC, canvas->wx_dc->window_ext_x, canvas->wx_dc->window_ext_y, NULL);
} }
} }
}
BOOL wxCanvasWnd::OnEraseBkgnd (HDC pDC)
{
DoErase(wx_window, pDC);
return TRUE; return TRUE;
} }
@ -708,28 +713,46 @@ void wxCanvas::DoPaint()
if (need_update) { if (need_update) {
RECT r; RECT r;
if (GetRgnBox(need_update, &r) != NULLREGION) { if (GetRgnBox(need_update, &r) != NULLREGION) {
wxDC *dc; if (wstyle & wxTRANSPARENT_WIN) {
HDC hdc; wxDC *dc;
HRGN paint_rgn; HDC hdc;
HRGN paint_rgn;
paint_rgn = CreateRectRgn(0,0,0,0); paint_rgn = CreateRectRgn(0,0,0,0);
CombineRgn(paint_rgn, need_update, paint_rgn, RGN_COPY); CombineRgn(paint_rgn, need_update, paint_rgn, RGN_COPY);
SetRectRgn(need_update, 0, 0, 0, 0); SetRectRgn(need_update, 0, 0, 0, 0);
dc = GetDC(); dc = GetDC();
dc->limit_rgn = paint_rgn; dc->limit_rgn = paint_rgn;
hdc = dc->ThisDC(FALSE); hdc = dc->ThisDC(FALSE);
dc->DoClipping(hdc); dc->DoClipping(hdc);
dc->DoneDC(hdc); dc->DoneDC(hdc);
OnPaint(); OnPaint();
dc->limit_rgn = NULL; dc->limit_rgn = NULL;
hdc = dc->ThisDC(FALSE); hdc = dc->ThisDC(FALSE);
dc->DoClipping(hdc); dc->DoClipping(hdc);
dc->DoneDC(hdc); dc->DoneDC(hdc);
DeleteObject(paint_rgn); DeleteObject(paint_rgn);
} else {
SetRectRgn(need_update, 0, 0, 0, 0);
if (!(wstyle & wxNO_AUTOCLEAR)) {
/* The erase through OnEraseBkgnd() was confine to the clipping
area. Erase the full area. */
wxDC *dc;
HDC hdc;
dc = GetDC();
hdc = dc->ThisDC(FALSE);
DoErase(this, hdc);
dc->DoneDC(hdc);
}
OnPaint();
}
} }
} }
} }