changes to match listctrl.h changes (forgot to commit yesterday, sorry)

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index a62948302212ef72720a89b97c62d1d51e7d1363..f5b86d7c2b7d740a658ad60c7654894eb724aa4a 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -33,9 +33,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/defs.h"

 #include "wx/bitmap.h"
 #include "wx/bitmap.h"

+#include "wx/log.h"
+#include "wx/intl.h"

 #endif
 
 #include <windows.h>
 #endif
 
 #include <windows.h>


@@ -48,12 +48,8 @@
 
 #include "wx/msw/dib.h"
 
 
 #include "wx/msw/dib.h"
 

-#ifndef __TWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
-#ifdef __GNUWIN32__
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"

 #endif
 
 #ifndef SEEK_CUR
 #endif
 
 #ifndef SEEK_CUR


@@ -113,7 +109,7 @@ static BOOL WriteDIB(LPTSTR szFile, HANDLE hdib)
         if (!hdib)
                 return FALSE;
 
         if (!hdib)
                 return FALSE;
 

-        fh = OpenFile(wxFNCONV(szFile), &of, OF_CREATE | OF_READWRITE);
+        fh = OpenFile(wxConvertWX2MB(szFile), &of, OF_CREATE | OF_READWRITE);

         if (fh == -1)
                 return FALSE;
 
         if (fh == -1)
                 return FALSE;
 


@@ -163,9 +159,9 @@ WORD wxPaletteSize(VOID FAR * pv)
         NumColors = DibNumColors(lpbi);
 
         if (lpbi->biSize == sizeof(BITMAPCOREHEADER))
         NumColors = DibNumColors(lpbi);
 
         if (lpbi->biSize == sizeof(BITMAPCOREHEADER))

-                return NumColors * sizeof(RGBTRIPLE);
+                return (WORD)(NumColors * sizeof(RGBTRIPLE));

         else
         else

-                return NumColors * sizeof(RGBQUAD);
+                return (WORD)(NumColors * sizeof(RGBQUAD));

 }
 
 /****************************************************************************
 }
 
 /****************************************************************************


@@ -368,7 +364,7 @@ static DWORD PASCAL lread(int fh, void far *pv, DWORD ul)
                 ul -= MAXREAD;
                 hp += MAXREAD;
                 }
                 ul -= MAXREAD;
                 hp += MAXREAD;
                 }

-        if (_lread(fh, (LPSTR) hp, (WORD) ul) != (WORD) ul)
+        if (_lread(fh, (LPSTR) hp, (WXUINT) ul) != (WXUINT) ul)

                 return 0;
         return ulT;
 }
                 return 0;
         return ulT;
 }


@@ -398,7 +394,7 @@ static DWORD PASCAL lwrite(int fh, VOID FAR *pv, DWORD ul)
                 ul -= MAXREAD;
                 hp += MAXREAD;
                 }
                 ul -= MAXREAD;
                 hp += MAXREAD;
                 }

-        if (_lwrite(fh, (LPSTR) hp, (WORD) ul) != (WORD) ul)
+        if (_lwrite(fh, (LPSTR) hp, (WXUINT) ul) != (WXUINT) ul)

                 return 0;
         return ulT;
 }
                 return 0;
         return ulT;
 }


@@ -433,7 +429,7 @@ BOOL wxReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
 
     /* Open the file and get a handle to it's BITMAPINFO */
 
 
     /* Open the file and get a handle to it's BITMAPINFO */
 

-    fh = OpenFile (wxFNCONV(lpFileName), &of, OF_READ);
+    fh = OpenFile (wxConvertWX2MB(lpFileName), &of, OF_READ);

     if (fh == -1) {
         wxLogError(_("Can't open file '%s'"), lpFileName);
         return (0);
     if (fh == -1) {
         wxLogError(_("Can't open file '%s'"), lpFileName);
         return (0);


@@ -532,7 +528,7 @@ BOOL wxReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
     }
 
     /* offset to the bits from start of DIB header */
     }
 
     /* offset to the bits from start of DIB header */

-    offBits = (WORD)lpbi->biSize + nNumColors * sizeof(RGBQUAD);
+    offBits = (WORD)(lpbi->biSize + nNumColors * sizeof(RGBQUAD));

 
     if (bf.bfOffBits != 0L)
     {
 
     if (bf.bfOffBits != 0L)
     {


@@ -623,6 +619,9 @@ static BOOL PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB,
             result = TRUE;
         }
     }
             result = TRUE;
         }
     }

+
+       GlobalUnlock (hDIB);  // glt
+

     return(result);
 }
 
     return(result);
 }
 


@@ -669,7 +668,7 @@ HPALETTE wxMakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
         lpRGB = (RGBQUAD FAR *)((LPSTR)lpInfo + lpInfo->biSize);
 
         /* copy colors from the color table to the LogPalette structure */
         lpRGB = (RGBQUAD FAR *)((LPSTR)lpInfo + lpInfo->biSize);
 
         /* copy colors from the color table to the LogPalette structure */

-        for (i = 0; i < lpInfo->biClrUsed; i++, lpRGB++)
+        for (i = 0; (DWORD)i < lpInfo->biClrUsed; i++, lpRGB++)

         {
             npPal->palPalEntry[i].peRed = lpRGB->rgbRed;
             npPal->palPalEntry[i].peGreen = lpRGB->rgbGreen;
         {
             npPal->palPalEntry[i].peRed = lpRGB->rgbRed;
             npPal->palPalEntry[i].peGreen = lpRGB->rgbGreen;


@@ -709,12 +708,14 @@ bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette **pal)
 
   if (hPalette)
   {
 
   if (hPalette)
   {

+#if wxUSE_PALETTE

     if (pal)
     {
       *pal = new wxPalette;
       (*pal)->SetHPALETTE((WXHPALETTE) hPalette);
     }
     else
     if (pal)
     {
       *pal = new wxPalette;
       (*pal)->SetHPALETTE((WXHPALETTE) hPalette);
     }
     else

+#endif // wxUSE_PALETTE

       DeleteObject(hPalette);
   }
   else if (pal)
       DeleteObject(hPalette);
   }
   else if (pal)


@@ -929,8 +930,10 @@ HANDLE wxBitmapToDIB (HBITMAP hBitmap, HPALETTE hPal)
 bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap)
 {
   HPALETTE hPalette = 0;
 bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap)
 {
   HPALETTE hPalette = 0;

+#if wxUSE_PALETTE

   if (colourmap)
     hPalette = (HPALETTE) colourmap->GetHPALETTE();
   if (colourmap)
     hPalette = (HPALETTE) colourmap->GetHPALETTE();

+#endif // wxUSE_PALETTE

 
   HANDLE dibHandle = wxBitmapToDIB((HBITMAP) bitmap->GetHBITMAP(), hPalette);
   if (dibHandle)
 
   HANDLE dibHandle = wxBitmapToDIB((HBITMAP) bitmap->GetHBITMAP(), hPalette);
   if (dibHandle)


@@ -942,4 +945,3 @@ bool wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxPalette *colourmap)
   else return FALSE;
 }
 
   else return FALSE;
 }
 

-