AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Set the width of the layout to the actual wrap width (our requisition) not

Browse Source 
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.)
This commit is contained in:
Owen Taylor 2002-05-14 20:55:22 +00:00 committed by Owen Taylor
parent 1dd8a1453f
commit 11aed263b7
45 changed files with 587 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
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.)
Tue May 14 15:40:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):

23
ChangeLog.pre-2-10
View File

@ -1,3 +1,26 @@
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.)
Tue May 14 15:40:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):

23
ChangeLog.pre-2-2
View File

@ -1,3 +1,26 @@
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.)
Tue May 14 15:40:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):

23
ChangeLog.pre-2-4
View File

@ -1,3 +1,26 @@
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.)
Tue May 14 15:40:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):

23
ChangeLog.pre-2-6
View File

@ -1,3 +1,26 @@
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.)
Tue May 14 15:40:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):

23
ChangeLog.pre-2-8
View File

@ -1,3 +1,26 @@
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.)
Tue May 14 15:40:49 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):

1
docs/reference/gdk/tmpl/drawing.sgml
View File

@ -32,7 +32,6 @@ drawn onto. This can be a #GdkPixmap, a #GdkBitmap,
or a #GdkWindow.
</para>
@user_data:
<!-- ##### FUNCTION gdk_drawable_ref ##### -->
<para>

6
docs/reference/gdk/tmpl/gcs.sgml
View File

@ -37,12 +37,6 @@ It is an opaque structure with no user-visible
elements.
</para>
@parent_instance:
@clip_x_origin:
@clip_y_origin:
@ts_x_origin:
@ts_y_origin:
@colormap:
<!-- ##### STRUCT GdkGCValues ##### -->
<para>

5
docs/reference/gdk/tmpl/gdkscreen.sgml
View File

@ -24,8 +24,9 @@ form a large screen area.
<!-- ##### STRUCT GdkScreen ##### -->
<para>
The <structname>GdkScreen</structname> struct is the GDK representation of a
physical screen. All its fields are private and should not be accessed directly.
This is a currently just a placeholder typedef for the first argument of
the @window_at_pointer function in #GdkPointerHooks. It will be used
when GDK gets multihead support.
</para>

2
docs/reference/gdk/tmpl/keys.sgml
View File

@ -89,8 +89,6 @@ state; the second phase is to look up the keycode/group/level triplet
in the keymap and see what keyval it corresponds to.
</para>
@parent_instance:
@display:
<!-- ##### STRUCT GdkKeymapKey ##### -->
<para>

1
docs/reference/gdk/tmpl/pixmaps.sgml
View File

@ -27,7 +27,6 @@ The type #GdkDrawable refers generically to any of
these types.
</para>
@user_data:
<!-- ##### FUNCTION gdk_pixmap_new ##### -->
<para>

10
docs/reference/gdk/tmpl/windows.sgml
View File

@ -28,7 +28,6 @@ The type #GdkDrawable refers generically to any of
these types.
</para>
@user_data: used to store the #GtkWidget associated with this window
<!-- ##### ENUM GdkWindowType ##### -->
<para>
@ -238,15 +237,6 @@ corresponding flag in #GdkWindowAttributesType.
@GDK_WA_WMCLASS: Honor the wmclass_class and wmclass_name fields
@GDK_WA_NOREDIR: Honor the override_redirect field
<!-- ##### STRUCT GdkScreen ##### -->
<para>
This is a currently just a placeholder typedef for the first argument of
the @window_at_pointer function in #GdkPointerHooks. It will be used
when GDK gets multihead support.
</para>
@parent_instance:
<!-- ##### FUNCTION gdk_window_new ##### -->
<para>

12
docs/reference/gtk/tmpl/gtk-unused.sgml
View File

@ -1027,12 +1027,6 @@ after other user handlers and the default handler.
@GTK_FILL_X:
@GTK_FILL_Y:
<!-- ##### ARG GtkPaned:handle-size ##### -->
<para>
</para>
<!-- ##### STRUCT GtkPatternSpec ##### -->
<para>
@ -1128,12 +1122,6 @@ and its unique identifying integer.
@nparams:
@params:
<!-- ##### ARG GtkSpinButton:shadow-type ##### -->
<para>
the type of border that surrounds the arrows of a spin button.
</para>
<!-- ##### STRUCT GtkStatusbarMsg ##### -->
<para>
Holds the data for a statusbar message. <structfield>text</structfield> holds the actual text string. <structfield>context_id</structfield> is the context that this message is associated with, and <structfield>message_id</structfield> is this particular message's identifier. However, these fields should not be modified directly.

25
docs/reference/gtk/tmpl/gtkbbox.sgml
View File

@ -157,3 +157,28 @@ box.
</para>
<!-- ##### ARG GtkButtonBox:secondary ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
<para>
</para>

25
docs/reference/gtk/tmpl/gtkbox.sgml
View File

@ -382,3 +382,28 @@ how to allocate space for children, equally or variably. Refers to
the <structfield>homogeneous</structfield> field of #GtkBox-struct.
</para>
<!-- ##### ARG GtkBox:expand ##### -->
<para>
</para>
<!-- ##### ARG GtkBox:fill ##### -->
<para>
</para>
<!-- ##### ARG GtkBox:padding ##### -->
<para>
</para>
<!-- ##### ARG GtkBox:pack-type ##### -->
<para>
</para>
<!-- ##### ARG GtkBox:position ##### -->
<para>
</para>

20
docs/reference/gtk/tmpl/gtkbutton.sgml
View File

@ -249,3 +249,23 @@ The #GtkReliefStyle as outlined in gtk_button_set_relief().
</para>
<!-- ##### ARG GtkButton:default-border ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:default-outside-border ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:child-displacement-y ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:child-displacement-x ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtkcheckbutton.sgml
View File

@ -66,3 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
@Returns:
<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
<para>
</para>
<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
<para>
</para>

15
docs/reference/gtk/tmpl/gtkdialog.sgml
View File

@ -298,3 +298,18 @@ was clicked.
</para>
<!-- ##### ARG GtkDialog:content-area-border ##### -->
<para>
</para>
<!-- ##### ARG GtkDialog:button-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkDialog:action-area-border ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtkfixed.sgml
View File

@ -166,3 +166,13 @@ Moves a child of a #GtkFixed container to the given position.
@has_window:
<!-- ##### ARG GtkFixed:x ##### -->
<para>
</para>
<!-- ##### ARG GtkFixed:y ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtklayout.sgml
View File

@ -171,3 +171,13 @@ Layout width, see gtk_layout_set_size()
Layout height, see gtk_layout_set_size()
</para>
<!-- ##### ARG GtkLayout:x ##### -->
<para>
</para>
<!-- ##### ARG GtkLayout:y ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtkmenubar.sgml
View File

@ -64,3 +64,13 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
@position: the position in the item list where the @child is added.
<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
<para>
</para>

5
docs/reference/gtk/tmpl/gtkmenuitem.sgml
View File

@ -201,3 +201,8 @@ submenu. For normal applications, the relevant signal is "activate".
@menuitem: the object which received the signal.
@arg1:
<!-- ##### ARG GtkMenuItem:selected-shadow-type ##### -->
<para>
</para>

5
docs/reference/gtk/tmpl/gtkmessagedialog.sgml
View File

@ -112,3 +112,8 @@ then call gtk_dialog_add_buttons().
</para>
<!-- ##### ARG GtkMessageDialog:message-border ##### -->
<para>
</para>

30
docs/reference/gtk/tmpl/gtknotebook.sgml
View File

@ -496,3 +496,33 @@ Whether the popup menu for switching pages is enabled.
whether the tabs must have all the same size.
</para>
<!-- ##### ARG GtkNotebook:tab-label ##### -->
<para>
</para>
<!-- ##### ARG GtkNotebook:menu-label ##### -->
<para>
</para>
<!-- ##### ARG GtkNotebook:position ##### -->
<para>
</para>
<!-- ##### ARG GtkNotebook:tab-expand ##### -->
<para>
</para>
<!-- ##### ARG GtkNotebook:tab-fill ##### -->
<para>
</para>
<!-- ##### ARG GtkNotebook:tab-pack ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtkoptionmenu.sgml
View File

@ -100,3 +100,13 @@ selected value for the option menu.
</para>
<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
<para>
</para>
<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
<para>
</para>

5
docs/reference/gtk/tmpl/gtkpaned.sgml
View File

@ -215,3 +215,8 @@ gutter (the area between the two panes). It does nothing now.
</para>
<!-- ##### ARG GtkPaned:handle-size ##### -->
<para>
</para>

2
docs/reference/gtk/tmpl/gtkplug.sgml
View File

@ -47,8 +47,8 @@ inside the first applications window.
</para>
@display:
@plug:
@display:
@socket_id:

30
docs/reference/gtk/tmpl/gtkrange.sgml
View File

@ -153,3 +153,33 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:stepper-size ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:slider-width ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:trough-border ##### -->
<para>
</para>

4
docs/reference/gtk/tmpl/gtkrc.sgml
View File

@ -792,11 +792,9 @@ otherwise %NULL.
<!-- ##### FUNCTION gtk_rc_get_module_dir ##### -->
<para>
Returns the directory in which GTK+ will look for
theme engines.
</para>
@Returns: The directory. (Must be freed with g_free())
@Returns:
<!-- ##### FUNCTION gtk_rc_get_im_module_path ##### -->

10
docs/reference/gtk/tmpl/gtkscale.sgml
View File

@ -148,3 +148,13 @@ If the current value is displayed as a string next to the slider.
The position in which the current value is displayed.
</para>
<!-- ##### ARG GtkScale:slider-length ##### -->
<para>
</para>
<!-- ##### ARG GtkScale:value-spacing ##### -->
<para>
</para>

30
docs/reference/gtk/tmpl/gtkscrollbar.sgml
View File

@ -54,3 +54,33 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
<para>
</para>

5
docs/reference/gtk/tmpl/gtkspinbutton.sgml
View File

@ -473,3 +473,8 @@ how a spin button should be updated.
reads the current value, or sets a new value.
</para>
<!-- ##### ARG GtkSpinButton:shadow-type ##### -->
<para>
the type of border that surrounds the arrows of a spin button.
</para>

5
docs/reference/gtk/tmpl/gtkstatusbar.sgml
View File

@ -138,3 +138,8 @@ Is emitted whenever a new message gets pushed onto a statusbar's stack.
@context_id: the context id of the relevant message/statusbar.
@text: the message that was pushed.
<!-- ##### ARG GtkStatusbar:shadow-type ##### -->
<para>
</para>

10
docs/reference/gtk/tmpl/gtkstyle.sgml
View File

@ -179,6 +179,16 @@ Returns whether the style is attached to a window.
@Returns:
<!-- ##### FUNCTION gtk_style_get_font_for_display ##### -->
<para>
</para>
@display:
@style:
@Returns:
<!-- ##### FUNCTION gtk_style_set_font ##### -->
<para>

40
docs/reference/gtk/tmpl/gtktable.sgml
View File

@ -276,3 +276,43 @@ Sets or retrieves the number of pixels of space between rows.
Whether each cell in the table should be the same size or not.
</para>
<!-- ##### ARG GtkTable:left-attach ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:right-attach ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:top-attach ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:bottom-attach ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:x-options ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:y-options ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:x-padding ##### -->
<para>
</para>
<!-- ##### ARG GtkTable:y-padding ##### -->
<para>
</para>

25
docs/reference/gtk/tmpl/gtktoolbar.sgml
View File

@ -386,3 +386,28 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:space-style ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:internal-padding ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:space-size ##### -->
<para>
</para>

25
docs/reference/gtk/tmpl/gtktreeview.sgml
View File

@ -901,3 +901,28 @@ Function used for #gtk_tree_view_map_expanded_rows.
</para>
<!-- ##### ARG GtkTreeView:expander-size ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:allow-rules ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
<para>
</para>

55
docs/reference/gtk/tmpl/gtkwidget.sgml
View File

@ -1320,6 +1320,26 @@ This function is not useful for applications.
@class:
<!-- ##### FUNCTION gtk_widget_class_find_style_property ##### -->
<para>
</para>
@klass:
@property_name:
@Returns:
<!-- ##### FUNCTION gtk_widget_class_list_style_properties ##### -->
<para>
</para>
@klass:
@n_properties:
@Returns:
<!-- ##### FUNCTION gtk_widget_region_intersect ##### -->
<para>
@ -2163,3 +2183,38 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:interior-focus ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-padding ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>

2
gtk/Makefile.am
View File

@ -573,6 +573,8 @@ install-data-local: install-ms-lib install-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)

8
gtk/gtkaccelgroup.c
View File

@ -119,15 +119,15 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class)
G_SIGNAL_DETAILED,
0,
accel_activate_accumulator, NULL,
_gtk_marshal_BOOLEAN__OBJECT_UINT_UINT,
G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
_gtk_marshal_BOOLEAN__OBJECT_UINT_FLAGS,
G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, GDK_TYPE_MODIFIER_TYPE);
signal_accel_changed = g_signal_new ("accel_changed",
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GtkAccelGroupClass, accel_changed),
NULL, NULL,
_gtk_marshal_VOID__UINT_UINT_BOXED,
G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_CLOSURE);
_gtk_marshal_VOID__UINT_FLAGS_BOXED,
G_TYPE_NONE, 3, G_TYPE_UINT, GDK_TYPE_MODIFIER_TYPE, G_TYPE_CLOSURE);
}
static void

5
gtk/gtklabel.c
View File

@ -1447,6 +1447,7 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_layout_set_width (label->layout, width);
pango_layout_get_extents (label->layout, NULL, &logical_rect);
width = logical_rect.width;
height = logical_rect.height;
/* Unfortunately, the above may leave us with a very unbalanced looking paragraph,
@ -1465,7 +1466,7 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_layout_get_extents (label->layout, NULL, &logical_rect);
if (logical_rect.height <= height)
width = perfect_width;
width = logical_rect.width;
else
{
gint mid_width = (perfect_width + width) / 2;
@ -1476,7 +1477,7 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_layout_get_extents (label->layout, NULL, &logical_rect);
if (logical_rect.height <= height)
width = mid_width;
width = logical_rect.width;
}
}
}

4
gtk/gtkmarshalers.list
View File

@ -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

14
gtk/gtkrc.c
View File

@ -299,9 +299,9 @@ gtk_rc_make_default_dir (const gchar *type)
var = g_getenv ("GTK_EXE_PREFIX");
if (var)
path = g_build_filename (var, "lib", "gtk-2.0", type, GTK_BINARY_VERSION, NULL);
path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
else
path = g_build_filename (GTK_LIBDIR, "gtk-2.0", type, GTK_BINARY_VERSION, NULL);
path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
return path;
}
@ -367,6 +367,16 @@ gtk_rc_get_theme_dir (void)
return path;
}
/**
* gtk_rc_get_module_dir:
*
* Returns a directory in which GTK+ looks for theme engines.
* For full information about the search for theme engines,
* see the docs for <envvar>GTK_PATH</envvar> in
* <xref linkend="gtk-running">.
*
* return value: the directory. (Must be freed with g_free())
**/
gchar *
gtk_rc_get_module_dir (void)
{