Make wxWindow::HasScrollbar() respect wxScrolled::ShowScrollbars().

[wxWidgets.git] / src / gtk / dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 161ec246f78c9912c1a9d06b8840e544c1b99854..a11615391e6d7b77e6107050452af4740b202503 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/dcclient.cpp
 // Purpose:     wxWindowDCImpl implementation
 // Author:      Robert Roebling
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Chris Breeze
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1413,10 +1412,13 @@ void wxWindowDCImpl::DoDrawRotatedText(const wxString& text, int xLogical, int y
         bg_col = m_textBackgroundColour.GetColor();
 
     PangoMatrix matrix = PANGO_MATRIX_INIT;
-    pango_matrix_scale(&matrix, m_scaleX, m_scaleY);
-    pango_matrix_rotate (&matrix, angle);
-    pango_context_set_matrix (m_context, &matrix);
-    pango_layout_context_changed (m_layout);
+    if (!wxIsSameDouble(m_scaleX, 1) || !wxIsSameDouble(m_scaleY, 1) || !wxIsNullDouble(angle))
+    {
+        pango_matrix_scale(&matrix, m_scaleX, m_scaleY);
+        pango_matrix_rotate(&matrix, angle);
+        pango_context_set_matrix(m_context, &matrix);
+        pango_layout_context_changed(m_layout);
+    }
 
     int w, h;
     pango_layout_get_pixel_size(m_layout, &w, &h);