From c7b2e4941fdf9842e17d2d375474e0846d0a1abe Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 27 Aug 2006 00:31:39 +0000 Subject: [PATCH] returning true is sufficient to stop signal emission git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/listbox.cpp | 8 +------ src/gtk/notebook.cpp | 2 -- src/gtk/popupwin.cpp | 1 - src/gtk/radiobox.cpp | 2 -- src/gtk/toplevel.cpp | 1 - src/gtk/window.cpp | 51 ++++++-------------------------------------- 6 files changed, 7 insertions(+), 58 deletions(-) diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index fae6eb8e79..884593028c 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -240,13 +240,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, listbox->m_spacePressed = true; } - if (ret) - { - g_signal_stop_emission_by_name (widget, "key_press_event"); - return TRUE; - } - - return FALSE; + return ret; } } diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index c82ea26a99..f95f03dce6 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -220,7 +220,6 @@ gtk_notebook_key_press_callback( GtkWidget *widget, // m_selection = page; gtk_notebook_set_current_page( GTK_NOTEBOOK(widget), page ); - g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } @@ -248,7 +247,6 @@ gtk_notebook_key_press_callback( GtkWidget *widget, client->SetFocus(); } - g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 98bb95953f..0889be36d3 100644 --- a/src/gtk/popupwin.cpp +++ b/src/gtk/popupwin.cpp @@ -76,7 +76,6 @@ static gint gtk_dialog_focus_callback( GtkWidget *widget, GtkDirectionType WXUNU wxapp_install_idle_handler(); /* This disables GTK's tab traversal */ - g_signal_stop_emission_by_name (widget, "focus"); return TRUE; } } diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 8d399e33e4..d00e6cfc76 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -119,8 +119,6 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ return FALSE; } - g_signal_stop_emission_by_name (widget, "key_press_event"); - if ((gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Left)) { diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index c6ef11f681..68efed2a08 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -208,7 +208,6 @@ static gboolean gtk_frame_focus_callback( GtkWidget *widget, GtkDirectionType WX wxapp_install_idle_handler(); // This disables GTK's tab traversal - g_signal_stop_emission_by_name (widget, "focus"); return TRUE; } } diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 00d1a6c617..a177129ae7 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1122,10 +1122,6 @@ gtk_window_key_press_callback( GtkWidget *widget, } } - - - - // win is a control: tab can be propagated up if ( !ret && ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) && @@ -1150,13 +1146,7 @@ gtk_window_key_press_callback( GtkWidget *widget, ret = win->GetParent()->GetEventHandler()->ProcessEvent( new_event ); } - if (ret) - { - g_signal_stop_emission_by_name (widget, "key_press_event"); - return TRUE; - } - - return FALSE; + return ret; } } @@ -1257,11 +1247,7 @@ gtk_window_key_release_callback( GtkWidget *widget, return FALSE; } - if ( !win->GetEventHandler()->ProcessEvent( event ) ) - return FALSE; - - g_signal_stop_emission_by_name (widget, "key_release_event"); - return TRUE; + return win->GetEventHandler()->ProcessEvent(event); } } @@ -1613,7 +1599,6 @@ gtk_window_button_press_callback( GtkWidget *widget, if (win->GetEventHandler()->ProcessEvent( event )) { - g_signal_stop_emission_by_name (widget, "button_press_event"); return TRUE; } @@ -1684,13 +1669,7 @@ gtk_window_button_release_callback( GtkWidget *widget, event.SetEventObject( win ); event.SetId( win->GetId() ); - if (win->GetEventHandler()->ProcessEvent( event )) - { - g_signal_stop_emission_by_name (widget, "button_release_event"); - return TRUE; - } - - return FALSE; + return win->GetEventHandler()->ProcessEvent(event); } //----------------------------------------------------------------------------- @@ -1756,13 +1735,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, } } - if (win->GetEventHandler()->ProcessEvent( event )) - { - g_signal_stop_emission_by_name (widget, "motion_notify_event"); - return TRUE; - } - - return FALSE; + return win->GetEventHandler()->ProcessEvent(event); } //----------------------------------------------------------------------------- @@ -1977,13 +1950,7 @@ gtk_window_enter_callback( GtkWidget *widget, } } - if (win->GetEventHandler()->ProcessEvent( event )) - { - g_signal_stop_emission_by_name (widget, "enter_notify_event"); - return TRUE; - } - - return FALSE; + return win->GetEventHandler()->ProcessEvent(event); } //----------------------------------------------------------------------------- @@ -2022,13 +1989,7 @@ gtk_window_leave_callback( GtkWidget *widget, event.m_x = x + pt.x; event.m_y = y + pt.y; - if (win->GetEventHandler()->ProcessEvent( event )) - { - g_signal_stop_emission_by_name (widget, "leave_notify_event"); - return TRUE; - } - - return FALSE; + return win->GetEventHandler()->ProcessEvent(event); } //----------------------------------------------------------------------------- -- 2.45.2