From: Robin Dunn Date: Fri, 28 Nov 2003 18:42:44 +0000 (+0000) Subject: Expose SetClippingRegion(point, size) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4da6d35e8f81ddf59bff7fea8ea4e1acc7aa0554 Expose SetClippingRegion(point, size) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/demo/ColourDB.py b/wxPython/demo/ColourDB.py index e07a27bf27..ad7c92fc74 100644 --- a/wxPython/demo/ColourDB.py +++ b/wxPython/demo/ColourDB.py @@ -57,7 +57,7 @@ class TestWindow(wxScrolledWindow): if not dc: dc = wxClientDC(self) rect = self.GetUpdateRegion().GetBox() - dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height) + dc.SetClippingRect(rect) self.TileBackground(dc) diff --git a/wxPython/demo/wxDragImage.py b/wxPython/demo/wxDragImage.py index 8506fb7200..4c348637cf 100644 --- a/wxPython/demo/wxDragImage.py +++ b/wxPython/demo/wxDragImage.py @@ -137,7 +137,7 @@ class DragCanvas(wxScrolledWindow): def EraseShape(self, shape, dc): r = shape.GetRect() - dc.SetClippingRegion(r.x, r.y, r.width, r.height) + dc.SetClippingRect(r) self.TileBackground(dc) self.DrawShapes(dc) dc.DestroyClippingRegion() @@ -148,7 +148,7 @@ class DragCanvas(wxScrolledWindow): if not dc: dc = wxClientDC(self) rect = self.GetUpdateRegion().GetBox() - dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height) + dc.SetClippingRect(rect) self.TileBackground(dc) diff --git a/wxPython/docs/MigrationGuide.txt b/wxPython/docs/MigrationGuide.txt index 638e5cc9b3..09d29d2962 100644 --- a/wxPython/docs/MigrationGuide.txt +++ b/wxPython/docs/MigrationGuide.txt @@ -275,6 +275,11 @@ that are affected are listed here:: Blit(destPt, size, sourceDC, srcPt, rop = wxCOPY, useMask = FALSE, srcPtMask = wx.DefaultPosition) + SetClippingRegionXY SetClippingRegion(x, y, width, height) + SetClippingRegion(point, size) + SetClippingRect(rect) + SetClippingRegionAsRegion(region); + If you have code that draws on a DC you **will** get errors because of these changes, but it should be easy to fix the code. You can either diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i index da92e4ada9..4b4034bcb3 100644 --- a/wxPython/src/_dc.i +++ b/wxPython/src/_dc.i @@ -219,8 +219,8 @@ public: // clipping region // --------------- - void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - //void SetClippingRegion(const wxPoint& pt, const wxSize& sz) + %name(SetClippingRegionXY)void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + void SetClippingRegion(const wxPoint& pt, const wxSize& sz); %name(SetClippingRect) void SetClippingRegion(const wxRect& rect); %name(SetClippingRegionAsRegion) void SetClippingRegion(const wxRegion& region); diff --git a/wxPython/wx/lib/rightalign.py b/wxPython/wx/lib/rightalign.py index fc9fd17e6e..2a485134dd 100644 --- a/wxPython/wx/lib/rightalign.py +++ b/wxPython/wx/lib/rightalign.py @@ -61,7 +61,7 @@ class wxRightTextCtrl(wxTextCtrl): fclr = wxSystemSettings_GetColour(wxSYS_COLOUR_GRAYTEXT) dc.SetTextForeground(fclr) - dc.SetClippingRegion(0, 0, dcwidth, dcheight) + dc.SetClippingRegionXY(0, 0, dcwidth, dcheight) dc.DrawText(text, x, y) if x < 0: