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/gtkpixmap.c | |
| parent | 7bb4d7d961d2856f235db861c93a4838ae7b4f50 (diff) | |
| download | gtk+-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/gtkpixmap.c')
| -rw-r--r-- | gtk/gtkpixmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 06e9aa7312..eec55f0bf0 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -28,10 +28,10 @@ static void gtk_pixmap_finalize (GtkObject *object); static GtkWidgetClass *parent_class; -guint +GtkType gtk_pixmap_get_type (void) { - static guint pixmap_type = 0; + static GtkType pixmap_type = 0; if (!pixmap_type) { @@ -46,7 +46,7 @@ gtk_pixmap_get_type (void) (GtkArgGetFunc) NULL, }; - pixmap_type = gtk_type_unique (gtk_misc_get_type (), &pixmap_info); + pixmap_type = gtk_type_unique (GTK_TYPE_MISC, &pixmap_info); } return pixmap_type; |