Merge branch 'rename-window-to-surface' into 'master'

Rename window to surface

See merge request GNOME/gtk!72

diff --cc gsk/gl/gskglrenderer.c
Simple merge

diff --cc gtk/gtkgrid.c
index 3419756f9109352f5defab64b9e7c544a5562803,674ba180258ebd0dae849cc0b673c7155fad55ca..65dd19b475dd3c394a1735f79821192e9412cdf3
--- 1/gtk/gtkgrid.c
--- 2/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@@ -1699,8 -1729,9 +1699,8 @@@ gtk_grid_init (GtkGrid *grid
  {
    GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
  
-   gtk_widget_set_has_window (GTK_WIDGET (grid), FALSE);
+   gtk_widget_set_has_surface (GTK_WIDGET (grid), FALSE);
  
 -  priv->children = NULL;
    priv->orientation = GTK_ORIENTATION_HORIZONTAL;
    priv->baseline_row = 0;
  

diff --cc gtk/gtklevelbar.c
Simple merge

diff --cc gtk/gtkpaned.c
index d6d0173c9a34d993c2752db8d27bce6c97dc9868,62cd9d8088dd9eab2fcc19a2e95c4b0889c73e17..75f441a0f30174684a33e146969c109ad1d4f853
--- 1/gtk/gtkpaned.c
--- 2/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@@ -1496,12 -1494,15 +1496,12 @@@ connect_drag_gesture_signals (GtkPane
  static void
  gtk_paned_init (GtkPaned *paned)
  {
 -  GtkPanedPrivate *priv;
 +  GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
    GtkGesture *gesture;
  
-   gtk_widget_set_has_window (GTK_WIDGET (paned), FALSE);
+   gtk_widget_set_has_surface (GTK_WIDGET (paned), FALSE);
    gtk_widget_set_can_focus (GTK_WIDGET (paned), TRUE);
  
 -  paned->priv = gtk_paned_get_instance_private (paned);
 -  priv = paned->priv;
 -
    priv->orientation = GTK_ORIENTATION_HORIZONTAL;
  
    priv->child1 = NULL;

diff --cc gtk/gtkprogressbar.c
Simple merge

diff --cc gtk/gtkswitch.c
Simple merge

diff --cc gtk/gtkwidget.c
Simple merge