#include "wx/settings.h"
#include "wx/intl.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
+
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// idle system
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 );
+ }
+
+ combo->m_prevSelection = curSelection;
+
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
- event.SetInt( combo->GetSelection() );
+ event.SetInt( curSelection );
event.SetString( combo->GetStringSelection() );
event.SetEventObject( combo );
m_alreadySent = FALSE;
m_needParent = TRUE;
m_acceptsFocus = TRUE;
+ m_prevSelection = 0;
- wxSize newSize( size );
- if (newSize.x == -1)
- newSize.x = 80;
- if (newSize.y == -1)
- newSize.y = 26;
- if (newSize.y > 30)
- newSize.y = 30;
-
- if (!PreCreation( parent, pos, newSize ) ||
+ 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();
// make it more useable
- gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
+ gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
+
+ // and case-sensitive
+ gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
+
GtkWidget *list = GTK_COMBO(m_widget)->list;
+ gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+
for (int i = 0; i < n; i++)
{
/* don't send first event, which GTK sends aways when
- inserting the first item */
+ inserting the first item */
m_alreadySent = TRUE;
GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
}
m_parent->DoAddChild( this );
+
+ m_focusWidget = GTK_COMBO(m_widget)->entry;
PostCreation();
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+ wxSize size_best( DoGetBestSize() );
+ wxSize new_size( size );
+ if (new_size.x == -1)
+ new_size.x = size_best.x;
+ if (new_size.y == -1)
+ new_size.y = size_best.y;
+ if (new_size.y > size_best.y)
+ new_size.y = size_best.y;
+ 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() );
- SetFont( parent->GetFont() );
Show( TRUE );
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
- wxNode *node = m_clientDataList.Nth( n );
+ wxNode *node = m_clientObjectList.Nth( n );
if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->Data();
DisableEvents();
GtkWidget *list = GTK_COMBO(m_widget)->list;
+ gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );
gtk_list_select_item( GTK_LIST(list), n );
+ m_prevSelection = n;
EnableEvents();
}
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
-#else
- gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+ gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
}
void wxComboBox::Cut()
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
-#else
- gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+ gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
}
void wxComboBox::Paste()
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
- gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+ gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);
}
void wxComboBox::SetInsertionPoint( long pos )
long wxComboBox::GetInsertionPoint() const
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- return (long) GTK_EDITABLE(entry)->current_pos;
+ return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
}
long wxComboBox::GetLastPosition() const
if ( FindString(value) == wxNOT_FOUND )
{
Append(value);
+ SetStringSelection(value);
// and generate the selected event for it
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
}
- //else: do nothing, this will open the listbox
+
+ // 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);
+ return;
+ }
+ }
+
+ return;
}
}
-
+
event.Skip();
}
wxSize wxComboBox::DoGetBestSize() const
{
- return wxSize(100, 26);
+ wxSize ret( wxControl::DoGetBestSize() );
+
+ // we know better our horizontal extent: it depends on the longest string
+ // in the combobox
+ ret.x = 0;
+ if ( m_widget )
+ {
+ GdkFont *font = m_font.GetInternalFont();
+
+ wxCoord width;
+ size_t count = Number();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
+ if ( width > ret.x )
+ ret.x = width;
+ }
+ }
+
+ // empty combobox should have some reasonable default size too
+ if ( ret.x < 100 )
+ ret.x = 100;
+ return ret;
}
#endif
projects / wxWidgets.git / blobdiff