Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk version check should be runtime, not compile time

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-05-17 17:02:14 +00:00
parent 442cd17f74
commit 93de378435
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/dcclient.cpp
View File

@@ -1113,13 +1113,12 @@ void wxGTKWindowImplDC::DoDrawBitmap( const wxBitmap &bitmap,
if ((w != ww) || (h != hh)) if ((w != ww) || (h != hh))
use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, 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. // 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 // Pixbufs-based bitmaps with alpha channel don't have a mask, so we
// have to call GetPixmap() here -- it converts the pixbuf into pixmap // have to call GetPixmap() here -- it converts the pixbuf into pixmap
// and also creates the mask as a side-effect: // and also creates the mask as a side-effect:
use_bitmap.GetPixmap(); if (gtk_check_version(2,2,0))
#endif use_bitmap.GetPixmap();
// apply mask if any // apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;