X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ac05a91abea459438b8ea62074108d3daf39568..d9ff0f91fbddae88286567cab74dcfb59c91fc0f:/src/common/config.cpp?ds=sidebyside diff --git a/src/common/config.cpp b/src/common/config.cpp index 1b614016b2..05ca5af209 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -27,18 +27,17 @@ #define wxUSE_CONFIG_NATIVE 1 #endif +#include "wx/config.h" +#include "wx/intl.h" +#include "wx/log.h" + #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) #include "wx/app.h" #include "wx/file.h" -#include "wx/log.h" #include "wx/textfile.h" #include "wx/utils.h" -#include "wx/log.h" #include "wx/utils.h" -#include "wx/intl.h" - -#include "wx/config.h" #include #include @@ -266,6 +265,8 @@ wxConfigPathChanger::~wxConfigPathChanger() } } +#endif // wxUSE_CONFIG + // ---------------------------------------------------------------------------- // static & global functions // ---------------------------------------------------------------------------- @@ -381,6 +382,8 @@ wxString wxExpandEnvVars(const wxString& str) } // this function is used to properly interpret '..' in path +/// separates group and entry names (probably shouldn't be changed) + void wxSplitPath(wxArrayString& aParts, const wxChar *sz) { aParts.Empty(); @@ -418,5 +421,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz) } } -#endif // wxUSE_CONFIG