1997-11-24 22:37:52 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
|
|
|
#include "gtkbox.h"
|
|
|
|
|
1998-01-17 07:52:38 +00:00
|
|
|
enum {
|
|
|
|
ARG_0,
|
|
|
|
ARG_SPACING,
|
|
|
|
ARG_HOMOGENEOUS
|
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-06-16 05:20:05 +00:00
|
|
|
enum {
|
|
|
|
CHILD_ARG_0,
|
|
|
|
CHILD_ARG_EXPAND,
|
|
|
|
CHILD_ARG_FILL,
|
|
|
|
CHILD_ARG_PADDING,
|
|
|
|
CHILD_ARG_PACK_TYPE,
|
|
|
|
CHILD_ARG_POSITION
|
|
|
|
};
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void gtk_box_class_init (GtkBoxClass *klass);
|
|
|
|
static void gtk_box_init (GtkBox *box);
|
1998-06-28 07:46:10 +00:00
|
|
|
static void gtk_box_get_arg (GtkObject *object,
|
1998-01-17 07:52:38 +00:00
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
1998-06-28 07:46:10 +00:00
|
|
|
static void gtk_box_set_arg (GtkObject *object,
|
1998-01-17 07:52:38 +00:00
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
1997-11-24 22:37:52 +00:00
|
|
|
static void gtk_box_map (GtkWidget *widget);
|
|
|
|
static void gtk_box_unmap (GtkWidget *widget);
|
|
|
|
static void gtk_box_draw (GtkWidget *widget,
|
|
|
|
GdkRectangle *area);
|
|
|
|
static gint gtk_box_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event);
|
|
|
|
static void gtk_box_add (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
|
|
|
static void gtk_box_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
GTK_MENU_DIR_CHILD: check for the existance of
Thu Sep 3 04:22:20 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
GTK_MENU_DIR_CHILD: check for the existance of
menu_shell->active_menu_item before accessing its child.
GTK_MENU_DIR_PREV:
GTK_MENU_DIR_NEXT: if we haven't had an active item and still
don't, make a default selection.
Wed Sep 2 00:28:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_propagate_state): iterate
the children with _forall for sensitivity changes and with
_foreach on pure state changes. this fixes a lot of the
old inclusions of internal widgets into _foreach calls.
* gtk/gtktree.c: removed gtk_tree_foreach, let gtk_tree_forall
do the work. don't walk the subtrees of first level children.
* gtk/gtktreeitem.c: provide a _forall implementation,
which walks the subtrees as well for include_internals.
* gtk/gtkmenuitem.c: provide a _forall implementation, which walks
the submenus as well for include_internals.
* gtk/gtkscrolledwindow.c: removed gtk_scrolled_window_foreach and
implemented gtk_scrolled_window_forall, which will iterate over
the viewport and the scrollbars for gtk_container_forall or
iterate over the viewports children for gtk_container_foreach.
* gtk/gtktoolbar.c:
* gtk/gtktable.c:
* gtk/gtkpaned.c:
* gtk/gtkpacker.c:
* gtk/gtkmenushell.c:
* gtk/gtklist.c:
* gtk/gtkfixed.c:
* gtk/gtkclist.c:
* gtk/gtkbox.c:
* gtk/gtkbin.c:
* gtk/gtknotebook.c:
removed the old gtk_*_foreach functions and provided gtk_*_forall.
* gtk/gtknotebook.c:
(gtk_notebook_real_switch_page): expose tabs.
(gtk_notebook_page_num): new function to return the page number
of a distinct child.
(gtk_notebook_focus): minor fixups. foxus handling is still screwed
under some circumstances.
* gtk/gtktreeitem.c:
(gtk_real_tree_item_select):
(gtk_real_tree_item_deselect): major fixes.
some general fixups wrt queue_redraw, and tree items not being
NO_WINDOW widgets.
* gtk/gtklistitem.c:
(gtk_real_list_item_select):
(gtk_real_list_item_deselect):
(gtk_real_list_item_toggle):
removed unneccessary queue_redraw calls.
Wed Aug 30 09:42:07 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c: allow optionmenus to have the focus and
automatically popup the menu on space bar.
Wed Aug 26 06:40:34 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.h:
* gtk/gtkcontainer.c: implemented gtk_container_forall() (as a class
method), which acts similar to gtk_container_foreach(), but iterates
over internal children. the GtkContainer::foreach signal vanished in
favour of a new class method ->forall() that optionally includes
internal widgets.
* gtk/gtkclist.c (gtk_clist_init): provide no _foreach implementation
but a _forall implementation, since all child widgets we have are
internal ones.
(column_button_create): set the parent window prior
to gtk_widget_set_parent().
* gtk/gtkwidget.c:
exchanged all calls to gtk_container_foreach() with
gtk_container_forall().
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: added the GTK_COMPOSITE_CHILD, exported through
the GtkWidget::composite_child argument. to have a widget created
with the flag initially, two new functions got added to wrap a widgets
creation:
gtk_widget_push_composite_flag() and gtk_widget_pop_composite_flag().
Wed Aug 25 23:37:39 1998 Tim Janik <timj@gtk.org>
* gtk/gtktooltips.h:
* gtk/gtktooltips.c: exported gtk_tooltips_create_window() as
gtk_tooltips_force_window(), so tooltips->tip_window can be accessed
prior to the first tip being set.
don't put an extra reference on the window, since it is a toplevel,
it wont get destroyed from anywhere else.
* overall macro and GtkType fixups.
1998-09-03 02:38:53 +00:00
|
|
|
static void gtk_box_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data);
|
1998-06-16 05:20:05 +00:00
|
|
|
static void gtk_box_set_child_arg (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static void gtk_box_get_child_arg (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static GtkType gtk_box_child_type (GtkContainer *container);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static GtkContainerClass *parent_class = NULL;
|
|
|
|
|
|
|
|
|
1998-06-17 08:48:22 +00:00
|
|
|
GtkType
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_box_get_type (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-17 08:48:22 +00:00
|
|
|
static GtkType box_type = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
if (!box_type)
|
|
|
|
{
|
1998-11-30 19:07:15 +00:00
|
|
|
static const GtkTypeInfo box_info =
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
"GtkBox",
|
|
|
|
sizeof (GtkBox),
|
|
|
|
sizeof (GtkBoxClass),
|
|
|
|
(GtkClassInitFunc) gtk_box_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_box_init,
|
1998-07-04 15:31:30 +00:00
|
|
|
/* reserved_1 */ NULL,
|
|
|
|
/* reserved_2 */ NULL,
|
1998-06-28 07:46:10 +00:00
|
|
|
(GtkClassInitFunc) NULL,
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
1998-06-17 08:48:22 +00:00
|
|
|
box_type = gtk_type_unique (GTK_TYPE_CONTAINER, &box_info);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return box_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_class_init (GtkBoxClass *class)
|
|
|
|
{
|
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
GtkContainerClass *container_class;
|
|
|
|
|
|
|
|
object_class = (GtkObjectClass*) class;
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
container_class = (GtkContainerClass*) class;
|
|
|
|
|
1998-06-17 08:48:22 +00:00
|
|
|
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-02-19 07:18:42 +00:00
|
|
|
gtk_object_add_arg_type ("GtkBox::spacing", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_SPACING);
|
|
|
|
gtk_object_add_arg_type ("GtkBox::homogeneous", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HOMOGENEOUS);
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_container_add_child_arg_type ("GtkBox::expand", GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_EXPAND);
|
|
|
|
gtk_container_add_child_arg_type ("GtkBox::fill", GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_FILL);
|
|
|
|
gtk_container_add_child_arg_type ("GtkBox::padding", GTK_TYPE_ULONG, GTK_ARG_READWRITE, CHILD_ARG_PADDING);
|
|
|
|
gtk_container_add_child_arg_type ("GtkBox::pack_type", GTK_TYPE_PACK_TYPE, GTK_ARG_READWRITE, CHILD_ARG_PACK_TYPE);
|
|
|
|
gtk_container_add_child_arg_type ("GtkBox::position", GTK_TYPE_LONG, GTK_ARG_READWRITE, CHILD_ARG_POSITION);
|
1998-01-17 07:52:38 +00:00
|
|
|
|
1998-06-28 07:46:10 +00:00
|
|
|
object_class->set_arg = gtk_box_set_arg;
|
|
|
|
object_class->get_arg = gtk_box_get_arg;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class->map = gtk_box_map;
|
|
|
|
widget_class->unmap = gtk_box_unmap;
|
|
|
|
widget_class->draw = gtk_box_draw;
|
|
|
|
widget_class->expose_event = gtk_box_expose;
|
|
|
|
|
|
|
|
container_class->add = gtk_box_add;
|
|
|
|
container_class->remove = gtk_box_remove;
|
GTK_MENU_DIR_CHILD: check for the existance of
Thu Sep 3 04:22:20 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
GTK_MENU_DIR_CHILD: check for the existance of
menu_shell->active_menu_item before accessing its child.
GTK_MENU_DIR_PREV:
GTK_MENU_DIR_NEXT: if we haven't had an active item and still
don't, make a default selection.
Wed Sep 2 00:28:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_propagate_state): iterate
the children with _forall for sensitivity changes and with
_foreach on pure state changes. this fixes a lot of the
old inclusions of internal widgets into _foreach calls.
* gtk/gtktree.c: removed gtk_tree_foreach, let gtk_tree_forall
do the work. don't walk the subtrees of first level children.
* gtk/gtktreeitem.c: provide a _forall implementation,
which walks the subtrees as well for include_internals.
* gtk/gtkmenuitem.c: provide a _forall implementation, which walks
the submenus as well for include_internals.
* gtk/gtkscrolledwindow.c: removed gtk_scrolled_window_foreach and
implemented gtk_scrolled_window_forall, which will iterate over
the viewport and the scrollbars for gtk_container_forall or
iterate over the viewports children for gtk_container_foreach.
* gtk/gtktoolbar.c:
* gtk/gtktable.c:
* gtk/gtkpaned.c:
* gtk/gtkpacker.c:
* gtk/gtkmenushell.c:
* gtk/gtklist.c:
* gtk/gtkfixed.c:
* gtk/gtkclist.c:
* gtk/gtkbox.c:
* gtk/gtkbin.c:
* gtk/gtknotebook.c:
removed the old gtk_*_foreach functions and provided gtk_*_forall.
* gtk/gtknotebook.c:
(gtk_notebook_real_switch_page): expose tabs.
(gtk_notebook_page_num): new function to return the page number
of a distinct child.
(gtk_notebook_focus): minor fixups. foxus handling is still screwed
under some circumstances.
* gtk/gtktreeitem.c:
(gtk_real_tree_item_select):
(gtk_real_tree_item_deselect): major fixes.
some general fixups wrt queue_redraw, and tree items not being
NO_WINDOW widgets.
* gtk/gtklistitem.c:
(gtk_real_list_item_select):
(gtk_real_list_item_deselect):
(gtk_real_list_item_toggle):
removed unneccessary queue_redraw calls.
Wed Aug 30 09:42:07 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c: allow optionmenus to have the focus and
automatically popup the menu on space bar.
Wed Aug 26 06:40:34 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.h:
* gtk/gtkcontainer.c: implemented gtk_container_forall() (as a class
method), which acts similar to gtk_container_foreach(), but iterates
over internal children. the GtkContainer::foreach signal vanished in
favour of a new class method ->forall() that optionally includes
internal widgets.
* gtk/gtkclist.c (gtk_clist_init): provide no _foreach implementation
but a _forall implementation, since all child widgets we have are
internal ones.
(column_button_create): set the parent window prior
to gtk_widget_set_parent().
* gtk/gtkwidget.c:
exchanged all calls to gtk_container_foreach() with
gtk_container_forall().
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: added the GTK_COMPOSITE_CHILD, exported through
the GtkWidget::composite_child argument. to have a widget created
with the flag initially, two new functions got added to wrap a widgets
creation:
gtk_widget_push_composite_flag() and gtk_widget_pop_composite_flag().
Wed Aug 25 23:37:39 1998 Tim Janik <timj@gtk.org>
* gtk/gtktooltips.h:
* gtk/gtktooltips.c: exported gtk_tooltips_create_window() as
gtk_tooltips_force_window(), so tooltips->tip_window can be accessed
prior to the first tip being set.
don't put an extra reference on the window, since it is a toplevel,
it wont get destroyed from anywhere else.
* overall macro and GtkType fixups.
1998-09-03 02:38:53 +00:00
|
|
|
container_class->forall = gtk_box_forall;
|
1998-06-16 05:20:05 +00:00
|
|
|
container_class->child_type = gtk_box_child_type;
|
|
|
|
container_class->set_child_arg = gtk_box_set_child_arg;
|
|
|
|
container_class->get_child_arg = gtk_box_get_child_arg;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_init (GtkBox *box)
|
|
|
|
{
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
box->children = NULL;
|
|
|
|
box->spacing = 0;
|
|
|
|
box->homogeneous = FALSE;
|
|
|
|
}
|
|
|
|
|
1998-01-17 07:52:38 +00:00
|
|
|
static void
|
1998-06-28 07:46:10 +00:00
|
|
|
gtk_box_set_arg (GtkObject *object,
|
1998-01-17 07:52:38 +00:00
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
1998-06-28 07:46:10 +00:00
|
|
|
GtkBox *box;
|
|
|
|
|
|
|
|
box = GTK_BOX (object);
|
|
|
|
|
1998-01-17 07:52:38 +00:00
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_SPACING:
|
|
|
|
gtk_box_set_spacing (box, GTK_VALUE_INT (*arg));
|
|
|
|
break;
|
|
|
|
case ARG_HOMOGENEOUS:
|
|
|
|
gtk_box_set_homogeneous (box, GTK_VALUE_BOOL (*arg));
|
|
|
|
break;
|
1998-01-21 23:03:11 +00:00
|
|
|
default:
|
|
|
|
break;
|
1998-01-17 07:52:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-06-28 07:46:10 +00:00
|
|
|
gtk_box_get_arg (GtkObject *object,
|
1998-01-17 07:52:38 +00:00
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
1998-06-28 07:46:10 +00:00
|
|
|
GtkBox *box;
|
|
|
|
|
|
|
|
box = GTK_BOX (object);
|
|
|
|
|
1998-01-17 07:52:38 +00:00
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_SPACING:
|
|
|
|
GTK_VALUE_INT (*arg) = box->spacing;
|
|
|
|
break;
|
|
|
|
case ARG_HOMOGENEOUS:
|
|
|
|
GTK_VALUE_BOOL (*arg) = box->homogeneous;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
arg->type = GTK_TYPE_INVALID;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-06-16 05:20:05 +00:00
|
|
|
static GtkType
|
|
|
|
gtk_box_child_type (GtkContainer *container)
|
|
|
|
{
|
|
|
|
return GTK_TYPE_WIDGET;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_set_child_arg (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
gboolean expand = 0;
|
|
|
|
gboolean fill = 0;
|
|
|
|
guint padding = 0;
|
|
|
|
GtkPackType pack_type = 0;
|
|
|
|
|
|
|
|
if (arg_id != CHILD_ARG_POSITION)
|
|
|
|
gtk_box_query_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
&expand,
|
|
|
|
&fill,
|
|
|
|
&padding,
|
|
|
|
&pack_type);
|
|
|
|
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case CHILD_ARG_EXPAND:
|
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
GTK_VALUE_BOOL (*arg),
|
|
|
|
fill,
|
|
|
|
padding,
|
|
|
|
pack_type);
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_FILL:
|
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
expand,
|
|
|
|
GTK_VALUE_BOOL (*arg),
|
|
|
|
padding,
|
|
|
|
pack_type);
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_PADDING:
|
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
expand,
|
|
|
|
fill,
|
|
|
|
GTK_VALUE_ULONG (*arg),
|
|
|
|
pack_type);
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_PACK_TYPE:
|
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
expand,
|
|
|
|
fill,
|
|
|
|
padding,
|
|
|
|
GTK_VALUE_ENUM (*arg));
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_POSITION:
|
|
|
|
gtk_box_reorder_child (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
GTK_VALUE_LONG (*arg));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_get_child_arg (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
gboolean expand = 0;
|
|
|
|
gboolean fill = 0;
|
|
|
|
guint padding = 0;
|
|
|
|
GtkPackType pack_type = 0;
|
|
|
|
GList *list;
|
|
|
|
|
|
|
|
if (arg_id != CHILD_ARG_POSITION)
|
|
|
|
gtk_box_query_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
&expand,
|
|
|
|
&fill,
|
|
|
|
&padding,
|
|
|
|
&pack_type);
|
|
|
|
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case CHILD_ARG_EXPAND:
|
|
|
|
GTK_VALUE_BOOL (*arg) = expand;
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_FILL:
|
|
|
|
GTK_VALUE_BOOL (*arg) = fill;
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_PADDING:
|
|
|
|
GTK_VALUE_ULONG (*arg) = padding;
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_PACK_TYPE:
|
|
|
|
GTK_VALUE_ENUM (*arg) = pack_type;
|
|
|
|
break;
|
|
|
|
case CHILD_ARG_POSITION:
|
|
|
|
GTK_VALUE_LONG (*arg) = 0;
|
|
|
|
for (list = GTK_BOX (container)->children; list; list = list->next)
|
|
|
|
{
|
|
|
|
GtkBoxChild *child_entry;
|
|
|
|
|
|
|
|
child_entry = list->data;
|
|
|
|
if (child_entry->widget == child)
|
|
|
|
break;
|
|
|
|
GTK_VALUE_LONG (*arg)++;
|
|
|
|
}
|
|
|
|
if (!list)
|
|
|
|
GTK_VALUE_LONG (*arg) = -1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
arg->type = GTK_TYPE_INVALID;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_box_pack_start (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
1998-06-16 05:20:05 +00:00
|
|
|
gboolean expand,
|
|
|
|
gboolean fill,
|
|
|
|
guint padding)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkBoxChild *child_info;
|
|
|
|
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
1998-05-01 04:23:59 +00:00
|
|
|
g_return_if_fail (child->parent == NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
child_info = g_new (GtkBoxChild, 1);
|
|
|
|
child_info->widget = child;
|
|
|
|
child_info->padding = padding;
|
|
|
|
child_info->expand = expand ? TRUE : FALSE;
|
|
|
|
child_info->fill = fill ? TRUE : FALSE;
|
|
|
|
child_info->pack = GTK_PACK_START;
|
|
|
|
|
|
|
|
box->children = g_list_append (box->children, child_info);
|
|
|
|
|
|
|
|
gtk_widget_set_parent (child, GTK_WIDGET (box));
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (GTK_WIDGET (box)))
|
|
|
|
{
|
|
|
|
if (GTK_WIDGET_REALIZED (GTK_WIDGET (box)) &&
|
|
|
|
!GTK_WIDGET_REALIZED (child))
|
|
|
|
gtk_widget_realize (child);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_MAPPED (GTK_WIDGET (box)) &&
|
|
|
|
!GTK_WIDGET_MAPPED (child))
|
|
|
|
gtk_widget_map (child);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
|
|
|
|
gtk_widget_queue_resize (child);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_box_pack_end (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
1998-06-16 05:20:05 +00:00
|
|
|
gboolean expand,
|
|
|
|
gboolean fill,
|
|
|
|
guint padding)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkBoxChild *child_info;
|
|
|
|
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
1998-05-01 04:23:59 +00:00
|
|
|
g_return_if_fail (child->parent == NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
child_info = g_new (GtkBoxChild, 1);
|
|
|
|
child_info->widget = child;
|
|
|
|
child_info->padding = padding;
|
|
|
|
child_info->expand = expand ? TRUE : FALSE;
|
|
|
|
child_info->fill = fill ? TRUE : FALSE;
|
|
|
|
child_info->pack = GTK_PACK_END;
|
|
|
|
|
|
|
|
box->children = g_list_append (box->children, child_info);
|
|
|
|
|
|
|
|
gtk_widget_set_parent (child, GTK_WIDGET (box));
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (GTK_WIDGET (box)))
|
|
|
|
{
|
|
|
|
if (GTK_WIDGET_REALIZED (GTK_WIDGET (box)) &&
|
|
|
|
!GTK_WIDGET_REALIZED (child))
|
|
|
|
gtk_widget_realize (child);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_MAPPED (GTK_WIDGET (box)) &&
|
|
|
|
!GTK_WIDGET_MAPPED (child))
|
|
|
|
gtk_widget_map (child);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
|
|
|
|
gtk_widget_queue_resize (child);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_box_pack_start_defaults (GtkBox *box,
|
|
|
|
GtkWidget *child)
|
|
|
|
{
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
|
|
|
|
|
|
|
gtk_box_pack_start (box, child, TRUE, TRUE, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_box_pack_end_defaults (GtkBox *box,
|
|
|
|
GtkWidget *child)
|
|
|
|
{
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
|
|
|
|
|
|
|
gtk_box_pack_end (box, child, TRUE, TRUE, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_set_homogeneous (GtkBox *box,
|
|
|
|
gboolean homogeneous)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
|
|
|
|
if ((homogeneous ? TRUE : FALSE) != box->homogeneous)
|
|
|
|
{
|
|
|
|
box->homogeneous = homogeneous ? TRUE : FALSE;
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (box));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_box_set_spacing (GtkBox *box,
|
|
|
|
gint spacing)
|
|
|
|
{
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
|
|
|
|
if (spacing != box->spacing)
|
|
|
|
{
|
|
|
|
box->spacing = spacing;
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (box));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-18 03:09:42 +00:00
|
|
|
void
|
|
|
|
gtk_box_reorder_child (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
1998-06-16 05:20:05 +00:00
|
|
|
gint position)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
|
|
|
GList *list;
|
|
|
|
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
|
|
|
|
|
|
|
list = box->children;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
GtkBoxChild *child_info;
|
|
|
|
|
|
|
|
child_info = list->data;
|
|
|
|
if (child_info->widget == child)
|
|
|
|
break;
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
1998-01-18 04:15:22 +00:00
|
|
|
if (list && box->children->next)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
|
|
|
|
if (list->next)
|
|
|
|
list->next->prev = list->prev;
|
|
|
|
if (list->prev)
|
|
|
|
list->prev->next = list->next;
|
1998-01-18 04:15:22 +00:00
|
|
|
else
|
|
|
|
box->children = list->next;
|
1998-01-18 03:09:42 +00:00
|
|
|
|
|
|
|
tmp_list = box->children;
|
1998-06-16 05:20:05 +00:00
|
|
|
while (position && tmp_list->next)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
position--;
|
1998-01-18 03:09:42 +00:00
|
|
|
tmp_list = tmp_list->next;
|
|
|
|
}
|
|
|
|
|
1998-06-16 05:20:05 +00:00
|
|
|
if (position)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
|
|
|
tmp_list->next = list;
|
|
|
|
list->prev = tmp_list;
|
|
|
|
list->next = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (tmp_list->prev)
|
|
|
|
tmp_list->prev->next = list;
|
|
|
|
else
|
|
|
|
box->children = list;
|
|
|
|
list->prev = tmp_list->prev;
|
|
|
|
tmp_list->prev = list;
|
|
|
|
list->next = tmp_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
|
|
|
|
gtk_widget_queue_resize (child);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_box_query_child_packing (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
1998-06-16 05:20:05 +00:00
|
|
|
gboolean *expand,
|
|
|
|
gboolean *fill,
|
|
|
|
guint *padding,
|
1998-01-18 03:09:42 +00:00
|
|
|
GtkPackType *pack_type)
|
|
|
|
{
|
|
|
|
GList *list;
|
|
|
|
GtkBoxChild *child_info;
|
|
|
|
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
|
|
|
|
|
|
|
list = box->children;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
child_info = list->data;
|
|
|
|
if (child_info->widget == child)
|
|
|
|
break;
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
if (expand)
|
|
|
|
*expand = child_info->expand;
|
|
|
|
if (fill)
|
|
|
|
*fill = child_info->fill;
|
|
|
|
if (padding)
|
|
|
|
*padding = child_info->padding;
|
|
|
|
if (pack_type)
|
|
|
|
*pack_type = child_info->pack;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_box_set_child_packing (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
1998-06-16 05:20:05 +00:00
|
|
|
gboolean expand,
|
|
|
|
gboolean fill,
|
|
|
|
guint padding,
|
|
|
|
GtkPackType pack_type)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
|
|
|
GList *list;
|
|
|
|
GtkBoxChild *child_info;
|
|
|
|
|
|
|
|
g_return_if_fail (box != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (child != NULL);
|
|
|
|
|
|
|
|
list = box->children;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
child_info = list->data;
|
|
|
|
if (child_info->widget == child)
|
|
|
|
break;
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
child_info->expand = expand != FALSE;
|
|
|
|
child_info->fill = fill != FALSE;
|
|
|
|
child_info->padding = padding;
|
|
|
|
if (pack_type == GTK_PACK_END)
|
|
|
|
child_info->pack = GTK_PACK_END;
|
|
|
|
else
|
|
|
|
child_info->pack = GTK_PACK_START;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box))
|
1998-06-24 06:25:14 +00:00
|
|
|
gtk_widget_queue_resize (child);
|
1998-01-18 03:09:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_box_map (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (widget));
|
|
|
|
|
|
|
|
box = GTK_BOX (widget);
|
|
|
|
GTK_WIDGET_SET_FLAGS (box, GTK_MAPPED);
|
|
|
|
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget) &&
|
|
|
|
!GTK_WIDGET_MAPPED (child->widget))
|
|
|
|
gtk_widget_map (child->widget);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_unmap (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (widget));
|
|
|
|
|
|
|
|
box = GTK_BOX (widget);
|
|
|
|
GTK_WIDGET_UNSET_FLAGS (box, GTK_MAPPED);
|
|
|
|
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget) &&
|
|
|
|
GTK_WIDGET_MAPPED (child->widget))
|
|
|
|
gtk_widget_unmap (child->widget);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_draw (GtkWidget *widget,
|
|
|
|
GdkRectangle *area)
|
|
|
|
{
|
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GdkRectangle child_area;
|
|
|
|
GList *children;
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (widget));
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
|
|
|
{
|
|
|
|
box = GTK_BOX (widget);
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
1998-11-06 22:05:02 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (gtk_widget_intersect (child->widget, area, &child_area))
|
|
|
|
gtk_widget_draw (child->widget, &child_area);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
gtk_box_expose (GtkWidget *widget,
|
|
|
|
GdkEventExpose *event)
|
|
|
|
{
|
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GdkEventExpose child_event;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
g_return_val_if_fail (widget != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (GTK_IS_BOX (widget), FALSE);
|
|
|
|
g_return_val_if_fail (event != NULL, FALSE);
|
|
|
|
|
|
|
|
if (GTK_WIDGET_DRAWABLE (widget))
|
|
|
|
{
|
|
|
|
box = GTK_BOX (widget);
|
|
|
|
|
|
|
|
child_event = *event;
|
|
|
|
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (GTK_WIDGET_NO_WINDOW (child->widget) &&
|
|
|
|
gtk_widget_intersect (child->widget, &event->area, &child_event.area))
|
|
|
|
gtk_widget_event (child->widget, (GdkEvent*) &child_event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_add (GtkContainer *container,
|
|
|
|
GtkWidget *widget)
|
|
|
|
{
|
|
|
|
g_return_if_fail (container != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (container));
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
|
|
|
|
gtk_box_pack_start_defaults (GTK_BOX (container), widget);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
g_return_if_fail (container != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (container));
|
|
|
|
g_return_if_fail (widget != NULL);
|
|
|
|
|
|
|
|
box = GTK_BOX (container);
|
|
|
|
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
|
|
|
|
if (child->widget == widget)
|
|
|
|
{
|
1998-06-24 17:15:05 +00:00
|
|
|
gboolean was_visible;
|
1998-03-24 03:34:38 +00:00
|
|
|
|
1998-06-24 17:15:05 +00:00
|
|
|
was_visible = GTK_WIDGET_VISIBLE (widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_unparent (widget);
|
|
|
|
|
|
|
|
box->children = g_list_remove_link (box->children, children);
|
|
|
|
g_list_free (children);
|
|
|
|
g_free (child);
|
|
|
|
|
1998-06-24 17:15:05 +00:00
|
|
|
/* queue resize regardless of GTK_WIDGET_VISIBLE (container),
|
|
|
|
* since that's what is needed by toplevels.
|
|
|
|
*/
|
|
|
|
if (was_visible)
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (container));
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
children = children->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
GTK_MENU_DIR_CHILD: check for the existance of
Thu Sep 3 04:22:20 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):
GTK_MENU_DIR_CHILD: check for the existance of
menu_shell->active_menu_item before accessing its child.
GTK_MENU_DIR_PREV:
GTK_MENU_DIR_NEXT: if we haven't had an active item and still
don't, make a default selection.
Wed Sep 2 00:28:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_propagate_state): iterate
the children with _forall for sensitivity changes and with
_foreach on pure state changes. this fixes a lot of the
old inclusions of internal widgets into _foreach calls.
* gtk/gtktree.c: removed gtk_tree_foreach, let gtk_tree_forall
do the work. don't walk the subtrees of first level children.
* gtk/gtktreeitem.c: provide a _forall implementation,
which walks the subtrees as well for include_internals.
* gtk/gtkmenuitem.c: provide a _forall implementation, which walks
the submenus as well for include_internals.
* gtk/gtkscrolledwindow.c: removed gtk_scrolled_window_foreach and
implemented gtk_scrolled_window_forall, which will iterate over
the viewport and the scrollbars for gtk_container_forall or
iterate over the viewports children for gtk_container_foreach.
* gtk/gtktoolbar.c:
* gtk/gtktable.c:
* gtk/gtkpaned.c:
* gtk/gtkpacker.c:
* gtk/gtkmenushell.c:
* gtk/gtklist.c:
* gtk/gtkfixed.c:
* gtk/gtkclist.c:
* gtk/gtkbox.c:
* gtk/gtkbin.c:
* gtk/gtknotebook.c:
removed the old gtk_*_foreach functions and provided gtk_*_forall.
* gtk/gtknotebook.c:
(gtk_notebook_real_switch_page): expose tabs.
(gtk_notebook_page_num): new function to return the page number
of a distinct child.
(gtk_notebook_focus): minor fixups. foxus handling is still screwed
under some circumstances.
* gtk/gtktreeitem.c:
(gtk_real_tree_item_select):
(gtk_real_tree_item_deselect): major fixes.
some general fixups wrt queue_redraw, and tree items not being
NO_WINDOW widgets.
* gtk/gtklistitem.c:
(gtk_real_list_item_select):
(gtk_real_list_item_deselect):
(gtk_real_list_item_toggle):
removed unneccessary queue_redraw calls.
Wed Aug 30 09:42:07 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c: allow optionmenus to have the focus and
automatically popup the menu on space bar.
Wed Aug 26 06:40:34 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.h:
* gtk/gtkcontainer.c: implemented gtk_container_forall() (as a class
method), which acts similar to gtk_container_foreach(), but iterates
over internal children. the GtkContainer::foreach signal vanished in
favour of a new class method ->forall() that optionally includes
internal widgets.
* gtk/gtkclist.c (gtk_clist_init): provide no _foreach implementation
but a _forall implementation, since all child widgets we have are
internal ones.
(column_button_create): set the parent window prior
to gtk_widget_set_parent().
* gtk/gtkwidget.c:
exchanged all calls to gtk_container_foreach() with
gtk_container_forall().
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: added the GTK_COMPOSITE_CHILD, exported through
the GtkWidget::composite_child argument. to have a widget created
with the flag initially, two new functions got added to wrap a widgets
creation:
gtk_widget_push_composite_flag() and gtk_widget_pop_composite_flag().
Wed Aug 25 23:37:39 1998 Tim Janik <timj@gtk.org>
* gtk/gtktooltips.h:
* gtk/gtktooltips.c: exported gtk_tooltips_create_window() as
gtk_tooltips_force_window(), so tooltips->tip_window can be accessed
prior to the first tip being set.
don't put an extra reference on the window, since it is a toplevel,
it wont get destroyed from anywhere else.
* overall macro and GtkType fixups.
1998-09-03 02:38:53 +00:00
|
|
|
gtk_box_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
g_return_if_fail (container != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_BOX (container));
|
|
|
|
g_return_if_fail (callback != NULL);
|
|
|
|
|
|
|
|
box = GTK_BOX (container);
|
|
|
|
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
|
|
|
if (child->pack == GTK_PACK_START)
|
|
|
|
(* callback) (child->widget, callback_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
children = g_list_last (box->children);
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->prev;
|
|
|
|
|
|
|
|
if (child->pack == GTK_PACK_END)
|
|
|
|
(* callback) (child->widget, callback_data);
|
|
|
|
}
|
|
|
|
}
|