X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de303444986fc3894e258708b2390b03937b57ed..e8b90482676205a0fc997be9fcdc47ef62a37211:/src/msw/stdpaths.cpp

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 611d49a198..e8340f1a26 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -50,7 +50,7 @@ typedef HRESULT (WINAPI *SHGetSpecialFolderPath_t)(HWND, LPTSTR, int, BOOL);
 // ----------------------------------------------------------------------------
 
 // used in our wxLogTrace messages
-static const wxChar *TRACE_MASK = _T("stdpaths");
+#define TRACE_MASK _T("stdpaths")
 
 #ifndef CSIDL_APPDATA
     #define CSIDL_APPDATA         0x001a
@@ -250,17 +250,17 @@ wxString wxStandardPaths::GetAppDir()
 {
     wxFileName fn(wxGetFullModuleName());
 
-    // allow running the apps directly from build directory in debug builds
-#ifdef __WXDEBUG__
+    // allow running the apps directly from build directory in MSVC debug builds
+#ifdef _DEBUG
     wxString lastdir;
     if ( fn.GetDirCount() )
     {
         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__
+#endif // _DEBUG
 
     return fn.GetPath();
 }
@@ -274,9 +274,14 @@ wxString wxStandardPaths::GetDocumentsDir() const
 // 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
@@ -293,12 +298,12 @@ wxString wxStandardPaths::GetDataDir() 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