_conncect_after() should be used for controls emitting

    command events so as to not confuse GTK+ if the user
    intercepts them too early.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index b209fabcc5a1d428dd815986a2a80cd753c467ba..ed67afffaf51eb9bf06a57dd4ff418d4575027ba 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -149,7 +149,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
         OnSetBitmap();
     }
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 5d6dda1190e833a198a1ac19930172c8b92c0d89..640ba4139c3ef2032fddb51b73442950c07eb24f 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -145,7 +145,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     m_parent->DoAddChild( this );
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     m_parent->DoAddChild( this );

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index a2fa3409c87da8d7613bbe65b1a358f4a0092ec3..59d5402c12c206b84daf8d170c446298d3ba8614 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -569,7 +569,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
     // it has to change. Adapted from Matt Ownby.
     InvalidateBestSize();
     
     // it has to change. Adapted from Matt Ownby.
     InvalidateBestSize();
     

-    gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
+    gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate",

       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_widget_show( menu_item );
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_widget_show( menu_item );

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 6c40b2d84a7a2535f3ae8cc45a4f0f6e27c99bb3..e5dd27f1eac368d4c43c9c6770cc5aac16303682 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -122,7 +122,7 @@ 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_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 );
 
     // throw a SELECTED event only if the combobox popup is hidden
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
 
     // throw a SELECTED event only if the combobox popup is hidden


@@ -264,10 +264,10 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
                         GTK_SIGNAL_FUNC(gtk_popup_show_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_connect_after( GTK_OBJECT(combo->entry), "changed",

       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 
       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
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
 
     SetBestSize(size); // need this too because this is a wxControlWithItems


@@ -879,9 +879,9 @@ void wxComboBox::DisableEvents()
 
 void wxComboBox::EnableEvents()
 {
 
 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_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 );
 }
 
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 }
 

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index b209fabcc5a1d428dd815986a2a80cd753c467ba..ed67afffaf51eb9bf06a57dd4ff418d4575027ba 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -149,7 +149,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
         OnSetBitmap();
     }
 
         OnSetBitmap();
     }
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
       GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "enter",

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 5d6dda1190e833a198a1ac19930172c8b92c0d89..640ba4139c3ef2032fddb51b73442950c07eb24f 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -145,7 +145,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
+    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",

       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     m_parent->DoAddChild( this );
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     m_parent->DoAddChild( this );

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index a2fa3409c87da8d7613bbe65b1a358f4a0092ec3..59d5402c12c206b84daf8d170c446298d3ba8614 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -569,7 +569,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
     // it has to change. Adapted from Matt Ownby.
     InvalidateBestSize();
     
     // it has to change. Adapted from Matt Ownby.
     InvalidateBestSize();
     

-    gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
+    gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate",

       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_widget_show( menu_item );
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_widget_show( menu_item );

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 6c40b2d84a7a2535f3ae8cc45a4f0f6e27c99bb3..e5dd27f1eac368d4c43c9c6770cc5aac16303682 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -122,7 +122,7 @@ 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_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 );
 
     // throw a SELECTED event only if the combobox popup is hidden
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
 
     // throw a SELECTED event only if the combobox popup is hidden


@@ -264,10 +264,10 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     gtk_signal_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
                         GTK_SIGNAL_FUNC(gtk_popup_show_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_connect_after( GTK_OBJECT(combo->entry), "changed",

       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 
       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
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
 
     SetBestSize(size); // need this too because this is a wxControlWithItems


@@ -879,9 +879,9 @@ void wxComboBox::DisableEvents()
 
 void wxComboBox::EnableEvents()
 {
 
 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_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 );
 }
 
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
 }