From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 19 May 2001 17:59:51 +0000 (+0000)
Subject: Unicode compilation fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e987a489c8fa978f90b15a6630dfb7761b97e671?ds=sidebyside

Unicode compilation fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 1119b7f46a..968a1d14a5 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -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);
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 6f27f881aa..d878e874fa 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -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