diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-05-14 20:55:22 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-05-14 20:55:22 +0000 |
| commit | 11aed263b7e9ec7a02bb5ad610732969bc87073d (patch) | |
| tree | 90730288b0d16ba178eb4757ca9dad846cfef508 /gtk/gtkmarshalers.list | |
| parent | 1dd8a1453ff45d26e9c8c497e58070da5043eb7f (diff) | |
| download | gtk+-11aed263b7e9ec7a02bb5ad610732969bc87073d.tar.gz | |
Set the width of the layout to the actual wrap width (our requisition) not
Tue May 14 16:44:09 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_ensure_layout): Set
the width of the layout to the actual wrap width
(our requisition) not the width we set when calculating
the width. This results in the lines being justified
within the correct area. (#79157, Anders Carlsson)
* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected
registered parameter types of "accel_activate" and
"accel_changed" signals. (Patch from Murray Cumming, #78798)
* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
binary-version and type to correspond to the
current ordering in _gtk_get_module_path.
(#78746, Sergey Kuzminov)
* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
pointing to the GTK_PATH documentation.
* gtk/Makefile.am (uninstall-local): Delete
key themes as well. (#81286, Kristian Rietveld.)
Diffstat (limited to 'gtk/gtkmarshalers.list')
| -rw-r--r-- | gtk/gtkmarshalers.list | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index d1dd2070f9..b0fa87862d 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -25,7 +25,7 @@ BOOLEAN:BOXED BOOLEAN:BOXED,BOXED BOOLEAN:ENUM BOOLEAN:ENUM,INT -BOOLEAN:OBJECT,UINT,UINT +BOOLEAN:OBJECT,UINT,FLAGS BOOLEAN:OBJECT,INT,INT,UINT BOOLEAN:OBJECT,STRING,STRING,BOXED BOOLEAN:OBJECT,BOXED,BOXED @@ -81,8 +81,8 @@ VOID:POINTER,UINT VOID:STRING VOID:STRING,STRING VOID:STRING,INT,POINTER +VOID:UINT,FLAGS,BOXED VOID:UINT,UINT -VOID:UINT,UINT,BOXED VOID:UINT,STRING VOID:UINT,BOXED,UINT,FLAGS,FLAGS VOID:UINT,OBJECT,UINT,FLAGS,FLAGS |