X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e0071d949c302b17d6459de98c5cf42600d96fe..de4a74e2d01d600081c50a087c313a770906b560:/src/motif/dcclient.cpp?ds=sidebyside

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 285e7622d7..2013cc7dbe 100644
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1690,7 +1690,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
     }
     else if (m_currentStipple.Ok()
-        && ((m_currentStipple != oldStipple) || !GET_OPTIMIZATION))
+        && ((!m_currentStipple.IsSameAs(oldStipple)) || !GET_OPTIMIZATION))
     {
         XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
 
@@ -2066,7 +2066,8 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y,
 {
     wxDC::DoSetClippingRegion( x, y, width, height );
 
-    wxRegion temp(x, y, width, height);
+    wxRegion temp(XLOG2DEV(x), YLOG2DEV(y),
+                  XLOG2DEVREL(width), YLOG2DEVREL(height));
 
     SetDCClipping(temp.GetX11Region());
 
@@ -2086,16 +2087,14 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y,
 
 void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
 {
-    wxRect box = region.GetBox();
-
-    wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
-
     SetDCClipping(region.GetX11Region());
 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94
     if (m_window && m_window->GetBackingPixmap())
     {
+        wxRect box = region.GetBox();
+
         XRectangle rects[1];
         rects[0].x = (short)XLOG2DEV_2(box.x);
         rects[0].y = (short)YLOG2DEV_2(box.y);