just return the min size needed by the sizer for the windows with sizers from their...

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index c064590ae8f81b80eff016653b1969d595cb1f8b..3ffd2a177680f366e4843c0f02ebec54c19c62e9 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1472,14 +1472,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         return;
     size_t datalen = strlen(data);
 
-#ifdef PANGO_VERSION_MAJOR
-    // in Pango >= 1.16 the "underline of leading/trailing spaces" bug has been fixed...
-    static bool pangoOk = (pango_version_check(1, 16, 1) == NULL);
-#else
-    // the version of Pango used for compiling wxWidgets does not have version macros/functions...
-    // we are forced to assume that the run-time version of Pango is older than 1.16
-    const bool pangoOk = false;
-#endif
+    // in Pango >= 1.16 the "underline of leading/trailing spaces" bug
+    // has been fixed and thus the hack implemented below should never be used
+    static bool pangoOk = !wx_pango_version_check(1, 16, 0);
 
     bool needshack = underlined && !pangoOk;
     char *hackstring = NULL;
@@ -1724,7 +1719,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 void wxWindowDC::DoGetTextExtent(const wxString &string,
                                  wxCoord *width, wxCoord *height,
                                  wxCoord *descent, wxCoord *externalLeading,
-                                 wxFont *theFont) const
+                                 const wxFont *theFont) const
 {
     if ( width )
         *width = 0;