Committing in .

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

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index 854a6a65ab1c8996dc8e476d296177605289c06e..34b895da03c05cc7a510fd3622f90e16deb38f3b 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -19,12 +19,19 @@
 #include <io.h>
 #include <windows.h>
 
 #include <io.h>
 #include <windows.h>
 

-#ifdef __GNUWIN32__
-#include "wx/msw/gnuwin32/extra.h"
+#if defined(__MWERKS__)
+#include <wingdi.h>
+#include <winuser.h>

 #endif
 
 #endif
 

+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"
+#endif
+
+#include "wx/wxchar.h"

 #include "wx/msw/curicop.h"
 #include "wx/msw/curico.h"
 #include "wx/msw/curicop.h"
 #include "wx/msw/curico.h"

+#include "wx/string.h"

 
 //*****************************************************************************
 //* Function : ReadIconFile()                                                 *
 
 //*****************************************************************************
 //* Function : ReadIconFile()                                                 *


@@ -35,13 +42,13 @@
 //*            be created for any reason.                                     *
 //*****************************************************************************
 
 //*            be created for any reason.                                     *
 //*****************************************************************************
 

-HICON ReadIconFile( char *szFileName, HINSTANCE hInst, int *W, int *H)
+HICON ReadIconFile( wxChar *szFileName, HINSTANCE hInst, int *W, int *H)

 { HICON   hIcon;
   HANDLE  hDIB;
 
 { HICON   hIcon;
   HANDLE  hDIB;
 

-  if( (hDIB = ReadIcon(szFileName, W, H)) == NULL)
+  if( (hDIB = ReadIcon(szFileName, W, H)) == (HANDLE) NULL)

                                           // read the icon DIB from file
                                           // read the icon DIB from file

-    return NULL;
+    return (HICON) NULL;

   hIcon = MakeIcon( hDIB, hInst);         // create an icon from DIB
   GlobalFree( hDIB);
   return hIcon;
   hIcon = MakeIcon( hDIB, hInst);         // create an icon from DIB
   GlobalFree( hDIB);
   return hIcon;


@@ -58,13 +65,13 @@ HICON ReadIconFile( char *szFileName, HINSTANCE hInst, int *W, int *H)
 //*            monochrome.                                                    *
 //*****************************************************************************
 
 //*            monochrome.                                                    *
 //*****************************************************************************
 

-HICON CursorToIcon( char *szFileName, HINSTANCE hInst, int *W, int *H)
+HICON CursorToIcon( wxChar *szFileName, HINSTANCE hInst, int *W, int *H)

 { HANDLE  hDIB;     // Handle to DIB memory
   HICON   hIcon;    // Handle to Icon
 
 { HANDLE  hDIB;     // Handle to DIB memory
   HICON   hIcon;    // Handle to Icon
 

-  if( (hDIB = ReadCur( szFileName, NULL, W, H)) == NULL)
+  if( (hDIB = ReadCur( szFileName, NULL, W, H)) == (HANDLE) NULL)

                                                     // Read cursor DIB
                                                     // Read cursor DIB

-    return NULL;
+    return (HICON) NULL;

   hIcon = MakeIcon( hDIB, hInst);      // make icon from cursor DIB
   GlobalFree( hDIB);
   return hIcon;
   hIcon = MakeIcon( hDIB, hInst);      // make icon from cursor DIB
   GlobalFree( hDIB);
   return hIcon;


@@ -78,10 +85,10 @@ HICON CursorToIcon( char *szFileName, HINSTANCE hInst, int *W, int *H)
 //*            is corrupt or if memory cannot be allocated for the DIB info.  *
 //*****************************************************************************
 
 //*            is corrupt or if memory cannot be allocated for the DIB info.  *
 //*****************************************************************************
 

-HANDLE ReadIcon( char *szFileName, int *W, int *H)
+HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)

 { ICONFILEHEADER iconFileHead;   // ICON file header structure
   ICONFILERES    iconFileRes;    // ICON file resource
 { ICONFILEHEADER iconFileHead;   // ICON file header structure
   ICONFILERES    iconFileRes;    // ICON file resource

-  WORD           cbHead,
+  UINT           cbHead,

                  cbRes,
                  cbBits;         // Used for reading in file
   int            hFile;          // File handle
                  cbRes,
                  cbBits;         // Used for reading in file
   int            hFile;          // File handle


@@ -92,17 +99,16 @@ HANDLE ReadIcon( char *szFileName, int *W, int *H)
                  nDirEntries = 0;
 
    // Open and read the .ICO file header and the first ICONFILERES
                  nDirEntries = 0;
 
    // Open and read the .ICO file header and the first ICONFILERES

-  hFile  = _lopen( szFileName, OF_READ);
+  hFile  = _lopen( wxConvertWX2MB(szFileName), OF_READ);

   cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER));
   cbRes  = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES));
   ++nDirEntries;
 
   if((cbHead != sizeof( ICONFILEHEADER)) || (cbRes != sizeof( ICONFILERES)))
   cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER));
   cbRes  = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES));
   ++nDirEntries;
 
   if((cbHead != sizeof( ICONFILEHEADER)) || (cbRes != sizeof( ICONFILERES)))

-    return NULL;
-
+    return (HANDLE) NULL;

   // Verify that it's an .ICON file
   if( iconFileHead.wResourceType != 1)
   // Verify that it's an .ICON file
   if( iconFileHead.wResourceType != 1)

-    return NULL;
+    return (HANDLE) NULL;

 
   // inserted by P.S.
   while( (nDirEntries < iconFileHead.wResourceCount) &&
 
   // inserted by P.S.
   while( (nDirEntries < iconFileHead.wResourceCount) &&


@@ -110,7 +116,7 @@ HANDLE ReadIcon( char *szFileName, int *W, int *H)
   {
     cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));
     if(cbRes != sizeof( ICONFILERES))
   {
     cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));
     if(cbRes != sizeof( ICONFILERES))

-      return NULL;
+      return (HANDLE) NULL;

     else
       ++nDirEntries;
   }
     else
       ++nDirEntries;
   }


@@ -122,8 +128,9 @@ HANDLE ReadIcon( char *szFileName, int *W, int *H)
 
   // Allocate and lock memory to read in the DIB
   hDIB = GlobalAlloc(GHND, iconFileRes.dwDIBSize);
 
   // Allocate and lock memory to read in the DIB
   hDIB = GlobalAlloc(GHND, iconFileRes.dwDIBSize);

-  if(hDIB == NULL)
-    return NULL;
+  if(hDIB == (HANDLE) NULL)
+    return (HANDLE) NULL;
+

 #ifdef __WINDOWS_386__
   lpDIB = (LPBITMAPINFO)MK_FP32(GlobalLock(hDIB));
 #else
 #ifdef __WINDOWS_386__
   lpDIB = (LPBITMAPINFO)MK_FP32(GlobalLock(hDIB));
 #else


@@ -143,7 +150,7 @@ HANDLE ReadIcon( char *szFileName, int *W, int *H)
   if( (DWORD )cbBits != iconFileRes.dwDIBSize)
   {
     GlobalFree( hDIB);
   if( (DWORD )cbBits != iconFileRes.dwDIBSize)
   {
     GlobalFree( hDIB);

-    return NULL;
+    return (HANDLE) NULL;

   }
   return hDIB;
 }
   }
   return hDIB;
 }


@@ -168,7 +175,7 @@ HANDLE ReadIcon( char *szFileName, int *W, int *H)
 //*            bitmaps. So, no need to convert the AND bitmask.               *
 //*         7) Since a DIB is stored upside down, flip the monochrome AND bits*
 //*            by scanlines.                                                  *
 //*            bitmaps. So, no need to convert the AND bitmask.               *
 //*         7) Since a DIB is stored upside down, flip the monochrome AND bits*
 //*            by scanlines.                                                  *

-//*         8) Use the XOR and AND bits and create an icon with CreateIcon.   * 
+//*         8) Use the XOR and AND bits and create an icon with CreateIcon.   *

 //*****************************************************************************
 
 HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)
 //*****************************************************************************
 
 HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)


@@ -209,7 +216,7 @@ HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)
                             lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it
                             lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it

-  hDC = CreateDC( "DISPLAY", NULL, NULL, NULL);
+  hDC = CreateDC( wxT("DISPLAY"), NULL, NULL, NULL);

 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateDIBitmap( hDC, (LPBITMAPINFOHEADER)&(lpDIB->bmiHeader),
 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateDIBitmap( hDC, (LPBITMAPINFOHEADER)&(lpDIB->bmiHeader),


@@ -219,13 +226,13 @@ HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)
 
   dwBmpSize = (DWORD )(bmpXor.bmWidthBytes * bmpXor.bmHeight * bmpXor.bmPlanes);
   hXorDDB = GlobalAlloc( GHND, dwBmpSize);
 
   dwBmpSize = (DWORD )(bmpXor.bmWidthBytes * bmpXor.bmHeight * bmpXor.bmPlanes);
   hXorDDB = GlobalAlloc( GHND, dwBmpSize);

-  if(hXorDDB == NULL)
+  if(hXorDDB == (HANDLE) NULL)

   {
     // clean up before quitting
     DeleteObject( hbmXor);
     DeleteDC( hDC);
     GlobalUnlock( hDIB);
   {
     // clean up before quitting
     DeleteObject( hbmXor);
     DeleteDC( hDC);
     GlobalUnlock( hDIB);

-    return NULL;
+    return (HICON) NULL;

   }
 
 #ifdef __WINDOWS_386__
   }
 
 #ifdef __WINDOWS_386__


@@ -246,8 +253,8 @@ HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)
     szFlip[(k - 1) - j] = *(DWORD FAR *)lpANDbits;
 
   // 8) Use the XOR and AND bits and create an icon with CreateIcon.
     szFlip[(k - 1) - j] = *(DWORD FAR *)lpANDbits;
 
   // 8) Use the XOR and AND bits and create an icon with CreateIcon.

-  hIcon = CreateIcon( hInst, bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmPlanes,
-                      bmpXor.bmBitsPixel, (const BYTE *)szFlip, (const BYTE *)lpXorDDB);
+  hIcon = CreateIcon( hInst, bmpXor.bmWidth, bmpXor.bmHeight, (BYTE)bmpXor.bmPlanes,
+                      (BYTE)bmpXor.bmBitsPixel, (const BYTE *)szFlip, (const BYTE *)lpXorDDB);

 
   // Clean up before exiting.
   DeleteObject( hbmXor);
 
   // Clean up before exiting.
   DeleteObject( hbmXor);


@@ -270,15 +277,15 @@ HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)
 //*            be created for any reason.                                     *
 //*****************************************************************************
 
 //*            be created for any reason.                                     *
 //*****************************************************************************
 

-HCURSOR ReadCursorFile( char *szFileName, HINSTANCE hInst, int *W, int *H,
+HCURSOR ReadCursorFile( wxChar *szFileName, HINSTANCE hInst, int *W, int *H,

                         int *XHot, int *YHot)
 { HANDLE    hDIB;    // Handle to DIB memory
   HCURSOR   hCursor;
   POINT     ptHotSpot;
 
   // read cur DIB from file
                         int *XHot, int *YHot)
 { HANDLE    hDIB;    // Handle to DIB memory
   HCURSOR   hCursor;
   POINT     ptHotSpot;
 
   // read cur DIB from file

-  if( (hDIB = ReadCur( szFileName, (LPPOINT )&ptHotSpot, W, H)) == NULL)
-    return NULL;
+  if( (hDIB = ReadCur( szFileName, (LPPOINT )&ptHotSpot, W, H)) == (HANDLE) NULL)
+    return (HCURSOR) NULL;

   hCursor = MakeCursor( hDIB, (LPPOINT )&ptHotSpot, hInst);//create cur from DIB
   if(XHot != 0)
     *XHot = ptHotSpot.x;
   hCursor = MakeCursor( hDIB, (LPPOINT )&ptHotSpot, hInst);//create cur from DIB
   if(XHot != 0)
     *XHot = ptHotSpot.x;


@@ -299,15 +306,15 @@ HCURSOR ReadCursorFile( char *szFileName, HINSTANCE hInst, int *W, int *H,
 //*            monochrome.                                                    *
 //*****************************************************************************
 
 //*            monochrome.                                                    *
 //*****************************************************************************
 

-HCURSOR IconToCursor( char *szFileName, HINSTANCE hInst, int XHot, int YHot,
+HCURSOR IconToCursor( wxChar *szFileName, HINSTANCE hInst, int XHot, int YHot,

                       int  *W, int *H)
 { HCURSOR   hCursor;
   HANDLE    hDIB;
   POINT     ptHotSpot;
 
                       int  *W, int *H)
 { HCURSOR   hCursor;
   HANDLE    hDIB;
   POINT     ptHotSpot;
 

-  if( (hDIB = ReadIcon( szFileName, W, H)) == NULL)
+  if( (hDIB = ReadIcon( szFileName, W, H)) == (HANDLE) NULL)

                                              //read icon file to get icon DIB
                                              //read icon file to get icon DIB

-    return NULL;
+    return (HCURSOR) NULL;

   // Set the hot spot of the cursor
   ptHotSpot.x = XHot;
   ptHotSpot.y = YHot;
   // Set the hot spot of the cursor
   ptHotSpot.x = XHot;
   ptHotSpot.y = YHot;


@@ -325,10 +332,10 @@ HCURSOR IconToCursor( char *szFileName, HINSTANCE hInst, int XHot, int YHot,
 //*            is corrupt or if memory cannot be allocated for the DIB info.  *
 //*****************************************************************************
 
 //*            is corrupt or if memory cannot be allocated for the DIB info.  *
 //*****************************************************************************
 

-HANDLE ReadCur( char *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
+HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)

 { CURFILEHEADER   curFileHead;  // CURSOR file header structure
   CURFILERES      curFileRes;   // CURSOR file resource
 { CURFILEHEADER   curFileHead;  // CURSOR file header structure
   CURFILERES      curFileRes;   // CURSOR file resource

-  WORD            cbHead,
+  UINT            cbHead,

                   cbRes,
                   cbBits;       // Used for reading in file
   LPBITMAPINFO    lpDIB;        // Pointer to DIB memory
                   cbRes,
                   cbBits;       // Used for reading in file
   LPBITMAPINFO    lpDIB;        // Pointer to DIB memory


@@ -339,17 +346,17 @@ HANDLE ReadCur( char *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
                   nDirEntries = 0;
 
   // Open and read the .ICO file header and the first ICONFILERES
                   nDirEntries = 0;
 
   // Open and read the .ICO file header and the first ICONFILERES

-  hFile  = _lopen( szFileName, OF_READ);
+  hFile  = _lopen( wxConvertWX2MB(szFileName), OF_READ);

   cbHead = _lread( hFile,  (LPSTR )&curFileHead, sizeof( CURFILEHEADER));
   cbRes  = _lread( hFile,  (LPSTR )&curFileRes,  sizeof( CURFILERES));
   ++nDirEntries;
 
   if((cbHead != sizeof( CURFILEHEADER)) || (cbRes != sizeof( CURFILERES)))
   cbHead = _lread( hFile,  (LPSTR )&curFileHead, sizeof( CURFILEHEADER));
   cbRes  = _lread( hFile,  (LPSTR )&curFileRes,  sizeof( CURFILERES));
   ++nDirEntries;
 
   if((cbHead != sizeof( CURFILEHEADER)) || (cbRes != sizeof( CURFILERES)))

-    return NULL;
+    return (HANDLE) NULL;

 
    // Verify that it's an .CUR file
   if ((curFileRes.bReserved1 != 0) || (curFileHead.wResourceType != 2))
 
    // Verify that it's an .CUR file
   if ((curFileRes.bReserved1 != 0) || (curFileHead.wResourceType != 2))

-    return NULL;
+    return (HANDLE) NULL;

 
   // following added by P.S.
   while( (nDirEntries < curFileHead.wResourceCount) &&
 
   // following added by P.S.
   while( (nDirEntries < curFileHead.wResourceCount) &&


@@ -357,7 +364,7 @@ HANDLE ReadCur( char *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
   {
     cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));
     if(cbRes != sizeof( CURFILERES))
   {
     cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));
     if(cbRes != sizeof( CURFILERES))

-      return NULL;
+      return (HANDLE) NULL;

     else
       ++nDirEntries;
   }
     else
       ++nDirEntries;
   }


@@ -369,8 +376,8 @@ HANDLE ReadCur( char *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
 
   // Allocate & lock memory to read in the DIB
   hDIB = GlobalAlloc(GHND, curFileRes.dwDIBSize);
 
   // Allocate & lock memory to read in the DIB
   hDIB = GlobalAlloc(GHND, curFileRes.dwDIBSize);

-  if(hDIB == NULL)
-    return NULL;
+  if(hDIB == (HANDLE) NULL)
+    return (HANDLE) NULL;

 
 #ifdef __WINDOWS_386__
   lpDIB = (LPBITMAPINFO )MK_FP32(GlobalLock(hDIB));
 
 #ifdef __WINDOWS_386__
   lpDIB = (LPBITMAPINFO )MK_FP32(GlobalLock(hDIB));


@@ -390,9 +397,9 @@ HANDLE ReadCur( char *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
   {
     GlobalUnlock( hDIB);
     GlobalFree( hDIB);
   {
     GlobalUnlock( hDIB);
     GlobalFree( hDIB);

-    return NULL;
+    return (HANDLE) NULL;

   }
   }

-  if(lpptHotSpot != NULL)  // If it is necessary to know the hot spot
+  if(lpptHotSpot != (LPPOINT) NULL)  // If it is necessary to know the hot spot

   {
     lpptHotSpot->x = (int )curFileRes.wXHotspot;
     lpptHotSpot->y = (int )curFileRes.wYHotspot;
   {
     lpptHotSpot->x = (int )curFileRes.wXHotspot;
     lpptHotSpot->y = (int )curFileRes.wYHotspot;


@@ -433,13 +440,13 @@ HBITMAP ColorDDBToMonoDDB ( HBITMAP hbm)
 
   dwLen = bi.biSize + PaletteSize((LPSTR)&bi);
 
 
   dwLen = bi.biSize + PaletteSize((LPSTR)&bi);
 

-  hdc = GetDC( NULL);
+  hdc = GetDC( (HWND) NULL);

 
   hdib = GlobalAlloc( GHND, dwLen);
 
   hdib = GlobalAlloc( GHND, dwLen);

-  if (hdib == NULL)
+  if (hdib == (HANDLE) NULL)

   {
   {

-    ReleaseDC( NULL, hdc);
-    return NULL;
+    ReleaseDC( (HWND) NULL, hdc);
+    return (HBITMAP) NULL;

   }
 
 #ifdef __WINDOWS_386__
   }
 
 #ifdef __WINDOWS_386__


@@ -469,8 +476,8 @@ HBITMAP ColorDDBToMonoDDB ( HBITMAP hbm)
   else
   {
     GlobalFree( hdib);
   else
   {
     GlobalFree( hdib);

-    ReleaseDC( NULL, hdc);
-    return NULL;
+    ReleaseDC( (HWND) NULL, hdc);
+    return (HBITMAP) NULL;

   }
 
   // Call GetDIBits with a NON-NULL lpBits parameter, to actually
   }
 
   // Call GetDIBits with a NON-NULL lpBits parameter, to actually


@@ -487,9 +494,9 @@ HBITMAP ColorDDBToMonoDDB ( HBITMAP hbm)
                  (LPBITMAPINFO)lpbi, DIB_RGB_COLORS) == 0)
   {
     GlobalUnlock( hdib);
                  (LPBITMAPINFO)lpbi, DIB_RGB_COLORS) == 0)
   {
     GlobalUnlock( hdib);

-    hdib = NULL;
-    ReleaseDC( NULL, hdc);
-    return NULL;
+    hdib = (HANDLE) NULL;
+    ReleaseDC( (HWND) NULL, hdc);
+    return (HBITMAP) NULL;

   }
 
   // Finally, create a monochrome DDB, and put the DIB into
   }
 
   // Finally, create a monochrome DDB, and put the DIB into


@@ -503,7 +510,7 @@ HBITMAP ColorDDBToMonoDDB ( HBITMAP hbm)
   GlobalUnlock( hdib);
   GlobalFree( hdib);
 
   GlobalUnlock( hdib);
   GlobalFree( hdib);
 

-  ReleaseDC(NULL, hdc);
+  ReleaseDC((HWND) NULL, hdc);

   return hbmMono;
 }
 
   return hbmMono;
 }
 


@@ -570,7 +577,7 @@ HCURSOR MakeCursor( HANDLE hDIB, LPPOINT lpptHotSpot, HINSTANCE hInst)
                            lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it
                            lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it

-  hDC = CreateDC( "DISPLAY", NULL, NULL, NULL);
+  hDC = CreateDC( wxT("DISPLAY"), NULL, NULL, NULL);

 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateBitmap( (int )lpDIB->bmiHeader.biWidth,
 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateBitmap( (int )lpDIB->bmiHeader.biWidth,


@@ -581,12 +588,12 @@ HCURSOR MakeCursor( HANDLE hDIB, LPPOINT lpptHotSpot, HINSTANCE hInst)
 
   dwBmpSize = (DWORD )(bmpXor.bmWidthBytes * bmpXor.bmHeight * bmpXor.bmPlanes);
   hXorDDB = GlobalAlloc( GHND, dwBmpSize);
 
   dwBmpSize = (DWORD )(bmpXor.bmWidthBytes * bmpXor.bmHeight * bmpXor.bmPlanes);
   hXorDDB = GlobalAlloc( GHND, dwBmpSize);

-  if(hXorDDB == NULL)
+  if(hXorDDB == (HANDLE) NULL)

   {  // clean up before quitting
     DeleteObject( hbmXor);
     DeleteDC( hDC);
     GlobalUnlock( hDIB);
   {  // clean up before quitting
     DeleteObject( hbmXor);
     DeleteDC( hDC);
     GlobalUnlock( hDIB);

-    return NULL;
+    return (HCURSOR) NULL;

   }
 #ifdef __WINDOWS_386__
   lpXorDDB = (LPSTR)MK_FP32(GlobalLock( hXorDDB));
   }
 #ifdef __WINDOWS_386__
   lpXorDDB = (LPSTR)MK_FP32(GlobalLock( hXorDDB));


@@ -637,9 +644,9 @@ WORD PaletteSize( LPSTR pv)
   NumColors = DIBNumColors((LPSTR )lpbi);
 
   if(lpbi->biSize == sizeof( BITMAPCOREHEADER))  // OS/2 style DIBs
   NumColors = DIBNumColors((LPSTR )lpbi);
 
   if(lpbi->biSize == sizeof( BITMAPCOREHEADER))  // OS/2 style DIBs

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

   else
   else

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

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


@@ -665,7 +672,7 @@ WORD DIBNumColors ( LPSTR pv)
   // is in biClrUsed, whereas in the BITMAPCORE - style headers, it
   // is dependent on the bits per pixel ( = 2 raised to the power of
   // bits/pixel).
   // is in biClrUsed, whereas in the BITMAPCORE - style headers, it
   // is dependent on the bits per pixel ( = 2 raised to the power of
   // bits/pixel).

-    
+

   if(lpbi->biSize != sizeof( BITMAPCOREHEADER))
   {
     if(lpbi->biClrUsed != 0)
   if(lpbi->biSize != sizeof( BITMAPCOREHEADER))
   {
     if(lpbi->biClrUsed != 0)


@@ -691,7 +698,7 @@ WORD DIBNumColors ( LPSTR pv)
 
 #if 0
 // ******************************************************************
 
 #if 0
 // ******************************************************************

-BOOL fGetXPixmap( BOOL fIsIcon, char *szFileName, HINSTANCE hInst,
+BOOL fGetXPixmap( BOOL fIsIcon, wxChar *szFileName, HINSTANCE hInst,

                   char cData[], int &width, int &height)
 { HDC       hdc,
             hdcMemory;
                   char cData[], int &width, int &height)
 { HDC       hdc,
             hdcMemory;


@@ -766,7 +773,7 @@ HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint)
   NPSTR     andBits;
   NPSTR     xorBits;
 
   NPSTR     andBits;
   NPSTR     xorBits;
 

-  hDC = GetDC(NULL);
+  hDC = GetDC((HWND) NULL);

   hDCColor = CreateCompatibleDC(hDC);
   hDCMono = CreateCompatibleDC(hDC);
   hAndBmp = CreateCompatibleBitmap(hDCMono, 32, 32);
   hDCColor = CreateCompatibleDC(hDC);
   hDCMono = CreateCompatibleDC(hDC);
   hAndBmp = CreateCompatibleBitmap(hDCMono, 32, 32);


@@ -813,10 +820,17 @@ HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint)
   DeleteObject(hXorBmp);
   ReleaseDC(NULL, hDC);
 #ifndef __WIN32__
   DeleteObject(hXorBmp);
   ReleaseDC(NULL, hDC);
 #ifndef __WIN32__

+#ifdef STRICT
+  LocalUnlock(LocalHandle((void NEAR*) andBits));
+  LocalUnlock(LocalHandle((void NEAR*) xorBits));
+  LocalFree(LocalHandle((void NEAR*) andBits));
+  LocalFree(LocalHandle((void NEAR*) xorBits));
+#else

   LocalUnlock(LocalHandle((WORD) andBits));
   LocalUnlock(LocalHandle((WORD) xorBits));
   LocalFree(LocalHandle((WORD) andBits));
   LocalFree(LocalHandle((WORD) xorBits));
   LocalUnlock(LocalHandle((WORD) andBits));
   LocalUnlock(LocalHandle((WORD) xorBits));
   LocalFree(LocalHandle((WORD) andBits));
   LocalFree(LocalHandle((WORD) xorBits));

+#endif

 #else
   LocalUnlock(LocalHandle((LPCVOID) andBits));
   LocalUnlock(LocalHandle((LPCVOID) xorBits));
 #else
   LocalUnlock(LocalHandle((LPCVOID) andBits));
   LocalUnlock(LocalHandle((LPCVOID) xorBits));


@@ -829,7 +843,7 @@ HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint)
 /*
  * This doesn't work: just gives us a grey square. Ideas, anyone?
  */
 /*
  * This doesn't work: just gives us a grey square. Ideas, anyone?
  */

- 
+

 HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap)
 {
   HDC hDCColor, hDCMono;
 HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap)
 {
   HDC hDCColor, hDCMono;


@@ -843,7 +857,7 @@ HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap)
   NPSTR     andBits;
   NPSTR     xorBits;
 
   NPSTR     andBits;
   NPSTR     xorBits;
 

-  hDC = GetDC(NULL);
+  hDC = GetDC((HWND) NULL);

   hDCColor = CreateCompatibleDC(hDC);
   hDCMono = CreateCompatibleDC(hDC);
   hAndBmp = CreateCompatibleBitmap(hDCMono, 32, 32);
   hDCColor = CreateCompatibleDC(hDC);
   hDCMono = CreateCompatibleDC(hDC);
   hAndBmp = CreateCompatibleBitmap(hDCMono, 32, 32);


@@ -882,12 +896,19 @@ HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap)
   DeleteDC(hDCMono);
   DeleteObject(hAndBmp);
   DeleteObject(hXorBmp);
   DeleteDC(hDCMono);
   DeleteObject(hAndBmp);
   DeleteObject(hXorBmp);

-  ReleaseDC(NULL, hDC);
+  ReleaseDC((HWND) NULL, hDC);

 #ifndef __WIN32__
 #ifndef __WIN32__

+#ifdef STRICT
+  LocalUnlock(LocalHandle((void NEAR*) andBits));
+  LocalUnlock(LocalHandle((void NEAR*) xorBits));
+  LocalFree(LocalHandle((void NEAR*) andBits));
+  LocalFree(LocalHandle((void NEAR*) xorBits));
+#else

   LocalUnlock(LocalHandle((WORD) andBits));
   LocalUnlock(LocalHandle((WORD) xorBits));
   LocalFree(LocalHandle((WORD) andBits));
   LocalFree(LocalHandle((WORD) xorBits));
   LocalUnlock(LocalHandle((WORD) andBits));
   LocalUnlock(LocalHandle((WORD) xorBits));
   LocalFree(LocalHandle((WORD) andBits));
   LocalFree(LocalHandle((WORD) xorBits));

+#endif

 #else
   LocalUnlock(LocalHandle((LPCVOID) andBits));
   LocalUnlock(LocalHandle((LPCVOID) xorBits));
 #else
   LocalUnlock(LocalHandle((LPCVOID) andBits));
   LocalUnlock(LocalHandle((LPCVOID) xorBits));