avoid buffer overrun

[wxWidgets.git] / src / gtk / radiobox.cpp

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 04050c30dd3583afee670ea13d6904854c20c291..1053519c931dc1f62a29dadb657f58997e8e2a02 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -435,7 +435,7 @@ bool wxRadioBox::Show( bool show )
 
 int wxRadioBox::FindString( const wxString &find ) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
 
     int count = 0;
 
@@ -456,7 +456,7 @@ int wxRadioBox::FindString( const wxString &find ) const
         node = node->GetNext();
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 void wxRadioBox::SetFocus()
@@ -497,7 +497,7 @@ void wxRadioBox::SetSelection( int n )
 
 int wxRadioBox::GetSelection(void) const
 {
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid radiobox") );
 
     int count = 0;
 
@@ -512,16 +512,16 @@ int wxRadioBox::GetSelection(void) const
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.Item( n );
 
-    wxCHECK_MSG( node, wxT(""), wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, wxEmptyString, wxT("radiobox wrong index") );
 
     GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
 
@@ -575,28 +575,30 @@ bool wxRadioBox::Enable( bool enable )
     return true;
 }
 
-void wxRadioBox::Enable( int item, bool enable )
+bool wxRadioBox::Enable( int item, bool enable )
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxCHECK_RET( node, wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
     GtkButton *button = GTK_BUTTON( node->GetData() );
     GtkLabel *label = GTK_LABEL( BUTTON_CHILD(button) );
 
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( GTK_WIDGET(label), enable );
+
+    return true;
 }
 
-void wxRadioBox::Show( int item, bool show )
+bool wxRadioBox::Show( int item, bool show )
 {
-    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.Item( item );
 
-    wxCHECK_RET( node, wxT("radiobox wrong index") );
+    wxCHECK_MSG( node, false, wxT("radiobox wrong index") );
 
     GtkWidget *button = GTK_WIDGET( node->GetData() );
 
@@ -604,11 +606,13 @@ void wxRadioBox::Show( int item, bool show )
         gtk_widget_show( button );
     else
         gtk_widget_hide( button );
+
+    return true;
 }
 
 wxString wxRadioBox::GetStringSelection() const
 {
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
+    wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid radiobox") );
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
@@ -629,7 +633,7 @@ wxString wxRadioBox::GetStringSelection() const
     }
 
     wxFAIL_MSG( wxT("wxRadioBox none selected") );
-    return wxT("");
+    return wxEmptyString;
 }
 
 bool wxRadioBox::SetStringSelection( const wxString &s )
@@ -637,7 +641,7 @@ bool wxRadioBox::SetStringSelection( const wxString &s )
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") );
 
     int res = FindString( s );
-    if (res == -1) return false;
+    if (res == wxNOT_FOUND) return false;
     SetSelection( res );
 
     return true;