/////////////////////////////////////////////////////////////////////////////
-// Name: combobox.cpp
+// Name: src/gtk/combobox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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"
//-----------------------------------------------------------------------------
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 )
{
if (combo->m_ignoreNextUpdate)
{
- combo->m_ignoreNextUpdate = FALSE;
+ combo->m_ignoreNextUpdate = false;
return;
}
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 )
{
if (g_blockEventsOnDrag) return;
- int curSelection = combo->GetSelection();
+ int curSelection = combo->GetCurrentSelection();
if (combo->m_prevSelection == curSelection) return;
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 );
- // 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 );
+ }
+}
}
//-----------------------------------------------------------------------------
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();
// 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 );
if (style & wxNO_BORDER)
g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
#endif
-
+
GtkWidget *list = GTK_COMBO(m_widget)->list;
#ifndef __WXGTK20__
// "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_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_FUNC(gtk_popup_show_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
+ 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()
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();
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();
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;
#else
wxString str( label->label );
#endif
- if (item == str)
+ if (item.IsSameAs( str , bCase ) )
return count;
count++;
}
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") );
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;
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;
wxFAIL_MSG( wxT("wxComboBox: no selection") );
- return wxT("");
+ return wxEmptyString;
}
int wxComboBox::GetCount() const
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 );
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 ) );
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;
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.
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 );
}
}
#endif
-
projects / wxWidgets.git / blobdiff