Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode fix, it seems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-19 09:23:49 +00:00
parent 6c00e46fa8
commit 73c022c90a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/curico.cpp
View File

@@ -42,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; { HICON hIcon;
HANDLE hDIB; HANDLE hDIB;
@@ -65,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 { HANDLE hDIB; // Handle to DIB memory
HICON hIcon; // Handle to Icon HICON hIcon; // Handle to Icon
@@ -85,7 +85,7 @@ 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 { ICONFILEHEADER iconFileHead; // ICON file header structure
ICONFILERES iconFileRes; // ICON file resource ICONFILERES iconFileRes; // ICON file resource
WORD cbHead, WORD cbHead,
@@ -99,7 +99,7 @@ HANDLE ReadIcon( char *szFileName, int *W, int *H)
nDirEntries = 0; nDirEntries = 0;
// Open and read the .ICO file header and the first ICONFILERES // Open and read the .ICO file header and the first ICONFILERES
hFile = _lopen( szFileName, OF_READ); hFile = _lopen( wxFNCONV(szFileName), OF_READ);
cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER)); cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER));
cbRes = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES)); cbRes = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES));
++nDirEntries; ++nDirEntries;
@@ -277,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) int *XHot, int *YHot)
{ HANDLE hDIB; // Handle to DIB memory { HANDLE hDIB; // Handle to DIB memory
HCURSOR hCursor; HCURSOR hCursor;
@@ -306,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) int *W, int *H)
{ HCURSOR hCursor; { HCURSOR hCursor;
HANDLE hDIB; HANDLE hDIB;
@@ -332,7 +332,7 @@ 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 { CURFILEHEADER curFileHead; // CURSOR file header structure
CURFILERES curFileRes; // CURSOR file resource CURFILERES curFileRes; // CURSOR file resource
WORD cbHead, WORD cbHead,
@@ -346,7 +346,7 @@ HANDLE ReadCur( char *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
nDirEntries = 0; nDirEntries = 0;
// Open and read the .ICO file header and the first ICONFILERES // Open and read the .ICO file header and the first ICONFILERES
hFile = _lopen( szFileName, OF_READ); hFile = _lopen( wxFNCONV(szFileName), OF_READ);
cbHead = _lread( hFile, (LPSTR )&curFileHead, sizeof( CURFILEHEADER)); cbHead = _lread( hFile, (LPSTR )&curFileHead, sizeof( CURFILEHEADER));
cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES)); cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));
++nDirEntries; ++nDirEntries;
@@ -698,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) char cData[], int &width, int &height)
{ HDC hdc, { HDC hdc,
hdcMemory; hdcMemory;