From decd390a328c35a2d34c1ba34afb16aa3eed74f0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 30 Jun 2011 12:20:47 +0000 Subject: [PATCH] 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 --- include/wx/richtext/richtextuicustomization.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h index d507aba2fa..7b3afe51c8 100644 --- a/include/wx/richtext/richtextuicustomization.h +++ b/include/wx/richtext/richtextuicustomization.h @@ -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. -- 2.45.2