From b2801fb887fe40875b3ec90619b011b45c1d2796 Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 19 Jun 2020 16:18:18 -0400 Subject: add upstream 10.25 --- wx+/dc.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'wx+/dc.h') diff --git a/wx+/dc.h b/wx+/dc.h index f1b067ac..f6f5518b 100644 --- a/wx+/dc.h +++ b/wx+/dc.h @@ -73,8 +73,8 @@ class RecursiveDcClipper public: RecursiveDcClipper(wxDC& dc, const wxRect& r) : dc_(dc) { - auto it = clippingAreas.find(&dc); - if (it != clippingAreas.end()) + if (auto it = clippingAreas.find(&dc); + it != clippingAreas.end()) { oldRect_ = it->second; @@ -103,6 +103,9 @@ public: } private: + RecursiveDcClipper (const RecursiveDcClipper&) = delete; + RecursiveDcClipper& operator=(const RecursiveDcClipper&) = delete; + //associate "active" clipping area with each DC inline static std::unordered_map clippingAreas; @@ -156,6 +159,9 @@ public: } private: + BufferedPaintDC (const BufferedPaintDC&) = delete; + BufferedPaintDC& operator=(const BufferedPaintDC&) = delete; + std::optional& buffer_; wxPaintDC paintDc_; }; -- cgit