Wine fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -518,7 +518,7 @@ WXDLLIMPEXP_BASE const wxChar* wxGetHomeDir(wxString *pstr);
|
||||
|
||||
// Get the user's home dir (caller must copy --- volatile)
|
||||
// returns NULL is no HOME dir is known
|
||||
#if defined(__UNIX__) && wxUSE_UNICODE
|
||||
#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WINE__)
|
||||
WXDLLIMPEXP_BASE const wxMB2WXbuf wxGetUserHome(const wxString& user = wxEmptyString);
|
||||
#else
|
||||
WXDLLIMPEXP_BASE wxChar* wxGetUserHome(const wxString& user = wxEmptyString);
|
||||
|
@@ -387,7 +387,7 @@ const wxChar* wxGetHomeDir(wxString *pstr)
|
||||
wxString& strDir = *pstr;
|
||||
|
||||
// first branch is for Cygwin
|
||||
#if defined(__UNIX__)
|
||||
#if defined(__UNIX__) && !defined(__WINE__)
|
||||
const wxChar *szHome = wxGetenv("HOME");
|
||||
if ( szHome == NULL ) {
|
||||
// we're homeless...
|
||||
|
Reference in New Issue
Block a user