X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41eb6d76b01ccbf41c34ecbfeeabb14a4ac2046f..f54632db33bc3ccc834cc5bcb6405fae6e26ed6e:/src/gtk/combobox.cpp?ds=sidebyside

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 6ced6dccaa..c1e77b07d7 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -38,12 +38,13 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
-
+static int    g_SelectionBeforePopup = -2; // -2 <=> the popup is hidden
 //-----------------------------------------------------------------------------
 //  "changed" - typing and list item matches get changed, select-child
 //              if it doesn't match an item then just get a single changed
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
@@ -51,7 +52,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 
     if (combo->m_ignoreNextUpdate)
     {
-        combo->m_ignoreNextUpdate = FALSE;
+        combo->m_ignoreNextUpdate = false;
         return;
     }
 
@@ -62,16 +63,51 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
     event.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event );
 }
+}
 
+extern "C" {
 static void
 gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
 {
 }
+}
+
+extern "C" {
+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 (-2 = hidden)
+    g_SelectionBeforePopup = -2;
+}
+}
+
+extern "C" {
+static void
+gtk_popup_show_callback(GtkCombo *WXUNUSED(gtk_combo), wxComboBox *combo)
+{
+    // store the combobox selection value before the popup is shown
+  // if there is no selection, combo->GetSelection() returns -1
+    g_SelectionBeforePopup = combo->GetSelection();
+}
+}
 
 //-----------------------------------------------------------------------------
 // "select-child" - click/cursor get select-child, changed, select-child
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
@@ -96,15 +132,22 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
     gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry),
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
     combo->SetValue( combo->GetStringSelection() );
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry), "changed",
+    gtk_signal_connect_after( 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 (-2)
+    // 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 == -2)
+    {
+        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() );
@@ -112,6 +155,7 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
     event2.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event2 );
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxComboBox
@@ -159,16 +203,16 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          long style, const wxValidator& validator,
                          const wxString& name )
 {
-    m_ignoreNextUpdate = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_ignoreNextUpdate = false;
+    m_needParent = true;
+    m_acceptsFocus = true;
     m_prevSelection = 0;
 
     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();
@@ -178,7 +222,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id );
     // ... and add surogate handler.
     combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
-			      (GtkSignalFunc) gtk_dummy_callback, combo);
+                  (GtkSignalFunc) gtk_dummy_callback, combo);
 
     // make it more useable
     gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
@@ -186,6 +230,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,19 +268,26 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     if (style & wxCB_READONLY)
         gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
 
-    gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
+    // "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_after( GTK_OBJECT(combo->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 
-    gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
+    gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child",
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
 
     SetBestSize(size); // need this too because this is a wxControlWithItems
 
     // This is required for tool bar support
-    wxSize setsize = GetSize();
-    gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
+//    wxSize setsize = GetSize();
+//    gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
 
-    return TRUE;
+    return true;
 }
 
 wxComboBox::~wxComboBox()
@@ -599,16 +655,6 @@ void wxComboBox::SetSelection( int n )
     EnableEvents();
 }
 
-bool wxComboBox::SetStringSelection( const wxString &string )
-{
-    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") );
-
-    int res = FindString( string );
-    if (res == -1) return false;
-    SetSelection( res );
-    return true;
-}
-
 wxString wxComboBox::GetValue() const
 {
     GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
@@ -735,7 +781,7 @@ long wxComboBox::GetInsertionPoint() const
     return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
 }
 
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
 {
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     int pos = GTK_ENTRY(entry)->text_length;
@@ -834,9 +880,9 @@ void wxComboBox::DisableEvents()
 
 void wxComboBox::EnableEvents()
 {
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
+    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
+    gtk_signal_connect_after( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 }