From 75d07c0a3a675eb1504779451a170264490ebaa1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 10 Sep 2003 12:02:04 +0000 Subject: [PATCH] fixed a 'variable could be used uninitialized' warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/helpfrm.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 5c1dffd66e..e317b21598 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -740,21 +740,29 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword, if (foundcnt) { wxHtmlContentsItem *it; - if (mode == wxHELP_SEARCH_ALL) + switch ( mode ) { - it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0); - } - else if (mode == wxHELP_SEARCH_INDEX) - { - it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0); + default: + wxFAIL_MSG( _T("unknown help search mode") ); + // fall back + + case wxHELP_SEARCH_ALL: + it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0); + break; + + case wxHELP_SEARCH_INDEX: + it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0); + break; } + if (it) { m_HtmlWin->LoadPage(it->GetFullPath()); NotifyPageChanged(); } } - return (foundcnt > 0); + + return foundcnt > 0; } void wxHtmlHelpFrame::CreateContents()