From 708c45a6cef439edb007ca8f8329582244f152f5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 30 Aug 2003 23:03:07 +0000 Subject: [PATCH] return the index of the inserted/appended item git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/combobox.h | 16 ++++----- include/wx/gtk1/combobox.h | 16 ++++----- src/gtk/combobox.cpp | 68 ++++++++++++++++++++------------------ src/gtk1/combobox.cpp | 68 ++++++++++++++++++++------------------ 4 files changed, 86 insertions(+), 82 deletions(-) diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index fc16eb9a39..65938c8636 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -65,13 +65,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - void Append( const wxString &item ); - void Append( const wxString &item, void* clientData ); - void Append( const wxString &item, wxClientData* clientData ); + int Append( const wxString &item ); + int Append( const wxString &item, void* clientData ); + int Append( const wxString &item, wxClientData* clientData ); - void Insert( const wxString &item, int pos ); - void Insert( const wxString &item, int pos, void* clientData ); - void Insert( const wxString &item, int pos, wxClientData* clientData ); + int Insert( const wxString &item, int pos ); + int Insert( const wxString &item, int pos, void* clientData ); + int Insert( const wxString &item, int pos, wxClientData* clientData ); void SetClientData( int n, void* clientData ); void* GetClientData( int n ) const; @@ -125,8 +125,8 @@ public: void DisableEvents(); void EnableEvents(); - void AppendCommon( const wxString &item ); - void InsertCommon( const wxString &item, int pos ); + int AppendCommon( const wxString &item ); + int InsertCommon( const wxString &item, int pos ); GtkWidget* GetConnectWidget(); bool IsOwnGtkWindow( GdkWindow *window ); void ApplyWidgetStyle(); diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index fc16eb9a39..65938c8636 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -65,13 +65,13 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - void Append( const wxString &item ); - void Append( const wxString &item, void* clientData ); - void Append( const wxString &item, wxClientData* clientData ); + int Append( const wxString &item ); + int Append( const wxString &item, void* clientData ); + int Append( const wxString &item, wxClientData* clientData ); - void Insert( const wxString &item, int pos ); - void Insert( const wxString &item, int pos, void* clientData ); - void Insert( const wxString &item, int pos, wxClientData* clientData ); + int Insert( const wxString &item, int pos ); + int Insert( const wxString &item, int pos, void* clientData ); + int Insert( const wxString &item, int pos, wxClientData* clientData ); void SetClientData( int n, void* clientData ); void* GetClientData( int n ) const; @@ -125,8 +125,8 @@ public: void DisableEvents(); void EnableEvents(); - void AppendCommon( const wxString &item ); - void InsertCommon( const wxString &item, int pos ); + int AppendCommon( const wxString &item ); + int InsertCommon( const wxString &item, int pos ); GtkWidget* GetConnectWidget(); bool IsOwnGtkWindow( GdkWindow *window ); void ApplyWidgetStyle(); diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 29eaf88f4f..9e92ab9e2d 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -223,7 +223,7 @@ void wxComboBox::SetFocus() gtk_widget_grab_focus( m_focusWidget ); } -void wxComboBox::AppendCommon( const wxString &item ) +int wxComboBox::AppendCommon( const wxString &item ) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); @@ -246,43 +246,45 @@ void wxComboBox::AppendCommon( const wxString &item ) gtk_widget_show( list_item ); EnableEvents(); + + return GetCount() - 1; } -void wxComboBox::Append( const wxString &item ) +int wxComboBox::Append( const wxString &item ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL ); - AppendCommon( item ); + return AppendCommon( item ); } -void wxComboBox::Append( const wxString &item, void *clientData ) +int wxComboBox::Append( const wxString &item, void *clientData ) { m_clientDataList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*)NULL ); - AppendCommon( item ); + return AppendCommon( item ); } -void wxComboBox::Append( const wxString &item, wxClientData *clientData ) +int wxComboBox::Append( const wxString &item, wxClientData *clientData ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) clientData ); - AppendCommon( item ); + return AppendCommon( item ); } -void wxComboBox::InsertCommon( const wxString &item, int pos ) +int wxComboBox::InsertCommon( const wxString &item, int pos ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, + wxT("can't insert into sorted list")); + + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); if (pos == count) { - AppendCommon(item); - return; + return AppendCommon(item); } DisableEvents(); @@ -300,63 +302,63 @@ void wxComboBox::InsertCommon( const wxString &item, int pos ) gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - if (m_widgetStyle) ApplyWidgetStyle(); + if (m_widgetStyle) + ApplyWidgetStyle(); } gtk_widget_show( list_item ); EnableEvents(); + + return pos; } -void wxComboBox::Insert( const wxString &item, int pos ) +int wxComboBox::Insert( const wxString &item, int pos ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + const int count = GetCount(); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) { - Append(item); - return; + return Append(item); } m_clientDataList.Insert( pos, (wxObject*) NULL ); m_clientObjectList.Insert( pos, (wxObject*) NULL ); - InsertCommon( item, pos ); + return InsertCommon( item, pos ); } -void wxComboBox::Insert( const wxString &item, int pos, void *clientData ) +int wxComboBox::Insert( const wxString &item, int pos, void *clientData ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) { - Append(item, clientData); - return; + return Append(item, clientData); } m_clientDataList.Insert( pos, (wxObject*) clientData ); m_clientObjectList.Insert( pos, (wxObject*)NULL ); - InsertCommon( item, pos ); + return InsertCommon( item, pos ); } -void wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData ) +int wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) { - Append(item, clientData); - return; + return Append(item, clientData); } m_clientDataList.Insert( pos, (wxObject*) NULL ); m_clientObjectList.Insert( pos, (wxObject*) clientData ); - InsertCommon( item, pos ); + return InsertCommon( item, pos ); } void wxComboBox::SetClientData( int n, void* clientData ) diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 29eaf88f4f..9e92ab9e2d 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -223,7 +223,7 @@ void wxComboBox::SetFocus() gtk_widget_grab_focus( m_focusWidget ); } -void wxComboBox::AppendCommon( const wxString &item ) +int wxComboBox::AppendCommon( const wxString &item ) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); @@ -246,43 +246,45 @@ void wxComboBox::AppendCommon( const wxString &item ) gtk_widget_show( list_item ); EnableEvents(); + + return GetCount() - 1; } -void wxComboBox::Append( const wxString &item ) +int wxComboBox::Append( const wxString &item ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL ); - AppendCommon( item ); + return AppendCommon( item ); } -void wxComboBox::Append( const wxString &item, void *clientData ) +int wxComboBox::Append( const wxString &item, void *clientData ) { m_clientDataList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*)NULL ); - AppendCommon( item ); + return AppendCommon( item ); } -void wxComboBox::Append( const wxString &item, wxClientData *clientData ) +int wxComboBox::Append( const wxString &item, wxClientData *clientData ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) clientData ); - AppendCommon( item ); + return AppendCommon( item ); } -void wxComboBox::InsertCommon( const wxString &item, int pos ) +int wxComboBox::InsertCommon( const wxString &item, int pos ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, + wxT("can't insert into sorted list")); + + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); if (pos == count) { - AppendCommon(item); - return; + return AppendCommon(item); } DisableEvents(); @@ -300,63 +302,63 @@ void wxComboBox::InsertCommon( const wxString &item, int pos ) gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - if (m_widgetStyle) ApplyWidgetStyle(); + if (m_widgetStyle) + ApplyWidgetStyle(); } gtk_widget_show( list_item ); EnableEvents(); + + return pos; } -void wxComboBox::Insert( const wxString &item, int pos ) +int wxComboBox::Insert( const wxString &item, int pos ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + const int count = GetCount(); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) { - Append(item); - return; + return Append(item); } m_clientDataList.Insert( pos, (wxObject*) NULL ); m_clientObjectList.Insert( pos, (wxObject*) NULL ); - InsertCommon( item, pos ); + return InsertCommon( item, pos ); } -void wxComboBox::Insert( const wxString &item, int pos, void *clientData ) +int wxComboBox::Insert( const wxString &item, int pos, void *clientData ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) { - Append(item, clientData); - return; + return Append(item, clientData); } m_clientDataList.Insert( pos, (wxObject*) clientData ); m_clientObjectList.Insert( pos, (wxObject*)NULL ); - InsertCommon( item, pos ); + return InsertCommon( item, pos ); } -void wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData ) +int wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData ) { - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) { - Append(item, clientData); - return; + return Append(item, clientData); } m_clientDataList.Insert( pos, (wxObject*) NULL ); m_clientObjectList.Insert( pos, (wxObject*) clientData ); - InsertCommon( item, pos ); + return InsertCommon( item, pos ); } void wxComboBox::SetClientData( int n, void* clientData ) -- 2.45.2