X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/953704c1c76cfb9cfb7b91f0e81f98c30d27eb56..db8db70a19a52f14f284a99cafbf2f18c66372ea:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 20718dfae3..102ce9b224 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -59,7 +59,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) event.SetInt( combo->GetSelection() ); event.SetString( combo->GetStringSelection() ); event.SetEventObject( combo ); - + combo->GetEventHandler()->ProcessEvent( event ); } @@ -71,7 +71,7 @@ static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { if (g_isIdle) wxapp_install_idle_handler(); - + if (!combo->m_hasVMT) return; wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); @@ -126,7 +126,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, /* don't send first event, which GTK sends aways when inserting the first item */ m_alreadySent = TRUE; - + GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() ); m_clientDataList.Append( (wxObject*)NULL ); @@ -360,8 +360,6 @@ int wxComboBox::GetSelection() const } } - wxFAIL_MSG( _T("wxComboBox: no selection") ); - return -1; } @@ -596,7 +594,7 @@ void wxComboBox::DisableEvents() GList *child = list->children; while (child) { - gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), + gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); child = child->next; @@ -619,7 +617,7 @@ void wxComboBox::EnableEvents() void wxComboBox::OnSize( wxSizeEvent &event ) { event.Skip(); - + return; int w = 21;