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

Change SetStringSelection to return bool like in other classes and ports

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-27 19:59:35 +00:00
parent 14af60da8b
commit 95561ddfc3
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/combobox.h
View File

@@ -96,7 +96,7 @@ public:
int Number() const { return GetCount(); } int Number() const { return GetCount(); }
void SetSelection( int n ); void SetSelection( int n );
void Select( int n ) { return SetSelection( n ); } void Select( int n ) { return SetSelection( n ); }
void SetStringSelection( const wxString &string ); bool SetStringSelection( const wxString &string );
void SetString(int n, const wxString &text); void SetString(int n, const wxString &text);
wxString GetValue() const; wxString GetValue() const;

2
include/wx/gtk1/combobox.h
View File

@@ -96,7 +96,7 @@ public:
int Number() const { return GetCount(); } int Number() const { return GetCount(); }
void SetSelection( int n ); void SetSelection( int n );
void Select( int n ) { return SetSelection( n ); } void Select( int n ) { return SetSelection( n ); }
void SetStringSelection( const wxString &string ); bool SetStringSelection( const wxString &string );
void SetString(int n, const wxString &text); void SetString(int n, const wxString &text);
wxString GetValue() const; wxString GetValue() const;

7
src/gtk/combobox.cpp
View File

@@ -557,13 +557,14 @@ void wxComboBox::SetSelection( int n )
EnableEvents(); EnableEvents();
} }
void wxComboBox::SetStringSelection( const wxString &string ) bool wxComboBox::SetStringSelection( const wxString &string )
{ {
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") );
int res = FindString( string ); int res = FindString( string );
if (res == -1) return; if (res == -1) return false;
SetSelection( res ); SetSelection( res );
return true;
} }
wxString wxComboBox::GetValue() const wxString wxComboBox::GetValue() const

7
src/gtk1/combobox.cpp
View File

@@ -557,13 +557,14 @@ void wxComboBox::SetSelection( int n )
EnableEvents(); EnableEvents();
} }
void wxComboBox::SetStringSelection( const wxString &string ) bool wxComboBox::SetStringSelection( const wxString &string )
{ {
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") );
int res = FindString( string ); int res = FindString( string );
if (res == -1) return; if (res == -1) return false;
SetSelection( res ); SetSelection( res );
return true;
} }
wxString wxComboBox::GetValue() const wxString wxComboBox::GetValue() const