X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d6a9fdd13ab25f0ac7c54a3ec8098f8b5c1d118..63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index d8746af217..b1c46bdcd8 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,10 +7,6 @@ // 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" @@ -38,12 +34,14 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -static int g_SelectionBeforePopup = -1; +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 //----------------------------------------------------------------------------- +extern "C" { static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { @@ -51,7 +49,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) if (combo->m_ignoreNextUpdate) { - combo->m_ignoreNextUpdate = FALSE; + combo->m_ignoreNextUpdate = false; return; } @@ -62,42 +60,61 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) event.SetEventObject( combo ); combo->GetEventHandler()->ProcessEvent( event ); } +} +extern "C" { static void gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo)) { } +} +extern "C" { static void gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) -{ +{ // when the popup is hidden, throw a SELECTED event only if the combobox // selection changed. - int curSelection = combo->GetSelection(); - if (g_SelectionBeforePopup != curSelection) + 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 ); } - - // reset the selection flag to an identifiable value - g_SelectionBeforePopup = -1; +} } +extern "C" { static void gtk_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) { // store the combobox selection value before the popup is shown - g_SelectionBeforePopup = combo->GetSelection(); + g_SelectionBeforePopup = combo->GetCurrentSelection(); +} } //----------------------------------------------------------------------------- // "select-child" - click/cursor get select-child, changed, select-child //----------------------------------------------------------------------------- +extern "C" { static void gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { @@ -107,7 +124,7 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi if (g_blockEventsOnDrag) return; - int curSelection = combo->GetSelection(); + int curSelection = combo->GetCurrentSelection(); if (combo->m_prevSelection == curSelection) return; @@ -119,31 +136,34 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi // Quickly set the value of the combo box // as GTK+ does that only AFTER the event // is sent. - gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); + g_signal_handlers_disconnect_by_func (GTK_COMBO (combo->GetHandle())->entry, + (gpointer) gtk_text_changed_callback, + combo); combo->SetValue( combo->GetStringSelection() ); - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); + g_signal_connect_after (GTK_COMBO (combo->GetHandle())->entry, "changed", + G_CALLBACK (gtk_text_changed_callback), combo); - // throw a SELECTED event only if the combobox popup is hidden + // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE) // because when combobox popup is shown, gtk_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 == -1) + 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 ); - } - // Now send the event ourselves - wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); - event2.SetString( combo->GetValue() ); - event2.SetEventObject( combo ); - combo->GetEventHandler()->ProcessEvent( event2 ); + // 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 ); + } +} } //----------------------------------------------------------------------------- @@ -192,26 +212,27 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, long style, const wxValidator& validator, const wxString& name ) { - m_ignoreNextUpdate = FALSE; - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_ignoreNextUpdate = false; + m_needParent = true; + m_acceptsFocus = true; 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); // 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); + 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 (gtk_dummy_callback), + combo); // make it more useable gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); @@ -219,11 +240,10 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // and case-sensitive gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); - GtkWidget *list = GTK_COMBO(m_widget)->list; + if (style & wxNO_BORDER) + g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL ); -#ifndef __WXGTK20__ - // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE ); -#endif + GtkWidget *list = GTK_COMBO(m_widget)->list; for (int i = 0; i < n; i++) { @@ -254,24 +274,25 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // "show" and "hide" events are generated when user click on the combobox button which popups a list // this list is the "popwin" gtk widget - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "hide", - GTK_SIGNAL_FUNC(gtk_popup_hide_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show", - GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this ); + g_signal_connect (GTK_COMBO(combo)->popwin, "hide", + G_CALLBACK (gtk_popup_hide_callback), this); + g_signal_connect (GTK_COMBO(combo)->popwin, "show", + G_CALLBACK (gtk_popup_show_callback), this); - gtk_signal_connect( GTK_OBJECT(combo->entry), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); + g_signal_connect_after (combo->entry, "changed", + G_CALLBACK (gtk_text_changed_callback), this); - gtk_signal_connect( GTK_OBJECT(combo->list), "select-child", - GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); + g_signal_connect_after (combo->list, "select-child", + G_CALLBACK (gtk_combo_select_child_callback), + this); SetBestSize(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 ); +// wxSize setsize = GetSize(); +// gtk_widget_set_usize( m_widget, setsize.x, setsize.y ); - return TRUE; + return true; } wxComboBox::~wxComboBox() @@ -333,9 +354,9 @@ int wxComboBox::DoAppend( const wxString &item ) const int count = GetCount(); if ( (int)m_clientDataList.GetCount() < count ) - m_clientDataList.Append( (wxObject*) NULL ); + m_clientDataList.Append( (wxObject*) NULL ); if ( (int)m_clientObjectList.GetCount() < count ) - m_clientObjectList.Append( (wxObject*) NULL ); + m_clientObjectList.Append( (wxObject*) NULL ); EnableEvents(); @@ -380,9 +401,9 @@ int wxComboBox::DoInsert( const wxString &item, int pos ) count = GetCount(); if ( (int)m_clientDataList.GetCount() < count ) - m_clientDataList.Insert( pos, (wxObject*) NULL ); + m_clientDataList.Insert( pos, (wxObject*) NULL ); if ( (int)m_clientObjectList.GetCount() < count ) - m_clientObjectList.Insert( pos, (wxObject*) NULL ); + m_clientObjectList.Insert( pos, (wxObject*) NULL ); EnableEvents(); @@ -514,9 +535,9 @@ void wxComboBox::SetString(int n, const wxString &text) 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") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; @@ -526,12 +547,9 @@ int wxComboBox::FindString( const wxString &item ) const { 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) + + if (item.IsSameAs( str , bCase ) ) return count; count++; @@ -542,6 +560,14 @@ int wxComboBox::FindString( const wxString &item ) const } int wxComboBox::GetSelection() const +{ + // 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; +} + +int wxComboBox::GetCurrentSelection() const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); @@ -565,7 +591,7 @@ int wxComboBox::GetSelection() const wxString wxComboBox::GetString( 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; @@ -575,11 +601,7 @@ wxString wxComboBox::GetString( int n ) const { 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 { @@ -591,7 +613,7 @@ wxString wxComboBox::GetString( int n ) const wxString wxComboBox::GetStringSelection() 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; @@ -600,17 +622,13 @@ wxString wxComboBox::GetStringSelection() const { 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 return tmp; } wxFAIL_MSG( wxT("wxComboBox: no selection") ); - return wxT(""); + return wxEmptyString; } int wxComboBox::GetCount() const @@ -639,16 +657,6 @@ void wxComboBox::SetSelection( int 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 { GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry ); @@ -671,7 +679,7 @@ void wxComboBox::SetValue( const wxString& value ) wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = wxT(""); + wxString tmp; if (!value.IsNull()) tmp = value; gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) ); @@ -775,7 +783,7 @@ long wxComboBox::GetInsertionPoint() const return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry ); } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { GtkWidget *entry = GTK_COMBO(m_widget)->entry; int pos = GTK_ENTRY(entry)->text_length; @@ -810,15 +818,10 @@ void wxComboBox::GetSelection( long* from, long* to ) const if (IsEditable()) { GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry); -#ifdef __WXGTK20__ gint start, end; gtk_editable_get_selection_bounds(editable, & start, & end); *from = start; *to = end; -#else - *from = (long) editable->selection_start_pos; - *to = (long) editable->selection_end_pos; -#endif } } @@ -833,12 +836,12 @@ void wxComboBox::OnChar( wxKeyEvent &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 ); + wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId()); + eventEnter.SetString( GetValue() ); + eventEnter.SetInt( GetSelection() ); + eventEnter.SetEventObject( this ); - if (!GetEventHandler()->ProcessEvent( event )) + if (!GetEventHandler()->ProcessEvent( eventEnter )) { // This will invoke the dialog default action, such // as the clicking the default button. @@ -866,18 +869,22 @@ void wxComboBox::OnChar( wxKeyEvent &event ) void wxComboBox::DisableEvents() { - 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 ); + g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->list, + (gpointer) gtk_combo_select_child_callback, + this); + g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->entry, + (gpointer) gtk_text_changed_callback, + this); } void wxComboBox::EnableEvents() { - 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 ); + g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child", + G_CALLBACK (gtk_combo_select_child_callback), + this); + g_signal_connect_after (GTK_COMBO(m_widget)->entry, "changed", + G_CALLBACK (gtk_text_changed_callback), + this ); } void wxComboBox::OnSize( wxSizeEvent &event ) @@ -1036,4 +1043,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) } #endif -