Check for Pango XFT presence (for wxX11).

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

diff --git a/configure b/configure
index c8d40f1ee26e25b796687cac39f579cfacfe763e..091a39a8a450e43ecea1eea1e683246c53e41329 100755 (executable)
--- a/configure
+++ b/configure
@@ -25945,6 +25945,10 @@ echo "${ECHO_T}$PANGOXFT_LIBS" >&6
 
   if test $succeeded = yes; then
 
+                        cat >>confdefs.h <<\_ACEOF
+#define HAVE_PANGO_XFT 1
+_ACEOF
+
                         CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                         GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
 

diff --git a/configure.in b/configure.in
index 21b278dd98ac54d5e6ed582ff3e0a1e17be4d852..ae5b076c90337cf255e365f49e5e886e646b2521 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2767,6 +2767,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                 )
                 PKG_CHECK_MODULES(PANGOXFT, pangoxft,
                     [
+                        AC_DEFINE(HAVE_PANGO_XFT)
                         CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                         GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
                     ],

diff --git a/setup.h.in b/setup.h.in
index 895fb518b49290316c5d1b61d4b225c11e18ab1a..f89f8bfc5e9091c4f68123f01efa9c9293087a6a 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1306,6 +1306,9 @@
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
+/* Define if you have Pango xft support */
+#undef HAVE_PANGO_XFT
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 5d1ab3726cf139c4a01dbc1cccf2f29563718782..5288ac730382510507401844bc5db867ac5c31aa 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -690,7 +690,9 @@ bool wxApp::OnInitGui()
 
 #include <pango/pango.h>
 #include <pango/pangox.h>
-#include <pango/pangoxft.h>
+#ifdef HAVE_PANGO_XFT
+    #include <pango/pangoxft.h>
+#endif
 
 PangoContext* wxApp::GetPangoContext()
 {
@@ -700,7 +702,7 @@ PangoContext* wxApp::GetPangoContext()
 
     Display *xdisplay = (Display*) wxApp::GetDisplay();
 
-#if 1
+#ifdef HAVE_PANGO_XFT
     int xscreen = DefaultScreen(xdisplay);
     static int use_xft = -1;
     if (use_xft == -1)

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 286a7018ca4a5092a4e9a6dbeda4ae32cb6c3721..1f7200e9cccb8d98f3bc9d00d565e4ea498e957e 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -28,7 +28,9 @@
 #if wxUSE_UNICODE
 #include "glib.h"
 #include "pango/pangox.h"
-#include "pango/pangoxft.h"
+#ifdef HAVE_PANGO_XFT
+    #include "pango/pangoxft.h"
+#endif
 
 #include "pango_x.cpp"
 #endif

diff --git a/src/x11/pango_x.cpp b/src/x11/pango_x.cpp
index 49393ad53ede81ba4768d291c0c9ec9d30443ad7..405514c43aa5a153dceb769f5f571bd4ec171329 100644 (file)
--- a/src/x11/pango_x.cpp
+++ b/src/x11/pango_x.cpp
@@ -64,6 +64,7 @@ x11_draw_glyphs( Drawable            drawable,
                         PangoGlyphString   *glyphs,
                  wxColour           &colour )
 {
+#ifdef HAVE_PANGO_XFT
     if (PANGO_XFT_IS_FONT (font))
     {
         Display* xdisplay = wxGlobalDisplay();
@@ -84,6 +85,7 @@ x11_draw_glyphs( Drawable            drawable,
         XftDrawDestroy( draw );
     }
     else
+#endif
     {
         pango_x_render( wxGlobalDisplay(), drawable, gc, font, glyphs, x, y );
     }