From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Aug 2008 14:39:48 +0000 (+0000)
Subject: add parentheses for && inside || to fix g++ 4.3 warning
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c74fc1e130e8abc1a1b4a91255b17f657cd372dd?ds=sidebyside

add parentheses for && inside || to fix g++ 4.3 warning

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 18fb4f02b0..0f7ab2e9ef 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -901,9 +901,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 );