X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc38199c0d74ba6cddeced769765a2e445e380d..fde5a86bdac3b4286b48620ec5c1ee9be01b4549:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 319f1a6d66..c990c980ed 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -114,7 +114,8 @@
 
 #ifdef __WINDOWS__
     #include <windows.h>
-
+    #include "wx/msw/mslu.h"
+    
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     //
     // note that it must be included after <windows.h>
@@ -1085,11 +1086,15 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
-    return ::CopyFile(file1, file2, !overwrite) != 0;
+    if ( !::CopyFile(file1, file2, !overwrite) )
+    {
+        wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
+                      file1.c_str(), file2.c_str());
+
+        return FALSE;
+    }
 #elif defined(__WXPM__)
-    if (::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) == 0)
-        return TRUE;
-    else
+    if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
         return FALSE;
 #else // !Win32
     wxStructStat fbuf;
@@ -1168,9 +1173,9 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         return FALSE;
     }
 #endif // OS/2 || Mac
+#endif // __WXMSW__ && __WIN32__
 
     return TRUE;
-#endif // __WXMSW__ && __WIN32__
 }
 
 bool
@@ -1803,28 +1808,3 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 #ifdef __VISUALC__
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
-
-//------------------------------------------------------------------------
-// Missing functions in Unicode for Win9x
-//------------------------------------------------------------------------
-
-// NB: MSLU only covers Win32 API, it doesn't provide Unicode implementation of
-//     libc functions. Unfortunately, some of MSVCRT wchar_t functions
-//     (e.g. _wopen) don't work on Windows 9x, so we have to workaround it
-//     by calling the char version. We still want to use wchar_t version on
-//     NT/2000/XP, though, because they allow for Unicode file names.
-#if wxUSE_UNICODE_MSLU
-
-    #if defined( __VISUALC__ ) \
-        || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
-        || ( defined(__MWERKS__) && defined(__WXMSW__) )
-    WXDLLEXPORT int wxOpen(const wxChar *name, int flags, int mode)
-    {
-        if ( wxGetOsVersion() == wxWINDOWS_NT )
-            return _wopen(name, flags, mode);
-        else
-            return _open(wxConvFile.cWX2MB(name), flags, mode);
-    }
-    #endif
-
-#endif // wxUSE_UNICODE_MSLU