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 1119b7f46ac090a7c6fb79f2c0a911be6a034530..968a1d14a5c3ee4429ec474c154ad79b7a98d7ab 100644 (file)
--- 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
   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);
     {
       if (fp1)
         fclose (fp1);

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 6f27f881aab8402a9d2392ae5758a632de3c96d8..d878e874faab5f0f0014390798a91c23b9a96206 100644 (file)
--- 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)
 {
 #if defined(__WXMSW__) || defined(__WXPM__)
 int setdrive(int drive)
 {

-       char  newdrive[3];
+       wxChar  newdrive[3];

 
        if (drive < 1 || drive > 31)
                return -1;
 
        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 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
 #endif
 #else
     // VA doesn't know what LPSTR is and has its own set