Work around bogus g++ warnings about possibly missing return.
OS X g++ warned that "control may reach end of non-void function" in wxRichTextHelpInfo::ShowHelp(). This wasn't really the case but change the function logic slightly to (hopefully) suppress the warning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,10 +60,10 @@ public:
|
||||
|
||||
virtual bool ShowHelp(wxWindow* win)
|
||||
{
|
||||
if (m_uiCustomization && m_helpTopic != -1)
|
||||
return m_uiCustomization->ShowHelp(win, m_helpTopic);
|
||||
else
|
||||
if ( !m_uiCustomization || m_helpTopic == -1 )
|
||||
return false;
|
||||
|
||||
return m_uiCustomization->ShowHelp(win, m_helpTopic);
|
||||
}
|
||||
|
||||
/// Get the help topic identifier.
|
||||
|
Reference in New Issue
Block a user