X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38009d396d9b48d4ef8dad86921a870481742d33..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/msw/helpwin.cpp diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp index 9e1e6a5997..66e868d54d 100644 --- a/src/msw/helpwin.cpp +++ b/src/msw/helpwin.cpp @@ -26,11 +26,11 @@ #include "wx/msw/helpwin.h" -#if USE_HELP +#if wxUSE_HELP #include -#ifdef __WINDOWS__ -#include +#ifdef __WXMSW__ +#include "wx/msw/private.h" #endif #include @@ -41,9 +41,7 @@ // MAX length of Help descriptor #define _MAX_HELP_LEN 500 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase) -#endif wxWinHelpController::wxWinHelpController(void) { @@ -68,19 +66,19 @@ bool wxWinHelpController::LoadFile(const wxString& file) bool wxWinHelpController::DisplayContents(void) { - if (m_helpFile == "") return FALSE; + if (m_helpFile == wxT("")) return FALSE; + + wxString str = m_helpFile; + size_t len = str.Length(); + if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) + str += wxT(".hlp"); - char buf[_MAXPATHLEN]; - strcpy(buf, (const char*) m_helpFile); - size_t len = strlen(buf); - if (!(buf[len-1] == 'p' && buf[len-2] == 'l' && buf[len-3] == 'h' && buf[len-4] == '.')) - strcat(buf, ".hlp"); if (wxTheApp->GetTopWindow()) { #if defined(__WIN95__) - WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), buf, HELP_FINDER, 0L); + WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_FINDER, 0L); #else - WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), buf, HELP_CONTENTS, 0L); + WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTENTS, 0L); #endif return TRUE; } @@ -89,23 +87,35 @@ bool wxWinHelpController::DisplayContents(void) bool wxWinHelpController::DisplaySection(int section) { - // No WinHelp equivalent for this - return FALSE; + // Use context number + if (m_helpFile == wxT("")) return FALSE; + + wxString str = m_helpFile; + size_t len = str.Length(); + if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) + str += wxT(".hlp"); + + if (wxTheApp->GetTopWindow()) + { + WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section); + return TRUE; + } + return FALSE; } bool wxWinHelpController::DisplayBlock(long block) { // Use context number -- a very rough equivalent to block id! - if (!m_helpFile) return FALSE; + if (m_helpFile == wxT("")) return FALSE; + + wxString str = m_helpFile; + size_t len = str.Length(); + if (!(str[(size_t)(len-1)] == 'p' && str[(size_t)(len-2)] == 'l' && str[(size_t)(len-3)] == 'h' && str[(size_t)(len-4)] == '.')) + str += wxT(".hlp"); - char buf[_MAXPATHLEN]; - strcpy(buf, m_helpFile); - size_t len = strlen(buf); - if (!(buf[len-1] == 'p' && buf[len-2] == 'l' && buf[len-3] == 'h' && buf[len-4] == '.')) - strcat(buf, ".hlp"); if (wxTheApp->GetTopWindow()) { - WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), buf, HELP_CONTEXT, (DWORD)block); + WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)block); return TRUE; } return FALSE; @@ -113,16 +123,16 @@ bool wxWinHelpController::DisplayBlock(long block) bool wxWinHelpController::KeywordSearch(const wxString& k) { - if (m_helpFile == "") return FALSE; + if (m_helpFile == wxT("")) return FALSE; + + wxString str = m_helpFile; + size_t len = str.Length(); + if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.'))) + str += wxT(".hlp"); - char buf[_MAXPATHLEN]; - strcpy(buf, m_helpFile); - size_t len = strlen(buf); - if (!(buf[len-1] == 'p' && buf[len-2] == 'l' && buf[len-3] == 'h' && buf[len-4] == '.')) - strcat(buf, ".hlp"); if (wxTheApp->GetTopWindow()) { - WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), buf, HELP_PARTIALKEY, (DWORD)(const char*) k); + WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k); return TRUE; } return FALSE; @@ -145,4 +155,4 @@ void wxWinHelpController::OnQuit(void) { } -#endif // USE_HELP +#endif // wxUSE_HELP