ensure that the copies of the bitmap passed to wxMemoryDC ctor are not modified when...

[wxWidgets.git] / src / x11 / pango_x.cpp

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 )
 {
                         PangoGlyphString   *glyphs,
                  wxColour           &colour )
 {

+#ifdef HAVE_PANGO_XFT

     if (PANGO_XFT_IS_FONT (font))
     {
         Display* xdisplay = wxGlobalDisplay();
     if (PANGO_XFT_IS_FONT (font))
     {
         Display* xdisplay = wxGlobalDisplay();


@@ -84,6 +85,7 @@ x11_draw_glyphs( Drawable            drawable,
         XftDrawDestroy( draw );
     }
     else
         XftDrawDestroy( draw );
     }
     else

+#endif

     {
         pango_x_render( wxGlobalDisplay(), drawable, gc, font, glyphs, x, y );
     }
     {
         pango_x_render( wxGlobalDisplay(), drawable, gc, font, glyphs, x, y );
     }