From 2b5bd7fd873e583a3e74f1baf6634900756ef64b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Sat, 15 Aug 1998 18:47:23 +0000 Subject: [PATCH] fixed GetSelection() inversion bug git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/radiobox.cpp | 6 ++++-- src/gtk1/radiobox.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 6195828b7a..e1e66d05c6 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -166,14 +166,16 @@ int wxRadioBox::GetSelection(void) const { GSList *item = gtk_radio_button_group( m_radio ); int count = 0; + int found = -1; while (item) { GtkButton *button = GTK_BUTTON( item->data ); - if (GTK_TOGGLE_BUTTON(button)->active) return count; + if (GTK_TOGGLE_BUTTON(button)->active) found = count; count++; item = item->next; } - return -1; + + return found != -1 ? count-found-1 : -1; } wxString wxRadioBox::GetString( int n ) const diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 6195828b7a..e1e66d05c6 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -166,14 +166,16 @@ int wxRadioBox::GetSelection(void) const { GSList *item = gtk_radio_button_group( m_radio ); int count = 0; + int found = -1; while (item) { GtkButton *button = GTK_BUTTON( item->data ); - if (GTK_TOGGLE_BUTTON(button)->active) return count; + if (GTK_TOGGLE_BUTTON(button)->active) found = count; count++; item = item->next; } - return -1; + + return found != -1 ? count-found-1 : -1; } wxString wxRadioBox::GetString( int n ) const -- 2.45.2