From 7682e22edbf9cfb18bb6c86fdddb0361e2639928 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 20 Sep 2005 09:52:14 +0000 Subject: [PATCH] blind compilation fix for cygwin Unicode build (bug 1296144) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filefn.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 4a14615b78..779c4dfa28 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1363,10 +1363,6 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) bool needsANSI = true; #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU - // This is not legal code as the compiler - // is allowed destroy the wxCharBuffer. - // wxCharBuffer c_buffer(sz); - // char *cbuf = (char*)(const char*)c_buffer; char cbuf[_MAXPATHLEN]; #endif @@ -1452,7 +1448,13 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) #if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) // another example of DOS/Unix mix (Cygwin) wxString pathUnix = buf; +#if wxUSE_UNICODE + char bufA[_MAXPATHLEN]; + cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA); + wxConvFile.MB2WC(buf, bufA, sz); +#else cygwin_conv_to_full_win32_path(pathUnix, buf); +#endif // wxUSE_UNICODE #endif // __CYGWIN__ } -- 2.45.2