[gtk/wip/matthiasc/popup4: 130/140] popover: Drop activation api
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/popup4: 130/140] popover: Drop activation api
- Date: Mon, 29 Apr 2019 02:52:38 +0000 (UTC)
commit ce9e43ad2a6844ebac08384fd024fb2dd973739c
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 27 03:15:52 2019 +0000
popover: Drop activation api
The default activation is now handled
via action, and activating the focus can
be handled by GtkWindow, since we only
have one per-window focus anyway.
gtk/gtkpopover.c | 44 --------------------------------------------
gtk/gtkpopover.h | 2 --
2 files changed, 46 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 003aebb737..cd6891f7b7 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -725,22 +725,6 @@ gtk_popover_get_property (GObject *object,
}
}
-static void
-gtk_popover_activate_default (GtkPopover *popover)
-{
- GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
-
- gtk_root_activate_default (gtk_widget_get_root (priv->relative_to));
-}
-
-static void
-gtk_popover_activate_focus (GtkPopover *popover)
-{
- GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
-
- gtk_root_activate_focus (gtk_widget_get_root (priv->relative_to));
-}
-
static void
gtk_popover_close (GtkPopover *popover)
{
@@ -797,8 +781,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
container_class->add = gtk_popover_add;
container_class->remove = gtk_popover_remove;
- klass->activate_default = gtk_popover_activate_default;
- klass->activate_focus = gtk_popover_activate_focus;
klass->close = gtk_popover_close;
properties[PROP_RELATIVE_TO] =
@@ -831,26 +813,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
- signals[ACTIVATE_FOCUS] =
- g_signal_new (I_("activate-focus"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPopoverClass, activate_focus),
- NULL, NULL,
- NULL,
- G_TYPE_NONE,
- 0);
-
- signals[ACTIVATE_DEFAULT] =
- g_signal_new (I_("activate-default"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPopoverClass, activate_default),
- NULL, NULL,
- NULL,
- G_TYPE_NONE,
- 0);
-
signals[CLOSE] =
g_signal_new (I_("close"),
G_TYPE_FROM_CLASS (object_class),
@@ -873,12 +835,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
binding_set = gtk_binding_set_by_class (klass);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0, "activate-focus", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0, "activate-focus", 0);
-
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0, "activate-default", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0, "activate-default", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0, "activate-default", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0);
gtk_widget_class_set_css_name (widget_class, "popover");
diff --git a/gtk/gtkpopover.h b/gtk/gtkpopover.h
index bd8f8a123a..e9456bd7cb 100644
--- a/gtk/gtkpopover.h
+++ b/gtk/gtkpopover.h
@@ -50,8 +50,6 @@ struct _GtkPopoverClass
/* keybinding signals */
- void (* activate_focus) (GtkPopover *popover);
- void (* activate_default) (GtkPopover *popover);
void (* close) (GtkPopover *popover);
/* signals */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]