try to clear the device/logical unit fog; remove unused and unsupported (an assertion...

[wxWidgets.git] / src / msw / stdpaths.cpp

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 611d49a1989b0fdf199e146b2a2ab07bf178abc5..3e928c146219d37af017fdae2340fcc54136b0a2 100644 (file)
--- 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
@@ -257,7 +257,7 @@ wxString wxStandardPaths::GetAppDir()
     {
         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__
@@ -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