Updating OpenVMS compile configuration

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

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 37c0c9748ad7a18ec9425947b49157718a56459c..3e928c146219d37af017fdae2340fcc54136b0a2 100644 (file)
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -257,7 +257,7 @@ wxString wxStandardPaths::GetAppDir()
     {
         lastdir = fn.GetDirs().Last();
         lastdir.MakeLower();
     {
         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__
             fn.RemoveLastDir();
     }
 #endif // __WXDEBUG__


@@ -281,7 +281,7 @@ wxString wxStandardPaths::GetExecutablePath() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
 
 wxString wxStandardPaths::GetConfigDir() const
 {

-    return AppendAppName(DoGetDirectory(CSIDL_COMMON_APPDATA));
+    return AppendAppInfo(DoGetDirectory(CSIDL_COMMON_APPDATA));

 }
 
 wxString wxStandardPaths::GetUserConfigDir() const
 }
 
 wxString wxStandardPaths::GetUserConfigDir() const


@@ -298,12 +298,12 @@ wxString wxStandardPaths::GetDataDir() const
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

-    return AppendAppName(GetUserConfigDir());
+    return AppendAppInfo(GetUserConfigDir());

 }
 
 wxString wxStandardPaths::GetUserLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetUserLocalDataDir() const
 {

-    return AppendAppName(DoGetDirectory(CSIDL_LOCAL_APPDATA));
+    return AppendAppInfo(DoGetDirectory(CSIDL_LOCAL_APPDATA));

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 }
 
 wxString wxStandardPaths::GetPluginsDir() const