X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39fc096d5a40b85488a43226aa49c887ae86f45f..364f3b070071ee73e417a3770342d779774288e8:/src/msw/wince/helpwce.cpp?ds=sidebyside diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp index 0196bb6907..63a91351c0 100644 --- a/src/msw/wince/helpwce.cpp +++ b/src/msw/wince/helpwce.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpwce.h +// Name: src/msw/wince/helpwce.cpp // Purpose: Help system: Windows CE help implementation // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // 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" @@ -26,11 +22,11 @@ #include "wx/msw/wince/helpwce.h" #ifndef WX_PRECOMP + #include "wx/msw/missing.h" #include "wx/intl.h" #endif #include "wx/msw/private.h" -#include "wx/msw/missing.h" IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase) @@ -42,7 +38,7 @@ bool wxWinceHelpController::Initialize(const wxString& filename) bool wxWinceHelpController::LoadFile(const wxString& file) { - if (!file.IsEmpty()) + if (!file.empty()) m_helpFile = file; return true; } @@ -94,25 +90,29 @@ bool wxWinceHelpController::Quit() wxString wxWinceHelpController::GetValidFilename(const wxString& file) const { wxString path, name, ext; - wxSplitPath(file, & path, & name, & ext); + wxFileName::SplitPath(file, & path, & name, & ext); wxString fullName; - if (path.IsEmpty()) + if (path.empty()) fullName = name + wxT(".htm"); else if (path.Last() == wxT('\\')) 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.empty()) return false; wxString url( wxT("file:") + GetValidFilename(m_helpFile) ); - if (!topic.IsEmpty()) + if (!topic.empty()) url = url + wxT("#") + topic; return CreateProcess(wxT("peghelp.exe"), @@ -121,4 +121,3 @@ bool wxWinceHelpController::ViewURL(const wxString& topic) } #endif // wxUSE_HELP -