X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..37ed592f7106e4ba483baa6fba91a9c481048bbc:/src/gtk/combobox.cpp?ds=inline diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index a0a91e6a58..0ad836e685 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,77 +7,52 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "combobox.h" -#endif - -#include "wx/combobox.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_COMBOBOX -#include "wx/settings.h" -#include "wx/intl.h" - -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/combobox.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#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 -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern "C" { +static void +gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +{ + if (!combo->m_hasVMT) return; -//----------------------------------------------------------------------------- -// "select" -//----------------------------------------------------------------------------- + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); + event.SetString( combo->GetValue() ); + event.SetEventObject( combo ); + combo->HandleWindowEvent( event ); +} static void -gtk_combo_clicked_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; - if (g_blockEventsOnDrag) return; - - if (combo->m_alreadySent) - { - combo->m_alreadySent = FALSE; + if (combo->GetSelection() == -1) return; - } - - combo->m_alreadySent = TRUE; wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); event.SetInt( combo->GetSelection() ); event.SetString( combo->GetStringSelection() ); event.SetEventObject( combo ); - - combo->GetEventHandler()->ProcessEvent( event ); + combo->HandleWindowEvent( event ); } - -//----------------------------------------------------------------------------- -// "changed" -//----------------------------------------------------------------------------- - -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() ); - event.SetString( combo->GetValue() ); - event.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -87,334 +62,292 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *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, + const wxString& value, + const wxPoint& pos, const wxSize& size, + const wxArrayString& choices, + long style, const wxValidator& validator, + const wxString& name ) +{ + wxCArrayString chs(choices); + + return Create( parent, id, value, pos, size, chs.GetCount(), + chs.GetStrings(), style, validator, name ); +} + bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, int n, const wxString choices[], 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(); + if (HasFlag(wxCB_SORT)) + m_strings = new wxSortedArrayString(); - // make it more useable - gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE); + m_widget = gtk_combo_box_entry_new_text(); - wxSize newSize = size; - if (newSize.x == -1) - newSize.x = 100; - if (newSize.y == -1) - newSize.y = 26; - SetSize( newSize.x, newSize.y ); + if (HasFlag(wxBORDER_NONE)) + { + // Doesn't seem to work + // g_object_set (m_widget, "has-frame", FALSE, NULL); + } - GtkWidget *list = GTK_COMBO(m_widget)->list; + GtkEntry * const entry = GetEntry(); - for (int i = 0; i < n; i++) - { - /* don't send first event, which GTK sends aways when - inserting the first item */ - m_alreadySent = TRUE; + gtk_entry_set_editable( entry, TRUE ); - GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() ); + Append(n, choices); - m_clientDataList.Append( (wxObject*)NULL ); - m_clientObjectList.Append( (wxObject*)NULL ); + m_parent->DoAddChild( this ); - gtk_container_add( GTK_CONTAINER(list), list_item ); + m_focusWidget = GTK_WIDGET( entry ); - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); + PostCreation(size); - gtk_widget_show( list_item ); - } + ConnectWidget( m_widget ); - m_parent->DoAddChild( this ); + gtk_entry_set_text( entry, wxGTK_CONV(value) ); - PostCreation(); + if (style & wxCB_READONLY) + gtk_entry_set_editable( entry, FALSE ); - ConnectWidget( GTK_COMBO(m_widget)->button ); + g_signal_connect_after (entry, "changed", + G_CALLBACK (gtkcombobox_text_changed_callback), this); - if (!value.IsNull()) SetValue( value ); + g_signal_connect_after (m_widget, "changed", + G_CALLBACK (gtkcombobox_changed_callback), this); - if (style & wxCB_READONLY) - gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE ); - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + SetInitialSize(size); // need this too because this is a wxControlWithItems - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + return true; +} - Show( TRUE ); +GtkEntry *wxComboBox::GetEntry() const +{ + return GTK_ENTRY(GTK_BIN(m_widget)->child); +} - return TRUE; +GtkEditable *wxComboBox::GetEditable() const +{ + return GTK_EDITABLE( GTK_BIN(m_widget)->child ); } wxComboBox::~wxComboBox() { - wxNode *node = m_clientObjectList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientObjectList.Clear(); + Clear(); - m_clientDataList.Clear(); + delete m_strings; } -void wxComboBox::AppendCommon( const wxString &item ) +int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - GtkWidget *list = GTK_COMBO(m_widget)->list; + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); - GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() ); + wxASSERT_MSG( !IsSorted() || (pos == GetCount()), + _T("In a sorted combobox data could only be appended")); - gtk_container_add( GTK_CONTAINER(list), list_item ); + const int count = items.GetCount(); - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); + 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 ); - - if (m_widgetStyle) ApplyWidgetStyle(); - } - - gtk_widget_show( list_item ); -} + n = pos + i; + // If sorted, use this wxSortedArrayStrings to determine + // the right insertion point + if(m_strings) + n = m_strings->Add(items[i]); -void wxComboBox::Append( const wxString &item ) -{ - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); - - AppendCommon( item ); -} + gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) ); -void wxComboBox::Append( const wxString &item, void *clientData ) -{ - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*)NULL ); - - AppendCommon( item ); -} + m_clientData.Insert( NULL, n ); + AssignNewItemClientData(n, clientData, i, type); + } -void wxComboBox::Append( const wxString &item, wxClientData *clientData ) -{ - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) clientData ); + InvalidateBestSize(); - AppendCommon( item ); + return n; } -void wxComboBox::SetClientData( int n, void* clientData ) +void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return; - - node->SetData( (wxObject*) clientData ); + m_clientData[n] = clientData; } -void* wxComboBox::GetClientData( int n ) +void* wxComboBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return NULL; - - return node->Data(); + return m_clientData[n]; } -void wxComboBox::SetClientObject( int n, wxClientData* clientData ) +void wxComboBox::DoClear() { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return; + DisableEvents(); - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; + 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 ); - node->SetData( (wxObject*) clientData ); -} + m_clientData.Clear(); -wxClientData* wxComboBox::GetClientObject( int n ) -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); + if(m_strings) + m_strings->Clear(); - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return (wxClientData*) NULL; + EnableEvents(); - return (wxClientData*) node->Data(); + InvalidateBestSize(); } -void wxComboBox::Clear() +void wxComboBox::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_clear_items( GTK_LIST(list), 0, Number() ); + wxCHECK_RET( IsValid(n), wxT("invalid index") ); - wxNode *node = m_clientObjectList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientObjectList.Clear(); + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + gtk_combo_box_remove_text( combobox, n ); + + m_clientData.RemoveAt( n ); + if(m_strings) + m_strings->RemoveAt( n ); - m_clientDataList.Clear(); + InvalidateBestSize(); } -void wxComboBox::Delete( int n ) +void wxComboBox::SetString(unsigned int n, const wxString &text) { 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 ); + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + wxCHECK_RET( IsValid(n), wxT("invalid index") ); - if (!child) + GtkTreeModel *model = gtk_combo_box_get_model( combobox ); + GtkTreeIter iter; + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) { - wxFAIL_MSG(wxT("wrong index")); - return; + 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 ); } - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( listbox, list ); - g_list_free( list ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - m_clientObjectList.DeleteNode( node ); - } - - node = m_clientDataList.Nth( n ); - if (node) - { - m_clientDataList.DeleteNode( node ); - } + InvalidateBestSize(); } -int wxComboBox::FindString( const wxString &item ) +int wxComboBox::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") ); - GtkWidget *list = GTK_COMBO(m_widget)->list; - - 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 ); - if (item == wxString(label->label,*wxConvCurrent)) + 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 ); - str = wxString(label->label,*wxConvCurrent); - } - 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 ); - wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent); + 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::Number() 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 ) @@ -423,241 +356,184 @@ void wxComboBox::SetSelection( int n ) DisableEvents(); - GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_select_item( GTK_LIST(list), n ); + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + gtk_combo_box_set_active( combobox, n ); EnableEvents(); } -void wxComboBox::SetStringSelection( const wxString &string ) +void wxComboBox::OnChar( wxKeyEvent &event ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + switch ( event.GetKeyCode() ) + { + 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 ( HandleWindowEvent(eventEnter) ) + { + // Catch GTK event so that GTK doesn't open the drop + // down list upon RETURN. + return; + } + } - int res = FindString( string ); - if (res == -1) return; - SetSelection( res ); -} + // On enter key press, we must give a signal to default control, + // Otherwise, nothing happens when pressing Enter from inside a + // combo box in a dialog. + wxWindow *top_frame = wxGetTopLevelParent(this); + 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 ); + } + break; + } -wxString wxComboBox::GetValue() const -{ - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent); - 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), tmp.mbc_str() ); + 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; -#if (GTK_MINOR_VERSION > 0) - gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); -#else - gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 ); -#endif + 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; -#if (GTK_MINOR_VERSION > 0) - gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); -#else - gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 ); -#endif + 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; -#if (GTK_MINOR_VERSION > 0) - gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); -#else - gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 ); -#endif + 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() ); - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_entry_set_position( GTK_ENTRY(entry), (int)pos ); -} + // 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; + } + } -void wxComboBox::SetInsertionPointEnd() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + // empty combobox should have some reasonable default size too + if ( ret.x < 100 ) + ret.x = 100; - SetInsertionPoint( -1 ); + CacheBestSize(ret); + return ret; } -long wxComboBox::GetInsertionPoint() const +// static +wxVisualAttributes +wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - return (long) GTK_EDITABLE(entry)->current_pos; + 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") ); - // FIXME: not quite sure how to do this method right in multibyte mode - - 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; - gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos ); + Copy(); } -void wxComboBox::Remove(long from, long to) +void wxComboBox::OnPaste(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 ); + Paste(); } -void wxComboBox::SetSelection( long from, long to ) +void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event)) { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to ); + Undo(); } -void wxComboBox::SetEditable( bool editable ) +void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event)) { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_entry_set_editable( GTK_ENTRY(entry), editable ); + Redo(); } -void wxComboBox::OnChar( wxKeyEvent &event ) +void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event)) { - if ( event.KeyCode() == WXK_RETURN ) - { - wxString value = GetValue(); - - if ( Number() == 0 ) - { - // make Enter generate "selected" event if there is only one item - // in the combobox - without it, it's impossible to select it at - // all! - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); - event.SetInt( 0 ); - event.SetString( value ); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - } - else - { - // add the item to the list if it's not there yet - if ( FindString(value) == wxNOT_FOUND ) - { - Append(value); - - // and generate the selected event for it - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); - event.SetInt( Number() - 1 ); - event.SetString( value ); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - } - //else: do nothing, this will open the listbox - } - } - - event.Skip(); + RemoveSelection(); } -void wxComboBox::DisableEvents() +void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event)) { - GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); - GList *child = list->children; - while (child) - { - gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), - GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); - - child = child->next; - } + SelectAll(); } -void wxComboBox::EnableEvents() +void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event) { - GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); - GList *child = list->children; - while (child) - { - gtk_signal_connect( GTK_OBJECT(child->data), "select", - GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); - - child = child->next; - } + event.Enable( CanCut() ); } -void wxComboBox::OnSize( wxSizeEvent &event ) +void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event) { - event.Skip(); - - return; - - 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 ); + event.Enable( CanCopy() ); } -void wxComboBox::ApplyWidgetStyle() +void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event) { - SetWidgetStyle(); - -// gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle ); - gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle ); - gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle ); - - GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); - GList *child = list->children; - while (child) - { - gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); + event.Enable( CanPaste() ); +} - GtkBin *bin = GTK_BIN(child->data); - gtk_widget_set_style( bin->child, m_widgetStyle ); +void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event) +{ + event.Enable( CanUndo() ); +} - child = child->next; - } +void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event) +{ + event.Enable( CanRedo() ); } -GtkWidget* wxComboBox::GetConnectWidget() +void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) { - return GTK_COMBO(m_widget)->entry; + event.Enable(HasSelection() && IsEditable()) ; } -bool wxComboBox::IsOwnGtkWindow( GdkWindow *window ) +void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) { - return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) || - (window == GTK_COMBO(m_widget)->button->window ) ); + event.Enable(!wxTextEntry::IsEmpty()); } -#endif +#endif // wxUSE_COMBOBOX