diff options
| author | Tim Janik <timj@gtk.org> | 1998-06-17 08:48:22 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-06-17 08:48:22 +0000 |
| commit | 7d0331a679c00c20db87822739e7544c67c6c2fe (patch) | |
| tree | ca044e4a14619f6534aff6997b4212d6a0535fba /gtk/gtkbox.h | |
| parent | 7bb4d7d961d2856f235db861c93a4838ae7b4f50 (diff) | |
| download | gtk+-7d0331a679c00c20db87822739e7544c67c6c2fe.tar.gz | |
new function gdk_window_at_pointer() to retrive the current GdkWindow the
Wed Jun 17 03:47:40 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.h:
* gdk/gdkwindow.c: new function gdk_window_at_pointer() to retrive
the current GdkWindow the pointer is on if there is any.
* gtk/gtktable.c (gtk_table_init): preallocate a table with one row
and one column, so we don't construction logic at all. changed a few
(x < y - 1) to (x + 1 < y), to avoid failing evaluations due to
unsigned int wraps.
* gtk/gtkwidget.c (gtk_widget_set_parent): removed left over code
portion, added an additional check for parent != widget.
* more GtkType and macro fixups.
Diffstat (limited to 'gtk/gtkbox.h')
| -rw-r--r-- | gtk/gtkbox.h | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index 223207f958..db7a26798d 100644 --- a/gtk/gtkbox.h +++ b/gtk/gtkbox.h @@ -8,7 +8,7 @@ * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public @@ -26,22 +26,25 @@ #ifdef __cplusplus extern "C" { +#pragma } #endif /* __cplusplus */ -#define GTK_BOX(obj) GTK_CHECK_CAST (obj, gtk_box_get_type (), GtkBox) -#define GTK_BOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_box_get_type (), GtkBoxClass) -#define GTK_IS_BOX(obj) GTK_CHECK_TYPE (obj, gtk_box_get_type ()) +#define GTK_TYPE_BOX (gtk_box_get_type ()) +#define GTK_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BOX, GtkBox)) +#define GTK_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass)) +#define GTK_IS_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BOX)) +#define GTK_IS_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX)) -typedef struct _GtkBox GtkBox; +typedef struct _GtkBox GtkBox; typedef struct _GtkBoxClass GtkBoxClass; typedef struct _GtkBoxChild GtkBoxChild; struct _GtkBox { GtkContainer container; - + GList *children; gint16 spacing; guint homogeneous : 1; @@ -62,39 +65,39 @@ struct _GtkBoxChild }; -guint gtk_box_get_type (void); -void gtk_box_pack_start (GtkBox *box, +GtkType gtk_box_get_type (void); +void gtk_box_pack_start (GtkBox *box, GtkWidget *child, gboolean expand, gboolean fill, - guint padding); -void gtk_box_pack_end (GtkBox *box, + guint padding); +void gtk_box_pack_end (GtkBox *box, GtkWidget *child, gboolean expand, gboolean fill, - guint padding); -void gtk_box_pack_start_defaults (GtkBox *box, + guint padding); +void gtk_box_pack_start_defaults (GtkBox *box, GtkWidget *widget); -void gtk_box_pack_end_defaults (GtkBox *box, +void gtk_box_pack_end_defaults (GtkBox *box, GtkWidget *widget); -void gtk_box_set_homogeneous (GtkBox *box, +void gtk_box_set_homogeneous (GtkBox *box, gboolean homogeneous); -void gtk_box_set_spacing (GtkBox *box, - gint spacing); -void gtk_box_reorder_child (GtkBox *box, +void gtk_box_set_spacing (GtkBox *box, + gint spacing); +void gtk_box_reorder_child (GtkBox *box, GtkWidget *child, - gint position); -void gtk_box_query_child_packing (GtkBox *box, + gint position); +void gtk_box_query_child_packing (GtkBox *box, GtkWidget *child, gboolean *expand, gboolean *fill, - guint *padding, + guint *padding, GtkPackType *pack_type); -void gtk_box_set_child_packing (GtkBox *box, +void gtk_box_set_child_packing (GtkBox *box, GtkWidget *child, gboolean expand, gboolean fill, - guint padding, + guint padding, GtkPackType pack_type); |