more Sun C++ compiler warning fixes: in particular, added an ugly but

necessary workaround for avoiding warning in the .xpm files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-11 19:33:37 +00:00
parent 40325b2630
commit 295272bdcd
17 changed files with 116 additions and 66 deletions

View File

@@ -567,7 +567,6 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
/* Expand ~ and ~user */
nm = lnm;
s = wxT("");
if (nm[0] == wxT('~') && !q)
{
/* prefix ~ */
@@ -591,7 +590,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
if (was_sep) /* replace only if it was there: */
*s = SEP;
s = wxT("");
s = NULL;
} else {
nm = nnm;
s = home;