Commit e4c27b0a authored by Benjamin Otte's avatar Benjamin Otte
Browse files

API: GdkWindow no longer is a GdkDrawable

Also, name the get_type function properly.
parent 1ad7c5f8
......@@ -184,7 +184,7 @@ typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay *display,
struct _GdkWindow
{
GdkDrawable parent_instance;
GObject parent_instance;
GdkDrawable *impl; /* window-system-specific delegate object */
......
......@@ -278,12 +278,12 @@ new_region_tag (void)
}
GType
gdk_window_object_get_type (void)
gdk_window_get_type (void)
{
static GType object_type = 0;
if (!object_type)
object_type = g_type_register_static_simple (GDK_TYPE_DRAWABLE,
object_type = g_type_register_static_simple (G_TYPE_OBJECT,
"GdkWindow",
sizeof (GdkWindowObjectClass),
(GClassInitFunc) gdk_window_class_init,
......
......@@ -478,7 +478,7 @@ struct _GdkPointerHooks
typedef struct _GdkWindowObject GdkWindowObject;
typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
#define GDK_TYPE_WINDOW (gdk_window_object_get_type ())
#define GDK_TYPE_WINDOW (gdk_window_get_type ())
#define GDK_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow))
#define GDK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass))
#define GDK_IS_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
......@@ -488,7 +488,7 @@ typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
struct _GdkWindowObjectClass
{
GdkDrawableClass parent_class;
GObjectClass parent_class;
GdkWindow * (* pick_embedded_child) (GdkWindow *window,
gdouble x,
......@@ -522,7 +522,7 @@ struct _GdkWindowObjectClass
/* Windows
*/
GType gdk_window_object_get_type (void) G_GNUC_CONST;
GType gdk_window_get_type (void) G_GNUC_CONST;
GdkWindow* gdk_window_new (GdkWindow *parent,
GdkWindowAttr *attributes,
gint attributes_mask);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment