From 3053ecbd72c75922291be7a3525dfb6f9bed99b9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 Aug 2008 14:39:48 +0000 Subject: [PATCH] add parentheses for && inside || to fix g++ 4.3 warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/bitmap.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 2c63422815..6c3853dd04 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -966,9 +966,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) GdkPixbuf *pixbuf = GetPixbuf(); const bool hasAlpha = HasAlpha(); // allow access if bpp is valid and matches existence of alpha - if (pixbuf != NULL && ( - bpp == 24 && !hasAlpha || - bpp == 32 && hasAlpha)) + if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) ) { data.m_height = gdk_pixbuf_get_height( pixbuf ); data.m_width = gdk_pixbuf_get_width( pixbuf );