From 0e6667e2699fccd04313780f6cf21dbff8a435a7 Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Fri, 16 Apr 1999 11:30:09 +0000 Subject: [PATCH] wxGetUserHome() may return const val. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filefn.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index fd63c60c7e..6e7c62ada3 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -514,7 +514,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) /* prefix ~ */ if (nm[1] == SEP || nm[1] == 0) { /* ~/filename */ - if ((s = wxGetUserHome(_T(""))) != NULL) { + if ((s = WXSTRINGCAST wxGetUserHome(_T(""))) != NULL) { if (*++nm) nm++; } @@ -527,7 +527,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) was_sep = (*s == SEP); nnm = *s ? s + 1 : s; *s = 0; - if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) { + if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) { if (was_sep) /* replace only if it was there: */ *s = SEP; s = _T(""); @@ -577,7 +577,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin #endif // Handle environment - wxChar *val = (wxChar *) NULL; + const wxChar *val = (const wxChar *) NULL; wxChar *tcp = (wxChar *) NULL; if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL && (tcp = wxStrstr (dest, val)) != NULL)