From 9fe8b1e11240f5d853711c8e8fc4d2a0aa943c09 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 7 Nov 2016 01:12:47 +0100
Subject: [PATCH] API: gdk: Remove gdk_window_new()

It's finally no longer public API.
---
 docs/reference/gdk/gdk4-sections.txt |  4 +--
 gdk/gdkinternals.h                   | 21 ++++++++++++
 gdk/gdkwindow.h                      | 49 ----------------------------
 3 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 0d88611f55..d009b72a4a 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -275,11 +275,9 @@ GdkGravity
 GdkAnchorHints
 GdkWindowEdge
 GdkWindowTypeHint
-GdkWindowAttr
-GdkWindowAttributesType
-gdk_window_new
 gdk_window_new_toplevel
 gdk_window_new_popup
+gdk_window_new_temp
 gdk_window_new_child
 gdk_window_new_input
 gdk_window_destroy
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 02f0155a67..e29d97454d 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -41,6 +41,7 @@ G_BEGIN_DECLS
 /* Debugging support */
 
 typedef struct _GdkEventFilter         GdkEventFilter;
+typedef struct _GdkWindowAttr          GdkWindowAttr;
 
 typedef enum {
   GDK_EVENT_FILTER_REMOVED = 1 << 0
@@ -86,6 +87,12 @@ typedef enum {
   GDK_GL_GLES                   = 1 << 6
 } GdkGLFlags;
 
+typedef enum
+{
+  GDK_WA_X	   = 1 << 1,
+  GDK_WA_Y	   = 1 << 2
+} GdkWindowAttributesType;
+
 extern GList            *_gdk_default_filters;
 extern GdkWindow        *_gdk_parent_root;
 
@@ -147,6 +154,17 @@ struct _GdkEventPrivate
 
 typedef struct _GdkWindowPaint GdkWindowPaint;
 
+struct _GdkWindowAttr
+{
+  gint event_mask;
+  gint x, y;
+  gint width;
+  gint height;
+  GdkWindowWindowClass wclass;
+  GdkWindowType window_type;
+  GdkWindowTypeHint type_hint;
+};
+
 struct _GdkWindow
 {
   GObject parent_instance;
@@ -410,6 +428,9 @@ void            gdk_cairo_set_drawing_context    (cairo_t           *cr,
 cairo_surface_t *
            _gdk_window_ref_cairo_surface (GdkWindow *window);
 
+GdkWindow* gdk_window_new                (GdkWindow      *parent,
+                                          GdkWindowAttr  *attributes,
+                                          gint            attributes_mask);
 void       _gdk_window_destroy           (GdkWindow      *window,
                                           gboolean        foreign_destroy);
 void       _gdk_window_clear_update_area (GdkWindow      *window);
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 83030a86a0..482cc371b6 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -38,7 +38,6 @@
 G_BEGIN_DECLS
 
 typedef struct _GdkGeometry          GdkGeometry;
-typedef struct _GdkWindowAttr        GdkWindowAttr;
 typedef struct _GdkWindowRedirect    GdkWindowRedirect;
 
 /**
@@ -83,24 +82,6 @@ typedef enum
   GDK_WINDOW_SUBSURFACE
 } GdkWindowType;
 
-/**
- * GdkWindowAttributesType:
- * @GDK_WA_X: Honor the X coordinate field
- * @GDK_WA_Y: Honor the Y coordinate field
- *
- * Used to indicate which fields in the #GdkWindowAttr struct should be honored.
- * For example, if you filled in the “x” and “y” fields of #GdkWindowAttr,
- * pass “@GDK_WA_X | @GDK_WA_Y” to gdk_window_new(). Fields in
- * #GdkWindowAttr not covered by a bit in this enum are required; for example,
- * the @width/@height, @wclass, and @window_type fields are required, they have
- * no corresponding flag in #GdkWindowAttributesType.
- */
-typedef enum
-{
-  GDK_WA_X	   = 1 << 1,
-  GDK_WA_Y	   = 1 << 2
-} GdkWindowAttributesType;
-
 /* Size restriction enumeration.
  */
 /**
@@ -315,32 +296,6 @@ typedef enum
   GDK_FULLSCREEN_ON_ALL_MONITORS
 } GdkFullscreenMode;
 
-/**
- * GdkWindowAttr:
- * @event_mask: event mask (see gdk_window_set_events())
- * @x: X coordinate relative to parent window (see gdk_window_move())
- * @y: Y coordinate relative to parent window (see gdk_window_move())
- * @width: width of window
- * @height: height of window
- * @wclass: #GDK_INPUT_OUTPUT (normal window) or #GDK_INPUT_ONLY (invisible
- *  window that receives events)
- * @window_type: type of window
- * @cursor: cursor for the window (see gdk_window_set_cursor())
- * @type_hint: a hint of the function of the window
- *
- * Attributes to use for a newly-created window.
- */
-struct _GdkWindowAttr
-{
-  gint event_mask;
-  gint x, y;
-  gint width;
-  gint height;
-  GdkWindowWindowClass wclass;
-  GdkWindowType window_type;
-  GdkWindowTypeHint type_hint;
-};
-
 /**
  * GdkGeometry:
  * @min_width: minimum width of window (or -1 to use requisition, with
@@ -461,10 +416,6 @@ struct _GdkWindowClass
  */
 GDK_AVAILABLE_IN_ALL
 GType         gdk_window_get_type              (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
-GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
-                                                GdkWindowAttr *attributes,
-                                                gint           attributes_mask);
 GDK_AVAILABLE_IN_3_90
 GdkWindow *   gdk_window_new_toplevel          (GdkDisplay    *display,
                                                 gint           event_mask,