X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687d733769cc797102a52c7cad8edd32be5a2f89..54bdd8b0ff56a753ec41a31c8cec5cccf70a9ec5:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 499e2153d9..d8b6178e1c 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -4,14 +4,13 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "combobox.h" #endif - #include "wx/combobox.h" #include @@ -29,11 +28,15 @@ extern bool g_blockEventsOnDrag; // "select" //----------------------------------------------------------------------------- -static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +static void +gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { - if (!combo->HasVMT()) return; - if (g_blockEventsOnDrag) return; - + if (!combo->HasVMT()) + return; + + if (g_blockEventsOnDrag) + return; + if (combo->m_alreadySent) { combo->m_alreadySent = FALSE; @@ -41,13 +44,25 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox } combo->m_alreadySent = TRUE; - - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId()); + + wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); event.SetInt( combo->GetSelection() ); - wxString tmp( combo->GetStringSelection() ); - event.SetString( WXSTRINGCAST(tmp) ); - event.SetEventObject(combo); - combo->GetEventHandler()->ProcessEvent(event); + event.SetString( combo->GetStringSelection() ); + event.SetEventObject( combo ); + combo->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- +// "changed" +//----------------------------------------------------------------------------- + +static void +gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +{ + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); + event.SetString( combo->GetValue() ); + event.SetEventObject( combo ); + combo->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -58,68 +73,78 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl) BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_SIZE(wxComboBox::OnSize) + EVT_CHAR(wxComboBox::OnChar) END_EVENT_TABLE() 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 ) + long style, const wxValidator& validator, + const wxString& name ) { m_alreadySent = FALSE; m_needParent = TRUE; m_acceptsFocus = TRUE; - + PreCreation( parent, id, pos, size, style, name ); - + SetValidator( validator ); m_widget = gtk_combo_new(); - + + // make it more useable + gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE); + wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 26; + if (newSize.x == -1) + newSize.x = 100; + if (newSize.y == -1) + newSize.y = 26; SetSize( newSize.x, newSize.y ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; - + for (int i = 0; i < n; i++) { - GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); - + GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); + m_clientDataList.Append( (wxObject*)NULL ); m_clientObjectList.Append( (wxObject*)NULL ); - + gtk_container_add( GTK_CONTAINER(list), list_item ); - + gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - + gtk_widget_show( list_item ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", + + gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); } - + m_parent->AddChild( this ); (m_parent->m_insertCallback)( m_parent, this ); - + PostCreation(); ConnectWidget( GTK_COMBO(m_widget)->button ); - + if (!value.IsNull()) SetValue( value ); - + gtk_widget_realize( GTK_COMBO(m_widget)->list ); gtk_widget_realize( GTK_COMBO(m_widget)->entry ); gtk_widget_realize( GTK_COMBO(m_widget)->button ); - + + gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); Show( TRUE ); - + return TRUE; } @@ -138,18 +163,18 @@ wxComboBox::~wxComboBox() void wxComboBox::AppendCommon( const wxString &item ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; - - GtkWidget *list_item = gtk_list_item_new_with_label( item ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", + + GtkWidget *list_item = gtk_list_item_new_with_label( item ); + + gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); - + gtk_container_add( GTK_CONTAINER(list), list_item ); - + if (m_widgetStyle) ApplyWidgetStyle(); - + gtk_widget_show( list_item ); } @@ -157,7 +182,7 @@ void wxComboBox::Append( const wxString &item ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL ); - + AppendCommon( item ); } @@ -165,7 +190,7 @@ void wxComboBox::Append( const wxString &item, void *clientData ) { m_clientDataList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*)NULL ); - + AppendCommon( item ); } @@ -173,60 +198,60 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) clientData ); - + AppendCommon( item ); } void wxComboBox::SetClientData( int n, void* clientData ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxNode *node = m_clientDataList.Nth( n ); if (!node) return; - + node->SetData( (wxObject*) clientData ); } void* wxComboBox::GetClientData( int n ) { wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); - + wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; - + return node->Data(); } void wxComboBox::SetClientObject( int n, wxClientData* clientData ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; - + wxClientData *cd = (wxClientData*) node->Data(); if (cd) delete cd; - + node->SetData( (wxObject*) clientData ); } wxClientData* wxComboBox::GetClientObject( int n ) { wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); - + wxNode *node = m_clientDataList.Nth( n ); if (!node) return (wxClientData*) NULL; - + return (wxClientData*) node->Data(); } void wxComboBox::Clear() { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; gtk_list_clear_items( GTK_LIST(list), 0, Number() ); - + wxNode *node = m_clientObjectList.First(); while (node) { @@ -235,28 +260,28 @@ void wxComboBox::Clear() node = node->Next(); } m_clientObjectList.Clear(); - + m_clientDataList.Clear(); } void wxComboBox::Delete( int n ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list ); - + GList *child = g_list_nth( listbox->children, n ); - + if (!child) { wxFAIL_MSG("wrong index"); return; } - + 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) { @@ -264,7 +289,7 @@ void wxComboBox::Delete( int n ) if (cd) delete cd; m_clientObjectList.DeleteNode( node ); } - + node = m_clientDataList.Nth( n ); if (node) { @@ -275,31 +300,30 @@ void wxComboBox::Delete( int n ) int wxComboBox::FindString( const wxString &item ) { wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); - + 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 ); - if (item == label->label) return count; + if (item == label->label) + return count; count++; child = child->next; } - - wxFAIL_MSG( "wxComboBox: string not found" ); - - return -1; + + return wxNOT_FOUND; } int wxComboBox::GetSelection() const { wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *selection = GTK_LIST(list)->selection; if (selection) { @@ -312,37 +336,40 @@ int wxComboBox::GetSelection() const child = child->next; } } - + wxFAIL_MSG( "wxComboBox: no selection" ); - + return -1; } wxString wxComboBox::GetString( int n ) const { wxCHECK_MSG( m_widget != NULL, "", "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 ); - return label->label; + str = label->label; } - - wxFAIL_MSG( "wxComboBox: wrong index" ); - - return ""; + else + { + wxFAIL_MSG( "wxComboBox: wrong index" ); + } + + return str; } wxString wxComboBox::GetStringSelection() const { wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *selection = GTK_LIST(list)->selection; if (selection) { @@ -350,18 +377,18 @@ wxString wxComboBox::GetStringSelection() const wxString tmp = GTK_LABEL( bin->child )->label; return tmp; } - + wxFAIL_MSG( "wxComboBox: no selection" ); - + return ""; } int wxComboBox::Number() const { wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *child = GTK_LIST(list)->children; int count = 0; while (child) { count++; child = child->next; } @@ -371,7 +398,7 @@ int wxComboBox::Number() const void wxComboBox::SetSelection( int n ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *list = GTK_COMBO(m_widget)->list; gtk_list_select_item( GTK_LIST(list), n ); } @@ -379,7 +406,7 @@ void wxComboBox::SetSelection( int n ) void wxComboBox::SetStringSelection( const wxString &string ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + int res = FindString( string ); if (res == -1) return; SetSelection( res ); @@ -395,7 +422,7 @@ wxString wxComboBox::GetValue() const void wxComboBox::SetValue( const wxString& value ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; wxString tmp = ""; if (!value.IsNull()) tmp = value; @@ -405,7 +432,7 @@ void wxComboBox::SetValue( const wxString& value ) void wxComboBox::Copy() { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; #if (GTK_MINOR_VERSION == 1) gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); @@ -417,7 +444,7 @@ void wxComboBox::Copy() void wxComboBox::Cut() { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; #if (GTK_MINOR_VERSION == 1) gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); @@ -429,7 +456,7 @@ void wxComboBox::Cut() void wxComboBox::Paste() { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; #if (GTK_MINOR_VERSION == 1) gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); @@ -441,19 +468,16 @@ void wxComboBox::Paste() void wxComboBox::SetInsertionPoint( long pos ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; - int tmp = (int) pos; - gtk_entry_set_position( GTK_ENTRY(entry), tmp ); + gtk_entry_set_position( GTK_ENTRY(entry), (int)pos ); } void wxComboBox::SetInsertionPointEnd() { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - int pos = GTK_ENTRY(entry)->text_length; - SetInsertionPoint( pos-1 ); + + SetInsertionPoint( -1 ); } long wxComboBox::GetInsertionPoint() const @@ -472,7 +496,7 @@ long wxComboBox::GetLastPosition() const void wxComboBox::Replace( long from, long to, const wxString& value ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); if (value.IsNull()) return; @@ -483,28 +507,68 @@ void wxComboBox::Replace( long from, long to, const wxString& value ) void wxComboBox::Remove(long from, long to) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); } -void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) ) +void wxComboBox::SetSelection( long from, long to ) { - wxFAIL_MSG( "wxComboBox::SetSelection not implemented" ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; + gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to ); } -void wxComboBox::SetEditable( bool WXUNUSED(editable) ) +void wxComboBox::SetEditable( bool editable ) { - wxFAIL_MSG( "wxComboBox::SetEditable not implemented" ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; + gtk_entry_set_editable( GTK_ENTRY(entry), editable ); +} + +void wxComboBox::OnChar( wxKeyEvent &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(); } void wxComboBox::OnSize( wxSizeEvent &event ) { wxControl::OnSize( event ); - + 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 ); } @@ -512,20 +576,20 @@ void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::ApplyWidgetStyle() { 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 ); - + GtkBin *bin = GTK_BIN(child->data); gtk_widget_set_style( bin->child, m_widgetStyle ); - + child = child->next; } }