[gtk/shortcuts-rebased-again: 148/159] Drop the move-focus signal



commit 35bc9c081e3de9b607f0d09935ecbaf8e3649cd2
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 24 01:36:00 2019 +0000

    Drop the move-focus signal

 gtk/gtkwidget.c | 31 -------------------------------
 gtk/gtkwidget.h |  5 -----
 gtk/gtkwindow.c |  1 -
 3 files changed, 37 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3988968cfc..20bbf19473 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -523,7 +523,6 @@ enum {
   GRAB_NOTIFY,
   CHILD_NOTIFY,
   MNEMONIC_ACTIVATE,
-  MOVE_FOCUS,
   KEYNAV_FAILED,
   DRAG_BEGIN,
   DRAG_END,
@@ -635,8 +634,6 @@ static void     gtk_widget_real_style_updated    (GtkWidget         *widget);
 
 static gboolean                gtk_widget_real_focus                   (GtkWidget        *widget,
                                                                 GtkDirectionType  direction);
-static void             gtk_widget_real_move_focus              (GtkWidget        *widget,
-                                                                 GtkDirectionType  direction);
 static gboolean                gtk_widget_real_keynav_failed           (GtkWidget        *widget,
                                                                 GtkDirectionType  direction);
 #ifdef G_ENABLE_CONSISTENCY_CHECKS
@@ -947,7 +944,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->mnemonic_activate = gtk_widget_real_mnemonic_activate;
   klass->grab_focus = gtk_widget_real_grab_focus;
   klass->focus = gtk_widget_real_focus;
-  klass->move_focus = gtk_widget_real_move_focus;
   klass->keynav_failed = gtk_widget_real_keynav_failed;
   klass->drag_begin = NULL;
   klass->drag_end = NULL;
@@ -1646,22 +1642,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                               G_TYPE_FROM_CLASS (gobject_class),
                               _gtk_marshal_BOOLEAN__BOOLEANv);
 
-  /**
-   * GtkWidget::move-focus:
-   * @widget: the object which received the signal.
-   * @direction:
-   */
-  widget_signals[MOVE_FOCUS] =
-    g_signal_new (I_("move-focus"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                  G_STRUCT_OFFSET (GtkWidgetClass, move_focus),
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE,
-                  1,
-                  GTK_TYPE_DIRECTION_TYPE);
-
   /**
    * GtkWidget::keynav-failed:
    * @widget: the object which received the signal
@@ -5547,17 +5527,6 @@ gtk_widget_real_focus (GtkWidget         *widget,
   return TRUE;
 }
 
-static void
-gtk_widget_real_move_focus (GtkWidget         *widget,
-                            GtkDirectionType   direction)
-{
-  GtkRoot *root;
-
-  root = _gtk_widget_get_root (widget);
-  if (widget != GTK_WIDGET (root))
-    g_signal_emit (root, widget_signals[MOVE_FOCUS], 0, direction);
-}
-
 static gboolean
 gtk_widget_real_keynav_failed (GtkWidget        *widget,
                                GtkDirectionType  direction)
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 2a40b22f69..646d2f7edf 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -187,7 +187,6 @@ struct _GtkWidget
  * @grab_focus: Causes @widget to have the keyboard focus for the
  *   #GtkWindow it’s inside.
  * @focus:
- * @move_focus: Signal emitted when a change of focus is requested
  * @keynav_failed: Signal emitted if keyboard navigation fails.
  * @drag_begin: Signal emitted on the drag source when a drag is
  *   started.
@@ -269,10 +268,6 @@ struct _GtkWidgetClass
   void     (* grab_focus)               (GtkWidget           *widget);
   gboolean (* focus)                    (GtkWidget           *widget,
                                          GtkDirectionType     direction);
-
-  /* keyboard navigation */
-  void     (* move_focus)               (GtkWidget           *widget,
-                                         GtkDirectionType     direction);
   gboolean (* keynav_failed)            (GtkWidget           *widget,
                                          GtkDirectionType     direction);
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index da300cddcc..be60f21c08 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -809,7 +809,6 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class->unrealize = gtk_window_unrealize;
   widget_class->size_allocate = gtk_window_size_allocate;
   widget_class->focus = gtk_window_focus;
-  widget_class->move_focus = gtk_window_move_focus;
   widget_class->measure = gtk_window_measure;
   widget_class->state_flags_changed = gtk_window_state_flags_changed;
   widget_class->style_updated = gtk_window_style_updated;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]