diff options
| author | Tim Janik <timj@gtk.org> | 1998-06-17 08:48:22 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-06-17 08:48:22 +0000 |
| commit | 7d0331a679c00c20db87822739e7544c67c6c2fe (patch) | |
| tree | ca044e4a14619f6534aff6997b4212d6a0535fba /gtk/gtkbox.c | |
| parent | 7bb4d7d961d2856f235db861c93a4838ae7b4f50 (diff) | |
| download | gdk-pixbuf-7d0331a679c00c20db87822739e7544c67c6c2fe.tar.gz | |
new function gdk_window_at_pointer() to retrive the current GdkWindow the
Wed Jun 17 03:47:40 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.h:
* gdk/gdkwindow.c: new function gdk_window_at_pointer() to retrive
the current GdkWindow the pointer is on if there is any.
* gtk/gtktable.c (gtk_table_init): preallocate a table with one row
and one column, so we don't construction logic at all. changed a few
(x < y - 1) to (x + 1 < y), to avoid failing evaluations due to
unsigned int wraps.
* gtk/gtkwidget.c (gtk_widget_set_parent): removed left over code
portion, added an additional check for parent != widget.
* more GtkType and macro fixups.
Diffstat (limited to 'gtk/gtkbox.c')
| -rw-r--r-- | gtk/gtkbox.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 8ed7dc022..0804b1d21 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -68,10 +68,10 @@ static GtkType gtk_box_child_type (GtkContainer *container); static GtkContainerClass *parent_class = NULL; -guint +GtkType gtk_box_get_type (void) { - static guint box_type = 0; + static GtkType box_type = 0; if (!box_type) { @@ -86,7 +86,7 @@ gtk_box_get_type (void) (GtkArgGetFunc) gtk_box_get_arg, }; - box_type = gtk_type_unique (gtk_container_get_type (), &box_info); + box_type = gtk_type_unique (GTK_TYPE_CONTAINER, &box_info); } return box_type; @@ -103,7 +103,7 @@ gtk_box_class_init (GtkBoxClass *class) widget_class = (GtkWidgetClass*) class; container_class = (GtkContainerClass*) class; - parent_class = gtk_type_class (gtk_container_get_type ()); + parent_class = gtk_type_class (GTK_TYPE_CONTAINER); gtk_object_add_arg_type ("GtkBox::spacing", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_SPACING); gtk_object_add_arg_type ("GtkBox::homogeneous", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HOMOGENEOUS); |