Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ 1907169 ] GTK - trunk - dialog default button, part II for comboctrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-04-21 19:01:54 +00:00
parent e569b49372
commit bfc262ae46
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/combobox.cpp
View File

@@ -116,6 +116,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
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));
if (HasFlag(wxBORDER_NONE))
{
// Doesn't seem to work
@@ -382,17 +387,6 @@ void wxComboBox::OnChar( wxKeyEvent &event )
return;
}
}
// On enter key press, we must give a signal to default control,
// Otherwise, nothing happens when pressing Enter from inside a
// combo box in a dialog.
wxWindow *top_frame = wxGetTopLevelParent(this);
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 );
}
break;
}