From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 21 Jan 2006 14:45:47 +0000 (+0000)
Subject: Applied patch [ 1409971 ] wxX11: fix for DoDrawBitmap() when scaling is set
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cc5fb8a7cdaf2ff3706e4c468a1695e34c0505ec

Applied patch [ 1409971 ] wxX11: fix for DoDrawBitmap() when scaling is set


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

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 887f6562e3..033d476bbf 100644
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -1185,7 +1185,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
             int xscreen = DefaultScreen( xdisplay );
             Window xroot = RootWindow( xdisplay, xscreen );
 
-            new_pixmap = XCreatePixmap( xdisplay, xroot, w, h, 1 );
+            new_pixmap = XCreatePixmap( xdisplay, xroot, ww, hh, 1 );
             GC gc = XCreateGC( xdisplay, new_pixmap, 0, NULL );
 
             int bpp = wxTheApp->GetVisualInfo(m_display)->m_visualDepth;
@@ -1195,7 +1195,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
                 XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );
         
             XSetFillStyle( xdisplay, gc, FillSolid );
-            XFillRectangle( xdisplay, new_pixmap, gc, 0, 0, w, h );
+            XFillRectangle( xdisplay, new_pixmap, gc, 0, 0, ww, hh );
 
             if (bpp == 8)
                 XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );
@@ -1242,10 +1242,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     // drawing a mono-bitmap (XBitmap) we use the current text GC
     if (is_mono)
         XCopyPlane( (Display*) m_display, (Pixmap) use_bitmap.GetBitmap(), (Window) m_window,
-            (GC) m_textGC, 0, 0, w, h, xx, yy, 1 );
+            (GC) m_textGC, 0, 0, ww, hh, xx, yy, 1 );
     else
         XCopyArea( (Display*) m_display, (Pixmap) use_bitmap.GetPixmap(), (Window) m_window,
-            (GC) m_penGC, 0, 0, w, h, xx, yy );
+            (GC) m_penGC, 0, 0, ww, hh, xx, yy );
 
     // remove mask again if any
     if (setClipMask)