diff options
| author | Tim Janik <timj@gtk.org> | 1998-06-24 12:22:23 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-06-24 12:22:23 +0000 |
| commit | 9860caa53955e4522d34aa158d649a5f880f758d (patch) | |
| tree | a3f58e48771a24f6182e2ec3b8122ed049dcc338 /gtk/gtkmisc.c | |
| parent | 14bd8cf9e5c52629be585d47ce775811f00b3e6a (diff) | |
| download | gdk-pixbuf-9860caa53955e4522d34aa158d649a5f880f758d.tar.gz | |
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
Diffstat (limited to 'gtk/gtkmisc.c')
| -rw-r--r-- | gtk/gtkmisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index bfe4d2fdc..148e689db 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -103,10 +103,10 @@ gtk_misc_set_arg (GtkMisc *misc, gtk_misc_set_alignment (misc, misc->xalign, GTK_VALUE_DOUBLE (*arg)); break; case ARG_XPAD: - gtk_misc_set_alignment (misc, GTK_VALUE_INT (*arg), misc->ypad); + gtk_misc_set_padding (misc, GTK_VALUE_INT (*arg), misc->ypad); break; case ARG_YPAD: - gtk_misc_set_alignment (misc, misc->xpad, GTK_VALUE_INT (*arg)); + gtk_misc_set_padding (misc, misc->xpad, GTK_VALUE_INT (*arg)); break; default: break; |