X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..6aa4e3989fe770fc7293770ed46604e7d5b9fb99:/include/wx/dcmirror.h

diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index 98858240b6..890667cc88 100644
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -66,6 +66,9 @@ public:
     virtual void SetLogicalFunction(wxRasterOperationMode function)
         { m_dc.SetLogicalFunction(function); }
 
+    virtual void* GetHandle() const
+        { return m_dc.GetHandle(); }
+
 protected:
     // returns x and y if not mirroring or y and x if mirroring
     wxCoord GetX(wxCoord x, wxCoord y) const { return m_mirror ? y : x; }
@@ -79,27 +82,23 @@ protected:
     wxCoord *GetX(wxCoord *x, wxCoord *y) const { return m_mirror ? y : x; }
     wxCoord *GetY(wxCoord *x, wxCoord *y) const { return m_mirror ? x : y; }
 
-    // exchange x and y unconditionally
-    static void Swap(wxCoord& x, wxCoord& y)
-    {
-        wxCoord t = x;
-        x = y;
-        y = t;
-    }
-
     // exchange x and y components of all points in the array if necessary
-    void Mirror(int n, wxPoint points[]) const
+    wxPoint* Mirror(int n, const wxPoint*& points) const
     {
+        wxPoint* points_alloc = NULL;
         if ( m_mirror )
         {
+            points_alloc = new wxPoint[n];
             for ( int i = 0; i < n; i++ )
             {
-                Swap(points[i].x, points[i].y);
+                points_alloc[i].x = points[i].y;
+                points_alloc[i].y = points[i].x;
             }
+            points = points_alloc;
         }
+        return points_alloc;
     }
 
-
     // wxDCBase functions
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE)
@@ -223,28 +222,28 @@ protected:
         m_dc.DoGetSizeMM(GetX(w, h), GetY(w, h));
     }
 
-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],
                              wxCoord xoffset, wxCoord yoffset)
     {
-        Mirror(n, points);
+        wxPoint* points_alloc = Mirror(n, points);
 
         m_dc.DoDrawLines(n, points,
                          GetX(xoffset, yoffset), GetY(xoffset, yoffset));
 
-        Mirror(n, points);
+        delete[] points_alloc;
     }
 
-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
     {
-        Mirror(n, points);
+        wxPoint* points_alloc = Mirror(n, points);
 
         m_dc.DoDrawPolygon(n, points,
                            GetX(xoffset, yoffset), GetY(xoffset, yoffset),
                            fillStyle);
 
-        Mirror(n, points);
+        delete[] points_alloc;
     }
 
     virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))