Canvas: added some DECLARE_CLASS macros to stop it failing

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

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

-#ifndef __TWIN32__
-#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
 
 #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()                                                 *


@@ -37,7 +42,7 @@
 //*            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;
 


@@ -60,7 +65,7 @@ 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
 


@@ -80,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


@@ -94,7 +99,7 @@ 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;
   cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER));
   cbRes  = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES));
   ++nDirEntries;


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


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


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


@@ -272,7 +277,7 @@ 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;
                         int *XHot, int *YHot)
 { HANDLE    hDIB;    // Handle to DIB memory
   HCURSOR   hCursor;


@@ -301,7 +306,7 @@ 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;
                       int  *W, int *H)
 { HCURSOR   hCursor;
   HANDLE    hDIB;


@@ -327,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


@@ -341,7 +346,7 @@ 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;
   cbHead = _lread( hFile,  (LPSTR )&curFileHead, sizeof( CURFILEHEADER));
   cbRes  = _lread( hFile,  (LPSTR )&curFileRes,  sizeof( CURFILERES));
   ++nDirEntries;


@@ -572,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,


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

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


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


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


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


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


@@ -886,10 +898,17 @@ HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap)
   DeleteObject(hXorBmp);
   ReleaseDC((HWND) NULL, hDC);
 #ifndef __WIN32__
   DeleteObject(hXorBmp);
   ReleaseDC((HWND) 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));