summaryrefslogtreecommitdiff
path: root/gtk/gtkcontainer.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@gtk.org>1998-06-19 01:26:24 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-06-19 01:26:24 +0000
commit913831b26f3b4b0a69dce8574017a78828e93b83 (patch)
tree6454867cb387f24084917262261e1cdd7c4dcf89 /gtk/gtkcontainer.h
parent25bd56b9957d930a2edd573d52ef389493a224ae (diff)
downloadgtk+-913831b26f3b4b0a69dce8574017a78828e93b83.tar.gz
Remove --g-fatal-warnings flag from argv.
Thu Jun 18 21:13:54 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Remove --g-fatal-warnings flag from argv. Thu Jun 18 20:22:28 1998 Owen Taylor <otaylor@gtk.org> * gtk/genmarshal.pl: Modified to be more idiomatic Perl, to be more readable perl, to spit out stuff that looks more like readable C, and to pipe output through indent so output looks a lot like readable C. No functional changes. Thu Jun 18 17:43:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpixmap.[ch] (gtk_pixmap_set): Clear the background if necessary when switching to a masked pixmap. (Based on a patch from Ullrich Hafner <hafner@informatik.uni-wuerzburg.de>) Thu Jun 18 16:18:10 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkeditable.[ch]: Added action signals for keyboard bindings. (move_cursor, kill_word, etc, etc, etc). removed the time argument from gtk_editable_cut/copy/paste_clipboard (source but not binary incompatible...) Instead get time from gtk_get_current_event (). * gtk/gtktext.c gtk/gtkentry.c: Support the new editable signals. Thu Jun 18 02:52:09 1998 Owen Taylor <otaylor@gtk.org> Patches from Damon Chaplin <DAChaplin@email.msn.com>: gtk/gtkfontsel.h: Fixed GtkFontSelectionClass - I forgot to change parent class to GtkNotebookClass when splitting the widget in two. Also updated some comments. gtk/gtkfontsel.c: Fixed bug when toggling 'Allow scaled bitmaps' button without a font selected. Fixed bug in set_font_name - I hadn't updated the code to search for the style in the font_style clist - it was still assuming the style row was equal to its index, but it isn't any more. Changed 'Reset' button on filter page to 'Clear Filter'. Deleted old code relating to the old 'Filter Fonts' toggle Updated some comments. Cleared 'Actual Fontname' if no font is set. gtk/testgtk.c: Fixed problem when 'OK' button is pressed - it was destroying the GtkFontSelection instead of the GtkFontSelectionDialog. Thu Jun 18 02:15:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkmain.c (gtk_init): Added --g-fatal-warnings flag to make all warnings fatal errors. * gtk/testthreads.c: moved <pthreads.h> include inside #ifdef USE_PTHREADS Thu Jun 18 01:37:31 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkenums.h gtk/gtkcontainer.[ch] gtk/gtkwidget.c gtk/gtkmenu.c gtk/gtkviewport.c gtk/gtkwindow.c: - Added new function gtk_container_set_resize_mode() for fine-grained control of where resize-queueing is done. - Removed GtkContainer::need_resize and GtkWindow::move_resize - Added GtkContainer::check_resize to replace need_resize. - Added function gtk_container_check_resize() to trigger queued resizes, and gtk_container_resize_children() to Figure which children need to be size-allocated. (logic moved from gtkwindow.c) - Reorganized code in gtkwindow.c - Set the resize-mode for viewports so that resizes within a viewport don't propagate out of it.
Diffstat (limited to 'gtk/gtkcontainer.h')
-rw-r--r--gtk/gtkcontainer.h38
1 files changed, 28 insertions, 10 deletions
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 62916110c6..72cf24ea5c 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -49,9 +49,8 @@ struct _GtkContainer
GtkWidget *focus_child;
guint border_width : 16;
- guint auto_resize : 1;
guint need_resize : 1;
- guint block_resize : 1;
+ guint resize_mode : 2;
/* The list of children that requested a resize
@@ -69,7 +68,7 @@ struct _GtkContainerClass
GtkWidget *widget);
void (* remove) (GtkContainer *container,
GtkWidget *widget);
- gint (* need_resize) (GtkContainer *container);
+ void (* check_resize) (GtkContainer *container);
void (* foreach) (GtkContainer *container,
GtkCallback callback,
gpointer callbabck_data);
@@ -88,6 +87,7 @@ struct _GtkContainerClass
guint arg_id);
};
+/* Application-level methods */
GtkType gtk_container_get_type (void);
void gtk_container_border_width (GtkContainer *container,
@@ -96,11 +96,12 @@ 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_set_resize_mode (GtkContainer *container,
+ GtkResizeMode resize_mode);
+
+void gtk_container_check_resize (GtkContainer *container);
+
void gtk_container_foreach (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
@@ -114,16 +115,20 @@ void gtk_container_foreach_full (GtkContainer *container,
gpointer callback_data,
GtkDestroyNotify notify);
GList* gtk_container_children (GtkContainer *container);
-void gtk_container_register_toplevel (GtkContainer *container);
-void gtk_container_unregister_toplevel (GtkContainer *container);
gint gtk_container_focus (GtkContainer *container,
GtkDirectionType direction);
+
+/* Widget-level methods */
+
void gtk_container_set_focus_child (GtkContainer *container,
GtkWidget *child);
void gtk_container_set_focus_vadjustment (GtkContainer *container,
GtkAdjustment *adjustment);
void gtk_container_set_focus_hadjustment (GtkContainer *container,
GtkAdjustment *adjustment);
+void gtk_container_register_toplevel (GtkContainer *container);
+void gtk_container_unregister_toplevel (GtkContainer *container);
+void gtk_container_resize_children (GtkContainer *container);
GtkType gtk_container_child_type (GtkContainer *container);
@@ -173,8 +178,21 @@ void gtk_container_add_with_argv (GtkContainer *container,
GtkArg *args);
+/* Non-public methods */
+void gtk_container_clear_resize_widgets (GtkContainer *container);
+
+/* Deprecated methods */
+/* completely non-functional */
+void gtk_container_disable_resize (GtkContainer *container);
+void gtk_container_enable_resize (GtkContainer *container);
+
+/* Use gtk_container_set_resize_mode() instead */
+void gtk_container_block_resize (GtkContainer *container);
+void gtk_container_unblock_resize (GtkContainer *container);
+/* Use gtk_container_check_resize() instead */
+gint gtk_container_need_resize (GtkContainer *container);
#ifdef __cplusplus
}