Drop overlapping parts of GtkRootwip/matthiasc/popup4

Drop the parts of the GtkRoot inferface that
has been split off as GtkBud.

3 files changed, 1 insertions, 124 deletions

diff --git a/gtk/gtkroot.c b/gtk/gtkroot.c
index ad89b09517..0d405c49b8 100644
--- a/gtk/gtkroot.c
+++ b/gtk/gtkroot.c
@@ -50,26 +50,6 @@ gtk_root_default_get_display (GtkRoot *self)
   return gdk_display_get_default ();
 }
 
-static GskRenderer *
-gtk_root_default_get_renderer (GtkRoot *self)
-{
-  return NULL;
-}
-
-static void
-gtk_root_default_get_surface_transform (GtkRoot *self,
-                                        int     *x,
-                                        int     *y)
-{
-  *x = 0;
-  *y = 0;
-}
-
-static void
-gtk_root_default_check_resize (GtkRoot *self)
-{
-}
-
 static void
 gtk_root_default_add_mnemonic (GtkRoot   *self,
                                guint      keyval,
@@ -119,9 +99,6 @@ static void
 gtk_root_default_init (GtkRootInterface *iface)
 {
   iface->get_display = gtk_root_default_get_display;
-  iface->get_renderer = gtk_root_default_get_renderer;
-  iface->get_surface_transform = gtk_root_default_get_surface_transform;
-  iface->check_resize = gtk_root_default_check_resize;
   iface->add_mnemonic = gtk_root_default_add_mnemonic;
   iface->remove_mnemonic = gtk_root_default_remove_mnemonic;
   iface->activate_key = gtk_root_default_activate_key;
@@ -148,53 +125,6 @@ gtk_root_get_display (GtkRoot *self)
   return iface->get_display (self);
 }
 
-GskRenderer *
-gtk_root_get_renderer (GtkRoot *self)
-{
-  GtkRootInterface *iface;
-
-  g_return_val_if_fail (GTK_IS_ROOT (self), NULL);
-
-  iface = GTK_ROOT_GET_IFACE (self);
-  return iface->get_renderer (self);
-}
-
-void
-gtk_root_get_surface_transform (GtkRoot *self,
-                                int     *x,
-                                int     *y)
-{
-  GtkRootInterface *iface;
-
-  g_return_if_fail (GTK_IS_ROOT (self));
-  g_return_if_fail (x != 0);
-  g_return_if_fail (y != 0);
-
-  iface = GTK_ROOT_GET_IFACE (self);
-  return iface->get_surface_transform (self, x, y);
-}
-
-/**
- * gtk_root_get_for_surface:
- * @surface: a #GdkSurface
- *
- * Finds the GtkRoot associated with the surface.
- * 
- * Returns: (transfer none): the #GtkRoot that is associated with @surface
- */
-GtkWidget *
-gtk_root_get_for_surface (GdkSurface *surface)
-{
-  GtkWidget *widget;
-
-  widget = (GtkWidget *)gdk_surface_get_widget (surface);
-
-  if (widget && GTK_IS_ROOT (widget))
-    return widget;
-
-  return NULL;
-}
-
 /**
  * gtk_root_set_focus:
  * @self: a #GtkRoot
@@ -278,14 +208,6 @@ gtk_root_install_properties (GObjectClass *object_class,
   return GTK_ROOT_NUM_PROPERTIES;
 }
 
-static void
-gtk_root_check_resize (GtkRoot *self)
-{
-  g_return_if_fail (GTK_IS_ROOT (self));
-
-  GTK_ROOT_GET_IFACE (self)->check_resize (self);
-}
-
 static gboolean
 gtk_root_get_restyle_pending (GtkRoot *root)
 {
@@ -334,7 +256,7 @@ gtk_root_do_layout_phase (GdkFrameClock *clock,
    * since it doesn't cause any actual harm.
    */
   if (gtk_widget_needs_allocate (GTK_WIDGET (root)))
-    gtk_root_check_resize (root);
+    gtk_bud_check_resize (GTK_BUD (root));
 
   if (!gtk_root_needs_layout_phase (root))
     gtk_root_stop_layout_phase (root);
diff --git a/gtk/gtkroot.h b/gtk/gtkroot.h
index 81439e5b9a..72a7036050 100644
--- a/gtk/gtkroot.h
+++ b/gtk/gtkroot.h
@@ -46,12 +46,6 @@ struct _GtkRootInterface
 
   /*< public >*/
   GdkDisplay *          (* get_display)                 (GtkRoot                *self);
-  GskRenderer *         (* get_renderer)                (GtkRoot                *self);
-
-  void                  (* get_surface_transform)       (GtkRoot                *root,
-                                                         int                    *x,
-                                                         int                    *y);
-
   /* size allocation */
   void                  (* check_resize)                (GtkRoot                *root);
 
@@ -93,9 +87,6 @@ struct _GtkRootInterface
 };
 
 GDK_AVAILABLE_IN_ALL
-GtkWidget * gtk_root_get_for_surface (GdkSurface *surface);
-
-GDK_AVAILABLE_IN_ALL
 void        gtk_root_set_focus (GtkRoot   *self,
                                 GtkWidget *focus);
 GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2deb146509..6fb5b17769 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2374,39 +2374,6 @@ gtk_window_root_get_display (GtkRoot *root)
   return priv->display;
 }
 
-static GskRenderer *
-gtk_window_root_get_renderer (GtkRoot *root)
-{
-  GtkWindow *self = GTK_WINDOW (root);
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (self);
-
-  return priv->renderer;
-}
-
-static void
-gtk_window_root_get_surface_transform (GtkRoot *root,
-                                       int     *x,
-                                       int     *y)
-{
-  GtkWindow *self = GTK_WINDOW (root);
-  GtkStyleContext *context;
-  GtkBorder margin, border, padding;
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (self));
-  gtk_style_context_get_margin (context, &margin);
-  gtk_style_context_get_border (context, &border);
-  gtk_style_context_get_padding (context, &padding);
-
-  *x = margin.left + border.left + padding.left;
-  *y = margin.top + border.top + padding.top;
-}
-
-static void
-gtk_window_root_check_resize (GtkRoot *root)
-{
-  gtk_window_check_resize (GTK_WINDOW (root));
-}
-
 static void
 gtk_window_root_add_mnemonic (GtkRoot   *root,
                               guint      keyval,
@@ -2493,9 +2460,6 @@ static void
 gtk_window_root_interface_init (GtkRootInterface *iface)
 {
   iface->get_display = gtk_window_root_get_display;
-  iface->get_renderer = gtk_window_root_get_renderer;
-  iface->get_surface_transform = gtk_window_root_get_surface_transform;
-  iface->check_resize = gtk_window_root_check_resize;
   iface->add_mnemonic = gtk_window_root_add_mnemonic;
   iface->remove_mnemonic = gtk_window_root_remove_mnemonic;
   iface->activate_key = gtk_window_root_activate_key;