Some #include and #if wxUSE_XX things

[wxWidgets.git] / include / wx / msw / dibutils.h

diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h
index 746660d6886a65a1c8b49c487d32a7b6997b5f01..152f67a2c767bb9ebfe2a2c14800eaee61a5ab66 100644 (file)
--- a/include/wx/msw/dibutils.h
+++ b/include/wx/msw/dibutils.h
@@ -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))