From: Paul Cornett <paulcor@bullseye.com>
Date: Sun, 7 Dec 2008 05:50:11 +0000 (+0000)
Subject: fix bitmap position with RTL and non-default scale
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6226d1e97b7f6fdcf445565f6dad87293137f570?ds=sidebyside

fix bitmap position with RTL and non-default scale

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 7c647971b0..a7c10579f3 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1070,9 +1070,6 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 
-    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
-        xx -= w;
-
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + w, y + h );
 
@@ -1081,6 +1078,9 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
     int ww = XLOG2DEVREL(w);
     int hh = YLOG2DEVREL(h);
 
+    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
+        xx -= ww;
+
     if (IsOutsideOfClippingRegion( xx,yy,ww,hh ))
         return;