Applied (part of) small patch from Chris Bogolte which

    corrects a test in the Blit code.

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 32c7f5d8ed61d3012a78231192df2da0ab318dd3..ed7876025f746202eacf9db182bb85d854187957 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1308,7 +1308,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         // Scale bitmap if required
         wxBitmap use_bitmap;
 
         // Scale bitmap if required
         wxBitmap use_bitmap;

-        if ((bm_width != bm_ww) || (bm_height != bm_hh))
+        if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))

         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin
         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin


@@ -1426,7 +1426,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     }
     else // use_bitmap_method
     {
     }
     else // use_bitmap_method
     {

-        if ((width != ww) || (height != hh))
+        if ((memDC->m_selected.GetWidth() != ww) || (memDC->m_selected.GetHeight() != hh))

         {
             // get clip coords
             wxRegion tmp( xx,yy,ww,hh );
         {
             // get clip coords
             wxRegion tmp( xx,yy,ww,hh );

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 32c7f5d8ed61d3012a78231192df2da0ab318dd3..ed7876025f746202eacf9db182bb85d854187957 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1308,7 +1308,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         // Scale bitmap if required
         wxBitmap use_bitmap;
 
         // Scale bitmap if required
         wxBitmap use_bitmap;

-        if ((bm_width != bm_ww) || (bm_height != bm_hh))
+        if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))

         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin
         {
             // This indicates that the blitting code below will get
             // a clipped bitmap and therefore needs to move the origin


@@ -1426,7 +1426,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     }
     else // use_bitmap_method
     {
     }
     else // use_bitmap_method
     {

-        if ((width != ww) || (height != hh))
+        if ((memDC->m_selected.GetWidth() != ww) || (memDC->m_selected.GetHeight() != hh))

         {
             // get clip coords
             wxRegion tmp( xx,yy,ww,hh );
         {
             // get clip coords
             wxRegion tmp( xx,yy,ww,hh );