summaryrefslogtreecommitdiff
path: root/gtk/gtksocket.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2000-02-13 08:16:48 +0000
committerTim Janik <timj@src.gnome.org>2000-02-13 08:16:48 +0000
commitef03cb52872c19788e889b55ce9b30ff5a616677 (patch)
tree6a08cd7e4de091d8308e3f90d04e3af5011f5801 /gtk/gtksocket.h
parent196d48435ebdfc03bb37b55306465dc16a847320 (diff)
downloadgdk-pixbuf-ef03cb52872c19788e889b55ce9b30ff5a616677.tar.gz
s/refcount/ref_count/.
Sun Feb 13 08:54:45 2000 Tim Janik <timj@gtk.org> * gdk/gdkcursor.h (struct _GdkCursor): s/refcount/ref_count/. * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): * gdk/x11/gdkcursor-x11.c (_gdk_cursor_destroy): * gdk/gdkcursor.c (gdk_cursor_ref): insert assertments for the parameters given and cursor->ref_count. coding style fixups. * gtk/gtksocket.c (gtk_socket_class_init): parent class is GtkContainer, not GtkWidget. * gtk/*.h: applied patch from Mathieu Lacage <lacage@email.enst.fr> to fix up widget macros and add _GET_CLASS() variant. * gtk/*.c: some GtkType fixups.
Diffstat (limited to 'gtk/gtksocket.h')
-rw-r--r--gtk/gtksocket.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index df98fdc4d..4b91788e1 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -33,9 +33,12 @@ extern "C" {
#endif /* __cplusplus */
-#define GTK_SOCKET(obj) GTK_CHECK_CAST (obj, gtk_socket_get_type (), GtkSocket)
-#define GTK_SOCKET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_socket_get_type (), GtkSocketClass)
-#define GTK_IS_SOCKET(obj) GTK_CHECK_TYPE (obj, gtk_socket_get_type ())
+#define GTK_TYPE_SOCKET (gtk_socket_get_type ())
+#define GTK_SOCKET(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
+#define GTK_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOCKET, GtkSocketClass))
+#define GTK_IS_SOCKET(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOCKET))
+#define GTK_IS_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOCKET))
+#define GTK_SOCKET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SOCKET, GtkSocketClass))
typedef struct _GtkSocket GtkSocket;
@@ -64,7 +67,7 @@ struct _GtkSocketClass
GtkWidget* gtk_socket_new (void);
-GtkType gtk_socket_get_type (void );
+GtkType gtk_socket_get_type (void);
void gtk_socket_steal (GtkSocket *socket,
guint32 wid);