// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#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
extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
-// "select"
+// "select-child" - click/cursor get select-child, changed, select-child
//-----------------------------------------------------------------------------
static void
-gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
if (g_blockEventsOnDrag) return;
- if (combo->m_alreadySent)
- {
- combo->m_alreadySent = FALSE;
- return;
- }
-
- combo->m_alreadySent = TRUE;
-
int curSelection = combo->GetSelection();
if (combo->m_prevSelection != curSelection)
GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
}
- else if ((curSelection >= 0) && (combo->GetString(curSelection) == combo->GetValue()))
- return;
-
combo->m_prevSelection = curSelection;
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
}
//-----------------------------------------------------------------------------
-// "changed"
+// "changed" - typing and list item matches get changed, select-child
+// if it doesn't match an item then just get a single changed
//-----------------------------------------------------------------------------
static void
if (!combo->m_hasVMT) return;
- // avoids double events when the GetValue = one of the selections
- if (combo->m_alreadySent)
- {
- combo->m_alreadySent = FALSE;
- return;
- }
-
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() );
event.SetEventObject( combo );
combo->GetEventHandler()->ProcessEvent( event );
}
+static void
+gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
+{
+}
+
//-----------------------------------------------------------------------------
// wxComboBox
//-----------------------------------------------------------------------------
}
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);
// make it more useable
gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
-
+
// and case-sensitive
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
for (int i = 0; i < n; i++)
{
- /* don't send first event, which GTK sends aways when
- inserting the first item */
- m_alreadySent = TRUE;
-
GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );
m_clientDataList.Append( (wxObject*)NULL );
gtk_container_add( GTK_CONTAINER(list), list_item );
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
gtk_widget_show( list_item );
}
m_parent->DoAddChild( this );
-
- m_focusWidget = GTK_COMBO(m_widget)->entry;
+
+ m_focusWidget = combo->entry;
PostCreation();
- ConnectWidget( GTK_COMBO(m_widget)->button );
+ ConnectWidget( combo->button );
- if (!value.IsNull()) SetValue( value );
+ // MSW's combo box shows the value and the selection is -1
+ gtk_entry_set_text( GTK_ENTRY(combo->entry), wxGTK_CONV(value) );
+ gtk_list_unselect_all( GTK_LIST(combo->list) );
if (style & wxCB_READONLY)
- gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
+ gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
- gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+ gtk_signal_connect( 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_FUNC(gtk_combo_select_child_callback), (gpointer)this );
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
if ((new_size.x != size.x) || (new_size.y != size.y))
{
SetSize( new_size.x, new_size.y );
-
+
// This is required for tool bar support
gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
}
-
SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() );
wxComboBox::~wxComboBox()
{
- wxNode *node = m_clientObjectList.GetFirst();
+ wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
while (node)
{
wxClientData *cd = (wxClientData*)node->GetData();
gtk_widget_grab_focus( m_focusWidget );
}
-void wxComboBox::AppendCommon( const wxString &item )
+int wxComboBox::DoAppend( const wxString &item )
{
- wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+
+ DisableEvents();
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_container_add( GTK_CONTAINER(list), list_item );
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
if (GTK_WIDGET_REALIZED(m_widget))
{
gtk_widget_realize( list_item );
}
gtk_widget_show( list_item );
-}
-void wxComboBox::Append( const wxString &item )
-{
+ const 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 );
- AppendCommon( item );
+ EnableEvents();
+
+ return count - 1;
}
-void wxComboBox::Append( const wxString &item, void *clientData )
+int wxComboBox::DoInsert( const wxString &item, int pos )
{
- m_clientDataList.Append( (wxObject*) clientData );
- m_clientObjectList.Append( (wxObject*)NULL );
+ wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
+ wxT("can't insert into sorted list"));
- AppendCommon( item );
-}
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) clientData );
+ int count = GetCount();
+ wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+
+ if (pos == count)
+ return Append(item);
+
+ DisableEvents();
+
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+ GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
- AppendCommon( item );
+ GList *gitem_list = g_list_alloc ();
+ gitem_list->data = list_item;
+ gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_realize( list_item );
+ gtk_widget_realize( GTK_BIN(list_item)->child );
+
+ if (m_widgetStyle)
+ ApplyWidgetStyle();
+ }
+
+ gtk_widget_show( list_item );
+
+ 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 );
+
+ EnableEvents();
+
+ return pos;
}
-void wxComboBox::SetClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData( int n, void* clientData )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
- wxNode *node = m_clientDataList.Item( n );
+ wxList::compatibility_iterator node = m_clientDataList.Item( n );
if (!node) return;
node->SetData( (wxObject*) clientData );
}
-void* wxComboBox::GetClientData( int n )
+void* wxComboBox::DoGetItemClientData( int n ) const
{
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
- wxNode *node = m_clientDataList.Item( n );
- if (!node) return NULL;
+ wxList::compatibility_iterator node = m_clientDataList.Item( n );
- return node->GetData();
+ return node ? node->GetData() : NULL;
}
-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
+void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
- wxNode *node = m_clientObjectList.Item( n );
+ wxList::compatibility_iterator node = m_clientObjectList.Item( n );
if (!node) return;
wxClientData *cd = (wxClientData*) node->GetData();
node->SetData( (wxObject*) clientData );
}
-wxClientData* wxComboBox::GetClientObject( int n )
+wxClientData* wxComboBox::DoGetItemClientObject( int n ) const
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
- wxNode *node = m_clientObjectList.Item( n );
- if (!node) return (wxClientData*) NULL;
+ wxList::compatibility_iterator node = m_clientObjectList.Item( n );
- return (wxClientData*) node->GetData();
+ return node ? (wxClientData*) node->GetData() : NULL;
}
void wxComboBox::Clear()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+ DisableEvents();
+
GtkWidget *list = GTK_COMBO(m_widget)->list;
- gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+ gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
- wxNode *node = m_clientObjectList.GetFirst();
+ wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
while (node)
{
wxClientData *cd = (wxClientData*)node->GetData();
m_clientObjectList.Clear();
m_clientDataList.Clear();
+
+ EnableEvents();
}
void wxComboBox::Delete( int n )
return;
}
+ DisableEvents();
+
GList *list = g_list_append( (GList*) NULL, child->data );
gtk_list_remove_items( listbox, list );
g_list_free( list );
- wxNode *node = m_clientObjectList.Item( n );
+ wxList::compatibility_iterator node = m_clientObjectList.Item( n );
if (node)
{
wxClientData *cd = (wxClientData*)node->GetData();
if (cd) delete cd;
- m_clientObjectList.DeleteNode( node );
+ m_clientObjectList.Erase( node );
}
node = m_clientDataList.Item( n );
if (node)
+ m_clientDataList.Erase( node );
+
+ EnableEvents();
+}
+
+void wxComboBox::SetString(int n, const wxString &text)
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+ GList *child = g_list_nth( GTK_LIST(list)->children, n );
+ if (child)
+ {
+ GtkBin *bin = GTK_BIN( child->data );
+ GtkLabel *label = GTK_LABEL( bin->child );
+ gtk_label_set_text(label, wxGTK_CONV(text));
+ }
+ else
{
- m_clientDataList.DeleteNode( node );
+ wxFAIL_MSG( wxT("wxComboBox: wrong index") );
}
}
-int wxComboBox::FindString( const wxString &item )
+int wxComboBox::FindString( const wxString &item ) const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
#endif
if (item == str)
return count;
-
+
count++;
child = child->next;
}
return wxT("");
}
-int wxComboBox::Number() const
+int wxComboBox::GetCount() const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
-#if 0
+#if 0
for (int i = 0; i < wxStrlen(tmp.c_str()) +1; i++)
{
wxChar c = tmp[i];
}
printf( "\n" );
#endif
-
+
return tmp;
}
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+ if ( pos == GetLastPosition() )
+ pos = -1;
+
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
}
-void wxComboBox::SetInsertionPointEnd()
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
- SetInsertionPoint( -1 );
-}
-
long wxComboBox::GetInsertionPoint() const
{
return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
if (value.IsNull()) return;
gint pos = (gint)to;
-
+
#if wxUSE_UNICODE
wxCharBuffer buffer = wxConvUTF8.cWX2MB( value );
gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos );
#endif
}
-void wxComboBox::Remove(long from, long to)
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
void wxComboBox::SetSelection( long from, long to )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
{
if ( event.GetKeyCode() == WXK_RETURN )
{
- wxString value = GetValue();
- int selection = GetSelection();
+ // 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 );
- // note that gtk automatically selects an item if its in the list
- // so you don't have to call FindString
- if ((selection >= 0) && (GetString(selection) == value))
+ if (!GetEventHandler()->ProcessEvent( event ))
{
- // make Enter generate "selected" event if it equals an item
- wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
- event.SetInt( selection );
- event.SetString( value );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
- }
- else
- {
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
- event.SetString(value);
- event.SetInt(selection);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ // This will invoke the dialog default action, such
+ // as the clicking the default button.
+
+ wxWindow *top_frame = m_parent;
+ while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+ top_frame = top_frame->GetParent();
+
+ if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+ {
+ GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+ if (window->default_widget)
+ gtk_widget_activate (window->default_widget);
+ }
}
+
+ // Catch GTK event so that GTK doesn't open the drop
+ // down list upon RETURN.
return;
}
-
+
event.Skip();
}
void wxComboBox::DisableEvents()
{
- GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
- GList *child = list->children;
- while (child)
- {
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
- child = child->next;
- }
+ 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 );
}
void wxComboBox::EnableEvents()
{
- GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
- GList *child = list->children;
- while (child)
- {
- gtk_signal_connect( GTK_OBJECT(child->data), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
- child = child->next;
- }
+ 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 );
}
void wxComboBox::OnSize( wxSizeEvent &event )
projects / wxWidgets.git / blobdiff