Because someone was inconsistent about using LPSTR and char*, I missed

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

diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h
index b43d4fab2f19748ae867075544b2dc6443f35866..152f67a2c767bb9ebfe2a2c14800eaee61a5ab66 100644 (file)
--- 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
 // 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);
  **************************************************************************/
 
 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);
 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)                   \
 #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))
 
 
 #define DibInfo(pDIB)     ((BITMAPINFO FAR *)(pDIB))