[gtk+] API: GdkWindow no longer is a GdkDrawable
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] API: GdkWindow no longer is a GdkDrawable
- Date: Thu, 2 Dec 2010 19:56:21 +0000 (UTC)
commit e4c27b0a59f0c6821b6ae8c1cfd19080e459b505
Author: Benjamin Otte <otte redhat com>
Date: Tue Nov 23 01:54:37 2010 +0100
API: GdkWindow no longer is a GdkDrawable
Also, name the get_type function properly.
gdk/gdkinternals.h | 2 +-
gdk/gdkwindow.c | 4 ++--
gdk/gdkwindow.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 721e733..24b0956 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -184,7 +184,7 @@ typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay *display,
struct _GdkWindow
{
- GdkDrawable parent_instance;
+ GObject parent_instance;
GdkDrawable *impl; /* window-system-specific delegate object */
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c746764..a03e52e 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -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,
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 4e408ca..cf088b3 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]