X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11e62fe658531aaa2891351f19bd0a4c076717ae..4c410aa14e7818b946351842fed2905239c15592:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 3480b84904..b1c46bdcd8 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -75,18 +75,29 @@ gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) { // when the popup is hidden, throw a SELECTED event only if the combobox // selection changed. - int curSelection = combo->GetCurrentSelection(); - if (g_SelectionBeforePopup != curSelection) + const int curSelection = combo->GetCurrentSelection(); + + const bool hasChanged = curSelection != g_SelectionBeforePopup; + + // reset the selection flag to value meaning that it is hidden and do it + // now, before generating the events, so that GetSelection() returns the + // new value from the event handler + g_SelectionBeforePopup = wxID_NONE; + + if ( hasChanged ) { wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); event.SetInt( curSelection ); event.SetString( combo->GetStringSelection() ); event.SetEventObject( combo ); combo->GetEventHandler()->ProcessEvent( event ); - } - // reset the selection flag to value meaning that it is hidden - g_SelectionBeforePopup = wxID_NONE; + // for consistency with the other ports, send TEXT event + wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); + event2.SetString( combo->GetStringSelection() ); + event2.SetEventObject( combo ); + combo->GetEventHandler()->ProcessEvent( event2 ); + } } } @@ -125,11 +136,12 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi // Quickly set the value of the combo box // as GTK+ does that only AFTER the event // is sent. - gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); + g_signal_handlers_disconnect_by_func (GTK_COMBO (combo->GetHandle())->entry, + (gpointer) gtk_text_changed_callback, + combo); combo->SetValue( combo->GetStringSelection() ); - gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); + g_signal_connect_after (GTK_COMBO (combo->GetHandle())->entry, "changed", + G_CALLBACK (gtk_text_changed_callback), combo); // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE) // because when combobox popup is shown, gtk_combo_select_child_callback is @@ -144,7 +156,7 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi event.SetEventObject( combo ); combo->GetEventHandler()->ProcessEvent( event ); - // for consistencu with the other ports, don't generate text update + // for consistency with the other ports, don't generate text update // events while the user is browsing the combobox neither wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); event2.SetString( combo->GetValue() ); @@ -216,10 +228,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, GtkCombo *combo = GTK_COMBO(m_widget); // Disable GTK's broken events ... - gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id ); - // ... and add surogate handler. - combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed", - (GtkSignalFunc) gtk_dummy_callback, combo); + g_signal_handler_disconnect (combo->entry, combo->entry_change_id); + // ... and add surrogate handler. + combo->entry_change_id = g_signal_connect (combo->entry, "changed", + G_CALLBACK (gtk_dummy_callback), + combo); // make it more useable gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); @@ -227,17 +240,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // and case-sensitive gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); -#ifdef __WXGTK20__ if (style & wxNO_BORDER) g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL ); -#endif GtkWidget *list = GTK_COMBO(m_widget)->list; -#ifndef __WXGTK20__ - // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE ); -#endif - for (int i = 0; i < n; i++) { GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) ); @@ -267,16 +274,17 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // "show" and "hide" events are generated when user click on the combobox button which popups a list // this list is the "popwin" gtk widget - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "hide", - GTK_SIGNAL_FUNC(gtk_popup_hide_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show", - GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this ); + g_signal_connect (GTK_COMBO(combo)->popwin, "hide", + G_CALLBACK (gtk_popup_hide_callback), this); + g_signal_connect (GTK_COMBO(combo)->popwin, "show", + G_CALLBACK (gtk_popup_show_callback), this); - gtk_signal_connect_after( GTK_OBJECT(combo->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); + g_signal_connect_after (combo->entry, "changed", + G_CALLBACK (gtk_text_changed_callback), this); - gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child", - GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); + g_signal_connect_after (combo->list, "select-child", + G_CALLBACK (gtk_combo_select_child_callback), + this); SetBestSize(size); // need this too because this is a wxControlWithItems @@ -539,11 +547,8 @@ int wxComboBox::FindString( const wxString &item, bool bCase ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); -#ifdef __WXGTK20__ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString str( label->label ); -#endif + if (item.IsSameAs( str , bCase ) ) return count; @@ -596,11 +601,7 @@ wxString wxComboBox::GetString( int n ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); -#ifdef __WXGTK20__ str = wxGTK_CONV_BACK( gtk_label_get_text(label) ); -#else - str = wxString( label->label ); -#endif } else { @@ -621,11 +622,7 @@ wxString wxComboBox::GetStringSelection() const { GtkBin *bin = GTK_BIN( selection->data ); GtkLabel *label = GTK_LABEL( bin->child ); -#ifdef __WXGTK20__ wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); -#else - wxString tmp( label->label ); -#endif return tmp; } @@ -821,15 +818,10 @@ void wxComboBox::GetSelection( long* from, long* to ) const if (IsEditable()) { GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry); -#ifdef __WXGTK20__ gint start, end; gtk_editable_get_selection_bounds(editable, & start, & end); *from = start; *to = end; -#else - *from = (long) editable->selection_start_pos; - *to = (long) editable->selection_end_pos; -#endif } } @@ -877,18 +869,22 @@ void wxComboBox::OnChar( wxKeyEvent &event ) void wxComboBox::DisableEvents() { - gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list), - GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); - gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->entry), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); + g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->list, + (gpointer) gtk_combo_select_child_callback, + this); + g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->entry, + (gpointer) gtk_text_changed_callback, + this); } void wxComboBox::EnableEvents() { - gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", - GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); - gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); + g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child", + G_CALLBACK (gtk_combo_select_child_callback), + this); + g_signal_connect_after (GTK_COMBO(m_widget)->entry, "changed", + G_CALLBACK (gtk_text_changed_callback), + this ); } void wxComboBox::OnSize( wxSizeEvent &event )