[gtk/wip/matthiasc/popup5: 4/7] Stop using gtk_widget_is_toplevel



commit 7048d73805ce065919531d45f350fe4116d80cd6
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 20 03:31:03 2019 +0000

    Stop using gtk_widget_is_toplevel

 gtk/gtkwindow.c | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 6d2d76731b..64357b2e60 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4954,12 +4954,6 @@ gtk_window_show (GtkWidget *widget)
   GtkWindow *window = GTK_WINDOW (widget);
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
-  if (!_gtk_widget_is_toplevel (GTK_WIDGET (widget)))
-    {
-      GTK_WIDGET_CLASS (gtk_window_parent_class)->show (widget);
-      return;
-    }
-
   _gtk_widget_set_visible_flag (widget, TRUE);
 
   gtk_css_node_validate (gtk_widget_get_css_node (widget));
@@ -4988,12 +4982,6 @@ gtk_window_hide (GtkWidget *widget)
   GtkWindow *window = GTK_WINDOW (widget);
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
-  if (!_gtk_widget_is_toplevel (GTK_WIDGET (widget)))
-    {
-      GTK_WIDGET_CLASS (gtk_window_parent_class)->hide (widget);
-      return;
-    }
-
   _gtk_widget_set_visible_flag (widget, FALSE);
   gtk_widget_unmap (widget);
 
@@ -5009,12 +4997,6 @@ gtk_window_map (GtkWidget *widget)
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GdkSurface *surface;
 
-  if (!_gtk_widget_is_toplevel (widget))
-    {
-      GTK_WIDGET_CLASS (gtk_window_parent_class)->map (widget);
-      return;
-    }
-
   GTK_WIDGET_CLASS (gtk_window_parent_class)->map (widget);
 
   child = gtk_bin_get_child (GTK_BIN (window));
@@ -5110,12 +5092,6 @@ gtk_window_unmap (GtkWidget *widget)
   GtkWindowGeometryInfo *info;
   GdkSurfaceState state;
 
-  if (!_gtk_widget_is_toplevel (GTK_WIDGET (widget)))
-    {
-      GTK_WIDGET_CLASS (gtk_window_parent_class)->unmap (widget);
-      return;
-    }
-
   GTK_WIDGET_CLASS (gtk_window_parent_class)->unmap (widget);
   gdk_surface_hide (priv->surface);
 
@@ -5429,9 +5405,6 @@ get_shadow_width (GtkWindow *window,
       priv->fullscreen)
     return;
 
-  if (!_gtk_widget_is_toplevel (GTK_WIDGET (window)))
-    return;
-
   context = _gtk_widget_get_style_context (GTK_WIDGET (window));
 
   gtk_style_context_save_to_node (context, priv->decoration_node);
@@ -5606,9 +5579,6 @@ update_realized_window_properties (GtkWindow     *window,
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
-  if (!_gtk_widget_is_toplevel (GTK_WIDGET (window)))
-    return;
-
   if (priv->client_decorated && priv->use_client_shadow)
     update_shadow_width (window, window_border);
 
@@ -5974,11 +5944,6 @@ _gtk_window_set_allocation (GtkWindow           *window,
                                  priv->title_height;
     }
 
-  if (!_gtk_widget_is_toplevel (widget) && _gtk_widget_get_realized (widget))
-    {
-      gdk_surface_move_resize (priv->surface, 0, 0, width, height);
-    }
-
   *allocation_out = child_allocation;
 
   for (link = priv->popovers.head; link; link = link->next)
@@ -6017,9 +5982,6 @@ gtk_window_configure (GtkWindow *window,
 
   check_scale_changed (window);
 
-  if (!_gtk_widget_is_toplevel (widget))
-    return FALSE;
-
   /* If this is a gratuitous ConfigureNotify that's already
    * the same as our allocation, then we can fizzle it out.
    * This is the case for dragging windows around.
@@ -6427,9 +6389,6 @@ gtk_window_focus (GtkWidget        *widget,
   GtkWidget *old_focus_child;
   GtkWidget *parent;
 
-  if (!_gtk_widget_is_toplevel (widget))
-    return GTK_WIDGET_CLASS (gtk_window_parent_class)->focus (widget, direction);
-
   container = GTK_CONTAINER (widget);
   bin = GTK_BIN (widget);
 
@@ -6495,12 +6454,6 @@ static void
 gtk_window_move_focus (GtkWidget        *widget,
                        GtkDirectionType  dir)
 {
-  if (!_gtk_widget_is_toplevel (widget))
-    {
-      GTK_WIDGET_CLASS (gtk_window_parent_class)->move_focus (widget, dir);
-      return;
-    }
-
   gtk_widget_child_focus (widget, dir);
 
   if (!gtk_widget_get_focus_child (widget))


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