From: Robert Roebling <robert@roebling.de>
Date: Wed, 3 Nov 2004 21:47:55 +0000 (+0000)
Subject:   Added printing images.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b4382784436af107a6477520ff84cd7b40ac6c96?ds=inline

  Added printing images.


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

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 3c9c2622e0..12f74b4db3 100644
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -460,16 +460,22 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
         wxImage image = bitmap.ConvertToImage();
 
         if (!image.Ok()) return;
-
-    	gnome_print_moveto (m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        
+        double matrix[6];
+    	matrix[0] = XLOG2DEVREL(image.GetWidth());
+    	matrix[1] = 0;
+    	matrix[2] = 0;
+    	matrix[3] = YLOG2DEVREL(image.GetHeight());
+    	matrix[4] = XLOG2DEV(x);
+        matrix[5] = YLOG2DEV(y+image.GetHeight());
+    	gnome_print_concat( m_gpc, matrix );
+	    gnome_print_moveto(  m_gpc, 0, 0 );
         gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
     }
 }
 
 void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
-    return;
-
     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();
diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp
index 3c9c2622e0..12f74b4db3 100644
--- a/src/gtk1/gnome/gprint.cpp
+++ b/src/gtk1/gnome/gprint.cpp
@@ -460,16 +460,22 @@ void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
         wxImage image = bitmap.ConvertToImage();
 
         if (!image.Ok()) return;
-
-    	gnome_print_moveto (m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
+        
+        double matrix[6];
+    	matrix[0] = XLOG2DEVREL(image.GetWidth());
+    	matrix[1] = 0;
+    	matrix[2] = 0;
+    	matrix[3] = YLOG2DEVREL(image.GetHeight());
+    	matrix[4] = XLOG2DEV(x);
+        matrix[5] = YLOG2DEV(y+image.GetHeight());
+    	gnome_print_concat( m_gpc, matrix );
+	    gnome_print_moveto(  m_gpc, 0, 0 );
         gnome_print_rgbimage( m_gpc, (guchar*) image.GetData(), image.GetWidth(), image.GetHeight(), image.GetWidth()*3 );
     }
 }
 
 void wxGnomePrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
 {
-    return;
-
     if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();