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

_conncect_after() should be used for controls emitting

Browse Source 
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
This commit is contained in:
Robert Roebling
2005-02-05 12:51:05 +00:00
parent 1175aa4e13
commit 58b907f6e1
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/bmpbuttn.cpp
View File

@@ -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_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
gtk_signal_connect( GTK_OBJECT(m_widget), "enter", gtk_signal_connect( GTK_OBJECT(m_widget), "enter",

2
src/gtk/button.cpp
View File

@@ -145,7 +145,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
if (style & wxNO_BORDER) if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); 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 ); GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );

2
src/gtk/choice.cpp
View File

@@ -569,7 +569,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
// it has to change. Adapted from Matt Ownby. // it has to change. Adapted from Matt Ownby.
InvalidateBestSize(); 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_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
gtk_widget_show( menu_item ); gtk_widget_show( menu_item );

10
src/gtk/combobox.cpp
View File

@@ -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_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry),
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
combo->SetValue( combo->GetStringSelection() ); 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 ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
// throw a SELECTED event only if the combobox popup is hidden // 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_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this ); 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 ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
SetBestSize(size); // need this too because this is a wxControlWithItems 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 );
} }

2
src/gtk1/bmpbuttn.cpp
View File

@@ -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_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
gtk_signal_connect( GTK_OBJECT(m_widget), "enter", gtk_signal_connect( GTK_OBJECT(m_widget), "enter",

2
src/gtk1/button.cpp
View File

@@ -145,7 +145,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
if (style & wxNO_BORDER) if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); 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 ); GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );

2
src/gtk1/choice.cpp
View File

@@ -569,7 +569,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
// it has to change. Adapted from Matt Ownby. // it has to change. Adapted from Matt Ownby.
InvalidateBestSize(); 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_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
gtk_widget_show( menu_item ); gtk_widget_show( menu_item );

10
src/gtk1/combobox.cpp
View File

@@ -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_disconnect_by_func( GTK_OBJECT(GTK_COMBO(combo->GetHandle())->entry),
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
combo->SetValue( combo->GetStringSelection() ); 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 ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)combo );
// throw a SELECTED event only if the combobox popup is hidden // 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_connect( GTK_OBJECT(GTK_COMBO(combo)->popwin), "show",
GTK_SIGNAL_FUNC(gtk_popup_show_callback), (gpointer)this ); 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 ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
SetBestSize(size); // need this too because this is a wxControlWithItems 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 );
} }