X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6d60564cb1586ea3087696920945e5985641128..98cb8dcb0cf3b0e660f1f67e1c02451ab10257de:/src/common/config.cpp diff --git a/src/common/config.cpp b/src/common/config.cpp index d346b50bff..22037a2cdd 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -13,9 +13,6 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "confbase.h" -#endif #include "wx/wxprec.h" @@ -293,24 +290,25 @@ wxConfigPathChanger::~wxConfigPathChanger() // understands both Unix and Windows (but only under Windows) environment // variables expansion: i.e. $var, $(var) and ${var} are always understood // and in addition under Windows %var% is also. + +// don't change the values the enum elements: they must be equal +// to the matching [closing] delimiter. +enum Bracket +{ + Bracket_None, + Bracket_Normal = ')', + Bracket_Curly = '}', +#ifdef __WXMSW__ + Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) +#endif + Bracket_Max +}; + wxString wxExpandEnvVars(const wxString& str) { wxString strResult; strResult.Alloc(str.Len()); - // don't change the values the enum elements: they must be equal - // to the matching [closing] delimiter. - enum Bracket - { - Bracket_None, - Bracket_Normal = ')', - Bracket_Curly = '}', -#ifdef __WXMSW__ - Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) -#endif - Bracket_Max - }; - size_t m; for ( size_t n = 0; n < str.Len(); n++ ) { switch ( str[n] ) {