From 93de378435d2b8fcdd6bd5f819fe6a3308e86921 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 17 May 2007 17:02:14 +0000 Subject: [PATCH] gtk version check should be runtime, not compile time git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dcclient.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index f76c0f040a..2896f3c5b2 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1113,13 +1113,12 @@ void wxGTKWindowImplDC::DoDrawBitmap( const wxBitmap &bitmap, if ((w != ww) || (h != hh)) use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh ); -#if !GTK_CHECK_VERSION(2,2,0) // NB: We can't render pixbufs with GTK+ < 2.2, we need to use pixmaps code. // Pixbufs-based bitmaps with alpha channel don't have a mask, so we // have to call GetPixmap() here -- it converts the pixbuf into pixmap // and also creates the mask as a side-effect: - use_bitmap.GetPixmap(); -#endif + if (gtk_check_version(2,2,0)) + use_bitmap.GetPixmap(); // apply mask if any GdkBitmap *mask = (GdkBitmap *) NULL; -- 2.45.2