Integrate with GNOME's Recent Documents menu.

[wxWidgets.git] / src / common / radiocmn.cpp

diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index 8d954df010a949f7bca70ee8732588b0ea15d4af..766bd52109f7b6483367eec2264c1b953d54fe6f 100644 (file)
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -44,7 +44,7 @@
 
 void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style)
 {
 
 void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style)
 {

-    wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") );
+    wxCHECK_RET( majorDim != 0, wxT("major radiobox dimension can't be 0") );

 
     m_majorDim = majorDim;
 
 
     m_majorDim = majorDim;
 


@@ -125,7 +125,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unexpected wxDirection value") );
+                wxFAIL_MSG( wxT("unexpected wxDirection value") );

                 return wxNOT_FOUND;
         }
 
                 return wxNOT_FOUND;
         }
 


@@ -158,7 +158,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
         }
 
         wxASSERT_MSG( item < count && item >= 0,
         }
 
         wxASSERT_MSG( item < count && item >= 0,

-                      _T("logic error in wxRadioBox::GetNextItem()") );
+                      wxT("logic error in wxRadioBox::GetNextItem()") );

     }
     // we shouldn't select the non-active items, continue looking for a
     // visible and shown one unless we came back to the item we started from in
     }
     // we shouldn't select the non-active items, continue looking for a
     // visible and shown one unless we came back to the item we started from in


@@ -172,7 +172,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
 
 void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text)
 {
 
 void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text)
 {

-    wxASSERT_MSG( item < GetCount(), _T("Invalid item index") );
+    wxASSERT_MSG( item < GetCount(), wxT("Invalid item index") );

 
     // extend the array to have entries for all our items on first use
     if ( !m_itemsTooltips )
 
     // extend the array to have entries for all our items on first use
     if ( !m_itemsTooltips )


@@ -247,7 +247,7 @@ wxRadioBoxBase::~wxRadioBoxBase()
 // set helptext for a particular item
 void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText)
 {
 // set helptext for a particular item
 void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText)
 {

-    wxCHECK_RET( n < GetCount(), _T("Invalid item index") );
+    wxCHECK_RET( n < GetCount(), wxT("Invalid item index") );

 
     if ( m_itemsHelpTexts.empty() )
     {
 
     if ( m_itemsHelpTexts.empty() )
     {


@@ -261,7 +261,7 @@ void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText)
 // retrieve helptext for a particular item
 wxString wxRadioBoxBase::GetItemHelpText( unsigned int n ) const
 {
 // retrieve helptext for a particular item
 wxString wxRadioBoxBase::GetItemHelpText( unsigned int n ) const
 {

-    wxCHECK_MSG( n < GetCount(), wxEmptyString, _T("Invalid item index") );
+    wxCHECK_MSG( n < GetCount(), wxEmptyString, wxT("Invalid item index") );

 
     return m_itemsHelpTexts.empty() ? wxString() : m_itemsHelpTexts[n];
 }
 
     return m_itemsHelpTexts.empty() ? wxString() : m_itemsHelpTexts[n];
 }


@@ -271,13 +271,30 @@ wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived,
                                               const wxPoint& pt,
                                               wxHelpEvent::Origin origin) const
 {
                                               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 )
     {
 
     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;
     }
         if( !text.empty() )
             return text;
     }