X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb9010ed40454cc978a9cbaa6de2ee41ea8b6c84..9b58521dc97c069e4e3fc283a6d90497e1bcc80c:/src/os2/helpwin.cpp diff --git a/src/os2/helpwin.cpp b/src/os2/helpwin.cpp index 3d7e6c1360..95f57925c1 100644 --- a/src/os2/helpwin.cpp +++ b/src/os2/helpwin.cpp @@ -28,13 +28,11 @@ // MAX length of Help descriptor #define _MAX_HELP_LEN 500 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase) -#endif wxWinHelpController::wxWinHelpController() { - m_helpFile = ""; + m_helpFile = wxEmptyString; } wxWinHelpController::~wxWinHelpController() @@ -98,7 +96,7 @@ bool wxWinHelpController::DisplayBlock(long block) 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)] == '.')) + 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()) @@ -110,9 +108,10 @@ bool wxWinHelpController::DisplayBlock(long block) return FALSE; } -bool wxWinHelpController::KeywordSearch(const wxString& k) +bool wxWinHelpController::KeywordSearch(const wxString& k, + wxHelpSearchMode WXUNUSED(mode)) { - if (m_helpFile == "") return FALSE; + if (m_helpFile == wxEmptyString) return FALSE; wxString str = m_helpFile; size_t len = str.Length();