X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c1d7855d1fefcdbff0e093e21e5cf101ca604..a3b7db872925df2921f36637a84085ec04cf977a:/src/gtk/choice.cpp?ds=sidebyside diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index af58e5c2ce..bbfa2480bb 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -17,8 +17,9 @@ #include "wx/arrstr.h" #endif +#include #include "wx/gtk/private.h" - +#include "wx/gtk/private/gtk2-compat.h" // ---------------------------------------------------------------------------- // GTK callbacks @@ -29,7 +30,7 @@ extern "C" { static void gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { - choice->SendSelectionChangedEvent(wxEVT_COMMAND_CHOICE_SELECTED); + choice->SendSelectionChangedEvent(wxEVT_CHOICE); } } @@ -38,11 +39,9 @@ gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) - void wxChoice::Init() { - m_strings = (wxSortedArrayString *)NULL; + m_strings = NULL; m_stringCellIndex = 0; } @@ -75,10 +74,15 @@ 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; } +#ifdef __WXGTK3__ + m_widget = gtk_combo_box_text_new(); +#else m_widget = gtk_combo_box_new_text(); +#endif + g_object_ref(m_widget); Append(n, choices); @@ -97,28 +101,13 @@ wxChoice::~wxChoice() delete m_strings; } -void wxChoice::SendSelectionChangedEvent(wxEventType evt_type) -{ - if (!m_hasVMT) - return; - - if (GetSelection() == -1) - return; - - wxCommandEvent event( evt_type, GetId() ); - - int n = GetSelection(); - event.SetInt( n ); - event.SetString( GetStringSelection() ); - event.SetEventObject( this ); - InitCommandEventWithItems( event, n ); - - HandleWindowEvent( event ); -} - void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) { +#ifdef __WXGTK3__ + gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(m_widget), n, wxGTK_CONV(text)); +#else gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) ); +#endif } int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, @@ -128,7 +117,7 @@ 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(); @@ -139,7 +128,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, 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]); GTKInsertComboBoxTextItem( n, items[i] ); @@ -167,7 +156,7 @@ void wxChoice::DoClear() { wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - DisableEvents(); + GTKDisableEvents(); GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); GtkTreeModel* model = gtk_combo_box_get_model( combobox ); @@ -178,7 +167,7 @@ void wxChoice::DoClear() if (m_strings) m_strings->Clear(); - EnableEvents(); + GTKEnableEvents(); InvalidateBestSize(); } @@ -186,14 +175,18 @@ 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 ); + if ( !gtk_tree_model_iter_nth_child(model, &iter, NULL, n) ) + { + // This is really not supposed to happen for a valid index. + wxFAIL_MSG(wxS("Item unexpectedly not found.")); + return; + } gtk_list_store_remove( store, &iter ); m_clientData.RemoveAt( n ); @@ -298,69 +291,94 @@ 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); } -void wxChoice::DisableEvents() +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::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); } - 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 -// 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() ); + // Get the height of the control from GTK+ itself, but use our own version + // to compute the width large enough to show all our strings as GTK+ + // doesn't seem to take the control contents into account. + return GetSizeFromTextSize(wxChoiceBase::DoGetBestSize().x); +} - // we know better our horizontal extent: it depends on the longest string - // in the combobox - if ( m_widget ) - { - ret.x = 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; - } - } +wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const +{ + wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") ); - // empty combobox should have some reasonable default size too - if ((GetCount() == 0) && (ret.x < 80)) - ret.x = 80; + // a GtkEntry for wxComboBox and a GtkCellView for wxChoice + GtkWidget* childPart = gtk_bin_get_child(GTK_BIN(m_widget)); - CacheBestSize(ret); - return ret; + // Set a as small as possible size for the control, so preferred sizes + // return "natural" sizes, not taking into account the previous ones (which + // seems to be GTK+3 behaviour) + gtk_widget_set_size_request(m_widget, 0, 0); + + // We are interested in the difference of sizes between the whole contol + // and its child part. I.e. arrow, separators, etc. + GtkRequisition req; + gtk_widget_get_preferred_size(childPart, NULL, &req); + wxSize totalS = GTKGetPreferredSize(m_widget); + + wxSize tsize(xlen + totalS.x - req.width, totalS.y); + + // For a wxChoice, not for wxComboBox, add some margins + if ( !GTK_IS_ENTRY(childPart) ) + tsize.IncBy(5, 0); + + // Perhaps the user wants something different from CharHeight + if ( ylen > 0 ) + tsize.IncBy(0, ylen - GetCharHeight()); + + return tsize; +} + +void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) +{ + GTKApplyStyle(m_widget, style); + GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style); } // static wxVisualAttributes wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new); + return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new()); } - #endif // wxUSE_CHOICE || wxUSE_COMBOBOX