From: Ove Kaaven Date: Fri, 16 Apr 1999 23:06:39 +0000 (+0000) Subject: Unicodified wxSplitPath X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c16e5a9271ab576a76c8537b67e0f5e25f90bc67 Unicodified wxSplitPath git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/config.cpp b/src/common/config.cpp index b9aefd7202..401d25f236 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -365,18 +365,18 @@ wxString wxExpandEnvVars(const wxString& str) } // this function is used to properly interpret '..' in path -void wxSplitPath(wxArrayString& aParts, const char *sz) +void wxSplitPath(wxArrayString& aParts, const wxChar *sz) { aParts.Empty(); wxString strCurrent; - const char *pc = sz; + const wxChar *pc = sz; for ( ;; ) { - if ( *pc == '\0' || *pc == wxCONFIG_PATH_SEPARATOR ) { - if ( strCurrent == "." ) { + if ( *pc == _T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) { + if ( strCurrent == _T(".") ) { // ignore } - else if ( strCurrent == ".." ) { + else if ( strCurrent == _T("..") ) { // go up one level if ( aParts.IsEmpty() ) wxLogWarning(_("'%s' has extra '..', ignored."), sz); @@ -392,7 +392,7 @@ void wxSplitPath(wxArrayString& aParts, const char *sz) //else: // could log an error here, but we prefer to ignore extra '/' - if ( *pc == '\0' ) + if ( *pc == _T('\0') ) return; } else