Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around bogus g++ warnings about possibly missing return.

Browse Source 
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:
Vadim Zeitlin
2011-06-30 12:20:47 +00:00
parent e2250d6417
commit decd390a32
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/richtext/richtextuicustomization.h
View File

@@ -60,10 +60,10 @@ public:
virtual bool ShowHelp(wxWindow* win) virtual bool ShowHelp(wxWindow* win)
{ {
if (m_uiCustomization && m_helpTopic != -1) if ( !m_uiCustomization || m_helpTopic == -1 )
return m_uiCustomization->ShowHelp(win, m_helpTopic);
else
return false; return false;
return m_uiCustomization->ShowHelp(win, m_helpTopic);
} }
/// Get the help topic identifier. /// Get the help topic identifier.