From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 30 Dec 2019 05:31:32 +0000 (-0500)
Subject: Remove gtk_window_set_hardcoded_surface
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~475^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=baf99bb8681d93d7a8f1e17d8e23649410907224;p=gtk4.git

Remove gtk_window_set_hardcoded_surface

It is not used anymore.
---

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 408800268b..10dd3436bb 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -266,8 +266,6 @@ typedef struct
   GtkGesture *bubble_drag_gesture;
   GtkEventController *key_controller;
 
-  GdkSurface *hardcoded_surface;
-
   GtkCssNode *decoration_node;
 
   GdkSurface  *surface;
@@ -5536,27 +5534,19 @@ gtk_window_realize (GtkWidget *widget)
 
   gtk_widget_get_allocation (widget, &allocation);
 
-  if (priv->hardcoded_surface)
-    {
-      surface = priv->hardcoded_surface;
-      gdk_surface_resize (surface, allocation.width, allocation.height);
-    }
-  else
+  switch (priv->type)
     {
-      switch (priv->type)
-        {
-        case GTK_WINDOW_TOPLEVEL:
-          surface = gdk_surface_new_toplevel (gtk_widget_get_display (widget),
-					      allocation.width,
-					      allocation.height);
-          break;
-        case GTK_WINDOW_POPUP:
-          surface = gdk_surface_new_temp (gtk_widget_get_display (widget), &allocation);
-          break;
-        default:
-          g_error (G_STRLOC": Unknown window type %d!", priv->type);
-          break;
-        }
+    case GTK_WINDOW_TOPLEVEL:
+      surface = gdk_surface_new_toplevel (gtk_widget_get_display (widget),
+                                          allocation.width,
+                                          allocation.height);
+      break;
+    case GTK_WINDOW_POPUP:
+      surface = gdk_surface_new_temp (gtk_widget_get_display (widget), &allocation);
+      break;
+    default:
+      g_error (G_STRLOC": Unknown window type %d!", priv->type);
+      break;
     }
 
   priv->surface = surface;
@@ -5707,8 +5697,6 @@ gtk_window_unrealize (GtkWidget *widget)
   gdk_surface_set_widget (surface, NULL);
   gdk_surface_destroy (surface);
   g_clear_object (&priv->surface);
-
-  priv->hardcoded_surface = NULL;
 }
 
 static void
@@ -9118,18 +9106,6 @@ gtk_window_enable_debugging (GtkWindow *window,
   return TRUE;
 }
 
-void
-gtk_window_set_hardcoded_surface (GtkWindow *window,
-				  GdkSurface *surface)
-{
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
-  g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (!_gtk_widget_get_realized (GTK_WIDGET (window)));
-
-  g_set_object (&priv->hardcoded_surface, surface);
-}
-
 #ifdef GDK_WINDOWING_WAYLAND
 typedef struct {
   GtkWindow *window;
diff --git a/gtk/gtkwindowprivate.h b/gtk/gtkwindowprivate.h
index c803c56d61..6e6f8a6881 100644
--- a/gtk/gtkwindowprivate.h
+++ b/gtk/gtkwindowprivate.h
@@ -115,9 +115,6 @@ gboolean    _gtk_window_is_popover_widget  (GtkWindow *window,
 GdkPaintable *    gtk_window_get_icon_for_size (GtkWindow *window,
                                                 int        size);
 
-void       gtk_window_set_hardcoded_surface (GtkWindow *window,
-					     GdkSurface *surface);
-
 /* Exported handles */
 
 typedef void (*GtkWindowHandleExported)  (GtkWindow               *window,