Allow user code to override key events in generic wxListCtrl.

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

diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index f1fec65ad577df584d5e0eccf73c7a672c3b88aa..aa78ea96381bb7e858e3e59d5add347c4545e3b2 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 )


@@ -189,8 +189,7 @@ void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text)
         if ( tooltip )
         {
             // delete the tooltip
         if ( tooltip )
         {
             // delete the tooltip

-            delete tooltip;
-            tooltip = NULL;
+            wxDELETE(tooltip);

         }
         else // nothing to do
         {
         }
         else // nothing to do
         {


@@ -247,7 +246,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 +260,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];
 }