Don't return a broken accelerator object if the accelerator was not

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 9a1c2100bbc354794e9263936bc3d4800626947b..627a4e3489e12997c191c78d7bb6bcd580d3cd6d 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -38,7 +38,7 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
-
+static int    g_SelectionBeforePopup = -1;
 //-----------------------------------------------------------------------------
 //  "changed" - typing and list item matches get changed, select-child
 //              if it doesn't match an item then just get a single changed
@@ -68,6 +68,32 @@ gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
 {
 }
 
+static void
+gtk_popup_hide_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{  
+    // when the popup is hidden, throw a SELECTED event only if the combobox
+    // selection changed.
+    int curSelection = combo->GetSelection();
+    if (g_SelectionBeforePopup != curSelection)
+    {
+        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+        event.SetInt( curSelection );
+        event.SetString( combo->GetStringSelection() );
+        event.SetEventObject( combo );
+        combo->GetEventHandler()->ProcessEvent( event );
+    }
+    
+    // reset the selection flag to an identifiable value
+    g_SelectionBeforePopup = -1;
+}
+
+static void
+gtk_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{
+    // store the combobox selection value before the popup is shown
+    g_SelectionBeforePopup = combo->GetSelection();
+}
+
 //-----------------------------------------------------------------------------
 // "select-child" - click/cursor get select-child, changed, select-child
 //-----------------------------------------------------------------------------
@@ -99,12 +125,19 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
     gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
 
-    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( curSelection );
-    event.SetString( combo->GetStringSelection() );
-    event.SetEventObject( combo );
-
-    combo->GetEventHandler()->ProcessEvent( event );
+    // throw a SELECTED event only if the combobox popup is hidden
+    // because when combobox popup is shown, gtk_combo_select_child_callback is
+    // called each times the mouse is over an item with a pressed button so a lot
+    // of SELECTED event could be generated if the user keep the mouse button down
+    // and select other items ...
+    if (g_SelectionBeforePopup == -1)
+    {
+        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+        event.SetInt( curSelection );
+        event.SetString( combo->GetStringSelection() );
+        event.SetEventObject( combo );
+        combo->GetEventHandler()->ProcessEvent( event );
+      }
 
     // Now send the event ourselves
     wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
@@ -186,6 +219,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     // and case-sensitive
     gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
 
+#ifdef __WXGTK20__
+    if (style & wxNO_BORDER)
+        g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
+#endif
+        
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 #ifndef __WXGTK20__
@@ -219,6 +257,13 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     if (style & wxCB_READONLY)
         gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
 
+    // "show" and "hide" events are generated when user click on the combobox button which popups a list
+    // this list is the "popwin" gtk widget
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "hide",
+                       GTK_SIGNAL_FUNC(gtk_popup_hide_callback), (gpointer)this );
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
+                       GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this );
+
     gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 
@@ -769,8 +814,8 @@ void wxComboBox::GetSelection( long* from, long* to ) const
 {
     if (IsEditable())
     {
-#ifdef __WXGTK20__
         GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
+#ifdef __WXGTK20__
         gint start, end;
         gtk_editable_get_selection_bounds(editable, & start, & end);
         *from = start;