Applied font scaling patch (GetTextExtent()) to

   new printing code as well.

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

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 4bdc4076a0f8bbe7eb7436dd19fe2dedd5512cca..d776d44acd11268a115b15e4303d8df86f0be599 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -1412,9 +1412,9 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
     pango_layout_get_pixel_size( m_layout, &w, &h );
     
     if (width)
     pango_layout_get_pixel_size( m_layout, &w, &h );
     
     if (width)

-        *width = (wxCoord) w; 
+        *width = (wxCoord)(w / m_scaleX); 

     if (height)
     if (height)

-        *height = (wxCoord) h;
+        *height = (wxCoord)(h / m_scaleY);

     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);

diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp
index 4bdc4076a0f8bbe7eb7436dd19fe2dedd5512cca..d776d44acd11268a115b15e4303d8df86f0be599 100644 (file)
--- a/src/gtk1/gnome/gprint.cpp
+++ b/src/gtk1/gnome/gprint.cpp
@@ -1412,9 +1412,9 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
     pango_layout_get_pixel_size( m_layout, &w, &h );
     
     if (width)
     pango_layout_get_pixel_size( m_layout, &w, &h );
     
     if (width)

-        *width = (wxCoord) w; 
+        *width = (wxCoord)(w / m_scaleX); 

     if (height)
     if (height)

-        *height = (wxCoord) h;
+        *height = (wxCoord)(h / m_scaleY);

     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
     if (descent)
     {
         PangoLayoutIter *iter = pango_layout_get_iter(m_layout);