X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea2d542c019470f3201df95caf386f80cd6b9570..1abfa172c547a37751e598084fb8d541071471a3:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index ab4f7bead8..eb6ffdd427 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/gtk/combobox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,89 +7,52 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "combobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/combobox.h" - #if wxUSE_COMBOBOX -#include "wx/settings.h" -#include "wx/arrstr.h" -#include "wx/intl.h" +#include "wx/combobox.h" -#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/settings.h" + #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED + #include "wx/arrstr.h" +#endif #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; - -//----------------------------------------------------------------------------- -// "select-child" - click/cursor get select-child, changed, select-child -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- +extern "C" { static void -gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!combo->m_hasVMT) return; - if (g_blockEventsOnDrag) return; - - int curSelection = combo->GetSelection(); - - 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; - - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); - event.SetInt( curSelection ); - event.SetString( combo->GetStringSelection() ); + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); + event.SetString( combo->GetValue() ); event.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event ); } -//----------------------------------------------------------------------------- -// "changed" - typing and list item matches get changed, select-child -// if it doesn't match an item then just get a single changed -//----------------------------------------------------------------------------- - static void -gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +gtkcombobox_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() ); - event.SetString( combo->GetValue() ); + 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 ); } - -static void -gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo)) -{ } //----------------------------------------------------------------------------- @@ -99,8 +62,23 @@ gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo)) IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl) BEGIN_EVENT_TABLE(wxComboBox, wxControl) - EVT_SIZE(wxComboBox::OnSize) EVT_CHAR(wxComboBox::OnChar) + + EVT_MENU(wxID_CUT, wxComboBox::OnCut) + EVT_MENU(wxID_COPY, wxComboBox::OnCopy) + EVT_MENU(wxID_PASTE, wxComboBox::OnPaste) + EVT_MENU(wxID_UNDO, wxComboBox::OnUndo) + EVT_MENU(wxID_REDO, wxComboBox::OnRedo) + EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete) + EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll) + + EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut) + EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy) + EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste) + EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo) + EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo) + EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete) + EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll) END_EVENT_TABLE() bool wxComboBox::Create( wxWindow *parent, wxWindowID id, @@ -122,93 +100,74 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, long style, const wxValidator& validator, const wxString& name ) { - m_alreadySent = FALSE; - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_strings = NULL; + m_ignoreNextUpdate = false; m_prevSelection = 0; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxComboBox creation failed") ); - return FALSE; + return false; } - m_widget = gtk_combo_new(); - GtkCombo *combo = GTK_COMBO(m_widget); + if (HasFlag(wxCB_SORT)) + m_strings = new wxSortedArrayString(); - // 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); + m_widget = gtk_combo_box_entry_new_text(); - // make it more useable - gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); - - // and case-sensitive - gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); - - 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++) + if (HasFlag(wxBORDER_NONE)) { - GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) ); + // Doesn't seem to work + // g_object_set (m_widget, "has-frame", FALSE, NULL); + } - m_clientDataList.Append( (wxObject*)NULL ); - m_clientObjectList.Append( (wxObject*)NULL ); + GtkEntry * const entry = GetEntry(); - gtk_container_add( GTK_CONTAINER(list), list_item ); + gtk_entry_set_editable( entry, TRUE ); - gtk_widget_show( list_item ); - } + Append(n, choices); m_parent->DoAddChild( this ); - m_focusWidget = combo->entry; + m_focusWidget = GTK_WIDGET( entry ); PostCreation(size); - ConnectWidget( combo->button ); + ConnectWidget( m_widget ); - // MSW's combo box shows the value and the selection is -1 - gtk_entry_set_text( GTK_ENTRY(combo->entry), wxGTK_CONV(value) ); - gtk_list_unselect_all( GTK_LIST(combo->list) ); + gtk_entry_set_text( entry, wxGTK_CONV(value) ); if (style & wxCB_READONLY) - gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE ); + gtk_entry_set_editable( entry, FALSE ); + + g_signal_connect_after (entry, "changed", + G_CALLBACK (gtkcombobox_text_changed_callback), this); - gtk_signal_connect( GTK_OBJECT(combo->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); + g_signal_connect_after (m_widget, "changed", + G_CALLBACK (gtkcombobox_changed_callback), this); - gtk_signal_connect( GTK_OBJECT(combo->list), "select-child", - GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); - SetBestSize(size); // need this too because this is a wxControlWithItems + SetInitialSize(size); // need this too because this is a wxControlWithItems - // This is required for tool bar support - wxSize setsize = GetSize(); - gtk_widget_set_usize( m_widget, setsize.x, setsize.y ); - - return TRUE; + return true; +} + +GtkEntry *wxComboBox::GetEntry() const +{ + return GTK_ENTRY(GTK_BIN(m_widget)->child); +} + +GtkEditable *wxComboBox::GetEditable() const +{ + return GTK_EDITABLE( GTK_BIN(m_widget)->child ); } wxComboBox::~wxComboBox() { - wxList::compatibility_iterator node = m_clientObjectList.GetFirst(); - while (node) - { - wxClientData *cd = (wxClientData*)node->GetData(); - if (cd) delete cd; - node = node->GetNext(); - } - m_clientObjectList.Clear(); + Clear(); - m_clientDataList.Clear(); + delete m_strings; } void wxComboBox::SetFocus() @@ -222,320 +181,184 @@ void wxComboBox::SetFocus() gtk_widget_grab_focus( m_focusWidget ); } -int wxComboBox::DoAppend( const wxString &item ) +int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - DisableEvents(); - - GtkWidget *list = GTK_COMBO(m_widget)->list; + wxASSERT_MSG( !IsSorted() || (pos == GetCount()), + _T("In a sorted combobox data could only be appended")); - GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) ); + const int count = items.GetCount(); - gtk_container_add( GTK_CONTAINER(list), list_item ); + int n = wxNOT_FOUND; - if (GTK_WIDGET_REALIZED(m_widget)) + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + for( int i = 0; i < count; ++i ) { - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); - } - - // Apply current widget style to the new list_item - GtkRcStyle *style = CreateWidgetStyle(); - if (style) - { - gtk_widget_modify_style( GTK_WIDGET( list_item ), style ); - GtkBin *bin = GTK_BIN( list_item ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_modify_style( label, style ); - gtk_rc_style_unref( style ); - } + n = pos + i; + // If sorted, use this wxSortedArrayStrings to determine + // the right insertion point + if(m_strings) + n = m_strings->Add(items[i]); - gtk_widget_show( list_item ); + gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) ); - const int count = GetCount(); - - if ( (int)m_clientDataList.GetCount() < count ) - m_clientDataList.Append( (wxObject*) NULL ); - if ( (int)m_clientObjectList.GetCount() < count ) - m_clientObjectList.Append( (wxObject*) NULL ); - - EnableEvents(); - - return count - 1; -} - -int wxComboBox::DoInsert( const wxString &item, int pos ) -{ - wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, - wxT("can't insert into sorted list")); - - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - - int count = GetCount(); - wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); - - if (pos == count) - return Append(item); - - DisableEvents(); - - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) ); - - GList *gitem_list = g_list_alloc (); - gitem_list->data = list_item; - gtk_list_insert_items( GTK_LIST (list), gitem_list, pos ); - - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); - - ApplyWidgetStyle(); + m_clientData.Insert( NULL, n ); + AssignNewItemClientData(n, clientData, i, type); } - gtk_widget_show( list_item ); - - count = GetCount(); + InvalidateBestSize(); - if ( (int)m_clientDataList.GetCount() < count ) - m_clientDataList.Insert( pos, (wxObject*) NULL ); - if ( (int)m_clientObjectList.GetCount() < count ) - m_clientObjectList.Insert( pos, (wxObject*) NULL ); - - EnableEvents(); - - return pos; + return n; } -void wxComboBox::DoSetItemClientData( int n, void* clientData ) +void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - wxList::compatibility_iterator node = m_clientDataList.Item( n ); - if (!node) return; - - node->SetData( (wxObject*) clientData ); + m_clientData[n] = clientData; } -void* wxComboBox::DoGetItemClientData( int n ) const +void* wxComboBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); - - wxList::compatibility_iterator node = m_clientDataList.Item( n ); - - return node ? node->GetData() : NULL; + return m_clientData[n]; } -void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - wxList::compatibility_iterator node = m_clientObjectList.Item( n ); - if (!node) return; - - // wxItemContainer already deletes data for us - - node->SetData( (wxObject*) clientData ); -} - -wxClientData* wxComboBox::DoGetItemClientObject( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); - - wxList::compatibility_iterator node = m_clientObjectList.Item( n ); - - return node ? (wxClientData*) node->GetData() : NULL; -} - -void wxComboBox::Clear() +void wxComboBox::DoClear() { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); DisableEvents(); - GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_clear_items( GTK_LIST(list), 0, GetCount() ); + 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 ); - wxList::compatibility_iterator node = m_clientObjectList.GetFirst(); - while (node) - { - wxClientData *cd = (wxClientData*)node->GetData(); - if (cd) delete cd; - node = node->GetNext(); - } - m_clientObjectList.Clear(); + m_clientData.Clear(); - m_clientDataList.Clear(); + if(m_strings) + m_strings->Clear(); EnableEvents(); + + InvalidateBestSize(); } -void wxComboBox::Delete( int n ) +void wxComboBox::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - 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(); + wxCHECK_RET( IsValid(n), wxT("invalid index") ); - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( listbox, list ); - g_list_free( list ); + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + gtk_combo_box_remove_text( combobox, n ); - wxList::compatibility_iterator node = m_clientObjectList.Item( n ); - if (node) - { - wxClientData *cd = (wxClientData*)node->GetData(); - if (cd) delete cd; - m_clientObjectList.Erase( node ); - } + m_clientData.RemoveAt( n ); + if(m_strings) + m_strings->RemoveAt( n ); - node = m_clientDataList.Item( n ); - if (node) - m_clientDataList.Erase( node ); - - EnableEvents(); + InvalidateBestSize(); } -void wxComboBox::SetString(int n, const wxString &text) +void wxComboBox::SetString(unsigned int n, const wxString &text) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - GtkWidget *list = GTK_COMBO(m_widget)->list; + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + wxCHECK_RET( IsValid(n), wxT("invalid index") ); - GList *child = g_list_nth( GTK_LIST(list)->children, n ); - if (child) + GtkTreeModel *model = gtk_combo_box_get_model( combobox ); + GtkTreeIter iter; + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) { - 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") ); + 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 ); } + + InvalidateBestSize(); } -int wxComboBox::FindString( const wxString &item ) const +int wxComboBox::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - - GtkWidget *list = GTK_COMBO(m_widget)->list; + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") ); - GList *child = GTK_LIST(list)->children; + 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; - while (child) + do { - 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 == str) + 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++; - child = child->next; } + while ( gtk_tree_model_iter_next(model, &iter) ); return wxNOT_FOUND; } int wxComboBox::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - - 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) - { - if (child->data == selection->data) return count; - count++; - child = child->next; - } - } - - return -1; + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + return gtk_combo_box_get_active( combobox ); } -wxString wxComboBox::GetString( int n ) const +int wxComboBox::GetCurrentSelection() const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") ); - - GtkWidget *list = GTK_COMBO(m_widget)->list; - - wxString str; - GList *child = g_list_nth( GTK_LIST(list)->children, n ); - if (child) - { - 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 - { - wxFAIL_MSG( wxT("wxComboBox: wrong index") ); - } + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - return str; + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + return gtk_combo_box_get_active( combobox ); } -wxString wxComboBox::GetStringSelection() const +wxString wxComboBox::GetString(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") ); - GtkWidget *list = GTK_COMBO(m_widget)->list; + wxString str; - GList *selection = GTK_LIST(list)->selection; - if (selection) + 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)) { - 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 + 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; } - wxFAIL_MSG( wxT("wxComboBox: no selection") ); - - return wxT(""); + return str; } -int wxComboBox::GetCount() const +unsigned int wxComboBox::GetCount() const { wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") ); - GtkWidget *list = GTK_COMBO(m_widget)->list; - - GList *child = GTK_LIST(list)->children; - int count = 0; - while (child) { count++; child = child->next; } - return count; + 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; } void wxComboBox::SetSelection( int n ) @@ -544,255 +367,176 @@ void wxComboBox::SetSelection( int n ) DisableEvents(); - 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; + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + gtk_combo_box_set_active( combobox, n ); EnableEvents(); } -bool wxComboBox::SetStringSelection( const wxString &string ) -{ - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") ); - - int res = FindString( string ); - if (res == -1) return false; - SetSelection( res ); - return true; -} - -wxString wxComboBox::GetValue() const +void wxComboBox::OnChar( wxKeyEvent &event ) { - GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry ); - wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) ); - -#if 0 - for (int i = 0; i < wxStrlen(tmp.c_str()) +1; i++) + switch ( event.GetKeyCode() ) { - wxChar c = tmp[i]; - printf( "%d ", (int) (c) ); + case WXK_RETURN: + if ( HasFlag(wxTE_PROCESS_ENTER) ) + { + // 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) ) + { + // Catch GTK event so that GTK doesn't open the drop + // down list upon RETURN. + return; + } + } + break; } - printf( "\n" ); -#endif - return tmp; + event.Skip(); } -void wxComboBox::SetValue( const wxString& value ) +void wxComboBox::DisableEvents() { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child, + (gpointer)gtkcombobox_text_changed_callback, this); - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = wxT(""); - if (!value.IsNull()) tmp = value; - gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) ); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtkcombobox_changed_callback, this); } -void wxComboBox::Copy() +void wxComboBox::EnableEvents() { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child, + (gpointer)gtkcombobox_text_changed_callback, this); - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG ); + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtkcombobox_changed_callback, this); } -void wxComboBox::Cut() +GtkWidget* wxComboBox::GetConnectWidget() { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG ); + return GTK_WIDGET( GetEntry() ); } -void wxComboBox::Paste() +GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxUnusedVar(windows); - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG); + return GetEntry()->text_area; } -void wxComboBox::SetInsertionPoint( long pos ) +wxSize wxComboBox::DoGetBestSize() const { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxSize ret( wxControl::DoGetBestSize() ); - if ( pos == GetLastPosition() ) - pos = -1; + // 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; + } + } - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_entry_set_position( GTK_ENTRY(entry), (int)pos ); + // empty combobox should have some reasonable default size too + if ( ret.x < 100 ) + ret.x = 100; + + CacheBestSize(ret); + return ret; } -long wxComboBox::GetInsertionPoint() const +// static +wxVisualAttributes +wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry ); + return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true); } -long wxComboBox::GetLastPosition() const +// ---------------------------------------------------------------------------- +// standard event handling +// ---------------------------------------------------------------------------- + +void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event)) { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - int pos = GTK_ENTRY(entry)->text_length; - return (long) pos-1; + Cut(); } -void wxComboBox::Replace( long from, long to, const wxString& value ) +void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event)) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); - if (value.IsNull()) return; - gint pos = (gint)to; - -#if wxUSE_UNICODE - wxCharBuffer buffer = wxConvUTF8.cWX2MB( value ); - gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos ); -#else - gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos ); -#endif + Copy(); } -void wxComboBox::SetSelection( long from, long to ) +void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event)) { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to ); + Paste(); } -void wxComboBox::SetEditable( bool editable ) +void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_entry_set_editable( GTK_ENTRY(entry), editable ); + Undo(); } -void wxComboBox::OnChar( wxKeyEvent &event ) +void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) { - if ( event.GetKeyCode() == WXK_RETURN ) - { - // GTK automatically selects an item if its in the list - wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId()); - event.SetString( GetValue() ); - event.SetInt( GetSelection() ); - event.SetEventObject( this ); - - if (!GetEventHandler()->ProcessEvent( event )) - { - // 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); - } - } - - // Catch GTK event so that GTK doesn't open the drop - // down list upon RETURN. - return; - } - - event.Skip(); + Redo(); } -void wxComboBox::DisableEvents() +void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) { - 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 ); + long from, to; + GetSelection(& from, & to); + if (from != -1 && to != -1) + Remove(from, to); } -void wxComboBox::EnableEvents() +void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", - GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); + SetSelection(-1, -1); } -void wxComboBox::OnSize( wxSizeEvent &event ) +void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) { - event.Skip(); - -#if 0 - int w = 21; - gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height ); - - gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y ); - gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height ); -#endif // 0 + event.Enable( CanCut() ); } -void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style) +void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event) { -// 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; - } + event.Enable( CanCopy() ); } -GtkWidget* wxComboBox::GetConnectWidget() +void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) { - return GTK_COMBO(m_widget)->entry; + event.Enable( CanPaste() ); } -bool wxComboBox::IsOwnGtkWindow( GdkWindow *window ) +void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) { - return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) || - (window == GTK_COMBO(m_widget)->button->window ) ); + event.Enable( CanUndo() ); } -wxSize wxComboBox::DoGetBestSize() const +void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) { - wxSize ret( wxControl::DoGetBestSize() ); - - // we know better our horizontal extent: it depends on the longest string - // in the combobox - ret.x = 0; - if ( m_widget ) - { - int width; - size_t count = GetCount(); - for ( size_t 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; + event.Enable( CanRedo() ); +} - CacheBestSize(ret); - return ret; +void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) +{ + event.Enable(HasSelection() && IsEditable()) ; } -// static -wxVisualAttributes -wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) { - return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true); + event.Enable(GetLastPosition() > 0); } -#endif +#endif // wxUSE_COMBOBOX