FX_BOOL considered harmful, part 2.

core/src/fxge/win32/fx_win32_dib.cpp

Index: core/src/fxge/win32/fx_win32_dib.cpp
diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp
index 3dcfce48022b965a7ce0edcd567a98a946b844ed..610c69e4b1607650d71e2208d15987ea66b53cf8 100644
--- a/core/src/fxge/win32/fx_win32_dib.cpp
+++ b/core/src/fxge/win32/fx_win32_dib.cpp
@@ -49,19 +49,19 @@ CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap)
     result.ReleaseBuffer(len);
     return result;
 }
-CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi, LPVOID pData, FX_BOOL bAlpha)
+CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi, LPVOID pData, bool bAlpha)
 {
     int width = pbmi->bmiHeader.biWidth;
     int height = pbmi->bmiHeader.biHeight;
-    BOOL bBottomUp = TRUE;
+    BOOL bBottomUp = true;
     if (height < 0) {
         height = -height;
-        bBottomUp = FALSE;
+        bBottomUp = false;
     }
     int pitch = (width * pbmi->bmiHeader.biBitCount + 31) / 32 * 4;
     CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
     FXDIB_Format format = bAlpha ? (FXDIB_Format)(pbmi->bmiHeader.biBitCount + 0x200) : (FXDIB_Format)pbmi->bmiHeader.biBitCount;
-    FX_BOOL ret = pBitmap->Create(width, height, format);
+    bool ret = pBitmap->Create(width, height, format);
     if (!ret) {
         delete pBitmap;
         return NULL;
@@ -93,7 +93,7 @@ CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi, LPVOID pData, FX_BOOL
 }
 CFX_DIBitmap* CFX_WindowsDIB::LoadFromBuf(BITMAPINFO* pbmi, LPVOID pData)
 {
-    return _FX_WindowsDIB_LoadFromBuf(pbmi, pData, FALSE);
+    return _FX_WindowsDIB_LoadFromBuf(pbmi, pData, false);
 }
 HBITMAP	CFX_WindowsDIB::GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC)
 {
@@ -174,7 +174,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadDIBitmap(WINDIB_Open_Args_ args)
 }
 CFX_DIBitmap* CFX_WindowsDIB::LoadFromDDB(HDC hDC, HBITMAP hBitmap, FX_DWORD* pPalette, FX_DWORD palsize)
 {
-    FX_BOOL bCreatedDC = hDC == NULL;
+    bool bCreatedDC = hDC == NULL;
     if (hDC == NULL) {
         hDC = CreateCompatibleDC(NULL);
     }