Merge branch '10.25' into 'master'10.25

add upstream 10.25

See merge request opensource-tracking/FreeFileSync!23

1 files changed, 8 insertions, 2 deletions

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<wxDC*, wxRect> clippingAreas;
 
@@ -156,6 +159,9 @@ public:
     }
 
 private:
+    BufferedPaintDC           (const BufferedPaintDC&) = delete;
+    BufferedPaintDC& operator=(const BufferedPaintDC&) = delete;
+
     std::optional<wxBitmap>& buffer_;
     wxPaintDC paintDc_;
 };