X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..3f4a2351e4c677c88c18ea812b609477adee7380:/src/gtk1/combobox.cpp?ds=sidebyside diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 99e75910c2..ea3d169aac 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/gtk1/combobox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,24 +7,21 @@ // 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" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -38,12 +35,14 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; +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 +50,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) if (combo->m_ignoreNextUpdate) { - combo->m_ignoreNextUpdate = FALSE; + combo->m_ignoreNextUpdate = false; return; } @@ -62,16 +61,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. + 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 ); + } +} +} + +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->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 ) { @@ -81,7 +125,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; @@ -96,21 +140,30 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); combo->SetValue( combo->GetStringSelection() ); - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed", + gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); - 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 ); + // 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 == wxID_NONE) + { + 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, 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 ); + } +} } //----------------------------------------------------------------------------- @@ -159,16 +212,16 @@ 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(); @@ -176,9 +229,9 @@ 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); + (GtkSignalFunc) gtk_dummy_callback, combo); // make it more useable gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); @@ -188,9 +241,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, 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++) { @@ -219,19 +270,26 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, if (style & wxCB_READONLY) gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE ); - gtk_signal_connect( GTK_OBJECT(combo->entry), "changed", + // "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 ); + + gtk_signal_connect_after( GTK_OBJECT(combo->entry), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(combo->list), "select-child", + gtk_signal_connect_after( 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 // 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() @@ -290,12 +348,12 @@ int wxComboBox::DoAppend( const wxString &item ) gtk_widget_show( list_item ); - const int count = GetCount(); + const unsigned 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 ); + if ( m_clientDataList.GetCount() < count ) + m_clientDataList.Append( (wxObject*) NULL ); + if ( m_clientObjectList.GetCount() < count ) + m_clientObjectList.Append( (wxObject*) NULL ); EnableEvents(); @@ -304,17 +362,16 @@ int wxComboBox::DoAppend( const wxString &item ) return count - 1; } -int wxComboBox::DoInsert( const wxString &item, int pos ) +int wxComboBox::DoInsert( const wxString &item, unsigned 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") ); + wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") ); - if (pos == count) + if (pos == GetCount()) return Append(item); DisableEvents(); @@ -337,12 +394,12 @@ int wxComboBox::DoInsert( const wxString &item, int pos ) gtk_widget_show( list_item ); - count = GetCount(); + const unsigned int count = GetCount(); - if ( (int)m_clientDataList.GetCount() < count ) - m_clientDataList.Insert( pos, (wxObject*) NULL ); - if ( (int)m_clientObjectList.GetCount() < count ) - m_clientObjectList.Insert( pos, (wxObject*) NULL ); + if ( m_clientDataList.GetCount() < count ) + m_clientDataList.Insert( pos, (wxObject*) NULL ); + if ( m_clientObjectList.GetCount() < count ) + m_clientObjectList.Insert( pos, (wxObject*) NULL ); EnableEvents(); @@ -351,7 +408,7 @@ int wxComboBox::DoInsert( const wxString &item, int pos ) return pos; } -void wxComboBox::DoSetItemClientData( int n, void* clientData ) +void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); @@ -361,7 +418,7 @@ void wxComboBox::DoSetItemClientData( int n, void* clientData ) node->SetData( (wxObject*) clientData ); } -void* wxComboBox::DoGetItemClientData( int n ) const +void* wxComboBox::DoGetItemClientData(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); @@ -370,7 +427,7 @@ void* wxComboBox::DoGetItemClientData( int n ) const return node ? node->GetData() : NULL; } -void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData ) +void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); @@ -382,7 +439,7 @@ void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData ) node->SetData( (wxObject*) clientData ); } -wxClientData* wxComboBox::DoGetItemClientObject( int n ) const +wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const { wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); @@ -398,7 +455,7 @@ void wxComboBox::Clear() DisableEvents(); GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_clear_items( GTK_LIST(list), 0, GetCount() ); + gtk_list_clear_items( GTK_LIST(list), 0, (int)GetCount() ); wxList::compatibility_iterator node = m_clientObjectList.GetFirst(); while (node) @@ -416,7 +473,7 @@ void wxComboBox::Clear() InvalidateBestSize(); } -void wxComboBox::Delete( int n ) +void wxComboBox::Delete(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); @@ -453,7 +510,7 @@ void wxComboBox::Delete( int n ) 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") ); @@ -474,9 +531,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; @@ -486,12 +543,8 @@ 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++; @@ -502,6 +555,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") ); @@ -520,12 +581,12 @@ int wxComboBox::GetSelection() const } } - return -1; + return wxNOT_FOUND; } -wxString wxComboBox::GetString( int n ) 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; @@ -535,11 +596,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 { @@ -551,7 +608,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; @@ -560,27 +617,23 @@ 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 +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; + unsigned int count = 0; while (child) { count++; child = child->next; } return count; } @@ -599,16 +652,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 ); @@ -631,7 +674,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 ) ); @@ -674,7 +717,7 @@ void wxComboBox::Redo() void wxComboBox::SelectAll() { - Select(0, GetLastPosition()); + SetSelection(0, GetLastPosition()); } bool wxComboBox::CanUndo() const @@ -735,7 +778,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; @@ -755,7 +798,7 @@ void wxComboBox::Replace( long from, long to, const wxString& value ) 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 ); + gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.length(), &pos ); #endif } @@ -786,12 +829,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. @@ -827,9 +870,9 @@ void wxComboBox::DisableEvents() void wxComboBox::EnableEvents() { - gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", + gtk_signal_connect_after( 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_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); } @@ -887,10 +930,10 @@ wxSize wxComboBox::DoGetBestSize() const if ( m_widget ) { int width; - size_t count = GetCount(); - for ( size_t n = 0; n < count; n++ ) + unsigned int count = GetCount(); + for ( unsigned int n = 0; n < count; n++ ) { - GetTextExtent( GetString(n), &width, NULL, NULL, NULL ); + GetTextExtent(GetString(n), &width, NULL, NULL, NULL ); if ( width > ret.x ) ret.x = width; } @@ -989,4 +1032,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) } #endif -