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

Add missing GDI+ adjustments to wxRendererXP

Browse Source 
A few methods, notably including DrawFocusRect() and DrawItemText(),
were missing MSWApplyGDIPlusTransform() calls that need to be done
before drawing on an HDC corresponding to a wxGCDC object.

Add them by replacing calls to wxCopyRectToRECT() with the just added
ConvertToRECT() function, which adjusts the coordinates and copies
wxRect to RECT at once.
This commit is contained in:
Vadim Zeitlin
2018-02-01 17:38:23 +01:00
parent 5bfe0fdcc4
commit 92891cee47
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/renderer.cpp
View File

@@ -322,8 +322,7 @@ void wxRendererMSWBase::DrawFocusRect(wxWindow * WXUNUSED(win),
const wxRect& rect,
int WXUNUSED(flags))
{
RECT rc;
wxCopyRectToRECT(rect, rc);
RECT rc = ConvertToRECT(dc, rect);
::DrawFocusRect(GetHdcOf(dc.GetTempHDC()), &rc);
}
@@ -919,8 +918,8 @@ wxRendererXP::DrawItemSelectionRect(wxWindow *win,
if ( ::IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
{
RECT rc;
wxCopyRectToRECT(rect, rc);
RECT rc = ConvertToRECT(dc, rect);
if ( ::IsThemeBackgroundPartiallyTransparent(hTheme, LVP_LISTITEM, itemState) )
::DrawThemeParentBackground(GetHwndOf(win), GetHdcOf(dc.GetTempHDC()), &rc);
@@ -956,8 +955,7 @@ void wxRendererXP::DrawItemText(wxWindow* win,
if ( s_DrawThemeTextEx && // Might be not available if we're under XP
::IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
{
RECT rc;
wxCopyRectToRECT(rect, rc);
RECT rc = ConvertToRECT(dc, rect);
WXDTTOPTS textOpts;
textOpts.dwSize = sizeof(textOpts);
@@ -1081,8 +1079,7 @@ void wxRendererXP::DrawGauge(wxWindow* win,
return;
}
RECT r;
wxCopyRectToRECT(rect, r);
RECT r = ConvertToRECT(dc, rect);
::DrawThemeBackground(
hTheme,