X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ec1179b86dac6c87ad9f2cd126f87e92642c62c..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 0caf6df81f..ae69a86b37 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -21,188 +21,51 @@ #include "wx/arrstr.h" #endif -// We use GtkCombo which has been deprecated since GTK+ 2.3.0 -// in favour of GtkComboBox for #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; -static int g_SelectionBeforePopup = wxID_NONE; // this means the popup is hidden - -//----------------------------------------------------------------------------- -// "changed" - typing and list item matches get changed, select-child -// if it doesn't match an item then just get a single changed -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- extern "C" { static void -gtkcombo_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { - if (combo->m_ignoreNextUpdate) - { - combo->m_ignoreNextUpdate = false; - return; - } - - if (!combo->m_hasVMT) return; - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); event.SetString( combo->GetValue() ); event.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event ); -} -} - -extern "C" { -static void -gtkcombo_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo)) -{ -} -} - -extern "C" { -static void -gtkcombo_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) -{ - // when the popup is hidden, throw a SELECTED event only if the combobox - // selection changed. - 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 ); - - // 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 ); - } -} + combo->HandleWindowEvent( event ); } -extern "C" { static void -gtkcombo_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) +gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { - // store the combobox selection value before the popup is shown - g_SelectionBeforePopup = combo->GetCurrentSelection(); + combo->SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED); } -} - -//----------------------------------------------------------------------------- -// "select-child" - click/cursor get select-child, changed, select-child -//----------------------------------------------------------------------------- -extern "C" { static void -gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo ) -{ - if (!combo->m_hasVMT) return; - - if (g_blockEventsOnDrag) return; - - int curSelection = combo->GetCurrentSelection(); - - if (combo->m_prevSelection == curSelection) return; - - GtkWidget *list = GTK_COMBO(combo->m_widget)->list; - gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection ); - - combo->m_prevSelection = curSelection; - - // Quickly set the value of the combo box - // as GTK+ does that only AFTER the event - // is sent. - GtkWidget* entry = GTK_COMBO(combo->GetHandle())->entry; - g_signal_handlers_block_by_func( - entry, (gpointer)gtkcombo_text_changed_callback, combo); - combo->SetValue( combo->GetStringSelection() ); - g_signal_handlers_unblock_by_func( - entry, (gpointer)gtkcombo_text_changed_callback, combo); - - // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE) - // because when combobox popup is shown, gtkcombo_combo_select_child_callback is - // called each times the mouse is over an item with a pressed button so a lot - // of SELECTED event could be generated if the user keep the mouse button down - // and select other items ... - if (g_SelectionBeforePopup == wxID_NONE) - { - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); - event.SetInt( curSelection ); - event.SetString( combo->GetStringSelection() ); - event.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event ); - - // 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() ); - event2.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event2 ); - } -} -} - -#ifdef __WXGTK24__ -extern "C" { -static void -gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) -{ - if (!combo->m_hasVMT) return; - - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); - event.SetString( combo->GetValue() ); +gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject), + GParamSpec *WXUNUSED(param_spec), + wxComboBox *combo) +{ + gboolean isShown; + g_object_get( combo->m_widget, "popup-shown", &isShown, NULL ); + wxCommandEvent event( isShown ? wxEVT_COMMAND_COMBOBOX_DROPDOWN + : wxEVT_COMMAND_COMBOBOX_CLOSEUP, + combo->GetId() ); event.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event ); -} + combo->HandleWindowEvent( event ); } -extern "C" { -static void -gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) -{ - if (!combo->m_hasVMT) return; - - if (combo->GetSelection() == -1) - return; - - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); - event.SetInt( combo->GetSelection() ); - event.SetString( combo->GetStringSelection() ); - event.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event ); } -} - -#endif //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl) - -BEGIN_EVENT_TABLE(wxComboBox, wxControl) - EVT_SIZE(wxComboBox::OnSize) +BEGIN_EVENT_TABLE(wxComboBox, wxChoice) EVT_CHAR(wxComboBox::OnChar) EVT_MENU(wxID_CUT, wxComboBox::OnCut) @@ -222,6 +85,17 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll) END_EVENT_TABLE() +wxComboBox::~wxComboBox() +{ + if (m_entry) + GTKDisconnect(m_entry); +} + +void wxComboBox::Init() +{ + m_entry = NULL; +} + bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, @@ -241,10 +115,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, long style, const wxValidator& validator, const wxString& name ) { - m_strings = NULL; - m_ignoreNextUpdate = false; - m_prevSelection = 0; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { @@ -252,735 +122,205 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, return false; } - if(HasFlag(wxCB_SORT)) - m_strings = new wxSortedArrayString(); + if (HasFlag(wxCB_SORT)) + m_strings = new wxGtkCollatedArrayString(); -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - m_widget = gtk_combo_box_entry_new_text(); + GTKCreateComboBoxWidget(); - gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE ); - } - else -#endif + if (HasFlag(wxBORDER_NONE)) { - m_widget = gtk_combo_new(); - GtkCombo* combo = GTK_COMBO(m_widget); - - // Disable GTK's broken events ... - 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 (gtkcombo_dummy_callback), - combo); + // Doesn't seem to work + // g_object_set (m_widget, "has-frame", FALSE, NULL); + } - // make it more useable - gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); + GtkEntry * const entry = GetEntry(); - // and case-sensitive - gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); + if ( entry ) + { + // Set it up to trigger default item on enter key press + gtk_entry_set_activates_default( entry, + !HasFlag(wxTE_PROCESS_ENTER) ); - if (style & wxNO_BORDER) - g_object_set (combo->entry, "has-frame", FALSE, NULL ); + gtk_editable_set_editable(GTK_EDITABLE(entry), true); } Append(n, choices); m_parent->DoAddChild( this ); - GtkEntry *entry = NULL; -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - entry = GTK_ENTRY( GTK_BIN(m_widget)->child ); - else -#endif - entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry ); - - m_focusWidget = GTK_WIDGET( entry ); + if ( entry ) + m_focusWidget = GTK_WIDGET( entry ); PostCreation(size); -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - ConnectWidget( m_widget ); - else -#endif - ConnectWidget( GTK_COMBO(m_widget)->button ); - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if ( entry ) { - gtk_entry_set_text( entry, wxGTK_CONV(value) ); - if (style & wxCB_READONLY) - gtk_entry_set_editable( entry, FALSE ); - - g_signal_connect_after (entry, "changed", - G_CALLBACK (gtkcombobox_text_changed_callback), this); - - g_signal_connect_after (m_widget, "changed", - G_CALLBACK (gtkcombobox_changed_callback), this); - - } - else -#endif - { - GtkCombo *combo = GTK_COMBO(m_widget); - // MSW's combo box shows the value and the selection is -1 - gtk_entry_set_text( entry, wxGTK_CONV(value) ); - gtk_list_unselect_all( GTK_LIST(combo->list) ); - - if (style & wxCB_READONLY) - gtk_entry_set_editable( entry, FALSE ); - - // "show" and "hide" events are generated when user click on the combobox button which popups a list - // this list is the "popwin" gtk widget - g_signal_connect (GTK_COMBO(combo)->popwin, "hide", - G_CALLBACK (gtkcombo_popup_hide_callback), this); - g_signal_connect (GTK_COMBO(combo)->popwin, "show", - G_CALLBACK (gtkcombo_popup_show_callback), this); - g_signal_connect_after (combo->list, "select-child", - G_CALLBACK (gtkcombo_combo_select_child_callback), - this); - g_signal_connect_after (entry, "changed", - G_CALLBACK (gtkcombo_text_changed_callback), this); - } - - SetInitialSize(size); // need this too because this is a wxControlWithItems - - return true; -} - -GtkEditable *wxComboBox::GetEditable() const -{ -#ifdef __WXGTK24__ - if ( !gtk_check_version(2,4,0) ) - return GTK_EDITABLE( GTK_BIN(m_widget)->child ); - else -#endif - return GTK_EDITABLE( GTK_COMBO(m_widget)->entry ); -} - -wxComboBox::~wxComboBox() -{ - Clear(); - - delete m_strings; -} - -void wxComboBox::SetFocus() -{ - if ( m_hasFocus ) - { - // don't do anything if we already have focus - return; - } - - gtk_widget_grab_focus( m_focusWidget ); -} - -int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items, - unsigned int pos, - void **clientData, wxClientDataType type) -{ - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - - wxASSERT_MSG( !IsSorted() || (pos == GetCount()), - _T("In a sorted combobox data could only be appended")); - - const int count = items.GetCount(); - - int n = wxNOT_FOUND; - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - 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) - n = m_strings->Add(items[i]); - - gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) ); - - m_clientData.Insert( NULL, n ); - AssignNewItemClientData(n, clientData, i, type); + // this will assert and do nothing if the value is not in our list + // of strings which is the desired behaviour (for consistency with + // wxMSW and also because it doesn't make sense to have a string + // which is not a possible choice in a read-only combobox) + SetStringSelection(value); + gtk_editable_set_editable(GTK_EDITABLE(entry), false); } - } - else -#endif - { - DisableEvents(); - - GtkWidget *list = GTK_COMBO(m_widget)->list; - for( int i = 0; i < count; ++i ) + else // editable combobox { - n = pos + i; - // If sorted, use this wxSortedArrayStrings to determine - // the right insertion point - if(m_strings) - n = m_strings->Add(items[i]); - - GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( items[i] ) ); - - // TODO construct a list with all items and call gtk_list_insert_items once? - GList *gitem_list = g_list_alloc (); - gitem_list->data = list_item; - gtk_list_insert_items( GTK_LIST (list), gitem_list, n ); - - m_clientData.Insert( NULL, n ); - AssignNewItemClientData(n, clientData, i, type); - - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); - - ApplyWidgetStyle(); - } - - gtk_widget_show( list_item ); + // any value is accepted, even if it's not in our list + gtk_entry_set_text( entry, wxGTK_CONV(value) ); } - EnableEvents(); - } - - InvalidateBestSize(); - - return n; -} - -void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) -{ - m_clientData[n] = clientData; -} - -void* wxComboBox::DoGetItemClientData(unsigned int n) const -{ - return m_clientData[n]; -} - -void wxComboBox::DoClear() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - DisableEvents(); - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - const unsigned int count = GetCount(); - for (unsigned int i = 0; i < count; i++) - gtk_combo_box_remove_text( combobox, 0 ); - } - else // GTK+ < 2.4.0 -#endif // __WXGTK24__ - { - GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_clear_items( GTK_LIST(list), 0, GetCount() ); - } - - m_clientData.Clear(); - - if(m_strings) - m_strings->Clear(); - - EnableEvents(); - - InvalidateBestSize(); -} - -void wxComboBox::DoDeleteOneItem(unsigned int n) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - wxCHECK_RET( IsValid(n), wxT("invalid index") ); - - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - gtk_combo_box_remove_text( combobox, n ); - } - else -#endif - { - GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list ); - - GList *child = g_list_nth( listbox->children, n ); - - if (!child) - { - wxFAIL_MSG(wxT("wrong index")); - return; - } - - DisableEvents(); - - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( listbox, list ); - g_list_free( list ); + g_signal_connect_after (entry, "changed", + G_CALLBACK (gtkcombobox_text_changed_callback), this); - EnableEvents(); + GTKConnectClipboardSignals(GTK_WIDGET(entry)); } - m_clientData.RemoveAt( n ); - if(m_strings) - m_strings->RemoveAt( n ); - - InvalidateBestSize(); -} - -void wxComboBox::SetString(unsigned int n, const wxString &text) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + g_signal_connect_after (m_widget, "changed", + G_CALLBACK (gtkcombobox_changed_callback), this); -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - wxCHECK_RET( IsValid(n), wxT("invalid index") ); - - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) - { - 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 ); - g_value_unset( &value ); - } - } - else +#ifndef __WXGTK3__ + if ( !gtk_check_version(2,10,0) ) #endif { - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GList *child = g_list_nth( GTK_LIST(list)->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - gtk_label_set_text(label, wxGTK_CONV(text)); - } - else - { - wxFAIL_MSG( wxT("wxComboBox: wrong index") ); - } + g_signal_connect (m_widget, "notify::popup-shown", + G_CALLBACK (gtkcombobox_popupshown_callback), this); } - InvalidateBestSize(); + return true; } -int wxComboBox::FindString( const wxString &item, bool bCase ) const +void wxComboBox::GTKCreateComboBoxWidget() { - wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") ); - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel* model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - gtk_tree_model_get_iter_first( model, &iter ); - if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter )) - return -1; - int count = 0; - do - { - GValue value = { 0, }; - gtk_tree_model_get_value( model, &iter, 0, &value ); - wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) ); - g_value_unset( &value ); - - if (item.IsSameAs( str, bCase ) ) - return count; - - count++; - - } while (gtk_tree_model_iter_next( model, &iter )); - } - else +#ifdef __WXGTK3__ + m_widget = gtk_combo_box_text_new_with_entry(); +#else + m_widget = gtk_combo_box_entry_new_text(); #endif - { - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GList *child = GTK_LIST(list)->children; - int count = 0; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) ); + g_object_ref(m_widget); - if (item.IsSameAs( str , bCase ) ) - return count; - - count++; - child = child->next; - } - } - - return wxNOT_FOUND; + m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget))); } -int wxComboBox::GetSelection() const +GtkEditable *wxComboBox::GetEditable() const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - return gtk_combo_box_get_active( combobox ); - } - else -#endif - // if the popup is currently opened, use the selection as it had been - // before it dropped down - return g_SelectionBeforePopup == wxID_NONE ? GetCurrentSelection() - : g_SelectionBeforePopup; + return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget))); } -int wxComboBox::GetCurrentSelection() const +void wxComboBox::OnChar( wxKeyEvent &event ) { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + switch ( event.GetKeyCode() ) { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - return gtk_combo_box_get_active( combobox ); - } - else -#endif - { - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GList *selection = GTK_LIST(list)->selection; - if (selection) - { - GList *child = GTK_LIST(list)->children; - int count = 0; - while (child) + case WXK_RETURN: + if ( HasFlag(wxTE_PROCESS_ENTER) && GetEntry() ) { - if (child->data == selection->data) return count; - count++; - child = child->next; + // GTK automatically selects an item if its in the list + wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId()); + eventEnter.SetString( GetValue() ); + eventEnter.SetInt( GetSelection() ); + eventEnter.SetEventObject( this ); + + if ( HandleWindowEvent(eventEnter) ) + { + // Catch GTK event so that GTK doesn't open the drop + // down list upon RETURN. + return; + } } - } + break; } - return -1; -} - -wxString wxComboBox::GetString(unsigned int n) const -{ - wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") ); - - wxString str; - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel *model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) - { - GValue value = { 0, }; - gtk_tree_model_get_value( model, &iter, 0, &value ); - wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) ); - g_value_unset( &value ); - return tmp; - } - } - else -#endif - { - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GList *child = g_list_nth( GTK_LIST(list)->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - str = wxGTK_CONV_BACK( gtk_label_get_text(label) ); - } - else - { - wxFAIL_MSG( wxT("wxComboBox: wrong index") ); - } - } - - return str; -} - -unsigned int wxComboBox::GetCount() const -{ - wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") ); - -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - GtkTreeModel* model = gtk_combo_box_get_model( combobox ); - GtkTreeIter iter; - gtk_tree_model_get_iter_first( model, &iter ); - if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter )) - return 0; - unsigned int ret = 1; - while (gtk_tree_model_iter_next( model, &iter )) - ret++; - return ret; - } - else -#endif - { - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GList *child = GTK_LIST(list)->children; - unsigned int count = 0; - while (child) - { - count++; - child = child->next; - } - return count; - } + event.Skip(); } -void wxComboBox::SetSelection( int n ) +void wxComboBox::EnableTextChangedEvents(bool enable) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - DisableEvents(); + if ( !GetEntry() ) + return; -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) + if ( enable ) { - GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); - gtk_combo_box_set_active( combobox, n ); + g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)), + (gpointer)gtkcombobox_text_changed_callback, this); } - else -#endif + else // disable { - GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_unselect_item( GTK_LIST(list), m_prevSelection ); - gtk_list_select_item( GTK_LIST(list), n ); - m_prevSelection = n; + g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)), + (gpointer)gtkcombobox_text_changed_callback, this); } - - EnableEvents(); } -void wxComboBox::OnChar( wxKeyEvent &event ) +void wxComboBox::GTKDisableEvents() { - if ( event.GetKeyCode() == WXK_RETURN ) - { - // GTK automatically selects an item if its in the list - wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId()); - eventEnter.SetString( GetValue() ); - eventEnter.SetInt( GetSelection() ); - eventEnter.SetEventObject( this ); - - if (!GetEventHandler()->ProcessEvent( eventEnter )) - { - // This will invoke the dialog default action, such - // as the clicking the default button. - - wxWindow *top_frame = m_parent; - while (top_frame->GetParent() && !(top_frame->IsTopLevel())) - top_frame = top_frame->GetParent(); - - if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) - { - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); - - if (window->default_widget) - gtk_widget_activate (window->default_widget); - } - } + EnableTextChangedEvents(false); - // Catch GTK event so that GTK doesn't open the drop - // down list upon RETURN. - return; - } - - event.Skip(); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtkcombobox_changed_callback, this); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtkcombobox_popupshown_callback, this); } -void wxComboBox::DisableEvents() +void wxComboBox::GTKEnableEvents() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child, - (gpointer)gtkcombobox_text_changed_callback, this); - - g_signal_handlers_block_by_func(m_widget, - (gpointer)gtkcombobox_changed_callback, this); - } - else -#endif - { - g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->list, - (gpointer) gtkcombo_combo_select_child_callback, this); + EnableTextChangedEvents(true); - g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->entry, - (gpointer) gtkcombo_text_changed_callback, this); - } + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtkcombobox_changed_callback, this); + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtkcombobox_popupshown_callback, this); } -void wxComboBox::EnableEvents() +GtkWidget* wxComboBox::GetConnectWidget() { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child, - (gpointer)gtkcombobox_text_changed_callback, this); - - g_signal_handlers_unblock_by_func(m_widget, - (gpointer)gtkcombobox_changed_callback, this); - } - else -#endif - { - g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->list, - (gpointer) gtkcombo_combo_select_child_callback, this); - - g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->entry, - (gpointer) gtkcombo_text_changed_callback, this); - } + return GTK_WIDGET( GetEntry() ); } -void wxComboBox::OnSize( wxSizeEvent &event ) +GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - // Do nothing - } - else +#ifdef __WXGTK3__ + // no access to internal GdkWindows + return NULL; +#else + return gtk_entry_get_text_window(GetEntry()); #endif - { - // NB: In some situations (e.g. on non-first page of a wizard, if the - // size used is default size), GtkCombo widget is resized correctly, - // but it's look is not updated, it's rendered as if it was much wider. - // No other widgets are affected, so it looks like a bug in GTK+. - // Manually requesting resize calculation (as gtk_pizza_set_size does) - // fixes it. - if (GTK_WIDGET_VISIBLE(m_widget)) - gtk_widget_queue_resize(m_widget); - } - - event.Skip(); } -void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style) +// static +wxVisualAttributes +wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - // Do nothing - } - else +#ifdef __WXGTK3__ + return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry, true); +#else + return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true); #endif - { -// gtk_widget_modify_style( GTK_COMBO(m_widget)->button, syle ); - - gtk_widget_modify_style( GTK_COMBO(m_widget)->entry, style ); - gtk_widget_modify_style( GTK_COMBO(m_widget)->list, style ); - - GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); - GList *child = list->children; - while (child) - { - gtk_widget_modify_style( GTK_WIDGET(child->data), style ); - - GtkBin *bin = GTK_BIN(child->data); - gtk_widget_modify_style( bin->child, style ); - - child = child->next; - } - } } -GtkWidget* wxComboBox::GetConnectWidget() +void wxComboBox::SetValue(const wxString& value) { - GtkEntry *entry = NULL; -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - entry = GTK_ENTRY( GTK_BIN(m_widget)->child ); + if ( HasFlag(wxCB_READONLY) ) + SetStringSelection(value); else -#endif - entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry ); - - return GTK_WIDGET( entry ); + wxTextEntry::SetValue(value); } -GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const +void wxComboBox::SetString(unsigned int n, const wxString& text) { -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - { - wxUnusedVar(windows); + wxChoice::SetString(n, text); - return GTK_ENTRY(GTK_BIN(m_widget)->child)->text_area; - } - else -#endif // GTK+ 2.4 + if ( static_cast(n) == GetSelection() ) { - windows.push_back(GTK_ENTRY(GTK_COMBO(m_widget)->entry)->text_area); - windows.push_back(GTK_COMBO(m_widget)->button->window); + // We also need to update the currently shown text, for consistency + // with wxMSW and also because it makes sense as leaving the old string + // in the text but not in the list would be confusing to the user. + SetValue(text); - // indicate that we return multiple windows in the windows array - return NULL; + // And we need to keep the selection unchanged, modifying the item is + // not supposed to deselect it. + SetSelection(n); } } -wxSize wxComboBox::DoGetBestSize() const -{ - wxSize ret( wxControl::DoGetBestSize() ); - - // we know better our horizontal extent: it depends on the longest string - // in the combobox - if ( m_widget ) - { - int width; - unsigned int count = GetCount(); - for ( unsigned int n = 0; n < count; n++ ) - { - GetTextExtent(GetString(n), &width, NULL, NULL, NULL ); - if ( width > ret.x ) - ret.x = width; - } - } - - // empty combobox should have some reasonable default size too - if ( ret.x < 100 ) - ret.x = 100; - - CacheBestSize(ret); - return ret; -} - -// static -wxVisualAttributes -wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ -#ifdef __WXGTK24__ - if (!gtk_check_version(2,4,0)) - return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true); - else -#endif - return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true); -} - // ---------------------------------------------------------------------------- // standard event handling // ---------------------------------------------------------------------------- @@ -1012,15 +352,12 @@ void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) { - long from, to; - GetSelection(& from, & to); - if (from != -1 && to != -1) - Remove(from, to); + RemoveSelection(); } void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { - SetSelection(-1, -1); + SelectAll(); } void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) @@ -1055,7 +392,29 @@ void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) { - event.Enable(GetLastPosition() > 0); + event.Enable(!wxTextEntry::IsEmpty()); +} + +void wxComboBox::Popup() +{ + gtk_combo_box_popup( GTK_COMBO_BOX(m_widget) ); +} + +void wxComboBox::Dismiss() +{ + gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) ); +} + +wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const +{ + wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) ); + + // Add the margins we have previously set, but only the horizontal border + // as vertical one has been taken account in the prevoius call. + // Also get other GTK+ margins. + tsize.IncBy( GTKGetEntryMargins(GetEntry()).x, 0); + + return tsize; } #endif // wxUSE_COMBOBOX