summaryrefslogtreecommitdiff
path: root/gtk/gtkimage.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-11-28 01:56:09 +0000
committerTim Janik <timj@src.gnome.org>1998-11-28 01:56:09 +0000
commit58af2b56bf681998479e347f2de9daf4ff73f726 (patch)
treeff7f9cbfc99d79fe335e0f28fe92b0165be41d08 /gtk/gtkimage.c
parent36d80dc374b055205b566552ada7c4e0c45764ee (diff)
downloadgtk+-58af2b56bf681998479e347f2de9daf4ff73f726.tar.gz
deprecated gtk_widget_freeze_accelerators and
Sat Nov 28 00:06:49 1998 Tim Janik <timj@gtk.org> * gtk/gtkwidget.h: * gtk/gtkwidget.c: deprecated gtk_widget_freeze_accelerators and gtk_widget_thaw_accelerators, we provide gtk_widget_lock_accelerators and gtk_widget_unlock_accelerators. * gtk/gtklayout.h: * gtk/gtklayout.c: implemented incremental freezing facility. * gtk/gtktext.h: * gtk/gtktext.c: implemented incremental freezing facility. * gtk/gtkenums.h: * gtk/gtkaccelgroup.h: moved enum GtkAccelFlags into this place. * gtk/gtkentry.h: * gtk/gtkentry.c: deprecated gtk_entry_adjust_scroll(). * random GtkType, macro and indentation fixes. Fri Nov 27 22:50:15 1998 Tim Janik <timj@gtk.org> * gtk/gtkclist.h: * gtk/gtkclist.c: implemented incremental freezing facility, added a new class member (*refresh)() which takes over the thaw functionality. the clist FROZEN flag got removed on the way. * gtk/gtkctree.c: adaptions to feature the clist refresh functionality and incremental freezing. * gtk/gtkcalendar.c: implemented incremental freezing facility.
Diffstat (limited to 'gtk/gtkimage.c')
-rw-r--r--gtk/gtkimage.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 3f2cb73e62..9b26aafb2f 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -26,10 +26,10 @@ static gint gtk_image_expose (GtkWidget *widget,
GdkEventExpose *event);
-guint
+GtkType
gtk_image_get_type (void)
{
- static guint image_type = 0;
+ static GtkType image_type = 0;
if (!image_type)
{
@@ -45,7 +45,7 @@ gtk_image_get_type (void)
(GtkClassInitFunc) NULL,
};
- image_type = gtk_type_unique (gtk_misc_get_type (), &image_info);
+ image_type = gtk_type_unique (GTK_TYPE_MISC, &image_info);
}
return image_type;
@@ -78,7 +78,7 @@ gtk_image_new (GdkImage *val,
g_return_val_if_fail (val != NULL, NULL);
- image = gtk_type_new (gtk_image_get_type ());
+ image = gtk_type_new (GTK_TYPE_IMAGE);
gtk_image_set (image, val, mask);