diff --git a/samples/render/render.cpp b/samples/render/render.cpp index 1853fa21d7..dd1a4bc6df 100644 --- a/samples/render/render.cpp +++ b/samples/render/render.cpp @@ -68,6 +68,7 @@ public: { wxDCBrushChanger setBrush(dc, *wxBLUE_BRUSH); wxDCTextColourChanger setFgCol(dc, *wxWHITE); + wxDCTextBgModeChanger setBgMode(dc, wxBRUSHSTYLE_TRANSPARENT); dc.DrawRoundedRectangle(rect, 5); wxString label; diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 8425f08953..35a9da4974 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -277,7 +277,7 @@ wxRendererGeneric::DrawShadedRect(wxDC& dc, const wxPen& pen2) { // draw the rectangle - dc.SetPen(pen1); + wxDCPenChanger setPen(dc, pen1); dc.DrawLine(rect->GetLeft(), rect->GetTop(), rect->GetLeft(), rect->GetBottom()); dc.DrawLine(rect->GetLeft() + 1, rect->GetTop(), @@ -309,8 +309,8 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win, w = rect.width, h = rect.height; - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.SetPen(*wxTRANSPARENT_PEN); + wxDCBrushChanger setBrush(dc, wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); + wxDCPenChanger setPen(dc, *wxTRANSPARENT_PEN); dc.DrawRectangle(rect); dc.SetBrush(*wxTRANSPARENT_BRUSH); @@ -353,7 +353,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, params->m_selectionColour : wxColour(0x66, 0x66, 0x66); wxPen pen(c, penwidth); pen.SetCap(wxCAP_BUTT); - dc.SetPen(pen); + wxDCPenChanger setPen(dc, pen); dc.DrawLine(rect.x, y, rect.x + rect.width, y); } @@ -453,9 +453,9 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, wxString label( params->m_labelText ); - dc.SetFont(font); - dc.SetTextForeground(clr); - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + wxDCFontChanger setFont(dc, font); + wxDCTextColourChanger setTextFg(dc, clr); + wxDCTextBgModeChanger setBgMode(dc, wxBRUSHSTYLE_TRANSPARENT); int tw, th, td; dc.GetTextExtent( label, &tw, &th, &td); @@ -541,7 +541,7 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), // half of the length of the horz lines in "-" and "+" const wxCoord halfWidth = rect.width/2 - 2; - dc.SetPen(*wxBLACK_PEN); + wxDCPenChanger setPen(dc, *wxBLACK_PEN); dc.DrawLine(xMiddle - halfWidth, yMiddle, xMiddle + halfWidth + 1, yMiddle); @@ -635,12 +635,12 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, offset = 1; } - dc.SetPen(*wxTRANSPARENT_PEN); + wxDCPenChanger setPen(dc, *wxTRANSPARENT_PEN); if ( win->HasFlag(wxSP_3DSASH) ) { // Draw the 3D sash - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); + wxDCBrushChanger setBrush(dc, wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); dc.DrawRectangle(position + 2, 0, 3, h); dc.SetPen(m_penLightGrey); @@ -658,7 +658,7 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, else { // Draw a flat sash - dc.SetBrush(wxBrush(win->GetBackgroundColour())); + wxDCBrushChanger setBrush(dc, wxBrush(win->GetBackgroundColour())); dc.DrawRectangle(position, 0, 3, h); } } @@ -697,8 +697,8 @@ wxRendererGeneric::DrawDropArrow(wxWindow *win, wxPoint(rectMid + arrowHalf, arrowTopY), wxPoint(rectMid, arrowTopY + arrowHalf) }; - dc.SetBrush(wxBrush(win->GetForegroundColour())); - dc.SetPen(wxPen(win->GetForegroundColour())); + wxDCBrushChanger setBrush(dc, wxBrush(win->GetForegroundColour())); + wxDCPenChanger setPen(dc, wxPen(win->GetForegroundColour())); dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y); } @@ -708,8 +708,8 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), const wxRect& rect, int flags) { - dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); - dc.SetBrush( *wxTRANSPARENT_BRUSH ); + wxDCPenChanger setPen(dc, *(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); + wxDCBrushChanger setBrush(dc, *wxTRANSPARENT_BRUSH); dc.DrawRectangle(rect); if ( flags & wxCONTROL_CHECKED ) @@ -724,7 +724,7 @@ wxRendererGeneric::DrawCheckMark(wxWindow *WXUNUSED(win), const wxRect& rect, int flags) { - dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); + wxDCPenChanger setPen(dc, *(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); dc.DrawCheckMark(rect); } @@ -758,8 +758,8 @@ wxRendererGeneric::DrawPushButton(wxWindow *win, wxColour bgCol = flags & wxCONTROL_DISABLED ? wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) : win->GetBackgroundColour(); - dc.SetBrush(wxBrush(bgCol)); - dc.SetPen(wxPen(bgCol)); + wxDCBrushChanger setBrush(dc, wxBrush(bgCol)); + wxDCPenChanger setPen(dc, wxPen(bgCol)); dc.DrawRectangle(rect); } @@ -789,8 +789,8 @@ wxRendererGeneric::DrawCollapseButton(wxWindow *win, pt[2] = wxPoint(arrowTopY, rectMid + arrowHalf); } - dc.SetBrush(wxBrush(win->GetForegroundColour())); - dc.SetPen(wxPen(win->GetForegroundColour())); + wxDCBrushChanger setBrush(dc, wxBrush(win->GetForegroundColour())); + wxDCPenChanger setPen(dc, wxPen(win->GetForegroundColour())); dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y); } @@ -822,13 +822,11 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), brush = *wxTRANSPARENT_BRUSH; } - dc.SetBrush(brush); + wxDCBrushChanger setBrush(dc, brush); bool drawFocusRect = (flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED); - if ( drawFocusRect && !(flags & wxCONTROL_CELL) ) - dc.SetPen( *wxBLACK_PEN ); - else - dc.SetPen( *wxTRANSPARENT_PEN ); + bool blackPen = drawFocusRect && !(flags & wxCONTROL_CELL); + wxDCPenChanger setPen(dc, *(blackPen ? wxBLACK_PEN : wxTRANSPARENT_PEN)); dc.DrawRectangle( rect ); @@ -854,7 +852,7 @@ wxRendererGeneric::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect x2 = rect.GetRight(), y2 = rect.GetBottom(); - dc.SetPen(m_penBlack); + wxDCPenChanger setPen(dc, m_penBlack); #ifdef __WXMAC__ dc.SetLogicalFunction(wxCOPY); @@ -913,8 +911,8 @@ void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), bdr = *wxBLACK; } - dc.SetPen(bdr); - dc.SetBrush(fill); + wxDCPenChanger setPen(dc, bdr); + wxDCBrushChanger setBrush(dc, fill); dc.DrawRectangle(rect); } @@ -971,8 +969,8 @@ void wxRendererGeneric::DrawGauge(wxWindow* win, progRect.width = wxMulDivInt32(progRect.width, value, max); } - dc.SetBrush(colBar); - dc.SetPen(*wxTRANSPARENT_PEN); + wxDCBrushChanger setBrush(dc, colBar); + wxDCPenChanger setPen(dc, *wxTRANSPARENT_PEN); dc.DrawRectangle(progRect); } @@ -1005,9 +1003,10 @@ wxRendererGeneric::DrawItemText(wxWindow* WXUNUSED(win), // Draw text taking care not to change its colour if it had been set by the // caller for a normal item to allow having items in non-default colours. + wxDCTextColourChanger setTextFg(dc); if ( textColour.IsOk() ) - dc.SetTextForeground(textColour); - dc.SetTextBackground(wxTransparentColour); + setTextFg.Set(textColour); + wxDCTextBgColourChanger setTextBg(dc, wxTransparentColour); dc.DrawLabel(paintText, rect, align); } diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index ceff9adb1b..99eb4a26cc 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -380,8 +380,8 @@ void wxRendererMSWBase::DrawItemSelectionRect(wxWindow *win, brush = *wxTRANSPARENT_BRUSH; } - dc.SetBrush(brush); - dc.SetPen(*wxTRANSPARENT_PEN); + wxDCBrushChanger setBrush(dc, brush); + wxDCPenChanger setPen(dc, *wxTRANSPARENT_PEN); dc.DrawRectangle( rect ); if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT)) @@ -1165,8 +1165,8 @@ void wxRendererXP::DrawTextCtrl(wxWindow* win, etsState, TMT_BORDERCOLOR, &cref); bdr = wxRGBToColour(cref); - dc.SetPen( bdr ); - dc.SetBrush( fill ); + wxDCPenChanger setPen(dc, bdr); + wxDCBrushChanger setBrush(dc, fill); dc.DrawRectangle(rect); } @@ -1266,8 +1266,8 @@ wxRendererXP::DrawSplitterSash(wxWindow *win, { if ( !win->HasFlag(wxSP_NO_XP_THEME) ) { - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))); + wxDCPenChanger setPen(dc, *wxTRANSPARENT_PEN); + wxDCBrushChanger setBrush(dc, wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))); if ( orient == wxVERTICAL ) { dc.DrawRectangle(position, 0, SASH_WIDTH, size.y);