summaryrefslogtreecommitdiff
path: root/gtk/gtklayout.h
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/gtklayout.h
parent36d80dc374b055205b566552ada7c4e0c45764ee (diff)
downloadgdk-pixbuf-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/gtklayout.h')
-rw-r--r--gtk/gtklayout.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 0b8198fb1..9ec2812fa 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -32,9 +32,11 @@
extern "C" {
#endif /* __cplusplus */
-#define GTK_LAYOUT(obj) GTK_CHECK_CAST (obj, gtk_layout_get_type (), GtkLayout)
-#define GTK_LAYOUT_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_layout_get_type (), GtkLayoutClass)
-#define GTK_IS_LAYOUT(obj) GTK_CHECK_TYPE (obj, gtk_layout_get_type ())
+#define GTK_TYPE_LAYOUT (gtk_layout_get_type ())
+#define GTK_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LAYOUT, GtkLayout))
+#define GTK_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LAYOUT, GtkLayoutClass))
+#define GTK_IS_LAYOUT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LAYOUT))
+#define GTK_IS_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
typedef struct _GtkLayout GtkLayout;
typedef struct _GtkLayoutClass GtkLayoutClass;
@@ -69,7 +71,7 @@ struct _GtkLayout {
gint scroll_x;
gint scroll_y;
- guint frozen : 1;
+ guint freeze_count;
};
struct _GtkLayoutClass {
@@ -80,10 +82,9 @@ struct _GtkLayoutClass {
GtkAdjustment *vadjustment);
};
+GtkType gtk_layout_get_type (void);
GtkWidget* gtk_layout_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
-
-guint gtk_layout_get_type (void);
void gtk_layout_put (GtkLayout *layout,
GtkWidget *widget,
gint x,