AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

blind compilation fix for cygwin Unicode build (bug 1296144)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-09-20 09:52:14 +00:00
parent c25ac78a9f
commit 7682e22edb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/filefn.cpp
View File

@ -1363,10 +1363,6 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
bool needsANSI = true; bool needsANSI = true;
#if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU #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]; char cbuf[_MAXPATHLEN];
#endif #endif
@ -1452,7 +1448,13 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
#if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) #if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
// another example of DOS/Unix mix (Cygwin) // another example of DOS/Unix mix (Cygwin)
wxString pathUnix = buf; 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); cygwin_conv_to_full_win32_path(pathUnix, buf);
#endif // wxUSE_UNICODE
#endif // __CYGWIN__ #endif // __CYGWIN__
} }