2008-07-01 22:57:50 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
1997-11-24 22:37:52 +00:00
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1997-11-24 22:37:52 +00:00
|
|
|
* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser 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
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
2008-10-07 07:44:06 +00:00
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
1999-02-24 07:37:18 +00:00
|
|
|
*/
|
|
|
|
|
2008-06-22 14:28:52 +00:00
|
|
|
#include "config.h"
|
2008-10-07 07:44:06 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkbox.h"
|
2008-10-07 07:44:06 +00:00
|
|
|
#include "gtkorientable.h"
|
2009-12-02 08:48:42 +00:00
|
|
|
#include "gtkextendedlayout.h"
|
2005-03-22 02:14:55 +00:00
|
|
|
#include "gtkprivate.h"
|
2001-03-23 23:39:24 +00:00
|
|
|
#include "gtkintl.h"
|
2005-03-20 07:01:23 +00:00
|
|
|
#include "gtkalias.h"
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-17 07:52:38 +00:00
|
|
|
enum {
|
2001-03-23 23:39:24 +00:00
|
|
|
PROP_0,
|
2008-10-07 07:44:06 +00:00
|
|
|
PROP_ORIENTATION,
|
2001-03-23 23:39:24 +00:00
|
|
|
PROP_SPACING,
|
|
|
|
PROP_HOMOGENEOUS
|
1998-01-17 07:52:38 +00:00
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-06-16 05:20:05 +00:00
|
|
|
enum {
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
CHILD_PROP_0,
|
|
|
|
CHILD_PROP_EXPAND,
|
|
|
|
CHILD_PROP_FILL,
|
|
|
|
CHILD_PROP_PADDING,
|
|
|
|
CHILD_PROP_PACK_TYPE,
|
|
|
|
CHILD_PROP_POSITION
|
1998-06-16 05:20:05 +00:00
|
|
|
};
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
|
|
|
|
typedef struct _GtkBoxPrivate GtkBoxPrivate;
|
|
|
|
|
|
|
|
struct _GtkBoxPrivate
|
|
|
|
{
|
|
|
|
GtkOrientation orientation;
|
|
|
|
guint default_expand : 1;
|
|
|
|
guint spacing_set : 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define GTK_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_BOX, GtkBoxPrivate))
|
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
typedef struct _GtkBoxDesiredSizes GtkBoxDesiredSizes;
|
|
|
|
typedef struct _GtkBoxSpreading GtkBoxSpreading;
|
|
|
|
|
|
|
|
struct _GtkBoxDesiredSizes
|
|
|
|
{
|
|
|
|
gint minimum_size;
|
|
|
|
gint natural_size;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkBoxSpreading
|
|
|
|
{
|
|
|
|
GtkBoxChild *child;
|
|
|
|
gint index;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void gtk_box_get_desired_size (GtkExtendedLayout *layout,
|
|
|
|
GtkRequisition *minimum_size,
|
|
|
|
GtkRequisition *natural_size);
|
|
|
|
static void gtk_box_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
|
|
|
static void gtk_box_layout_interface_init (GtkExtendedLayoutIface *iface);
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2008-10-07 07:50:04 +00:00
|
|
|
static void gtk_box_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_box_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
|
|
|
|
static void gtk_box_add (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
|
|
|
static void gtk_box_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
|
|
|
static void gtk_box_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data);
|
|
|
|
static void gtk_box_set_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_box_get_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static GType gtk_box_child_type (GtkContainer *container);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2008-10-07 09:32:20 +00:00
|
|
|
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
|
|
|
|
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
|
2009-12-02 08:48:42 +00:00
|
|
|
NULL)
|
|
|
|
G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
|
|
|
|
gtk_box_layout_interface_init));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_class_init (GtkBoxClass *class)
|
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (class);
|
|
|
|
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
object_class->set_property = gtk_box_set_property;
|
|
|
|
object_class->get_property = gtk_box_get_property;
|
|
|
|
|
|
|
|
widget_class->size_allocate = gtk_box_size_allocate;
|
|
|
|
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
container_class->add = gtk_box_add;
|
|
|
|
container_class->remove = gtk_box_remove;
|
|
|
|
container_class->forall = gtk_box_forall;
|
|
|
|
container_class->child_type = gtk_box_child_type;
|
|
|
|
container_class->set_child_property = gtk_box_set_child_property;
|
|
|
|
container_class->get_child_property = gtk_box_get_child_property;
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
g_object_class_override_property (object_class,
|
|
|
|
PROP_ORIENTATION,
|
|
|
|
"orientation");
|
|
|
|
|
|
|
|
g_object_class_install_property (object_class,
|
2001-03-23 23:39:24 +00:00
|
|
|
PROP_SPACING,
|
|
|
|
g_param_spec_int ("spacing",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Spacing"),
|
|
|
|
P_("The amount of space between children"),
|
2001-03-23 23:39:24 +00:00
|
|
|
0,
|
|
|
|
G_MAXINT,
|
|
|
|
0,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
2008-09-24 08:41:46 +00:00
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
g_object_class_install_property (object_class,
|
2001-03-23 23:39:24 +00:00
|
|
|
PROP_HOMOGENEOUS,
|
|
|
|
g_param_spec_boolean ("homogeneous",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Homogeneous"),
|
|
|
|
P_("Whether the children should all be the same size"),
|
2001-03-23 23:39:24 +00:00
|
|
|
FALSE,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
2001-03-23 23:39:24 +00:00
|
|
|
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
|
|
CHILD_PROP_EXPAND,
|
2002-05-02 00:03:49 +00:00
|
|
|
g_param_spec_boolean ("expand",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Expand"),
|
|
|
|
P_("Whether the child should receive extra space when the parent grows"),
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
TRUE,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
|
|
CHILD_PROP_FILL,
|
2002-05-02 00:03:49 +00:00
|
|
|
g_param_spec_boolean ("fill",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Fill"),
|
|
|
|
P_("Whether extra space given to the child should be allocated to the child or used as padding"),
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
TRUE,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
|
|
CHILD_PROP_PADDING,
|
2002-05-02 00:03:49 +00:00
|
|
|
g_param_spec_uint ("padding",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Padding"),
|
|
|
|
P_("Extra space to put between the child and its neighbors, in pixels"),
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
0, G_MAXINT, 0,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
|
|
CHILD_PROP_PACK_TYPE,
|
2005-03-09 04:04:40 +00:00
|
|
|
g_param_spec_enum ("pack-type",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Pack type"),
|
|
|
|
P_("A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"),
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
GTK_TYPE_PACK_TYPE, GTK_PACK_START,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_container_class_install_child_property (container_class,
|
|
|
|
CHILD_PROP_POSITION,
|
2002-05-02 00:03:49 +00:00
|
|
|
g_param_spec_int ("position",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Position"),
|
|
|
|
P_("The index of the child in the parent"),
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
-1, G_MAXINT, 0,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
2008-10-07 07:44:06 +00:00
|
|
|
|
|
|
|
g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
static void
|
|
|
|
gtk_box_layout_interface_init (GtkExtendedLayoutIface *iface)
|
|
|
|
{
|
|
|
|
iface->get_desired_size = gtk_box_get_desired_size;
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_box_init (GtkBox *box)
|
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (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);
|
2001-11-04 22:57:03 +00:00
|
|
|
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), FALSE);
|
2008-10-07 07:44:06 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
box->children = NULL;
|
|
|
|
box->spacing = 0;
|
|
|
|
box->homogeneous = FALSE;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
|
|
|
private->orientation = GTK_ORIENTATION_HORIZONTAL;
|
|
|
|
private->default_expand = FALSE;
|
|
|
|
private->spacing_set = FALSE;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
static void
|
|
|
|
gtk_box_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-01-17 07:52:38 +00:00
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GtkBox *box = GTK_BOX (object);
|
|
|
|
GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (box);
|
1998-06-28 07:46:10 +00:00
|
|
|
|
2001-03-23 23:39:24 +00:00
|
|
|
switch (prop_id)
|
1998-01-17 07:52:38 +00:00
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
case PROP_ORIENTATION:
|
|
|
|
private->orientation = g_value_get_enum (value);
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (box));
|
|
|
|
break;
|
2001-03-23 23:39:24 +00:00
|
|
|
case PROP_SPACING:
|
|
|
|
gtk_box_set_spacing (box, g_value_get_int (value));
|
1998-01-17 07:52:38 +00:00
|
|
|
break;
|
2001-03-23 23:39:24 +00:00
|
|
|
case PROP_HOMOGENEOUS:
|
|
|
|
gtk_box_set_homogeneous (box, g_value_get_boolean (value));
|
1998-01-17 07:52:38 +00:00
|
|
|
break;
|
1998-01-21 23:03:11 +00:00
|
|
|
default:
|
2001-03-23 23:39:24 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-01-21 23:03:11 +00:00
|
|
|
break;
|
1998-01-17 07:52:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
static void
|
|
|
|
gtk_box_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-01-17 07:52:38 +00:00
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GtkBox *box = GTK_BOX (object);
|
|
|
|
GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (box);
|
1998-06-28 07:46:10 +00:00
|
|
|
|
2001-03-23 23:39:24 +00:00
|
|
|
switch (prop_id)
|
1998-01-17 07:52:38 +00:00
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
case PROP_ORIENTATION:
|
|
|
|
g_value_set_enum (value, private->orientation);
|
|
|
|
break;
|
2001-03-23 23:39:24 +00:00
|
|
|
case PROP_SPACING:
|
|
|
|
g_value_set_int (value, box->spacing);
|
1998-01-17 07:52:38 +00:00
|
|
|
break;
|
2001-03-23 23:39:24 +00:00
|
|
|
case PROP_HOMOGENEOUS:
|
|
|
|
g_value_set_boolean (value, box->homogeneous);
|
1998-01-17 07:52:38 +00:00
|
|
|
break;
|
|
|
|
default:
|
2001-03-23 23:39:24 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-01-17 07:52:38 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
static void
|
2009-12-02 08:48:42 +00:00
|
|
|
gtk_box_get_desired_size (GtkExtendedLayout *layout,
|
|
|
|
GtkRequisition *minimum_size,
|
|
|
|
GtkRequisition *natural_size)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
GtkBox *box;
|
|
|
|
GtkBoxPrivate *private;
|
2008-10-07 07:44:06 +00:00
|
|
|
GList *children;
|
|
|
|
gint nvis_children;
|
2009-12-02 08:48:42 +00:00
|
|
|
gint border_width;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
box = GTK_BOX (layout);
|
|
|
|
private = GTK_BOX_GET_PRIVATE (box);
|
|
|
|
border_width = GTK_CONTAINER (box)->border_width;
|
|
|
|
|
|
|
|
minimum_size->width = minimum_size->height = 0;
|
|
|
|
natural_size->width = natural_size->height = 0;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
nvis_children = 0;
|
2008-10-07 07:44:06 +00:00
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
GtkBoxChild *child;
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
|
|
|
|
2010-03-01 06:47:38 +00:00
|
|
|
if (gtk_widget_get_visible (child->widget))
|
2009-12-02 08:48:42 +00:00
|
|
|
{
|
|
|
|
GtkRequisition child_minimum_size;
|
|
|
|
GtkRequisition child_natural_size;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
gtk_widget_get_desired_size (child->widget,
|
|
|
|
&child_minimum_size,
|
|
|
|
&child_natural_size);
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
if (box->homogeneous)
|
|
|
|
{
|
|
|
|
gint width;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
width = child_minimum_size.width + child->padding * 2;
|
|
|
|
minimum_size->width = MAX (minimum_size->width, width);
|
|
|
|
|
|
|
|
width = child_natural_size.width + child->padding * 2;
|
|
|
|
natural_size->width = MAX (natural_size->width, width);
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
else
|
2009-12-02 08:48:42 +00:00
|
|
|
{
|
|
|
|
minimum_size->width += child_minimum_size.width + child->padding * 2;
|
|
|
|
natural_size->width += child_natural_size.width + child->padding * 2;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
minimum_size->height = MAX (minimum_size->height, child_minimum_size.height);
|
|
|
|
natural_size->height = MAX (natural_size->height, child_natural_size.height);
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
else
|
2009-12-02 08:48:42 +00:00
|
|
|
{
|
|
|
|
if (box->homogeneous)
|
|
|
|
{
|
|
|
|
gint height;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
height = child_minimum_size.height + child->padding * 2;
|
|
|
|
minimum_size->height = MAX (minimum_size->height, height);
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
height = child_natural_size.height + child->padding * 2;
|
|
|
|
natural_size->height = MAX (natural_size->height, height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
minimum_size->height += child_minimum_size.height + child->padding * 2;
|
|
|
|
natural_size->height += child_natural_size.height + child->padding * 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
minimum_size->width = MAX (minimum_size->width, child_minimum_size.width);
|
|
|
|
natural_size->width = MAX (natural_size->width, child_natural_size.width);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
nvis_children += 1;
|
|
|
|
}
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
if (nvis_children > 0)
|
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
if (box->homogeneous)
|
|
|
|
{
|
|
|
|
minimum_size->width *= nvis_children;
|
|
|
|
natural_size->width *= nvis_children;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
minimum_size->width += (nvis_children - 1) * box->spacing;
|
|
|
|
natural_size->width += (nvis_children - 1) * box->spacing;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
else
|
2009-12-02 08:48:42 +00:00
|
|
|
{
|
|
|
|
if (box->homogeneous)
|
|
|
|
{
|
|
|
|
minimum_size->height *= nvis_children;
|
|
|
|
natural_size->height *= nvis_children;
|
|
|
|
}
|
|
|
|
|
|
|
|
minimum_size->height += (nvis_children - 1) * box->spacing;
|
|
|
|
natural_size->height += (nvis_children - 1) * box->spacing;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
}
|
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
minimum_size->width += border_width * 2;
|
|
|
|
minimum_size->height += border_width * 2;
|
|
|
|
|
|
|
|
natural_size->width += border_width * 2;
|
|
|
|
natural_size->height += border_width * 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
gtk_box_compare_gap (gconstpointer p1,
|
|
|
|
gconstpointer p2,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GtkBoxDesiredSizes *sizes = data;
|
|
|
|
const GtkBoxSpreading *c1 = p1;
|
|
|
|
const GtkBoxSpreading *c2 = p2;
|
|
|
|
|
|
|
|
const gint d1 = MAX (sizes[c1->index].natural_size -
|
|
|
|
sizes[c1->index].minimum_size,
|
|
|
|
0);
|
|
|
|
const gint d2 = MAX (sizes[c2->index].natural_size -
|
|
|
|
sizes[c2->index].minimum_size,
|
|
|
|
0);
|
|
|
|
|
|
|
|
gint delta = (d2 - d1);
|
|
|
|
|
|
|
|
if (0 == delta)
|
|
|
|
delta = (c2->index - c1->index);
|
|
|
|
|
|
|
|
return delta;
|
2008-10-07 07:44:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
|
|
|
GtkBox *box = GTK_BOX (widget);
|
|
|
|
GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (box);
|
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
2009-12-02 08:48:42 +00:00
|
|
|
gint nvis_children;
|
|
|
|
gint nexpand_children;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
|
|
|
widget->allocation = *allocation;
|
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
nvis_children = 0;
|
|
|
|
nexpand_children = 0;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
|
|
|
for (children = box->children; children; children = children->next)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
|
2010-03-01 06:47:38 +00:00
|
|
|
if (gtk_widget_get_visible (child->widget))
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
|
|
|
nvis_children += 1;
|
|
|
|
if (child->expand)
|
|
|
|
nexpand_children += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nvis_children > 0)
|
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
gint border_width = GTK_CONTAINER (box)->border_width;
|
|
|
|
GtkTextDirection direction = gtk_widget_get_direction (widget);
|
|
|
|
GtkAllocation child_allocation;
|
|
|
|
GtkBoxSpreading *spreading = g_newa (GtkBoxSpreading, nvis_children);
|
|
|
|
GtkBoxDesiredSizes *sizes = g_newa (GtkBoxDesiredSizes, nvis_children);
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
GtkPackType packing;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
gint size;
|
|
|
|
gint extra;
|
|
|
|
gint x, y, i;
|
|
|
|
gint child_size;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
size = allocation->width - border_width * 2 - (nvis_children - 1) * box->spacing;
|
|
|
|
else
|
|
|
|
size = allocation->height - border_width * 2 - (nvis_children - 1) * box->spacing;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
if (box->homogeneous)
|
|
|
|
{
|
|
|
|
extra = size / nvis_children;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Retrieve desired size for visible children */
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
i = 0;
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
|
|
|
{
|
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
if (GTK_WIDGET_VISIBLE (child->widget))
|
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
|
2009-12-14 15:28:56 +00:00
|
|
|
gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child->widget),
|
|
|
|
allocation->height,
|
|
|
|
&sizes[i].minimum_size,
|
|
|
|
&sizes[i].natural_size);
|
2008-10-07 07:44:06 +00:00
|
|
|
else
|
2009-12-14 16:16:21 +00:00
|
|
|
gtk_extended_layout_get_height_for_width (GTK_EXTENDED_LAYOUT (child->widget),
|
2009-12-14 15:28:56 +00:00
|
|
|
allocation->width,
|
|
|
|
&sizes[i].minimum_size,
|
|
|
|
&sizes[i].natural_size);
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
size -= sizes[i].minimum_size;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
spreading[i].index = i;
|
|
|
|
spreading[i].child = child;
|
|
|
|
|
|
|
|
i += 1;
|
2008-10-07 07:44:06 +00:00
|
|
|
}
|
2009-12-02 08:48:42 +00:00
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
/* Distribute the container's extra space c_gap. We want to assign
|
|
|
|
* this space such that the sum of extra space assigned to children
|
|
|
|
* (c^i_gap) is equal to c_cap. The case that there's not enough
|
|
|
|
* space for all children to take their natural size needs some
|
|
|
|
* attention. The goals we want to achieve are:
|
|
|
|
*
|
|
|
|
* a) Maximize number of children taking their natural size.
|
|
|
|
* b) The allocated size of children should be a continuous
|
|
|
|
* function of c_gap. That is, increasing the container size by
|
|
|
|
* one pixel should never make drastic changes in the distribution.
|
|
|
|
* c) If child i takes its natural size and child j doesn't,
|
|
|
|
* child j should have received at least as much gap as child i.
|
|
|
|
*
|
|
|
|
* The following code distributes the additional space by following
|
|
|
|
* this rules.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Sort descending by gap and position. */
|
|
|
|
|
|
|
|
g_qsort_with_data (spreading,
|
|
|
|
nvis_children, sizeof (GtkBoxSpreading),
|
|
|
|
gtk_box_compare_gap, sizes);
|
|
|
|
|
|
|
|
/* Distribute available space.
|
|
|
|
* This master piece of a loop was conceived by Behdad Esfahbod.
|
|
|
|
*/
|
|
|
|
for (i = nvis_children - 1; i >= 0; --i)
|
|
|
|
{
|
|
|
|
/* Divide remaining space by number of remaining children.
|
|
|
|
* Sort order and reducing remaining space by assigned space
|
|
|
|
* ensures that space is distributed equally.
|
|
|
|
*/
|
|
|
|
gint glue = (size + i) / (i + 1);
|
|
|
|
gint gap = sizes[spreading[i].index].natural_size
|
|
|
|
- sizes[spreading[i].index].minimum_size;
|
|
|
|
|
|
|
|
extra = MIN (glue, gap);
|
|
|
|
sizes[spreading[i].index].minimum_size += extra;
|
|
|
|
|
|
|
|
size -= extra;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
/* Calculate space which hasn't distributed yet,
|
|
|
|
* and is available for expanding children.
|
|
|
|
*/
|
|
|
|
if (nexpand_children > 0)
|
|
|
|
extra = size / nexpand_children;
|
|
|
|
else
|
|
|
|
extra = 0;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
/* Allocate child positions. */
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing)
|
|
|
|
{
|
|
|
|
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
{
|
|
|
|
child_allocation.y = allocation->y + border_width;
|
|
|
|
child_allocation.height = MAX (1, allocation->height - border_width * 2);
|
|
|
|
if (packing == GTK_PACK_START)
|
|
|
|
x = allocation->x + border_width;
|
|
|
|
else
|
|
|
|
x = allocation->x + allocation->width - border_width;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
child_allocation.x = allocation->x + border_width;
|
|
|
|
child_allocation.width = MAX (1, allocation->width - border_width * 2);
|
|
|
|
if (packing == GTK_PACK_START)
|
|
|
|
y = allocation->y + border_width;
|
|
|
|
else
|
|
|
|
y = allocation->y + allocation->height - border_width;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
i = 0;
|
|
|
|
children = box->children;
|
|
|
|
while (children)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
child = children->data;
|
|
|
|
children = children->next;
|
2008-10-07 07:44:06 +00:00
|
|
|
|
2010-03-01 06:47:38 +00:00
|
|
|
if (gtk_widget_get_visible (child->widget))
|
2009-12-02 08:48:42 +00:00
|
|
|
{
|
|
|
|
if (child->pack == packing)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
/* Assign the child's size. */
|
|
|
|
|
|
|
|
if (box->homogeneous)
|
|
|
|
{
|
|
|
|
if (nvis_children == 1)
|
|
|
|
child_size = size;
|
|
|
|
else
|
|
|
|
child_size = extra;
|
|
|
|
|
|
|
|
nvis_children -= 1;
|
|
|
|
size -= extra;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
child_size = sizes[i].minimum_size + child->padding * 2;
|
|
|
|
|
|
|
|
if (child->expand)
|
|
|
|
{
|
|
|
|
if (nexpand_children == 1)
|
|
|
|
child_size += size;
|
|
|
|
else
|
|
|
|
child_size += extra;
|
|
|
|
|
|
|
|
nexpand_children -= 1;
|
|
|
|
size -= extra;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Assign the child's position. */
|
|
|
|
|
|
|
|
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
if (child->fill)
|
|
|
|
{
|
|
|
|
child_allocation.width = MAX (1, child_size - child->padding * 2);
|
|
|
|
child_allocation.x = x + child->padding;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
child_allocation.width = sizes[i].minimum_size;
|
|
|
|
child_allocation.x = x + (child_size - child_allocation.width) / 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (direction == GTK_TEXT_DIR_RTL)
|
|
|
|
child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width;
|
|
|
|
|
|
|
|
if (packing == GTK_PACK_START)
|
|
|
|
x += child_size + box->spacing;
|
|
|
|
else
|
|
|
|
x -= child_size + box->spacing;
|
|
|
|
}
|
2008-10-07 07:44:06 +00:00
|
|
|
else
|
|
|
|
{
|
2009-12-02 08:48:42 +00:00
|
|
|
if (child->fill)
|
|
|
|
{
|
|
|
|
child_allocation.height = MAX (1, child_size - child->padding * 2);
|
|
|
|
child_allocation.y = y + child->padding;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
child_allocation.height = sizes[i].minimum_size;
|
|
|
|
child_allocation.y = y + (child_size - child_allocation.height) / 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (packing == GTK_PACK_START)
|
|
|
|
y += child_size + box->spacing;
|
|
|
|
else
|
|
|
|
y -= child_size + box->spacing;
|
2008-10-07 07:44:06 +00:00
|
|
|
}
|
|
|
|
|
2009-12-02 08:48:42 +00:00
|
|
|
gtk_widget_size_allocate (child->widget, &child_allocation);
|
2008-10-07 07:44:06 +00:00
|
|
|
}
|
2009-12-02 08:48:42 +00:00
|
|
|
i += 1;
|
2008-10-07 07:44:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-10-07 04:29:52 +00:00
|
|
|
static GType
|
|
|
|
gtk_box_child_type (GtkContainer *container)
|
1998-06-16 05:20:05 +00:00
|
|
|
{
|
|
|
|
return GTK_TYPE_WIDGET;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2008-10-07 07:50:04 +00:00
|
|
|
gtk_box_set_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-06-16 05:20:05 +00:00
|
|
|
{
|
|
|
|
gboolean expand = 0;
|
|
|
|
gboolean fill = 0;
|
|
|
|
guint padding = 0;
|
|
|
|
GtkPackType pack_type = 0;
|
|
|
|
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
if (property_id != CHILD_PROP_POSITION)
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_query_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
&expand,
|
|
|
|
&fill,
|
|
|
|
&padding,
|
|
|
|
&pack_type);
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
switch (property_id)
|
1998-06-16 05:20:05 +00:00
|
|
|
{
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_EXPAND:
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
g_value_get_boolean (value),
|
1998-06-16 05:20:05 +00:00
|
|
|
fill,
|
|
|
|
padding,
|
|
|
|
pack_type);
|
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_FILL:
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
expand,
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
g_value_get_boolean (value),
|
1998-06-16 05:20:05 +00:00
|
|
|
padding,
|
|
|
|
pack_type);
|
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_PADDING:
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
expand,
|
|
|
|
fill,
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
g_value_get_uint (value),
|
1998-06-16 05:20:05 +00:00
|
|
|
pack_type);
|
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_PACK_TYPE:
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_set_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
expand,
|
|
|
|
fill,
|
|
|
|
padding,
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
g_value_get_enum (value));
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_POSITION:
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_reorder_child (GTK_BOX (container),
|
|
|
|
child,
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
g_value_get_int (value));
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
|
|
|
default:
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_box_get_child_property (GtkContainer *container,
|
|
|
|
GtkWidget *child,
|
|
|
|
guint property_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-06-16 05:20:05 +00:00
|
|
|
{
|
|
|
|
gboolean expand = 0;
|
|
|
|
gboolean fill = 0;
|
|
|
|
guint padding = 0;
|
|
|
|
GtkPackType pack_type = 0;
|
|
|
|
GList *list;
|
|
|
|
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
if (property_id != CHILD_PROP_POSITION)
|
1998-06-16 05:20:05 +00:00
|
|
|
gtk_box_query_child_packing (GTK_BOX (container),
|
|
|
|
child,
|
|
|
|
&expand,
|
|
|
|
&fill,
|
|
|
|
&padding,
|
|
|
|
&pack_type);
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
switch (property_id)
|
1998-06-16 05:20:05 +00:00
|
|
|
{
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
guint i;
|
|
|
|
case CHILD_PROP_EXPAND:
|
|
|
|
g_value_set_boolean (value, expand);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_FILL:
|
|
|
|
g_value_set_boolean (value, fill);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_PADDING:
|
|
|
|
g_value_set_uint (value, padding);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_PACK_TYPE:
|
|
|
|
g_value_set_enum (value, pack_type);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
case CHILD_PROP_POSITION:
|
|
|
|
i = 0;
|
1998-06-16 05:20:05 +00:00
|
|
|
for (list = GTK_BOX (container)->children; list; list = list->next)
|
|
|
|
{
|
|
|
|
GtkBoxChild *child_entry;
|
|
|
|
|
|
|
|
child_entry = list->data;
|
|
|
|
if (child_entry->widget == child)
|
|
|
|
break;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
i++;
|
1998-06-16 05:20:05 +00:00
|
|
|
}
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
g_value_set_int (value, list ? i : -1);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
|
|
|
default:
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
|
1998-06-16 05:20:05 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-28 16:16:26 +00:00
|
|
|
static void
|
|
|
|
gtk_box_pack (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
|
|
|
gboolean expand,
|
|
|
|
gboolean fill,
|
|
|
|
guint padding,
|
|
|
|
GtkPackType pack_type)
|
|
|
|
{
|
|
|
|
GtkBoxChild *child_info;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
|
|
|
g_return_if_fail (child->parent == NULL);
|
|
|
|
|
|
|
|
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 = pack_type;
|
|
|
|
child_info->is_secondary = FALSE;
|
|
|
|
|
|
|
|
box->children = g_list_append (box->children, child_info);
|
|
|
|
|
|
|
|
gtk_widget_freeze_child_notify (child);
|
|
|
|
|
|
|
|
gtk_widget_set_parent (child, GTK_WIDGET (box));
|
|
|
|
|
|
|
|
gtk_widget_child_notify (child, "expand");
|
|
|
|
gtk_widget_child_notify (child, "fill");
|
|
|
|
gtk_widget_child_notify (child, "padding");
|
|
|
|
gtk_widget_child_notify (child, "pack-type");
|
|
|
|
gtk_widget_child_notify (child, "position");
|
|
|
|
gtk_widget_thaw_child_notify (child);
|
|
|
|
}
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_new:
|
|
|
|
* @orientation: the box' orientation.
|
|
|
|
* @homogeneous: %TRUE if all children are to be given equal space allocations.
|
|
|
|
* @spacing: the number of pixels to place by default between children.
|
|
|
|
*
|
|
|
|
* Creates a new #GtkHBox.
|
|
|
|
*
|
|
|
|
* Return value: a new #GtkHBox.
|
|
|
|
*
|
|
|
|
* Since: 2.16
|
|
|
|
**/
|
2008-10-07 09:07:27 +00:00
|
|
|
GtkWidget*
|
|
|
|
_gtk_box_new (GtkOrientation orientation,
|
|
|
|
gboolean homogeneous,
|
|
|
|
gint spacing)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
|
|
|
return g_object_new (GTK_TYPE_BOX,
|
|
|
|
"orientation", orientation,
|
|
|
|
"spacing", spacing,
|
|
|
|
"homogeneous", homogeneous ? TRUE : FALSE,
|
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_pack_start:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @child: the #GtkWidget to be added to @box
|
|
|
|
* @expand: %TRUE if the new child is to be given extra space allocated to
|
|
|
|
* @box. The extra space will be divided evenly between all children of
|
|
|
|
* @box that use this option
|
|
|
|
* @fill: %TRUE if space given to @child by the @expand option is
|
|
|
|
* actually allocated to @child, rather than just padding it. This
|
|
|
|
* parameter has no effect if @expand is set to %FALSE. A child is
|
|
|
|
* always allocated the full height of a #GtkHBox and the full width
|
|
|
|
* of a #GtkVBox. This option affects the other dimension
|
|
|
|
* @padding: extra space in pixels to put between this child and its
|
|
|
|
* neighbors, over and above the global amount specified by
|
|
|
|
* #GtkBox:spacing property. If @child is a widget at one of the
|
|
|
|
* reference ends of @box, then @padding pixels are also put between
|
|
|
|
* @child and the reference edge of @box
|
|
|
|
*
|
|
|
|
* Adds @child to @box, packed with reference to the start of @box.
|
|
|
|
* The @child is packed after any other child packed with reference
|
|
|
|
* to the start of @box.
|
|
|
|
*/
|
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
|
|
|
{
|
2008-06-28 16:16:26 +00:00
|
|
|
gtk_box_pack (box, child, expand, fill, padding, GTK_PACK_START);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_pack_end:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @child: the #GtkWidget to be added to @box
|
|
|
|
* @expand: %TRUE if the new child is to be given extra space allocated
|
|
|
|
* to @box. The extra space will be divided evenly between all children
|
|
|
|
* of @box that use this option
|
|
|
|
* @fill: %TRUE if space given to @child by the @expand option is
|
|
|
|
* actually allocated to @child, rather than just padding it. This
|
|
|
|
* parameter has no effect if @expand is set to %FALSE. A child is
|
|
|
|
* always allocated the full height of a #GtkHBox and the full width
|
|
|
|
* of a #GtkVBox. This option affects the other dimension
|
|
|
|
* @padding: extra space in pixels to put between this child and its
|
|
|
|
* neighbors, over and above the global amount specified by
|
|
|
|
* #GtkBox:spacing property. If @child is a widget at one of the
|
|
|
|
* reference ends of @box, then @padding pixels are also put between
|
|
|
|
* @child and the reference edge of @box
|
|
|
|
*
|
|
|
|
* Adds @child to @box, packed with reference to the end of @box.
|
|
|
|
* The @child is packed after (away from end of) any other child
|
|
|
|
* packed with reference to the end of @box.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
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
|
|
|
{
|
2008-06-28 16:16:26 +00:00
|
|
|
gtk_box_pack (box, child, expand, fill, padding, GTK_PACK_END);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_pack_start_defaults:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @widget: the #GtkWidget to be added to @box
|
|
|
|
*
|
|
|
|
* Adds @widget to @box, packed with reference to the start of @box.
|
|
|
|
* The child is packed after any other child packed with reference
|
|
|
|
* to the start of @box.
|
|
|
|
*
|
|
|
|
* Parameters for how to pack the child @widget, #GtkBox:expand,
|
|
|
|
* #GtkBox:fill and #GtkBox:padding, are given their default
|
|
|
|
* values, %TRUE, %TRUE, and 0, respectively.
|
2008-07-06 04:46:36 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 2.14: Use gtk_box_pack_start()
|
2007-06-10 02:53:17 +00:00
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_box_pack_start_defaults (GtkBox *box,
|
|
|
|
GtkWidget *child)
|
|
|
|
{
|
|
|
|
gtk_box_pack_start (box, child, TRUE, TRUE, 0);
|
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_pack_end_defaults:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @widget: the #GtkWidget to be added to @box
|
|
|
|
*
|
|
|
|
* Adds @widget to @box, packed with reference to the end of @box.
|
|
|
|
* The child is packed after any other child packed with reference
|
|
|
|
* to the start of @box.
|
|
|
|
*
|
|
|
|
* Parameters for how to pack the child @widget, #GtkBox:expand,
|
|
|
|
* #GtkBox:fill and #GtkBox:padding, are given their default
|
|
|
|
* values, %TRUE, %TRUE, and 0, respectively.
|
2008-07-06 04:46:36 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 2.14: Use gtk_box_pack_end()
|
2007-06-10 02:53:17 +00:00
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_box_pack_end_defaults (GtkBox *box,
|
|
|
|
GtkWidget *child)
|
|
|
|
{
|
|
|
|
gtk_box_pack_end (box, child, TRUE, TRUE, 0);
|
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_set_homogeneous:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @homogeneous: a boolean value, %TRUE to create equal allotments,
|
|
|
|
* %FALSE for variable allotments
|
|
|
|
*
|
|
|
|
* Sets the #GtkBox:homogeneous property of @box, controlling
|
|
|
|
* whether or not all children of @box are given equal space
|
|
|
|
* in the box.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
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 (GTK_IS_BOX (box));
|
|
|
|
|
|
|
|
if ((homogeneous ? TRUE : FALSE) != box->homogeneous)
|
|
|
|
{
|
|
|
|
box->homogeneous = homogeneous ? TRUE : FALSE;
|
2001-03-23 23:39:24 +00:00
|
|
|
g_object_notify (G_OBJECT (box), "homogeneous");
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (box));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-06-24 15:34:48 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_get_homogeneous:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
*
|
|
|
|
* Returns whether the box is homogeneous (all children are the
|
2007-05-26 06:59:36 +00:00
|
|
|
* same size). See gtk_box_set_homogeneous().
|
2001-06-24 15:34:48 +00:00
|
|
|
*
|
|
|
|
* Return value: %TRUE if the box is homogeneous.
|
|
|
|
**/
|
|
|
|
gboolean
|
|
|
|
gtk_box_get_homogeneous (GtkBox *box)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
|
|
|
|
|
|
|
|
return box->homogeneous;
|
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_set_spacing:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @spacing: the number of pixels to put between children
|
|
|
|
*
|
|
|
|
* Sets the #GtkBox:spacing property of @box, which is the
|
|
|
|
* number of pixels to place between children of @box.
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_box_set_spacing (GtkBox *box,
|
|
|
|
gint spacing)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
|
|
|
|
if (spacing != box->spacing)
|
|
|
|
{
|
|
|
|
box->spacing = spacing;
|
2008-10-07 07:44:06 +00:00
|
|
|
_gtk_box_set_spacing_set (box, TRUE);
|
2008-09-24 08:41:46 +00:00
|
|
|
|
2001-03-23 23:39:24 +00:00
|
|
|
g_object_notify (G_OBJECT (box), "spacing");
|
2008-09-24 08:41:46 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (box));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-03-07 21:10:44 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_get_spacing:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
*
|
|
|
|
* Gets the value set by gtk_box_set_spacing().
|
|
|
|
*
|
|
|
|
* Return value: spacing between children
|
|
|
|
**/
|
|
|
|
gint
|
|
|
|
gtk_box_get_spacing (GtkBox *box)
|
|
|
|
{
|
2001-03-09 14:49:00 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_BOX (box), 0);
|
2001-03-07 21:10:44 +00:00
|
|
|
|
|
|
|
return box->spacing;
|
|
|
|
}
|
|
|
|
|
2008-09-24 08:41:46 +00:00
|
|
|
void
|
|
|
|
_gtk_box_set_spacing_set (GtkBox *box,
|
|
|
|
gboolean spacing_set)
|
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GtkBoxPrivate *private;
|
|
|
|
|
2008-09-24 08:41:46 +00:00
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
private = GTK_BOX_GET_PRIVATE (box);
|
|
|
|
|
|
|
|
private->spacing_set = spacing_set ? TRUE : FALSE;
|
2008-09-24 08:41:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
_gtk_box_get_spacing_set (GtkBox *box)
|
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GtkBoxPrivate *private;
|
|
|
|
|
2008-09-24 08:41:46 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
private = GTK_BOX_GET_PRIVATE (box);
|
|
|
|
|
|
|
|
return private->spacing_set;
|
2008-09-24 08:41:46 +00:00
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_reorder_child:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @child: the #GtkWidget to move
|
|
|
|
* @position: the new position for @child in the list of children
|
|
|
|
* of @box, starting from 0. If negative, indicates the end of
|
|
|
|
* the list
|
|
|
|
*
|
|
|
|
* Moves @child to a new @position in the list of @box children.
|
|
|
|
* The list is the <structfield>children</structfield> field of
|
|
|
|
* #GtkBox-struct, and contains both widgets packed #GTK_PACK_START
|
|
|
|
* as well as widgets packed #GTK_PACK_END, in the order that these
|
|
|
|
* widgets were added to @box.
|
|
|
|
*
|
|
|
|
* A widget's position in the @box children list determines where
|
|
|
|
* the widget is packed into @box. A child widget at some position
|
|
|
|
* in the list will be packed just after all other widgets of the
|
|
|
|
* same packing type that appear earlier in the list.
|
|
|
|
*/
|
1998-01-18 03:09:42 +00:00
|
|
|
void
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_box_reorder_child (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
|
|
|
gint position)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
2002-02-27 03:35:05 +00:00
|
|
|
GList *old_link;
|
|
|
|
GList *new_link;
|
|
|
|
GtkBoxChild *child_info = NULL;
|
|
|
|
gint old_position;
|
1998-01-18 03:09:42 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
2002-01-30 22:29:03 +00:00
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
1998-01-18 03:09:42 +00:00
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
old_link = box->children;
|
|
|
|
old_position = 0;
|
|
|
|
while (old_link)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
2002-02-27 03:35:05 +00:00
|
|
|
child_info = old_link->data;
|
1998-01-18 03:09:42 +00:00
|
|
|
if (child_info->widget == child)
|
|
|
|
break;
|
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
old_link = old_link->next;
|
|
|
|
old_position++;
|
1998-01-18 03:09:42 +00:00
|
|
|
}
|
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
g_return_if_fail (old_link != NULL);
|
1998-01-18 03:09:42 +00:00
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
if (position == old_position)
|
|
|
|
return;
|
1998-01-18 03:09:42 +00:00
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
box->children = g_list_delete_link (box->children, old_link);
|
1998-01-18 03:09:42 +00:00
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
if (position < 0)
|
|
|
|
new_link = NULL;
|
|
|
|
else
|
|
|
|
new_link = g_list_nth (box->children, position);
|
1998-01-18 03:09:42 +00:00
|
|
|
|
2002-02-27 03:35:05 +00:00
|
|
|
box->children = g_list_insert_before (box->children, new_link, child_info);
|
|
|
|
|
|
|
|
gtk_widget_child_notify (child, "position");
|
2010-03-01 06:47:38 +00:00
|
|
|
if (gtk_widget_get_visible (child)
|
|
|
|
&& gtk_widget_get_visible (GTK_WIDGET (box)))
|
2002-02-27 03:35:05 +00:00
|
|
|
gtk_widget_queue_resize (child);
|
1998-01-18 03:09:42 +00:00
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_query_child_packing:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @child: the #GtkWidget of the child to query
|
|
|
|
* @expand: pointer to return location for #GtkBox:expand child property
|
|
|
|
* @fill: pointer to return location for #GtkBox:fill child property
|
|
|
|
* @padding: pointer to return location for #GtkBox:padding child property
|
|
|
|
* @pack_type: pointer to return location for #GtkBox:pack-type child property
|
2007-06-10 06:52:51 +00:00
|
|
|
*
|
|
|
|
* Obtains information about how @child is packed into @box.
|
2007-06-10 02:53:17 +00:00
|
|
|
*/
|
1998-01-18 03:09:42 +00:00
|
|
|
void
|
2007-06-10 02:53:17 +00:00
|
|
|
gtk_box_query_child_packing (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
|
|
|
gboolean *expand,
|
|
|
|
gboolean *fill,
|
|
|
|
guint *padding,
|
|
|
|
GtkPackType *pack_type)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
|
|
|
GList *list;
|
1999-01-21 22:29:58 +00:00
|
|
|
GtkBoxChild *child_info = NULL;
|
1998-01-18 03:09:42 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
2002-01-30 22:29:03 +00:00
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
1998-01-18 03:09:42 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-10 02:53:17 +00:00
|
|
|
/**
|
|
|
|
* gtk_box_set_child_packing:
|
|
|
|
* @box: a #GtkBox
|
|
|
|
* @child: the #GtkWidget of the child to set
|
|
|
|
* @expand: the new value of the #GtkBox:expand child property
|
|
|
|
* @fill: the new value of the #GtkBox:fill child property
|
|
|
|
* @padding: the new value of the #GtkBox:padding child property
|
|
|
|
* @pack_type: the new value of the #GtkBox:pack-type child property
|
|
|
|
*
|
|
|
|
* Sets the way @child is packed into @box.
|
|
|
|
*/
|
1998-01-18 03:09:42 +00:00
|
|
|
void
|
2007-06-10 02:53:17 +00:00
|
|
|
gtk_box_set_child_packing (GtkBox *box,
|
|
|
|
GtkWidget *child,
|
|
|
|
gboolean expand,
|
|
|
|
gboolean fill,
|
|
|
|
guint padding,
|
|
|
|
GtkPackType pack_type)
|
1998-01-18 03:09:42 +00:00
|
|
|
{
|
|
|
|
GList *list;
|
1999-01-21 22:29:58 +00:00
|
|
|
GtkBoxChild *child_info = NULL;
|
1998-01-18 03:09:42 +00:00
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
2002-01-30 22:29:03 +00:00
|
|
|
g_return_if_fail (GTK_IS_WIDGET (child));
|
1998-01-18 03:09:42 +00:00
|
|
|
|
|
|
|
list = box->children;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
child_info = list->data;
|
|
|
|
if (child_info->widget == child)
|
|
|
|
break;
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_widget_freeze_child_notify (child);
|
1998-01-18 03:09:42 +00:00
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
child_info->expand = expand != FALSE;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_widget_child_notify (child, "expand");
|
1998-01-18 03:09:42 +00:00
|
|
|
child_info->fill = fill != FALSE;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_widget_child_notify (child, "fill");
|
1998-01-18 03:09:42 +00:00
|
|
|
child_info->padding = padding;
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_widget_child_notify (child, "padding");
|
1998-01-18 03:09:42 +00:00
|
|
|
if (pack_type == GTK_PACK_END)
|
|
|
|
child_info->pack = GTK_PACK_END;
|
|
|
|
else
|
|
|
|
child_info->pack = GTK_PACK_START;
|
2005-03-26 05:49:15 +00:00
|
|
|
gtk_widget_child_notify (child, "pack-type");
|
1998-01-18 03:09:42 +00:00
|
|
|
|
2010-03-01 06:47:38 +00:00
|
|
|
if (gtk_widget_get_visible (child)
|
|
|
|
&& gtk_widget_get_visible (GTK_WIDGET (box)))
|
1998-06-24 06:25:14 +00:00
|
|
|
gtk_widget_queue_resize (child);
|
1998-01-18 03:09:42 +00:00
|
|
|
}
|
fix PROP_EVENTS.
Mon Jun 18 02:00:49 2001 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
* gtk/Makefile.am:
* gtk/gtk.h: disabled GtkPacker compilation.
* gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
* gtk/gtknotebook.c:
* gtk/gtktable.c:
* gtk/gtkbox.c: ported this over to child properties.
* gtk/gtksettings.c: fetch class properties via
g_object_class_list_properties().
* gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
child arg interface. use gobjectnotifyqueue.c for child property
notification.
* gtk/gtkwidget.[hc]: provide necessary means for container child
properties, i.e. ::child_notify signal,
gtk_widget_freeze_child_notify(),
gtk_widget_child_notify(),
gtk_widget_thaw_child_notify().
* tests/testgtk.c: removed inferior property handling code, for
property editing, a generic module should be used, and GLE
coincidentally fullfills that purpose.
* docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
needs to be adapted to g_object_class_list_properties() before this
builds again.
2001-06-19 12:54:10 +00:00
|
|
|
gtk_widget_thaw_child_notify (child);
|
1998-01-18 03:09:42 +00:00
|
|
|
}
|
|
|
|
|
2008-10-07 07:44:06 +00:00
|
|
|
void
|
2008-10-07 09:07:27 +00:00
|
|
|
_gtk_box_set_old_defaults (GtkBox *box)
|
2008-10-07 07:44:06 +00:00
|
|
|
{
|
|
|
|
GtkBoxPrivate *private;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_BOX (box));
|
|
|
|
|
|
|
|
private = GTK_BOX_GET_PRIVATE (box);
|
|
|
|
|
|
|
|
private->default_expand = TRUE;
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_box_add (GtkContainer *container,
|
|
|
|
GtkWidget *widget)
|
|
|
|
{
|
2008-10-07 07:44:06 +00:00
|
|
|
GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (container);
|
|
|
|
|
|
|
|
gtk_box_pack_start (GTK_BOX (container), widget,
|
|
|
|
private->default_expand,
|
|
|
|
private->default_expand,
|
|
|
|
0);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_box_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget)
|
|
|
|
{
|
2008-02-07 15:50:39 +00:00
|
|
|
GtkBox *box = GTK_BOX (container);
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
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
|
|
|
|
2010-03-01 06:47:38 +00:00
|
|
|
was_visible = gtk_widget_get_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);
|
|
|
|
|
2010-03-01 06:47:38 +00:00
|
|
|
/* queue resize regardless of gtk_widget_get_visible (container),
|
1998-06-24 17:15:05 +00:00
|
|
|
* 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
|
|
|
{
|
2008-02-07 15:50:39 +00:00
|
|
|
GtkBox *box = GTK_BOX (container);
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkBoxChild *child;
|
|
|
|
GList *children;
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
2005-03-20 07:01:23 +00:00
|
|
|
|
|
|
|
#define __GTK_BOX_C__
|
|
|
|
#include "gtkaliasdef.c"
|