X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..86834940ec9269fec1a1cbfc935c2310140f624a:/src/msw/helpwin.cpp?ds=sidebyside diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp index b2d5613556..464ea1025a 100644 --- a/src/msw/helpwin.cpp +++ b/src/msw/helpwin.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) @@ -50,22 +50,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase) bool wxWinHelpController::Initialize(const wxString& filename) { m_helpFile = filename; - return TRUE; + return true; } bool wxWinHelpController::LoadFile(const wxString& file) { if (!file.IsEmpty()) m_helpFile = file; - return TRUE; + return true; } bool wxWinHelpController::DisplayContents(void) { - if (m_helpFile.IsEmpty()) return FALSE; - + if (m_helpFile.IsEmpty()) return false; + wxString str = GetValidFilename(m_helpFile); - + #if defined(__WIN95__) return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L) != 0); #else @@ -76,8 +76,8 @@ bool wxWinHelpController::DisplayContents(void) bool wxWinHelpController::DisplaySection(int section) { // Use context number - if (m_helpFile.IsEmpty()) return FALSE; - + if (m_helpFile.IsEmpty()) return false; + wxString str = GetValidFilename(m_helpFile); return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0); @@ -85,8 +85,8 @@ bool wxWinHelpController::DisplaySection(int section) bool wxWinHelpController::DisplayContextPopup(int contextId) { - if (m_helpFile.IsEmpty()) return FALSE; - + if (m_helpFile.IsEmpty()) return false; + wxString str = GetValidFilename(m_helpFile); return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0); @@ -95,15 +95,16 @@ bool wxWinHelpController::DisplayContextPopup(int contextId) bool wxWinHelpController::DisplayBlock(long block) { DisplaySection(block); - return TRUE; + return true; } -bool wxWinHelpController::KeywordSearch(const wxString& k) +bool wxWinHelpController::KeywordSearch(const wxString& k, + wxHelpSearchMode WXUNUSED(mode)) { - if (m_helpFile.IsEmpty()) return FALSE; - + if (m_helpFile.IsEmpty()) return false; + wxString str = GetValidFilename(m_helpFile); - + return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0); }