X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0662f99096f665089e23dc7d342ac85ceb72f9e3..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/gtk/choice.cpp?ds=sidebyside diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 4fbc3417c0..d9fc4408c7 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -38,11 +38,10 @@ gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) - -wxChoice::wxChoice() - : m_strings(NULL) +void wxChoice::Init() { + m_strings = NULL; + m_stringCellIndex = 0; } bool wxChoice::Create( wxWindow *parent, wxWindowID id, @@ -63,8 +62,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - m_strings = NULL; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { @@ -76,10 +73,11 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, { // if our m_strings != NULL, Append() will check for it and insert // items in the correct order - m_strings = new wxSortedArrayString; + m_strings = new wxGtkCollatedArrayString; } m_widget = gtk_combo_box_new_text(); + g_object_ref(m_widget); Append(n, choices); @@ -117,6 +115,11 @@ void wxChoice::SendSelectionChangedEvent(wxEventType evt_type) HandleWindowEvent( event ); } +void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) +{ + gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) ); +} + int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, wxClientDataType type) @@ -124,22 +127,21 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") ); wxASSERT_MSG( !IsSorted() || (pos == GetCount()), - _T("In a sorted choice data could only be appended")); + wxT("In a sorted choice data could only be appended")); const int count = items.GetCount(); int n = wxNOT_FOUND; - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); for ( int i = 0; i < count; ++i ) { n = pos + i; // If sorted, use this wxSortedArrayStrings to determine // the right insertion point - if(m_strings) + if (m_strings) n = m_strings->Add(items[i]); - gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) ); + GTKInsertComboBoxTextItem( n, items[i] ); m_clientData.Insert( NULL, n ); AssignNewItemClientData(n, clientData, i, type); @@ -164,18 +166,18 @@ void wxChoice::DoClear() { wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - DisableEvents(); + GTKDisableEvents(); - const unsigned int count = GetCount(); - for (unsigned int i = 0; i < count; i++) - gtk_combo_box_remove_text( GTK_COMBO_BOX(m_widget), 0 ); + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel* model = gtk_combo_box_get_model( combobox ); + gtk_list_store_clear(GTK_LIST_STORE(model)); m_clientData.Clear(); if (m_strings) m_strings->Clear(); - EnableEvents(); + GTKEnableEvents(); InvalidateBestSize(); } @@ -183,9 +185,16 @@ void wxChoice::DoClear() void wxChoice::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") ); + + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel* model = gtk_combo_box_get_model( combobox ); + GtkListStore* store = GTK_LIST_STORE(model); + GtkTreeIter iter; + gtk_tree_model_iter_nth_child( model, &iter, + NULL, (gint) n ); + gtk_list_store_remove( store, &iter ); - gtk_combo_box_remove_text( GTK_COMBO_BOX( m_widget ), n ); m_clientData.RemoveAt( n ); if ( m_strings ) m_strings->RemoveAt( n ); @@ -207,7 +216,7 @@ int wxChoice::FindString( const wxString &item, bool bCase ) const do { GValue value = { 0, }; - gtk_tree_model_get_value( model, &iter, 0, &value ); + gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value ); wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) ); g_value_unset( &value ); @@ -240,7 +249,7 @@ void wxChoice::SetString(unsigned int n, const wxString &text) GValue value = { 0, }; g_value_init( &value, G_TYPE_STRING ); g_value_set_string( &value, wxGTK_CONV( text ) ); - gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, 0, &value ); + gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, m_stringCellIndex, &value ); g_value_unset( &value ); } @@ -259,7 +268,7 @@ wxString wxChoice::GetString(unsigned int n) const if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) { GValue value = { 0, }; - gtk_tree_model_get_value( model, &iter, 0, &value ); + gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value ); wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) ); g_value_unset( &value ); return tmp; @@ -288,21 +297,35 @@ void wxChoice::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - DisableEvents(); + GTKDisableEvents(); GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); gtk_combo_box_set_active( combobox, n ); - EnableEvents(); + GTKEnableEvents(); +} + +void wxChoice::SetColumns(int n) +{ + gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n); +} + +int wxChoice::GetColumns() const +{ + // gtk_combo_box_get_wrap_width() was added in gtk 2.6 + gint intval; + g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL); + return intval; } -void wxChoice::DisableEvents() + +void wxChoice::GTKDisableEvents() { g_signal_handlers_block_by_func(m_widget, (gpointer) gtk_choice_changed_callback, this); } -void wxChoice::EnableEvents() +void wxChoice::GTKEnableEvents() { g_signal_handlers_unblock_by_func(m_widget, (gpointer) gtk_choice_changed_callback, this); @@ -311,7 +334,7 @@ void wxChoice::EnableEvents() GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return m_widget->window; + return gtk_widget_get_window(m_widget); } // Notice that this method shouldn't be necessary, because GTK calculates @@ -326,7 +349,7 @@ wxSize wxChoice::DoGetBestSize() const // in the combobox if ( m_widget ) { - ret.x = 60; // start with something "sensible" + ret.x = GetCount() > 0 ? 0 : 60; // start with something "sensible" int width; unsigned int count = GetCount(); for ( unsigned int n = 0; n < count; n++ ) @@ -345,6 +368,13 @@ wxSize wxChoice::DoGetBestSize() const return ret; } +void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) +{ + gtk_widget_modify_style(m_widget, style); + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); +} + + // static wxVisualAttributes wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))