Added wxUSE_DC_CACHEING and associated code to wxMSW

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

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index c8df51825e49b4a3001d2cd9967ee8c8a8f9d965..34b895da03c05cc7a510fd3622f90e16deb38f3b 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -88,7 +88,7 @@ HICON CursorToIcon( wxChar *szFileName, HINSTANCE hInst, int *W, int *H)
 HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
 { ICONFILEHEADER iconFileHead;   // ICON file header structure
   ICONFILERES    iconFileRes;    // ICON file resource
 HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
 { 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


@@ -111,7 +111,7 @@ HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
     return (HANDLE) NULL;
 
   // inserted by P.S.
     return (HANDLE) NULL;
 
   // inserted by P.S.

-  while( ((unsigned)nDirEntries < iconFileHead.wResourceCount) &&
+  while( (nDirEntries < iconFileHead.wResourceCount) &&

          ((iconFileRes.bWidth != nWidth) || (iconFileRes.bHeight != nHeight)))
   {
     cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));
          ((iconFileRes.bWidth != nWidth) || (iconFileRes.bHeight != nHeight)))
   {
     cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));


@@ -175,7 +175,7 @@ HANDLE ReadIcon( wxChar *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)


@@ -253,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);


@@ -335,7 +335,7 @@ HCURSOR IconToCursor( wxChar *szFileName, HINSTANCE hInst, int XHot, int YHot,
 HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
 { CURFILEHEADER   curFileHead;  // CURSOR file header structure
   CURFILERES      curFileRes;   // CURSOR file resource
 HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
 { 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


@@ -359,7 +359,7 @@ HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
     return (HANDLE) NULL;
 
   // following added by P.S.
     return (HANDLE) NULL;
 
   // following added by P.S.

-  while( ((unsigned)nDirEntries < curFileHead.wResourceCount) &&
+  while( (nDirEntries < curFileHead.wResourceCount) &&

          ((curFileRes.bWidth != nWidth) || (curFileRes.bHeight != nHeight)))
   {
     cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));
          ((curFileRes.bWidth != nWidth) || (curFileRes.bHeight != nHeight)))
   {
     cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));


@@ -644,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));

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


@@ -672,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)


@@ -843,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;