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

Add helper wxRendererMSWBase::ConvertToRECT()

Browse Source 
Combine MSWApplyGDIPlusTransform() and wxCopyRectToRECT() into a single
helper function to simplify the code and, importantly, to make it more
difficult to forget call the former function.

No real changes, this is a pure refactoring.
This commit is contained in:
Vadim Zeitlin
2018-02-01 17:35:02 +01:00
parent 0091e2aaab
commit 5bfe0fdcc4
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/msw/renderer.cpp
View File

@@ -99,6 +99,16 @@ public:
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0) wxOVERRIDE = 0; int flags = 0) wxOVERRIDE = 0;
protected:
// Helper function returning the MSW RECT corresponding to the wxRect
// adjusted for the given wxDC.
static RECT ConvertToRECT(wxDC& dc, const wxRect& rect)
{
RECT rc;
wxCopyRectToRECT(dc.GetImpl()->MSWApplyGDIPlusTransform(rect), rc);
return rc;
}
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -411,10 +421,7 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
{ {
wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
int style = DFCS_SCROLLCOMBOBOX; int style = DFCS_SCROLLCOMBOBOX;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
@@ -435,10 +442,7 @@ wxRendererMSW::DoDrawFrameControl(UINT type,
{ {
wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
int style = kind; int style = kind;
if ( flags & wxCONTROL_CHECKED ) if ( flags & wxCONTROL_CHECKED )
@@ -613,10 +617,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
int state; int state;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
@@ -656,10 +657,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") ); wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") );
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
int state; int state;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
@@ -702,10 +700,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED; int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
::DrawThemeBackground ::DrawThemeBackground
@@ -744,10 +739,7 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme,
{ {
wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") ); wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
// the base state is always 1, whether it is PBS_NORMAL, // the base state is always 1, whether it is PBS_NORMAL,
// {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL
@@ -876,10 +868,7 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
if (flags & wxCONTROL_EXPANDED) if (flags & wxCONTROL_EXPANDED)
flags |= wxCONTROL_CHECKED; flags |= wxCONTROL_CHECKED;
wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect); RECT r = ConvertToRECT(dc, rect);
RECT r;
wxCopyRectToRECT(adjustedRect, r);
::DrawThemeBackground ::DrawThemeBackground
( (