X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05d31b3aca84298974766d6021738fb64961a36b..c398434d925aa9e2b190ce632fac1a79ffcbf043:/src/common/radiocmn.cpp?ds=inline

diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index 8d954df010..f1fec65ad5 100644
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -271,13 +271,30 @@ 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 )
     {
-        wxString text = GetItemHelpText(wx_static_cast(unsigned int, item));
+        wxString text = GetItemHelpText(static_cast<unsigned int>(item));
         if( !text.empty() )
             return text;
     }