X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2c9411060933aa5e92edf3e6251f9fc90090d20..1f2f732921b6456c87ab8d180c5bd14456a5b35f:/src/gtk/choice.cpp diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 9eefcf06da..fa6221e50a 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -40,9 +40,10 @@ gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) 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 +64,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 )) { @@ -80,6 +79,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, } m_widget = gtk_combo_box_new_text(); + g_object_ref(m_widget); Append(n, choices); @@ -117,6 +117,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) @@ -130,7 +135,6 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, int n = wxNOT_FOUND; - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); for ( int i = 0; i < count; ++i ) { n = pos + i; @@ -139,7 +143,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, 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); @@ -166,9 +170,9 @@ void wxChoice::DoClear() DisableEvents(); - 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(); @@ -185,7 +189,14 @@ void wxChoice::DoDeleteOneItem(unsigned int n) wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); - gtk_combo_box_remove_text( GTK_COMBO_BOX( m_widget ), n ); + 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 ); + m_clientData.RemoveAt( n ); if ( m_strings ) m_strings->RemoveAt( n ); @@ -207,7 +218,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 +251,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 +270,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; @@ -296,6 +307,20 @@ void wxChoice::SetSelection( int n ) EnableEvents(); } +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() { g_signal_handlers_block_by_func(m_widget, @@ -314,6 +339,44 @@ GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const return m_widget->window; } +// Notice that this method shouldn't be necessary, because GTK calculates +// properly size of the combobox but for unknown reasons it doesn't work +// correctly in wx without this. +wxSize wxChoice::DoGetBestSize() const +{ + // strangely, this returns a width of 188 pixels from GTK+ (?) + wxSize ret( wxControl::DoGetBestSize() ); + + // we know better our horizontal extent: it depends on the longest string + // in the combobox + if ( m_widget ) + { + ret.x = GetCount() > 0 ? 0 : 60; // start with something "sensible" + int width; + unsigned int count = GetCount(); + for ( unsigned int n = 0; n < count; n++ ) + { + GetTextExtent(GetString(n), &width, NULL, NULL, NULL ); + if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text + ret.x = width + 40; + } + } + + // empty combobox should have some reasonable default size too + if ((GetCount() == 0) && (ret.x < 80)) + ret.x = 80; + + CacheBestSize(ret); + return ret; +} + +void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) +{ + gtk_widget_modify_style(m_widget, style); + gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); +} + + // static wxVisualAttributes wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))