X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..07cf98cb8eb7625eeffc95e407a9fa1ad863b451:/src/common/config.cpp?ds=sidebyside diff --git a/src/common/config.cpp b/src/common/config.cpp index c0b5c85700..19822e4691 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -23,10 +23,6 @@ #pragma hdrstop #endif //__BORLANDC__ -#ifndef WX_PRECOMP - #include "wx/defs.h" -#endif - #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || defined(wxCONFIG_WIN32_NATIVE)) #include "wx/app.h" @@ -190,7 +186,7 @@ bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const bool wxConfigBase::Write(const wxString& key, double val) { wxString str; - str.Printf(_T("%f"), val); + str.Printf(wxT("%f"), val); return Write(key, str); } @@ -200,6 +196,11 @@ bool wxConfigBase::Write(const wxString& key, bool value) return Write(key, l); } +bool wxConfigBase::Write( const wxString &key, const wxChar *text ) +{ + wxString str( text ) ; + return Write( key, str ) ; +} wxString wxConfigBase::ExpandEnvVars(const wxString& str) const { wxString tmp; // Required for BC++ @@ -375,11 +376,11 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) wxString strCurrent; const wxChar *pc = sz; for ( ;; ) { - if ( *pc == _T('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) { - if ( strCurrent == _T(".") ) { + if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) { + if ( strCurrent == wxT(".") ) { // ignore } - else if ( strCurrent == _T("..") ) { + else if ( strCurrent == wxT("..") ) { // go up one level if ( aParts.IsEmpty() ) wxLogWarning(_("'%s' has extra '..', ignored."), sz); @@ -395,7 +396,7 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) //else: // could log an error here, but we prefer to ignore extra '/' - if ( *pc == _T('\0') ) + if ( *pc == wxT('\0') ) return; } else