native wxBitmapComboBox implementation for MSW (patch 1941399)

[wxWidgets.git] / src / gtk / combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 6a7c62a6049af219835c583636c1e3fdf51605ee..e3feabd0114f63e0d52ce5a4ad37eba0f891919e 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -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;
     }