1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 4ba9dc6d3cb6e7bf24801585898d21eeaa501af2..d0f397e00a5f6885cdb78575867e1bf2f90d4555 100644 (file)
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -246,7 +246,9 @@ wxString wxStandardPaths::GetUserConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() 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
 }
 
 wxString wxStandardPaths::GetUserDataDir() const


@@ -280,9 +282,8 @@ wxString wxStandardPathsWin16::GetConfigDir() const
         wxLogLastError(_T("GetWindowsDirectory"));
     }
 #else
         wxLogLastError(_T("GetWindowsDirectory"));
     }
 #else

-    // TODO:
-    //    eVC4 - use CSIDL_WINDOWS
-    //    eVC3 - probably not possible through API
+    // TODO: use CSIDL_WINDOWS (eVC4, possibly not eVC3)
+    dir = wxT("\\Windows");

 #endif
 
     return dir;
 #endif
 
     return dir;