Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linup API of wxRadioBox::Show on all ports. Move wxRadioBox::IsValid from wxUniversal to base class (+ GTK which do not use base class) and use it where applicable. Minor source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-23 16:39:25 +00:00
parent 14fc1a0c5c
commit 789f679516
12 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/radiobox.cpp
View File

@@ -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,7 +512,7 @@ int wxRadioBox::GetSelection(void) const
wxFAIL_MSG( wxT("wxRadioBox none selected") );
return -1;
return wxNOT_FOUND;
}
wxString wxRadioBox::GetString( int n ) const
@@ -592,13 +592,13 @@ bool wxRadioBox::Enable( int item, bool 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() );
@@ -606,6 +606,8 @@ void wxRadioBox::Show( int item, bool show )
gtk_widget_show( button );
else
gtk_widget_hide( button );
return true;
}
wxString wxRadioBox::GetStringSelection() const
@@ -639,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;