From dcf18859bb9d8dd83f770ef3813dfda6b23a2c82 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Thu, 9 Oct 2003 19:50:00 +0000
Subject: [PATCH]   Use new bitmap scalingin DrawBitmap() as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/dcclient.cpp  | 15 ++-------------
 src/gtk1/dcclient.cpp | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 509f84f230..6f377fde56 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1060,20 +1060,9 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     }
 
     // scale bitmap if required 
-    wxBitmap use_bitmap;
+    wxBitmap use_bitmap = bitmap;
     if ((w != ww) || (h != hh))
-    {
-        wxImage image = bitmap.ConvertToImage();
-        image.Rescale( ww, hh );
-        if (is_mono)
-            use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
-        else
-            use_bitmap = wxBitmap(image);
-    }
-    else
-    {
-        use_bitmap = bitmap;
-    }
+        use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
     
     // apply mask if any
     GdkBitmap *mask = (GdkBitmap *) NULL;
diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 509f84f230..6f377fde56 100644
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1060,20 +1060,9 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     }
 
     // scale bitmap if required 
-    wxBitmap use_bitmap;
+    wxBitmap use_bitmap = bitmap;
     if ((w != ww) || (h != hh))
-    {
-        wxImage image = bitmap.ConvertToImage();
-        image.Rescale( ww, hh );
-        if (is_mono)
-            use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
-        else
-            use_bitmap = wxBitmap(image);
-    }
-    else
-    {
-        use_bitmap = bitmap;
-    }
+        use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
     
     // apply mask if any
     GdkBitmap *mask = (GdkBitmap *) NULL;