diff options
| author | Tim Janik <timj@gtk.org> | 2000-02-13 08:16:48 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2000-02-13 08:16:48 +0000 |
| commit | ef03cb52872c19788e889b55ce9b30ff5a616677 (patch) | |
| tree | 6a08cd7e4de091d8308e3f90d04e3af5011f5801 /gtk/gtksocket.c | |
| parent | 196d48435ebdfc03bb37b55306465dc16a847320 (diff) | |
| download | gtk+-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.c')
| -rw-r--r-- | gtk/gtksocket.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index e5bdeac276..6be2af88e4 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -71,7 +71,7 @@ static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent, static GtkWidgetClass *parent_class = NULL; GtkType -gtk_socket_get_type () +gtk_socket_get_type (void) { static GtkType socket_type = 0; @@ -88,7 +88,7 @@ gtk_socket_get_type () (GtkArgGetFunc) NULL }; - socket_type = gtk_type_unique (gtk_container_get_type (), &socket_info); + socket_type = gtk_type_unique (GTK_TYPE_CONTAINER, &socket_info); } return socket_type; @@ -105,7 +105,7 @@ gtk_socket_class_init (GtkSocketClass *class) widget_class = (GtkWidgetClass*) class; container_class = (GtkContainerClass*) class; - parent_class = gtk_type_class (gtk_widget_get_type ()); + parent_class = gtk_type_class (GTK_TYPE_CONTAINER); widget_class->realize = gtk_socket_realize; widget_class->unrealize = gtk_socket_unrealize; @@ -133,11 +133,11 @@ gtk_socket_init (GtkSocket *socket) } GtkWidget* -gtk_socket_new () +gtk_socket_new (void) { GtkSocket *socket; - socket = gtk_type_new (gtk_socket_get_type ()); + socket = gtk_type_new (GTK_TYPE_SOCKET); return GTK_WIDGET (socket); } @@ -403,7 +403,7 @@ gtk_socket_focus_out_event (GtkWidget *widget, GdkEventFocus *event) g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE); socket = GTK_SOCKET (widget); - toplevel = gtk_widget_get_ancestor (widget, gtk_window_get_type()); + toplevel = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW); if (toplevel) { @@ -698,7 +698,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) { #if 0 GtkWidget *toplevel; - toplevel = gtk_widget_get_ancestor (widget, gtk_window_get_type()); + toplevel = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW); if (toplevel) { @@ -757,11 +757,11 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) #elif defined (GDK_WINDOWING_WIN32) -guint -gtk_socket_get_type () +GtkType +gtk_socket_get_type (void) { g_error ("GtkSocket not implemented"); - return 42; + return 0; } GtkWidget* |