X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e7c2aa5822f9a6e97d8d7848b95ea2eadcd98b..5b6ec9803a058368a1b240a22d444c7301c5715a:/src/msw/dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index d86337576a..4694f6b261 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -26,7 +26,6 @@
  *******************************************************************************/
 
 // For compilers that support precompilation, includes "wx.h".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
@@ -474,7 +473,8 @@ BOOL ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
 	    goto ErrExit;
     }
 
-    if (!(nNumColors = (WORD)lpbi->biClrUsed))
+    nNumColors = (WORD)lpbi->biClrUsed;
+    if ( nNumColors == 0 )
     {
 	/* no color table for 24-bit, default size otherwise */
 	if (lpbi->biBitCount != 24)
@@ -595,7 +595,8 @@ BOOL PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB,
     lpInfo = (LPBITMAPINFOHEADER) GlobalLock(hDIB);
 #endif
 
-    if ((hPalette = MakeDIBPalette(lpInfo)))
+    hPalette = MakeDIBPalette(lpInfo);
+    if ( hPalette )
     {
 	// Need to realize palette for converting DIB to bitmap.
 	hOldPal = SelectPalette(hDC, hPalette, TRUE);