X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..6c00e46fa83e3a9c0e76a76f15522a10b3a5c67f:/include/wx/msw/dibutils.h diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h index b43d4fab2f..152f67a2c7 100644 --- a/include/wx/msw/dibutils.h +++ b/include/wx/msw/dibutils.h @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Microsoft, Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /*************************************************************************** @@ -41,8 +41,8 @@ typedef HANDLE HDIB; **************************************************************************/ void ClearSystemPalette(void); -PDIB DibOpenFile(LPSTR szFile); -int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi); +PDIB DibOpenFile(LPTSTR szFile); +int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi); BOOL DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage); PDIB DibCreate(int bits, int dx, int dy); BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal); @@ -112,9 +112,10 @@ PDIB DibReadBitmapInfo(HFILE fh); #define FixBitmapInfo(lpbi) if ((lpbi)->biSizeImage == 0) \ (lpbi)->biSizeImage = DibSizeImage(lpbi); \ if ((lpbi)->biClrUsed == 0) \ - (lpbi)->biClrUsed = DibNumColors(lpbi); \ - if ((lpbi)->biCompression == BI_BITFIELDS && (lpbi)->biClrUsed == 0) \ - ; // (lpbi)->biClrUsed = 3; + (lpbi)->biClrUsed = DibNumColors(lpbi); + +// if ((lpbi)->biCompression == BI_BITFIELDS && (lpbi)->biClrUsed == 0) +// ; // (lpbi)->biClrUsed = 3; #define DibInfo(pDIB) ((BITMAPINFO FAR *)(pDIB))