{
combo->SendSelectionChangedEvent(wxEVT_COMMAND_COMBOBOX_SELECTED);
}
+
+static void
+gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject),
+ GParamSpec *WXUNUSED(param_spec),
+ wxComboBox *combo)
+{
+ gboolean isShown;
+ g_object_get( combo->m_widget, "popup-shown", &isShown, NULL );
+ wxCommandEvent event( isShown ? wxEVT_COMMAND_COMBOBOX_DROPDOWN
+ : wxEVT_COMMAND_COMBOBOX_CLOSEUP,
+ combo->GetId() );
+ event.SetEventObject( combo );
+ combo->HandleWindowEvent( event );
+}
}
//-----------------------------------------------------------------------------
// wxComboBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
-
BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
EVT_CHAR(wxComboBox::OnChar)
EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
END_EVENT_TABLE()
+void wxComboBox::Init()
+{
+ m_entry = NULL;
+}
+
bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos, const wxSize& size,
long style, const wxValidator& validator,
const wxString& name )
{
- m_strings = NULL;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
}
if (HasFlag(wxCB_SORT))
- m_strings = new wxSortedArrayString();
+ m_strings = new wxGtkCollatedArrayString();
- m_widget = gtk_combo_box_entry_new_text();
-
- // Set it up to trigger default item on enter key press
- GtkWidget *widget = gtk_bin_get_child(GTK_BIN(m_widget));
- gtk_entry_set_activates_default(GTK_ENTRY(widget),
- !HasFlag(wxTE_PROCESS_ENTER));
+ GTKCreateComboBoxWidget();
if (HasFlag(wxBORDER_NONE))
{
GtkEntry * const entry = GetEntry();
- gtk_entry_set_editable( entry, TRUE );
+ if ( entry )
+ {
+ // Set it up to trigger default item on enter key press
+ gtk_entry_set_activates_default( entry,
+ !HasFlag(wxTE_PROCESS_ENTER) );
+
+ gtk_editable_set_editable(GTK_EDITABLE(entry), true);
+ }
Append(n, choices);
m_parent->DoAddChild( this );
- m_focusWidget = GTK_WIDGET( entry );
+ if ( entry )
+ m_focusWidget = GTK_WIDGET( entry );
PostCreation(size);
- gtk_entry_set_text( entry, wxGTK_CONV(value) );
-
- if (style & wxCB_READONLY)
- gtk_entry_set_editable( entry, FALSE );
-
- g_signal_connect_after (entry, "changed",
- G_CALLBACK (gtkcombobox_text_changed_callback), this);
+ if ( entry )
+ {
+ if (style & wxCB_READONLY)
+ {
+ // this will assert and do nothing if the value is not in our list
+ // of strings which is the desired behaviour (for consistency with
+ // wxMSW and also because it doesn't make sense to have a string
+ // which is not a possible choice in a read-only combobox)
+ SetStringSelection(value);
+ gtk_editable_set_editable(GTK_EDITABLE(entry), false);
+ }
+ else // editable combobox
+ {
+ // any value is accepted, even if it's not in our list
+ gtk_entry_set_text( entry, wxGTK_CONV(value) );
+ }
+
+ g_signal_connect_after (entry, "changed",
+ G_CALLBACK (gtkcombobox_text_changed_callback), this);
+ }
g_signal_connect_after (m_widget, "changed",
G_CALLBACK (gtkcombobox_changed_callback), this);
+ if ( !gtk_check_version(2,10,0) )
+ {
+ g_signal_connect (m_widget, "notify::popup-shown",
+ G_CALLBACK (gtkcombobox_popupshown_callback), this);
+ }
+
SetInitialSize(size); // need this too because this is a wxControlWithItems
return true;
}
-GtkEntry *wxComboBox::GetEntry() const
+void wxComboBox::GTKCreateComboBoxWidget()
{
- return GTK_ENTRY(GTK_BIN(m_widget)->child);
+ m_widget = gtk_combo_box_entry_new_text();
+ g_object_ref(m_widget);
+
+ m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
}
GtkEditable *wxComboBox::GetEditable() const
{
- return GTK_EDITABLE( GTK_BIN(m_widget)->child );
+ return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget)));
}
void wxComboBox::OnChar( wxKeyEvent &event )
switch ( event.GetKeyCode() )
{
case WXK_RETURN:
- if ( HasFlag(wxTE_PROCESS_ENTER) )
+ if ( HasFlag(wxTE_PROCESS_ENTER) && GetEntry() )
{
// GTK automatically selects an item if its in the list
wxCommandEvent eventEnter(wxEVT_COMMAND_TEXT_ENTER, GetId());
event.Skip();
}
-void wxComboBox::DisableEvents()
+void wxComboBox::EnableTextChangedEvents(bool enable)
+{
+ if ( !GetEntry() )
+ return;
+
+ if ( enable )
+ {
+ g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+ (gpointer)gtkcombobox_text_changed_callback, this);
+ }
+ else // disable
+ {
+ g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),
+ (gpointer)gtkcombobox_text_changed_callback, this);
+ }
+}
+
+void wxComboBox::GTKDisableEvents()
{
- g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
- (gpointer)gtkcombobox_text_changed_callback, this);
+ EnableTextChangedEvents(false);
g_signal_handlers_block_by_func(m_widget,
(gpointer)gtkcombobox_changed_callback, this);
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer)gtkcombobox_popupshown_callback, this);
}
-void wxComboBox::EnableEvents()
+void wxComboBox::GTKEnableEvents()
{
- g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
- (gpointer)gtkcombobox_text_changed_callback, this);
+ EnableTextChangedEvents(true);
g_signal_handlers_unblock_by_func(m_widget,
(gpointer)gtkcombobox_changed_callback, this);
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer)gtkcombobox_popupshown_callback, this);
}
GtkWidget* wxComboBox::GetConnectWidget()
return GTK_WIDGET( GetEntry() );
}
-GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
+GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const
{
- wxUnusedVar(windows);
-
- return GetEntry()->text_area;
+ return gtk_entry_get_text_window(GetEntry());
}
// static
return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);
}
+void wxComboBox::SetValue(const wxString& value)
+{
+ if ( HasFlag(wxCB_READONLY) )
+ SetStringSelection(value);
+ else
+ wxTextEntry::SetValue(value);
+}
+
// ----------------------------------------------------------------------------
// standard event handling
// ----------------------------------------------------------------------------
event.Enable(!wxTextEntry::IsEmpty());
}
+void wxComboBox::Popup()
+{
+ gtk_combo_box_popup( GTK_COMBO_BOX(m_widget) );
+}
+
+void wxComboBox::Dismiss()
+{
+ gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) );
+}
#endif // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff