Further wxUniv fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,6 +27,8 @@
|
||||
#define wxUSE_CONFIG_NATIVE 1
|
||||
#endif
|
||||
|
||||
#include "wx/config.h"
|
||||
|
||||
#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
|
||||
|
||||
#include "wx/app.h"
|
||||
@@ -38,8 +40,6 @@
|
||||
#include "wx/utils.h"
|
||||
#include "wx/intl.h"
|
||||
|
||||
#include "wx/config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <ctype.h>
|
||||
@@ -266,6 +266,8 @@ wxConfigPathChanger::~wxConfigPathChanger()
|
||||
}
|
||||
}
|
||||
|
||||
#endif // wxUSE_CONFIG
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// static & global functions
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -381,6 +383,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 +422,4 @@ void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
|
||||
}
|
||||
}
|
||||
|
||||
#endif // wxUSE_CONFIG
|
||||
|
||||
|
Reference in New Issue
Block a user