callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate GDK_WINDOW_OBJECT and GdkWindowObject

Browse Source
This commit is contained in:
Alexander Larsson
2009-09-04 17:53:27 +02:00
parent d0ac27fe5f
commit 812b3c451d
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdkwindow.h
View File

@ -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(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_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)) #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)) #define GDK_WINDOW_OBJECT(object) ((GdkWindowObject *) GDK_WINDOW (object))
#ifndef GDK_COMPILATION #ifndef GDK_COMPILATION
/* We used to export all of GdkWindowObject, but we don't want to keep doing so. /* 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, 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. */ so we keep the old exported version public, but in reality it is larger. */
@ -316,6 +319,7 @@ struct _GdkWindowObject
GdkWindowRedirect *redirect; GdkWindowRedirect *redirect;
}; };
#endif #endif
#endif
struct _GdkWindowObjectClass struct _GdkWindowObjectClass
{ {

2
gtk/gtktestutils.c
View File

@ -21,6 +21,8 @@
/* need to get the prototypes of all get_type functions */ /* need to get the prototypes of all get_type functions */
#define GTK_ENABLE_BROKEN #define GTK_ENABLE_BROKEN
#undef GTK_DISABLE_DEPRECATED #undef GTK_DISABLE_DEPRECATED
/* Need to get GDK_WINDOW_OBJECT */
#undef GDK_DISABLE_DEPRECATED
#include "config.h" #include "config.h"

1
tests/testwindows.c
View File

@ -1,3 +1,4 @@
#undef GDK_DISABLE_DEPRECATED
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>