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

Refactor wxDCClipper ctors to use a common Init() method

Browse Source 
No changes, this is just a pure refactoring to facilitate the upcoming
change which won't have to be done in all these ctors any more.
This commit is contained in:
Vadim Zeitlin
2018-06-18 00:26:32 +02:00
parent caa2fde425
commit fe0f9fefe4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/dc.h
View File

@@ -1437,18 +1437,15 @@ class WXDLLIMPEXP_CORE wxDCClipper
public: public:
wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc) wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)
{ {
dc.GetClippingBox(m_oldClipRect); Init(r.GetBox());
dc.SetClippingRegion(r.GetBox());
} }
wxDCClipper(wxDC& dc, const wxRect& r) : m_dc(dc) wxDCClipper(wxDC& dc, const wxRect& r) : m_dc(dc)
{ {
dc.GetClippingBox(m_oldClipRect); Init(r);
dc.SetClippingRegion(r.x, r.y, r.width, r.height);
} }
wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) : m_dc(dc) wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) : m_dc(dc)
{ {
dc.GetClippingBox(m_oldClipRect); Init(wxRect(x, y, w, h));
dc.SetClippingRegion(x, y, w, h);
} }
~wxDCClipper() ~wxDCClipper()
@@ -1459,6 +1456,13 @@ public:
} }
private: private:
// Common part of all ctors.
void Init(const wxRect& r)
{
m_dc.GetClippingBox(m_oldClipRect);
m_dc.SetClippingRegion(r);
}
wxDC& m_dc; wxDC& m_dc;
wxRect m_oldClipRect; wxRect m_oldClipRect;