X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/665b71b17c8eb8f2586a8c84f8d9cf0d8559bf35..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/src/msw/wince/helpwce.cpp diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp index 1e6a0b19a8..28958bff85 100644 --- a/src/msw/wince/helpwce.cpp +++ b/src/msw/wince/helpwce.cpp @@ -6,13 +6,9 @@ // Created: 2003-07-12 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "helpwce.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -87,7 +83,7 @@ bool wxWinceHelpController::KeywordSearch(const wxString& WXUNUSED(k), bool wxWinceHelpController::Quit() { - return TRUE; + return true; } // Append extension if necessary. @@ -103,14 +99,18 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const fullName = path + name + wxT(".htm"); else fullName = path + wxT("\\") + name + wxT(".htm"); + + if (!wxFileExists(fullName)) + fullName = wxT("\\Windows\\") + name + wxT(".htm"); + return fullName; } // View URL bool wxWinceHelpController::ViewURL(const wxString& topic) { - if (m_helpFile.IsEmpty()) return FALSE; - + if (m_helpFile.IsEmpty()) return false; + wxString url( wxT("file:") + GetValidFilename(m_helpFile) ); if (!topic.IsEmpty()) url = url + wxT("#") + topic;