From: Julian Smart Date: Sun, 20 Mar 2005 11:52:33 +0000 (+0000) Subject: Fix wxFileConfig for WinCE X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/503602dfe7fd468159d8d563657ad10c0bf6601f Fix wxFileConfig for WinCE Provide standard WinCE Windows path for wxStandardPaths git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index a4c5629b0b..daaa9291fb 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -292,7 +292,10 @@ wxString wxFileConfig::GetGlobalDir() // There's no such thing as global cfg dir in MS-DOS, let's return // current directory (FIXME_MGL?) return wxT(".\\"); -#else // Windows +#elif defined(__WXWINCE__) + strDir = wxT("\\Windows\\"); +#elif // Windows + wxChar szWinDir[MAX_PATH]; ::GetWindowsDirectory(szWinDir, MAX_PATH); diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp index 707c30e383..02b714d8f4 100644 --- a/src/msw/stdpaths.cpp +++ b/src/msw/stdpaths.cpp @@ -282,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;