X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e1a9bc7c9b9a38e13e506308f8b7c7b04c8f88c..ea8ca011a351c6aaa4009bedbf0cec19a7c57d98:/src/gtk1/combobox.cpp diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 5ec1549e86..6c967b58be 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/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 = -2; // -2 <=> the popup is hidden +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 ) { @@ -62,18 +60,22 @@ 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(); + int curSelection = combo->GetCurrentSelection(); if (g_SelectionBeforePopup != curSelection) { wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); @@ -81,24 +83,33 @@ gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) 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 (-2 = hidden) - g_SelectionBeforePopup = -2; + // reset the selection flag to value meaning that it is hidden + g_SelectionBeforePopup = wxID_NONE; +} } +extern "C" { static void gtk_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo) { // store the combobox selection value before the popup is shown - // if there is no selection, combo->GetSelection() returns -1 - 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 ) { @@ -108,7 +119,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; @@ -126,25 +137,27 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); - // throw a SELECTED event only if the combobox popup is hidden (-2) + // 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 == -2) + 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 ); + } +} } //----------------------------------------------------------------------------- @@ -210,7 +223,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // Disable GTK's broken events ... gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id ); - // ... and add surogate handler. + // ... and add surrogate handler. combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed", (GtkSignalFunc) gtk_dummy_callback, combo); @@ -339,9 +352,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(); @@ -386,9 +399,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(); @@ -520,9 +533,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; @@ -537,7 +550,7 @@ int wxComboBox::FindString( const wxString &item ) const #else wxString str( label->label ); #endif - if (item == str) + if (item.IsSameAs( str , bCase ) ) return count; count++; @@ -548,6 +561,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") ); @@ -571,7 +592,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; @@ -597,7 +618,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; @@ -616,7 +637,7 @@ wxString wxComboBox::GetStringSelection() const wxFAIL_MSG( wxT("wxComboBox: no selection") ); - return wxT(""); + return wxEmptyString; } int wxComboBox::GetCount() const @@ -667,7 +688,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 ) ); @@ -829,12 +850,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. @@ -1032,4 +1053,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) } #endif -