AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

window: Remove ::set-focus

Browse Source 
The focus-widget is now a property, so we don't need
this signal anymore.
This commit is contained in:
Matthias Clasen 2019-03-16 01:28:23 -04:00
parent 31d9ecb5c3
commit f68855341e
2 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
gtk/gtkwindow.c
View File

@ -440,8 +440,6 @@ static gint gtk_window_focus (GtkWidget *widget,
GtkDirectionType direction);
static void gtk_window_move_focus (GtkWidget *widget,
GtkDirectionType dir);
static void gtk_window_real_set_focus (GtkWindow *window,
GtkWidget *focus);
static void gtk_window_real_activate_default (GtkWindow *window);
static void gtk_window_real_activate_focus (GtkWindow *window);
@ -816,8 +814,6 @@ gtk_window_class_init (GtkWindowClass *klass)
container_class->remove = gtk_window_remove;
container_class->forall = gtk_window_forall;
klass->set_focus = gtk_window_real_set_focus;
klass->activate_default = gtk_window_real_activate_default;
klass->activate_focus = gtk_window_real_activate_focus;
klass->keys_changed = gtk_window_keys_changed;
@ -1120,24 +1116,6 @@ gtk_window_class_init (GtkWindowClass *klass)
g_object_class_install_properties (gobject_class, LAST_ARG, window_props);
gtk_root_install_properties (gobject_class, LAST_ARG);
/**
* GtkWindow:set-focus:
* @window: the window which received the signal
* @widget: (nullable): the newly focused widget (or %NULL for no focus)
*
* This signal is emitted whenever the currently focused widget in
* this window changes.
*/
window_signals[SET_FOCUS] =
g_signal_new (I_("set-focus"),
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWindowClass, set_focus),
NULL, NULL,
NULL,
G_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
/**
* GtkWindow::activate-focus:
* @window: the window which received the signal
@ -2778,27 +2756,6 @@ gtk_window_get_role (GtkWindow *window)
return priv->wm_role;
}
/**
* gtk_window_set_focus:
* @window: a #GtkWindow
* @focus: (allow-none): widget to be the new focus widget, or %NULL to unset
* any focus widget for the toplevel window.
*
* If @focus is not the current focus widget, and is focusable, sets
* it as the focus widget for the window. If @focus is %NULL, unsets
* the focus widget for this window. To set the focus to a particular
* widget in the toplevel, it is usually more convenient to use
* gtk_widget_grab_focus() instead of this function.
**/
void
gtk_window_set_focus (GtkWindow *window,
GtkWidget *focus)
{
g_return_if_fail (GTK_IS_WINDOW (window));
g_signal_emit (window, window_signals[SET_FOCUS], 0, focus);
}
/**
* gtk_window_set_default:
* @window: a #GtkWindow
@ -7328,10 +7285,24 @@ set_focus_widget (GtkWindow *window,
do_focus_change (priv->focus_widget, TRUE);
}
static void
gtk_window_real_set_focus (GtkWindow *window,
GtkWidget *focus)
/**
* gtk_window_set_focus:
* @window: a #GtkWindow
* @focus: (allow-none): widget to be the new focus widget, or %NULL to unset
* any focus widget for the toplevel window.
*
* If @focus is not the current focus widget, and is focusable, sets
* it as the focus widget for the window. If @focus is %NULL, unsets
* the focus widget for this window. To set the focus to a particular
* widget in the toplevel, it is usually more convenient to use
* gtk_widget_grab_focus() instead of this function.
**/
void
gtk_window_set_focus (GtkWindow *window,
GtkWidget *focus)
{
g_return_if_fail (GTK_IS_WINDOW (window));
if (focus && !gtk_widget_is_sensitive (focus))
return;

4
gtk/gtkwindow.h
View File

@ -57,7 +57,6 @@ struct _GtkWindow
/**
* GtkWindowClass:
* @parent_class: The parent class.
* @set_focus: Sets child as the focus widget for the window.
* @activate_focus: Activates the current focused widget within the window.
* @activate_default: Activates the default widget for the window.
* @keys_changed: Signal gets emitted when the set of accelerators or
@ -72,9 +71,6 @@ struct _GtkWindowClass
/*< public >*/
void (* set_focus) (GtkWindow *window,
GtkWidget *focus);
/* G_SIGNAL_ACTION signals for keybindings */
void (* activate_focus) (GtkWindow *window);