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

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 4ba9dc6d3c..02b714d8f4 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -246,7 +246,9 @@ wxString wxStandardPaths::GetUserConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-    return AppendAppName(DoGetDirectory(CSIDL_PROGRAM_FILES));
+    // under Windows each program is usually installed in its own directory and
+    // so its datafiles are in the same directory as its main executable
+    return wxFileName(wxGetFullModuleName()).GetPath();
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
@@ -280,9 +282,8 @@ wxString wxStandardPathsWin16::GetConfigDir() const
         wxLogLastError(_T("GetWindowsDirectory"));
     }
 #else
-    // TODO:
-    //    eVC4 - use CSIDL_WINDOWS
-    //    eVC3 - probably not possible through API
+    // TODO: use CSIDL_WINDOWS (eVC4, possibly not eVC3)
+    return wxT("\\Windows");
 #endif
 
     return dir;