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

Unicode compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-05-19 17:59:51 +00:00
parent af9083592b
commit e987a489c8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/filefn.cpp
View File

@@ -950,9 +950,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
FILE *fp2 = (FILE *) NULL;
FILE *fp3 = (FILE *) NULL;
// Open the inputs and outputs
if ((fp1 = fopen (OS_FILENAME( file1 ), "rb")) == NULL ||
(fp2 = fopen (OS_FILENAME( file2 ), "rb")) == NULL ||
(fp3 = fopen (OS_FILENAME( outfile ), "wb")) == NULL)
if ((fp1 = wxFopen (OS_FILENAME( file1 ), wxT("rb"))) == NULL ||
(fp2 = wxFopen (OS_FILENAME( file2 ), wxT("rb"))) == NULL ||
(fp3 = wxFopen (OS_FILENAME( outfile ), wxT("wb"))) == NULL)
{
if (fp1)
fclose (fp1);

10
src/generic/dirctrlg.cpp
View File

@@ -308,18 +308,18 @@ static const int ID_NEW = 1004;
#if defined(__WXMSW__) || defined(__WXPM__)
int setdrive(int drive)
{
char newdrive[3];
wxChar newdrive[3];
if (drive < 1 || drive > 31)
return -1;
newdrive[0] = (char)('A' + (char)drive - (char)1);
newdrive[1] = ':';
newdrive[2] = '\0';
newdrive[0] = (wxChar)(wxT('A') + drive - 1);
newdrive[1] = wxT(':');
newdrive[2] = wxT('\0');
#if defined(__WXMSW__)
#ifdef __WIN16__
if (wxSetWorkingDirectory(newdrive))
#else
if (SetCurrentDirectory((LPSTR)newdrive))
if (::SetCurrentDirectory(newdrive))
#endif
#else
// VA doesn't know what LPSTR is and has its own set