Deprecate GDK_WINDOW_OBJECT and GdkWindowObject

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 36a79f0f6c987340ebbce38283259443803c6c6a..3370e0fd9566d0f1da80ce3aed3897ea8c1a5fad 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -258,9 +258,12 @@ typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
 #define GDK_IS_WINDOW(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
 #define GDK_IS_WINDOW_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW))
 #define GDK_WINDOW_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowObjectClass))
+
+#ifndef GDK_DISABLE_DEPRECATED
 #define GDK_WINDOW_OBJECT(object)    ((GdkWindowObject *) GDK_WINDOW (object))
 
 #ifndef GDK_COMPILATION
+
 /* We used to export all of GdkWindowObject, but we don't want to keep doing so.
    However, there are various parts of it accessed by macros and other code,
    so we keep the old exported version public, but in reality it is larger. */
@@ -316,6 +319,7 @@ struct _GdkWindowObject
   GdkWindowRedirect *redirect;
 };
 #endif
+#endif
 
 struct _GdkWindowObjectClass
 {

diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 383af9a7a108e89efefeff8eaa9e8ee8945af410..64bf351976f123383b4849c8177350df2aac0201 100644 (file)
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -21,6 +21,8 @@
 /* need to get the prototypes of all get_type functions */
 #define GTK_ENABLE_BROKEN
 #undef GTK_DISABLE_DEPRECATED
+/* Need to get GDK_WINDOW_OBJECT */
+#undef GDK_DISABLE_DEPRECATED
 
 #include "config.h"
 

diff --git a/tests/testwindows.c b/tests/testwindows.c
index a6cd0a5bd0f798b6506328006e9848d159e25eac..d2d5f0dfe678e9e1badf84e8a9cfc321b42dfe1c 100644 (file)
--- a/tests/testwindows.c
+++ b/tests/testwindows.c
@@ -1,3 +1,4 @@
+#undef GDK_DISABLE_DEPRECATED
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <X11/Xlib.h>