summaryrefslogtreecommitdiff
path: root/gtk/gtkcontainer.h
diff options
context:
space:
mode:
authorTim Janik <timj@gimp.org>1998-02-02 04:54:25 +0000
committerTim Janik <timj@src.gnome.org>1998-02-02 04:54:25 +0000
commiteef38289b2379669784be1b030b1c803ebc7ee69 (patch)
treebbd108413216f18474aac3af49605a79a1264a10 /gtk/gtkcontainer.h
parent81fe36047e9bfbf27b224cd35cc869ca6082bf38 (diff)
downloadgtk+-eef38289b2379669784be1b030b1c803ebc7ee69.tar.gz
GTK_RESIZE_NEEDED is a private flag now.
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org> * gtk/gtkcontainer.h: * gtk/gtkcontainer.c: GTK_RESIZE_NEEDED is a private flag now. (gtk_container_register_toplevel): new function. (gtk_container_unregister_toplevel): new function. * gtk/gtkmain.c: GTK_LEAVE_PENDING is a private flag now. * gtk/gtkmenu.c: call gtk_container_register_toplevel in gtk_menu_class_init instead of this dirty gtk_widget_set_parent(,NULL) hack. new default handler gtk_menu_destroy for calling gtk_container_unregister_toplevel. removed GTK_ANCHORED, GTK_UNMAPPED. * gtk/gtkobject.h: macro cleanups, added GTK_DESTROYED flag. * gtk/gtkobject.c: only emit DESTROY signal if !GTK_OBJECT_DESTROYED (object). * gtk/gtkprivate.h: new file that will not be automatically included. it holds the private flags for GtkWidget along with it's SET/UNSET and examination macros. * gtk/gtkwidget.c: private flags: GTK_RESIZE_NEEDED, GTK_REDRAW_PENDING, GTK_RESIZE_PENDING, GTK_IN_REPARENT, GTK_USER_STYLE. GTK_ANCHORED is replaced by GTK_TOPLEVEL. added missing UNSET for GTK_IN_REPARENT. removed the gtk_widget_set_parent(, NULL) hack for toplevels. upon destroy free memory for widgets with GTK_WIDGET_HAS_SHAPE_MASK. * gtk/gtkwidget.h: split up the widget flags into a public and a private portion. added an extra field private_flags to GtkWidget without making it bigger by using an alignment gap of 16 bit. macro cleanups. * gtk/gtkwindow.c: removed GTK_ANCHORED. new function gtk_window_destroy for calling gtk_container_unregister_toplevel. removed the gtk_widget_set_parent(,NULL), call gtk_container_register_toplevel instead. remove GTK_UNMAPPED. GTK_RESIZE_NEEDED is private now. * gtk/gtksignal.c (gtk_signal_disconnect): removed a bug on removal that cut off the handler list -> living_objects == 0 with testgtk. made some warnings more descriptive. new function gtk_signal_connect_object_while_alive, which will automatically destroy the connection once one of the objects is destroyed. didn't include this before removal of the above mentioned bug. * reflected refcounting revolution in ChangeLog
Diffstat (limited to 'gtk/gtkcontainer.h')
-rw-r--r--gtk/gtkcontainer.h50
1 files changed, 27 insertions, 23 deletions
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index bcb43aec18..6904bc5786 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -43,6 +43,7 @@ struct _GtkContainer
GtkWidget widget;
GtkWidget *focus_child;
+
gint16 border_width;
guint auto_resize : 1;
guint need_resize : 1;
@@ -72,29 +73,32 @@ struct _GtkContainerClass
-guint gtk_container_get_type (void);
-void gtk_container_border_width (GtkContainer *container,
- gint border_width);
-void gtk_container_add (GtkContainer *container,
- GtkWidget *widget);
-void gtk_container_remove (GtkContainer *container,
- GtkWidget *widget);
-void gtk_container_disable_resize (GtkContainer *container);
-void gtk_container_enable_resize (GtkContainer *container);
-void gtk_container_block_resize (GtkContainer *container);
-void gtk_container_unblock_resize (GtkContainer *container);
-gint gtk_container_need_resize (GtkContainer *container);
-void gtk_container_foreach (GtkContainer *container,
- GtkCallback callback,
- gpointer callback_data);
-void gtk_container_foreach_interp (GtkContainer *container,
- GtkCallbackMarshal callback,
- gpointer callback_data,
- GtkDestroyNotify notify);
-gint gtk_container_focus (GtkContainer *container,
- GtkDirectionType direction);
-GList* gtk_container_children (GtkContainer *container);
-
+guint gtk_container_get_type (void);
+void gtk_container_border_width (GtkContainer *container,
+ gint border_width);
+void gtk_container_add (GtkContainer *container,
+ GtkWidget *widget);
+void gtk_container_remove (GtkContainer *container,
+ GtkWidget *widget);
+void gtk_container_disable_resize (GtkContainer *container);
+void gtk_container_enable_resize (GtkContainer *container);
+void gtk_container_block_resize (GtkContainer *container);
+void gtk_container_unblock_resize (GtkContainer *container);
+gint gtk_container_need_resize (GtkContainer *container);
+void gtk_container_foreach (GtkContainer *container,
+ GtkCallback callback,
+ gpointer callback_data);
+void gtk_container_foreach_interp (GtkContainer *container,
+ GtkCallbackMarshal callback,
+ gpointer callback_data,
+ GtkDestroyNotify notify);
+gint gtk_container_focus (GtkContainer *container,
+ GtkDirectionType direction);
+GList* gtk_container_children (GtkContainer *container);
+
+void gtk_container_register_toplevel (GtkContainer *container);
+void gtk_container_unregister_toplevel (GtkContainer *container);
+
#ifdef __cplusplus
}