use wxDC::SetDeviceClippingRegion() instead of deprecated SetClippingRegion()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index 9bc793e343cc1aa57b4536d39d72e60e2c72a41f..a635f8f7e816cb8ae0209c9677a3872e76e313b6 100644 (file)
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -58,14 +58,14 @@ bool wxDoSetShape( Display* xdisplay,
     else
     {
         // wxRegion::ConvertToBitmap gives us the wrong Pixmap:
     else
     {
         // wxRegion::ConvertToBitmap gives us the wrong Pixmap:

-        // polichrome and with black and whire reversed
+        // polychrome and with black and white reversed

         wxRect box = region.GetBox();
         wxBitmap bmp(box.GetRight(), box.GetBottom(), 1);
         wxMemoryDC dc;
         dc.SelectObject(bmp);
         dc.SetBackground(*wxBLACK_BRUSH);
         dc.Clear();
         wxRect box = region.GetBox();
         wxBitmap bmp(box.GetRight(), box.GetBottom(), 1);
         wxMemoryDC dc;
         dc.SelectObject(bmp);
         dc.SetBackground(*wxBLACK_BRUSH);
         dc.Clear();

-        dc.SetClippingRegion(region);
+        dc.SetDeviceClippingRegion(region);

         dc.SetBackground(*wxWHITE_BRUSH);
         dc.Clear();
         dc.SelectObject(wxNullBitmap);
         dc.SetBackground(*wxWHITE_BRUSH);
         dc.Clear();
         dc.SelectObject(wxNullBitmap);

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index b437ef79f65eb8ac2d55262b88a69aac1e8791bc..6cae3175d72ad30eb58bd3e2cdf935322565bfc5 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -1206,7 +1206,7 @@ void wxWindowX11::SendEraseEvents()
     if (m_clearRegion.IsEmpty()) return;
 
     wxClientDC dc( (wxWindow*)this );
     if (m_clearRegion.IsEmpty()) return;
 
     wxClientDC dc( (wxWindow*)this );

-    dc.SetClippingRegion( m_clearRegion );
+    dc.SetDeviceClippingRegion( m_clearRegion );

 
     wxEraseEvent erase_event( GetId(), &dc );
     erase_event.SetEventObject( this );
 
     wxEraseEvent erase_event( GetId(), &dc );
     erase_event.SetEventObject( this );