From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 12 Nov 2006 15:39:12 +0000 (+0000)
Subject: Wine fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dc484d491b15355285a89da275c58c2ef247d1f4

Wine fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 499f2bad0f..91863a219a 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -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);
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6eff2fe253..7ded6a5d18 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -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...