From 6eb872ea536238192da0112926bc94e948703718 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 12 Feb 2009 23:18:29 +0000 Subject: [PATCH] return radio box own help text when origin is Origin_Unknown to make sure GetHelpText() returns the same value as was passed to SetHelpText() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/radiocmn.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp index c8234e282c..f1fec65ad5 100644 --- a/src/common/radiocmn.cpp +++ b/src/common/radiocmn.cpp @@ -271,9 +271,26 @@ wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived, const wxPoint& pt, wxHelpEvent::Origin origin) const { - const int item = origin == wxHelpEvent::Origin_HelpButton - ? GetItemFromPoint(pt) - : GetSelection(); + int item; + switch ( origin ) + { + case wxHelpEvent::Origin_HelpButton: + item = GetItemFromPoint(pt); + break; + + case wxHelpEvent::Origin_Keyboard: + item = GetSelection(); + break; + + default: + wxFAIL_MSG( "unknown help even origin" ); + // fall through + + case wxHelpEvent::Origin_Unknown: + // this value is used when we're called from GetHelpText() for the + // radio box itself, so don't return item-specific text in this case + item = wxNOT_FOUND; + } if ( item != wxNOT_FOUND ) { -- 2.45.2