#if wxUSE_STDPATHS
+#include "wx/stdpaths.h"
+
#ifndef WX_PRECOMP
- #include "wx/app.h"
+ #include "wx/utils.h"
#endif //WX_PRECOMP
#include "wx/dynlib.h"
#include "wx/filename.h"
-#include "wx/stdpaths.h"
-
#include "wx/msw/private.h"
#include "wx/msw/wrapshl.h"
// ----------------------------------------------------------------------------
// used in our wxLogTrace messages
-static const wxChar *TRACE_MASK = _T("stdpaths");
+#define TRACE_MASK _T("stdpaths")
#ifndef CSIDL_APPDATA
#define CSIDL_APPDATA 0x001a
{
lastdir = fn.GetDirs().Last();
lastdir.MakeLower();
- if ( lastdir.Matches(_T("debug*")) || lastdir.Matches(_T("vc_msw*")) )
+ if ( lastdir.Matches(_T("debug*")) || lastdir.Matches(_T("vc*msw*")) )
fn.RemoveLastDir();
}
#endif // __WXDEBUG__
// public functions
// ----------------------------------------------------------------------------
+wxString wxStandardPaths::GetExecutablePath() const
+{
+ return wxGetFullModuleName();
+}
+
wxString wxStandardPaths::GetConfigDir() const
{
- return AppendAppName(DoGetDirectory(CSIDL_COMMON_APPDATA));
+ return AppendAppInfo(DoGetDirectory(CSIDL_COMMON_APPDATA));
}
wxString wxStandardPaths::GetUserConfigDir() const
wxString wxStandardPaths::GetUserDataDir() const
{
- return AppendAppName(GetUserConfigDir());
+ return AppendAppInfo(GetUserConfigDir());
}
wxString wxStandardPaths::GetUserLocalDataDir() const
{
- return AppendAppName(DoGetDirectory(CSIDL_LOCAL_APPDATA));
+ return AppendAppInfo(DoGetDirectory(CSIDL_LOCAL_APPDATA));
}
wxString wxStandardPaths::GetPluginsDir() const