diff options
69 files changed, 555 insertions, 279 deletions
@@ -1,3 +1,40 @@ +2002-08-10 Soren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gtk/tree_widget.sgml, + docs/reference/gtk/tmpl/gtkdialog.sgml, + docs/reference/gtk/tmpl/gtkentry.sgml, + docs/reference/gtk/tmpl/gtkfilesel.sgml, + docs/reference/gtk/tmpl/gtkfontsel.sgml, + docs/reference/gtk/tmpl/gtkfontseldlg.sgml, + docs/reference/gtk/tmpl/gtktreemodel.sgml, + docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c, + gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c, + gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c, + gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c, + gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c, + gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c, + gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c, + gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c, + gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c, + gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c, + gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c, + gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, + gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c, + gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h, + gtk/gtkwindow.c: + + Minor documentation fixes + + (#89254, patch from Brett Nash; + #85809, patch from daten@dnetc.org; + #76391, patch from Ross Burton; + #74559, Manuel Clos; + #73569, #72005, Alexey A. Malyshev; + #70061, patch from Dennis Bj"orklund; + #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov; + #78932, Vitaly Tishkov, patch from Ross Burton; + #73306) + 2002-08-10 Matthias Clasen <maclas@gmx.de> * gdk/gdkrgb.c (gdk_rgb_try_colormap): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index de770c85a..915901eef 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,40 @@ +2002-08-10 Soren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gtk/tree_widget.sgml, + docs/reference/gtk/tmpl/gtkdialog.sgml, + docs/reference/gtk/tmpl/gtkentry.sgml, + docs/reference/gtk/tmpl/gtkfilesel.sgml, + docs/reference/gtk/tmpl/gtkfontsel.sgml, + docs/reference/gtk/tmpl/gtkfontseldlg.sgml, + docs/reference/gtk/tmpl/gtktreemodel.sgml, + docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c, + gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c, + gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c, + gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c, + gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c, + gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c, + gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c, + gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c, + gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c, + gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c, + gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c, + gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, + gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c, + gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h, + gtk/gtkwindow.c: + + Minor documentation fixes + + (#89254, patch from Brett Nash; + #85809, patch from daten@dnetc.org; + #76391, patch from Ross Burton; + #74559, Manuel Clos; + #73569, #72005, Alexey A. Malyshev; + #70061, patch from Dennis Bj"orklund; + #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov; + #78932, Vitaly Tishkov, patch from Ross Burton; + #73306) + 2002-08-10 Matthias Clasen <maclas@gmx.de> * gdk/gdkrgb.c (gdk_rgb_try_colormap): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index de770c85a..915901eef 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,40 @@ +2002-08-10 Soren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gtk/tree_widget.sgml, + docs/reference/gtk/tmpl/gtkdialog.sgml, + docs/reference/gtk/tmpl/gtkentry.sgml, + docs/reference/gtk/tmpl/gtkfilesel.sgml, + docs/reference/gtk/tmpl/gtkfontsel.sgml, + docs/reference/gtk/tmpl/gtkfontseldlg.sgml, + docs/reference/gtk/tmpl/gtktreemodel.sgml, + docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c, + gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c, + gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c, + gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c, + gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c, + gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c, + gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c, + gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c, + gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c, + gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c, + gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c, + gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, + gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c, + gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h, + gtk/gtkwindow.c: + + Minor documentation fixes + + (#89254, patch from Brett Nash; + #85809, patch from daten@dnetc.org; + #76391, patch from Ross Burton; + #74559, Manuel Clos; + #73569, #72005, Alexey A. Malyshev; + #70061, patch from Dennis Bj"orklund; + #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov; + #78932, Vitaly Tishkov, patch from Ross Burton; + #73306) + 2002-08-10 Matthias Clasen <maclas@gmx.de> * gdk/gdkrgb.c (gdk_rgb_try_colormap): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index de770c85a..915901eef 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,40 @@ +2002-08-10 Soren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gtk/tree_widget.sgml, + docs/reference/gtk/tmpl/gtkdialog.sgml, + docs/reference/gtk/tmpl/gtkentry.sgml, + docs/reference/gtk/tmpl/gtkfilesel.sgml, + docs/reference/gtk/tmpl/gtkfontsel.sgml, + docs/reference/gtk/tmpl/gtkfontseldlg.sgml, + docs/reference/gtk/tmpl/gtktreemodel.sgml, + docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c, + gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c, + gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c, + gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c, + gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c, + gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c, + gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c, + gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c, + gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c, + gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c, + gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c, + gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, + gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c, + gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h, + gtk/gtkwindow.c: + + Minor documentation fixes + + (#89254, patch from Brett Nash; + #85809, patch from daten@dnetc.org; + #76391, patch from Ross Burton; + #74559, Manuel Clos; + #73569, #72005, Alexey A. Malyshev; + #70061, patch from Dennis Bj"orklund; + #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov; + #78932, Vitaly Tishkov, patch from Ross Burton; + #73306) + 2002-08-10 Matthias Clasen <maclas@gmx.de> * gdk/gdkrgb.c (gdk_rgb_try_colormap): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index de770c85a..915901eef 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,40 @@ +2002-08-10 Soren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gtk/tree_widget.sgml, + docs/reference/gtk/tmpl/gtkdialog.sgml, + docs/reference/gtk/tmpl/gtkentry.sgml, + docs/reference/gtk/tmpl/gtkfilesel.sgml, + docs/reference/gtk/tmpl/gtkfontsel.sgml, + docs/reference/gtk/tmpl/gtkfontseldlg.sgml, + docs/reference/gtk/tmpl/gtktreemodel.sgml, + docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c, + gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c, + gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c, + gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c, + gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c, + gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c, + gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c, + gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c, + gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c, + gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c, + gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c, + gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, + gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c, + gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h, + gtk/gtkwindow.c: + + Minor documentation fixes + + (#89254, patch from Brett Nash; + #85809, patch from daten@dnetc.org; + #76391, patch from Ross Burton; + #74559, Manuel Clos; + #73569, #72005, Alexey A. Malyshev; + #70061, patch from Dennis Bj"orklund; + #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov; + #78932, Vitaly Tishkov, patch from Ross Burton; + #73306) + 2002-08-10 Matthias Clasen <maclas@gmx.de> * gdk/gdkrgb.c (gdk_rgb_try_colormap): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index de770c85a..915901eef 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,40 @@ +2002-08-10 Soren Sandmann <sandmann@daimi.au.dk> + + * docs/reference/gtk/tree_widget.sgml, + docs/reference/gtk/tmpl/gtkdialog.sgml, + docs/reference/gtk/tmpl/gtkentry.sgml, + docs/reference/gtk/tmpl/gtkfilesel.sgml, + docs/reference/gtk/tmpl/gtkfontsel.sgml, + docs/reference/gtk/tmpl/gtkfontseldlg.sgml, + docs/reference/gtk/tmpl/gtktreemodel.sgml, + docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c, + gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c, + gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c, + gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c, + gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c, + gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c, + gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c, + gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c, + gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c, + gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c, + gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c, + gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c, + gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c, + gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h, + gtk/gtkwindow.c: + + Minor documentation fixes + + (#89254, patch from Brett Nash; + #85809, patch from daten@dnetc.org; + #76391, patch from Ross Burton; + #74559, Manuel Clos; + #73569, #72005, Alexey A. Malyshev; + #70061, patch from Dennis Bj"orklund; + #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov; + #78932, Vitaly Tishkov, patch from Ross Burton; + #73306) + 2002-08-10 Matthias Clasen <maclas@gmx.de> * gdk/gdkrgb.c (gdk_rgb_try_colormap): diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml index fb6275b5e..4058c2f9f 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml @@ -99,6 +99,16 @@ Application-driven progressive image loading. @Returns: +<!-- ##### FUNCTION gdk_pixbuf_loader_set_size ##### --> +<para> + +</para> + +@loader: +@width: +@height: + + <!-- ##### FUNCTION gdk_pixbuf_loader_get_pixbuf ##### --> <para> @@ -126,16 +136,6 @@ Application-driven progressive image loading. @error: @Returns: -<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### --> - <para> - This signal is emitted when the pixbuf loader has been fed the - initial amount of data that is required to figure out the size - of the image that it will create. Applications can call - gdk_pixbuf_loader_set_size() in response to this signal to set - the desired size to which the image should be scaled. - </para> -@width: the original width of the image -@height: the original height of the image <!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### --> <para> @@ -144,6 +144,8 @@ Application-driven progressive image loading. call gdk_pixbuf_loader_get_pixbuf() to fetch the partially-loaded pixbuf. </para> +@gdkpixbufloader: the object which received the signal. + <!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### --> <para> This signal is emitted when a significant area of the image being @@ -154,6 +156,11 @@ Application-driven progressive image loading. </para> @gdkpixbufloader: Loader which emitted the signal. +@arg1: +@arg2: +@arg3: +@arg4: +<!-- # Unused Parameters # --> @x: X offset of upper-left corner of the updated area. @y: Y offset of upper-left corner of the updated area. @width: Width of updated area. @@ -176,4 +183,19 @@ sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "") End: --> +<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### --> + <para> + This signal is emitted when the pixbuf loader has been fed the + initial amount of data that is required to figure out the size + of the image that it will create. Applications can call + gdk_pixbuf_loader_set_size() in response to this signal to set + the desired size to which the image should be scaled. + </para> + +@gdkpixbufloader: the object which received the signal. +@arg1: +@arg2: +<!-- # Unused Parameters # --> +@width: the original width of the image +@height: the original height of the image diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index cf6dbb8ba..68015589b 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -882,6 +882,13 @@ they will be ignored. </para> +<!-- ##### FUNCTION gdk_screen_close ##### --> +<para> + +</para> + +@screen: + <!-- ##### FUNCTION gdk_screen_use_virtual_screen ##### --> <para> diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml index 17b08f934..b7a50b47f 100644 --- a/docs/reference/gdk/tmpl/gdkdisplay.sgml +++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml @@ -205,3 +205,11 @@ of an X display. All its fields are private and should not be accessed directly. @sm_client_id: +<!-- ##### SIGNAL GdkDisplay::closed ##### --> +<para> + +</para> + +@gdkdisplay: the object which received the signal. +@arg1: + diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml index 40797a255..8b2ac7b45 100644 --- a/docs/reference/gdk/tmpl/gdkscreen.sgml +++ b/docs/reference/gdk/tmpl/gdkscreen.sgml @@ -166,14 +166,6 @@ when GDK gets multihead support. @Returns: -<!-- ##### FUNCTION gdk_screen_close ##### --> -<para> - -</para> - -@screen: - - <!-- ##### FUNCTION gdk_screen_list_visuals ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml index ecc2bfdd8..ceec7a091 100644 --- a/docs/reference/gtk/tmpl/gtkbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbbox.sgml @@ -162,22 +162,22 @@ box. </para> -<!-- ##### ARG GtkButtonBox:child-min-height ##### --> +<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### --> <para> </para> -<!-- ##### ARG GtkButtonBox:child-min-width ##### --> +<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### --> <para> </para> -<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### --> +<!-- ##### ARG GtkButtonBox:child-min-width ##### --> <para> </para> -<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### --> +<!-- ##### ARG GtkButtonBox:child-min-height ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index 606ca5da9..ecc477c1d 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -248,22 +248,22 @@ mouse cursor is. </para> -<!-- ##### ARG GtkButton:default-border ##### --> +<!-- ##### ARG GtkButton:child-displacement-y ##### --> <para> </para> -<!-- ##### ARG GtkButton:default-outside-border ##### --> +<!-- ##### ARG GtkButton:child-displacement-x ##### --> <para> </para> -<!-- ##### ARG GtkButton:child-displacement-y ##### --> +<!-- ##### ARG GtkButton:default-border ##### --> <para> </para> -<!-- ##### ARG GtkButton:child-displacement-x ##### --> +<!-- ##### ARG GtkButton:default-outside-border ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 7b5e72c6a..9f985152d 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -66,12 +66,12 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: -<!-- ##### ARG GtkCheckButton:indicator-size ##### --> +<!-- ##### ARG GtkCheckButton:indicator-spacing ##### --> <para> </para> -<!-- ##### ARG GtkCheckButton:indicator-spacing ##### --> +<!-- ##### ARG GtkCheckButton:indicator-size ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index 6a113643a..3a5480f41 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -127,17 +127,18 @@ response from the user.</para></listitem> <!-- ##### STRUCT GtkDialog ##### --> <para> -<structfield>window</structfield> is a #GtkWindow, but should not be -modified directly, (use the functions provided, such as -gtk_window_set_title(). See the #GtkWindow section for more). +<structfield>vbox</structfield> is a #GtkVBox - the main part of the +dialog box. </para> <para> -<structfield>vbox</structfield> is a #GtkVBox - the main part of the dialog box. -</para> -<para> -<structfield>action_area</structfield> is a #GtkHBox packed below the dividing #GtkHSeparator in the dialog. It is treated exactly the same as any other #GtkHBox. + +<structfield>action_area</structfield> is a #GtkHBox packed below the +dividing #GtkHSeparator in the dialog. It is treated exactly the same +as any other #GtkHBox. </para> +@action_area: +@vbox: <!-- ##### ENUM GtkDialogFlags ##### --> <para> @@ -303,12 +304,12 @@ was clicked. </para> -<!-- ##### ARG GtkDialog:button-spacing ##### --> +<!-- ##### ARG GtkDialog:action-area-border ##### --> <para> </para> -<!-- ##### ARG GtkDialog:action-area-border ##### --> +<!-- ##### ARG GtkDialog:button-spacing ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index f00dbb568..5b04ab5b3 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -95,15 +95,11 @@ gtk_editable_set_position() instead. <!-- ##### FUNCTION gtk_entry_get_text ##### --> <para> -Retrieve the contents of the entry widget. The returned -pointer points to internally allocated storage in the -widget and must not be freed, modified or stored. -See also gtk_editable_get_chars(). + </para> -@entry: a #GtkEntry. -@Returns: the pointer the the contents of the text widget as a - string. +@entry: +@Returns: <!-- ##### FUNCTION gtk_entry_select_region ##### --> diff --git a/docs/reference/gtk/tmpl/gtkfilesel.sgml b/docs/reference/gtk/tmpl/gtkfilesel.sgml index afc8d6d1d..f64024db1 100644 --- a/docs/reference/gtk/tmpl/gtkfilesel.sgml +++ b/docs/reference/gtk/tmpl/gtkfilesel.sgml @@ -100,11 +100,6 @@ The #GtkFileSelection struct contains the following #GtkWidget fields: </row> <row> -<entry>*dir_list, *file_list;</entry> -<entry>the two #GtkCList widgets corresponding to directories and files.</entry> -</row> - -<row> <entry>*ok_button, *cancel_button;</entry> <entry>the two main buttons that signals should be connected to in order to perform an action when the user hits either OK or Cancel.</entry> </row> diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml index 986ada711..d3c030f01 100644 --- a/docs/reference/gtk/tmpl/gtkfontsel.sgml +++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml @@ -94,7 +94,8 @@ Gets the text displayed in the preview area. </para> @fontsel: a #GtkFontSelection. -@Returns: the text displayed in the preview area. +@Returns: the text displayed in the preview area. This string is + owned by the widget and should not be modified or freed. <!-- ##### FUNCTION gtk_font_selection_set_preview_text ##### --> diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml index e781c7e27..d6e07d28f 100644 --- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml +++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml @@ -115,7 +115,8 @@ Gets the text displayed in the preview area. </para> @fsd: a #GtkFontSelectionDialog. -@Returns: the text displayed in the preview area. +@Returns: the text displayed in the preview area. This string is owned + by the widget and should not be modified or freed. <!-- ##### FUNCTION gtk_font_selection_dialog_set_preview_text ##### --> diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 876a046a5..31debc57f 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -100,12 +100,12 @@ selected value for the option menu. </para> -<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### --> +<!-- ##### ARG GtkOptionMenu:indicator-size ##### --> <para> </para> -<!-- ##### ARG GtkOptionMenu:indicator-size ##### --> +<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index 3ad1851a3..153dbaaa3 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -153,32 +153,32 @@ Emitted when the range value changes. </para> -<!-- ##### ARG GtkRange:stepper-spacing ##### --> +<!-- ##### ARG GtkRange:slider-width ##### --> <para> </para> -<!-- ##### ARG GtkRange:stepper-size ##### --> +<!-- ##### ARG GtkRange:arrow-displacement-y ##### --> <para> </para> -<!-- ##### ARG GtkRange:trough-border ##### --> +<!-- ##### ARG GtkRange:arrow-displacement-x ##### --> <para> </para> -<!-- ##### ARG GtkRange:slider-width ##### --> +<!-- ##### ARG GtkRange:stepper-spacing ##### --> <para> </para> -<!-- ##### ARG GtkRange:arrow-displacement-y ##### --> +<!-- ##### ARG GtkRange:trough-border ##### --> <para> </para> -<!-- ##### ARG GtkRange:arrow-displacement-x ##### --> +<!-- ##### ARG GtkRange:stepper-size ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index 8935f1164..d2861f190 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -148,12 +148,12 @@ format_value_callback (GtkScale *scale, </para> -<!-- ##### ARG GtkScale:slider-length ##### --> +<!-- ##### ARG GtkScale:value-spacing ##### --> <para> </para> -<!-- ##### ARG GtkScale:value-spacing ##### --> +<!-- ##### ARG GtkScale:slider-length ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml index 65792a700..e5cbe8e03 100644 --- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml @@ -54,12 +54,12 @@ The #GtkScrollbar struct does not contain any public data. </para> -<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### --> <para> </para> @@ -69,17 +69,17 @@ The #GtkScrollbar struct does not contain any public data. </para> -<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:min-slider-length ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:min-slider-length ##### --> +<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index c3aebfa08..31a39e94a 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -58,7 +58,6 @@ GTK+ structs, the fields in this struct should only be read, never modified directly. </para> -@refcount: private field, ignore @appearance: pointer to sub-struct containing certain attributes @justification: @direction: @@ -73,15 +72,10 @@ modified directly. @tabs: @wrap_mode: @language: -@padding1: @invisible: @bg_full_height: @editable: @realized: -@pad1: -@pad2: -@pad3: -@pad4: <!-- ##### FUNCTION gtk_text_tag_new ##### --> <para> @@ -132,16 +126,11 @@ modified directly. @bg_stipple: @fg_stipple: @rise: -@padding1: @underline: @strikethrough: @draw_bg: @inside_selection: @is_text: -@pad1: -@pad2: -@pad3: -@pad4: <!-- ##### FUNCTION gtk_text_attributes_new ##### --> <para> diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 71686ff36..0e12b5d3c 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -386,27 +386,27 @@ Should be used if you wish to perform an action when ever the style of a toolbar </para> -<!-- ##### ARG GtkToolbar:button-relief ##### --> +<!-- ##### ARG GtkToolbar:space-size ##### --> <para> </para> -<!-- ##### ARG GtkToolbar:internal-padding ##### --> +<!-- ##### ARG GtkToolbar:shadow-type ##### --> <para> </para> -<!-- ##### ARG GtkToolbar:shadow-type ##### --> +<!-- ##### ARG GtkToolbar:space-style ##### --> <para> </para> -<!-- ##### ARG GtkToolbar:space-size ##### --> +<!-- ##### ARG GtkToolbar:button-relief ##### --> <para> </para> -<!-- ##### ARG GtkToolbar:space-style ##### --> +<!-- ##### ARG GtkToolbar:internal-padding ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 6fc6e39c1..902ea0911 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -310,7 +310,7 @@ section. <!-- ##### MACRO gtk_tree_path_new_root ##### --> <para> -A alternate name for gtk_tree_path_new_root() provided for +An alternate name for gtk_tree_path_new_iter() provided for compatibility reasons; this macro will be deprecated in future versions of GTK+. </para> diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index e96163a6b..cf97b8fb2 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -906,7 +906,7 @@ Function used for #gtk_tree_view_map_expanded_rows. </para> -<!-- ##### ARG GtkTreeView:indent-expanders ##### --> +<!-- ##### ARG GtkTreeView:expander-size ##### --> <para> </para> @@ -916,12 +916,12 @@ Function used for #gtk_tree_view_map_expanded_rows. </para> -<!-- ##### ARG GtkTreeView:expander-size ##### --> +<!-- ##### ARG GtkTreeView:allow-rules ##### --> <para> </para> -<!-- ##### ARG GtkTreeView:allow-rules ##### --> +<!-- ##### ARG GtkTreeView:indent-expanders ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 7fde53364..750e4493b 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -22,7 +22,18 @@ GtkWidget <!-- ##### STRUCT GtkWidgetClass ##### --> <para> +<structfield>activate_signal</structfield> +The signal to emit when a widget of this class is activated, +gtk_widget_activate() handles the emission. Implementation of this +signal is optional. +</para> +<para> +<structfield>set_scroll_adjustment_signal</structfield> +This signal is emitted when a widget of this class is added +to a scrolling aware parent, gtk_widget_set_scroll_adjustments() +handles the emission. +Implementation of this signal is optional. </para> @@ -1603,7 +1614,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::button-release-event ##### --> <para> @@ -1612,7 +1623,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::child-notify ##### --> <para> @@ -1629,7 +1640,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::configure-event ##### --> <para> @@ -1638,7 +1649,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::delete-event ##### --> <para> @@ -1647,7 +1658,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::destroy-event ##### --> <para> @@ -1656,7 +1667,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::direction-changed ##### --> <para> @@ -1754,7 +1765,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::event ##### --> <para> @@ -1763,7 +1774,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::event-after ##### --> <para> @@ -1780,7 +1791,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::focus ##### --> <para> @@ -1789,7 +1800,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @arg1: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::focus-in-event ##### --> <para> @@ -1798,7 +1809,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::focus-out-event ##### --> <para> @@ -1807,7 +1818,7 @@ This function is deprecated; it does nothing. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::grab-focus ##### --> <para> @@ -1850,7 +1861,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::key-release-event ##### --> <para> @@ -1859,7 +1870,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::leave-notify-event ##### --> <para> @@ -1868,7 +1879,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::map ##### --> <para> @@ -1884,7 +1895,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::mnemonic-activate ##### --> <para> @@ -1902,7 +1913,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::no-expose-event ##### --> <para> @@ -1911,7 +1922,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::parent-set ##### --> <para> @@ -1936,7 +1947,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::proximity-in-event ##### --> <para> @@ -1945,7 +1956,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::proximity-out-event ##### --> <para> @@ -1954,7 +1965,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::realize ##### --> <para> @@ -1970,7 +1981,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::selection-clear-event ##### --> <para> @@ -1979,7 +1990,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::selection-get ##### --> <para> @@ -1998,7 +2009,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::selection-received ##### --> <para> @@ -2016,7 +2027,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::show ##### --> <para> @@ -2080,7 +2091,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::unrealize ##### --> <para> @@ -2096,7 +2107,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### SIGNAL GtkWidget::window-state-event ##### --> <para> @@ -2105,7 +2116,7 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @event: -@Returns: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. <!-- ##### ARG GtkWidget:name ##### --> <para> @@ -2192,27 +2203,27 @@ a widget changes from un-anchored to anchored or vice-versa. </para> -<!-- ##### ARG GtkWidget:cursor-color ##### --> +<!-- ##### ARG GtkWidget:interior-focus ##### --> <para> </para> -<!-- ##### ARG GtkWidget:secondary-cursor-color ##### --> +<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### --> <para> </para> -<!-- ##### ARG GtkWidget:focus-line-width ##### --> +<!-- ##### ARG GtkWidget:secondary-cursor-color ##### --> <para> </para> -<!-- ##### ARG GtkWidget:interior-focus ##### --> +<!-- ##### ARG GtkWidget:focus-line-pattern ##### --> <para> </para> -<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### --> +<!-- ##### ARG GtkWidget:cursor-color ##### --> <para> </para> @@ -2222,7 +2233,7 @@ a widget changes from un-anchored to anchored or vice-versa. </para> -<!-- ##### ARG GtkWidget:focus-line-pattern ##### --> +<!-- ##### ARG GtkWidget:focus-line-width ##### --> <para> </para> diff --git a/docs/reference/gtk/tree_widget.sgml b/docs/reference/gtk/tree_widget.sgml index 0f1f94758..352bdb078 100644 --- a/docs/reference/gtk/tree_widget.sgml +++ b/docs/reference/gtk/tree_widget.sgml @@ -220,7 +220,7 @@ static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer dat GtkTreeSelection *select; select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)); -gtk_tree_selection_set_mode (select, GTK_SELECT_SINGLE); +gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE); g_signal_connect (G_OBJECT (select), "changed", G_CALLBACK (tree_selection_changed_cb), NULL); diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index b4e1b9e81..9361e8f4d 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -293,7 +293,8 @@ gdk_internal_connection_watch (Display *display, * * Gets the name of the display. * - * Returns: a string representing the display name. + * Returns: a string representing the display name. This string is owned + * by GDK and should not be modified or freed. */ G_CONST_RETURN gchar * gdk_display_get_name (GdkDisplay * display) @@ -448,8 +449,8 @@ gdk_display_beep (GdkDisplay * display) * gdk_display_sync() before gdk_error_trap_pop() makes sure that any errors * generated from earlier requests are handled before the error trap is removed. * - * This is most useful for X11. On windowing systems where requests handled - * synchronously, this function will do nothing. + * This is most useful for X11. On windowing systems where requests are + * handled synchronously, this function will do nothing. */ void gdk_display_sync (GdkDisplay * display) diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 6d77e8335..e03474121 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -158,7 +158,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class) CHILD_PROP_SECONDARY, g_param_spec_boolean ("secondary", _("Secondary"), - _("If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons."), + _("If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"), FALSE, G_PARAM_READWRITE)); } diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 4b3aba0a1..755886633 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -123,7 +123,7 @@ gtk_box_class_init (GtkBoxClass *class) PROP_SPACING, g_param_spec_int ("spacing", _("Spacing"), - _("The amount of space between children."), + _("The amount of space between children"), 0, G_MAXINT, 0, @@ -133,7 +133,7 @@ gtk_box_class_init (GtkBoxClass *class) PROP_HOMOGENEOUS, g_param_spec_boolean ("homogeneous", _("Homogeneous"), - _("Whether the children should all be the same size."), + _("Whether the children should all be the same size"), FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE)); diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index aab09a531..2647ec0ce 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -187,7 +187,7 @@ gtk_button_class_init (GtkButtonClass *klass) PROP_LABEL, g_param_spec_string ("label", _("Label"), - _("Text of the label widget inside the button, if the button contains a label widget."), + _("Text of the label widget inside the button, if the button contains a label widget"), NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); @@ -211,7 +211,7 @@ gtk_button_class_init (GtkButtonClass *klass) PROP_RELIEF, g_param_spec_enum ("relief", _("Border relief"), - _("The border relief style."), + _("The border relief style"), GTK_TYPE_RELIEF_STYLE, GTK_RELIEF_NORMAL, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -1127,13 +1127,13 @@ gtk_button_set_label (GtkButton *button, * @button: a #GtkButton * * Fetches the text from the label of the button, as set by - * gtk_button_set_label(). This string is owned by the widget - * and must not be modified or freed. If the label text has not - * been set the return value will be %NULL. This will be the + * gtk_button_set_label(). If the label text has not + * been set the return value will be %NULL. This will be the * case if you create an empty button with gtk_button_new() to * use as a container. * - * Return value: the text of the label widget. + * Return value: The text of the label widget. This string is owned + * by the widget and must not be modified or freed. **/ G_CONST_RETURN gchar * gtk_button_get_label (GtkButton *button) diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 34dd331a5..d0fc40b17 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -137,7 +137,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_XALIGN, g_param_spec_float ("xalign", _("xalign"), - _("The x-align."), + _("The x-align"), 0.0, 1.0, 0.0, @@ -148,7 +148,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_YALIGN, g_param_spec_float ("yalign", _("yalign"), - _("The y-align."), + _("The y-align"), 0.0, 1.0, 0.5, @@ -159,7 +159,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_XPAD, g_param_spec_uint ("xpad", _("xpad"), - _("The xpad."), + _("The xpad"), 0, 100, 2, @@ -170,7 +170,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_YPAD, g_param_spec_uint ("ypad", _("ypad"), - _("The ypad."), + _("The ypad"), 0, 100, 2, @@ -181,7 +181,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_WIDTH, g_param_spec_int ("width", _("width"), - _("The fixed width."), + _("The fixed width"), -1, 100, -1, @@ -192,7 +192,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_HEIGHT, g_param_spec_int ("height", _("height"), - _("The fixed height."), + _("The fixed height"), -1, 100, -1, @@ -203,7 +203,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) PROP_IS_EXPANDER, g_param_spec_boolean ("is_expander", _("Is Expander"), - _("Row has children."), + _("Row has children"), FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE)); diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index e2d840f59..1252d2eef 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -128,7 +128,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class) PROP_PIXBUF, g_param_spec_object ("pixbuf", _("Pixbuf Object"), - _("The pixbuf to render."), + _("The pixbuf to render"), GDK_TYPE_PIXBUF, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -137,7 +137,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class) PROP_PIXBUF_EXPANDER_OPEN, g_param_spec_object ("pixbuf_expander_open", _("Pixbuf Expander Open"), - _("Pixbuf for open expander."), + _("Pixbuf for open expander"), GDK_TYPE_PIXBUF, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -146,7 +146,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class) PROP_PIXBUF_EXPANDER_CLOSED, g_param_spec_object ("pixbuf_expander_closed", _("Pixbuf Expander Closed"), - _("Pixbuf for closed expander."), + _("Pixbuf for closed expander"), GDK_TYPE_PIXBUF, G_PARAM_READABLE | G_PARAM_WRITABLE)); diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 19619cad4..87d5226d2 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -187,7 +187,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class) PROP_ATTRIBUTES, g_param_spec_boxed ("attributes", _("Attributes"), - _("A list of style attributes to apply to the text of the renderer."), + _("A list of style attributes to apply to the text of the renderer"), PANGO_TYPE_ATTR_LIST, G_PARAM_READWRITE)); diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 954142bb1..cb5943aa6 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -113,7 +113,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass) PROP_ACTIVE, g_param_spec_boolean ("active", _("Active"), - _("Whether the menu item is checked."), + _("Whether the menu item is checked"), FALSE, G_PARAM_READWRITE)); @@ -121,7 +121,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass) PROP_INCONSISTENT, g_param_spec_boolean ("inconsistent", _("Inconsistent"), - _("Whether to display an \"inconsistent\" state."), + _("Whether to display an \"inconsistent\" state"), FALSE, G_PARAM_READWRITE)); diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index a72ae9028..b27548b03 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -206,7 +206,7 @@ gtk_container_class_init (GtkContainerClass *class) PROP_BORDER_WIDTH, g_param_spec_uint ("border_width", _("Border width"), - _("The width of the empty border outside the containers children."), + _("The width of the empty border outside the containers children"), 0, G_MAXINT, 0, @@ -215,7 +215,7 @@ gtk_container_class_init (GtkContainerClass *class) PROP_CHILD, g_param_spec_object ("child", _("Child"), - _("Can be used to add a new child to the container."), + _("Can be used to add a new child to the container"), GTK_TYPE_WIDGET, G_PARAM_WRITABLE)); container_signals[ADD] = diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index 5f20d177b..416c92a81 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -138,7 +138,7 @@ gtk_curve_class_init (GtkCurveClass *class) PROP_MAX_X, g_param_spec_float ("max_x", _("Maximum X"), - _("Maximum possible X value."), + _("Maximum possible X value"), -G_MAXFLOAT, G_MAXFLOAT, 1.0, diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index 4dbaac8eb..c39df01ee 100644 --- a/gtk/gtkdialog.h +++ b/gtk/gtkdialog.h @@ -97,8 +97,9 @@ struct _GtkDialog { GtkWindow window; - GtkWidget *vbox; + /*< public >*/ GtkWidget *action_area; + GtkWidget *vbox; /*< private >*/ GtkWidget *separator; diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index c6fc15a9d..7762a3613 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -433,7 +433,7 @@ gtk_entry_class_init (GtkEntryClass *class) PROP_CURSOR_POSITION, g_param_spec_int ("cursor_position", _("Cursor Position"), - _("The current position of the insertion cursor in chars."), + _("The current position of the insertion cursor in chars"), 0, MAX_SIZE, 0, @@ -443,7 +443,7 @@ gtk_entry_class_init (GtkEntryClass *class) PROP_SELECTION_BOUND, g_param_spec_int ("selection_bound", _("Selection Bound"), - _("The position of the opposite end of the selection from the cursor in chars."), + _("The position of the opposite end of the selection from the cursor in chars"), 0, MAX_SIZE, 0, @@ -461,7 +461,7 @@ gtk_entry_class_init (GtkEntryClass *class) PROP_MAX_LENGTH, g_param_spec_int ("max_length", _("Maximum length"), - _("Maximum number of characters for this entry. Zero if no maximum."), + _("Maximum number of characters for this entry. Zero if no maximum"), 0, MAX_SIZE, 0, @@ -478,7 +478,7 @@ gtk_entry_class_init (GtkEntryClass *class) PROP_HAS_FRAME, g_param_spec_boolean ("has_frame", _("Has Frame"), - _("FALSE removes outside bevel from entry."), + _("FALSE removes outside bevel from entry"), TRUE, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -494,14 +494,14 @@ gtk_entry_class_init (GtkEntryClass *class) PROP_ACTIVATES_DEFAULT, g_param_spec_boolean ("activates_default", _("Activates default"), - _("Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed."), + _("Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed"), FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_WIDTH_CHARS, g_param_spec_int ("width_chars", _("Width in chars"), - _("Number of characters to leave space for in the entry."), + _("Number of characters to leave space for in the entry"), -1, G_MAXINT, -1, @@ -737,7 +737,7 @@ gtk_entry_class_init (GtkEntryClass *class) gtk_settings_install_property (g_param_spec_boolean ("gtk-entry-select-on-focus", _("Select on focus"), - _("Whether to select the contents of an entry when it is focused."), + _("Whether to select the contents of an entry when it is focused"), TRUE, G_PARAM_READWRITE)); } @@ -3440,6 +3440,18 @@ gtk_entry_set_editable (GtkEntry *entry, gtk_editable_set_editable (GTK_EDITABLE (entry), editable); } +/** + * gtk_entry_get_text: + * @entry: a #GtkEntry + * + * Retrieves the contents of the entry widget. + * See also gtk_editable_get_chars(). + * + * Return value: a pointer to the contents of the widget as a + * string. This string points to internally allocated + * storage in the widget and must not be freed, modified or + * stored. + **/ G_CONST_RETURN gchar* gtk_entry_get_text (GtkEntry *entry) { diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index efc5b1bff..d06ef2937 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -534,14 +534,14 @@ gtk_file_selection_class_init (GtkFileSelectionClass *class) PROP_FILENAME, g_param_spec_string ("filename", _("Filename"), - _("The currently selected filename."), + _("The currently selected filename"), NULL, G_PARAM_READABLE | G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_SHOW_FILEOPS, g_param_spec_boolean ("show_fileops", _("Show file operations"), - _("Whether buttons for creating/manipulating files should be displayed."), + _("Whether buttons for creating/manipulating files should be displayed"), FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -549,7 +549,7 @@ gtk_file_selection_class_init (GtkFileSelectionClass *class) PROP_SELECT_MULTIPLE, g_param_spec_boolean ("select_multiple", _("Select multiple"), - _("Whether to allow multiple files to be selected."), + _("Whether to allow multiple files to be selected"), FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE)); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 6307d9d5b..b5bc910a4 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -208,21 +208,21 @@ gtk_font_selection_class_init (GtkFontSelectionClass *klass) PROP_FONT_NAME, g_param_spec_string ("font_name", _("Font name"), - _("The X string that represents this font."), + _("The X string that represents this font"), NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_FONT, g_param_spec_boxed ("font", _("Font"), - _("The GdkFont that is currently selected."), + _("The GdkFont that is currently selected"), GDK_TYPE_FONT, G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_PREVIEW_TEXT, g_param_spec_string ("preview_text", _("Preview text"), - _("The text to display in order to demonstrate the selected font."), + _("The text to display in order to demonstrate the selected font"), PREVIEW_TEXT, G_PARAM_READWRITE)); gobject_class->finalize = gtk_font_selection_finalize; diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 6668d63bc..bedf2c4ae 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -123,7 +123,7 @@ gtk_frame_class_init (GtkFrameClass *class) PROP_LABEL, g_param_spec_string ("label", _("Label"), - _("Text of the frame's label."), + _("Text of the frame's label"), NULL, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -131,7 +131,7 @@ gtk_frame_class_init (GtkFrameClass *class) PROP_LABEL_XALIGN, g_param_spec_float ("label_xalign", _("Label xalign"), - _("The horizontal alignment of the label."), + _("The horizontal alignment of the label"), 0.0, 1.0, 0.5, @@ -141,7 +141,7 @@ gtk_frame_class_init (GtkFrameClass *class) PROP_LABEL_YALIGN, g_param_spec_float ("label_yalign", _("Label yalign"), - _("The vertical alignment of the label."), + _("The vertical alignment of the label"), 0.0, 1.0, 0.5, @@ -150,7 +150,7 @@ gtk_frame_class_init (GtkFrameClass *class) g_object_class_install_property (gobject_class, PROP_SHADOW, g_param_spec_enum ("shadow", NULL, - _("Deprecated property, use shadow_type instead."), + _("Deprecated property, use shadow_type instead"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_ETCHED_IN, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -158,7 +158,7 @@ gtk_frame_class_init (GtkFrameClass *class) PROP_SHADOW_TYPE, g_param_spec_enum ("shadow_type", _("Frame shadow"), - _("Appearance of the frame border."), + _("Appearance of the frame border"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_ETCHED_IN, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -167,7 +167,7 @@ gtk_frame_class_init (GtkFrameClass *class) PROP_LABEL_WIDGET, g_param_spec_object ("label_widget", _("Label widget"), - _("A widget to display in place of the usual frame label."), + _("A widget to display in place of the usual frame label"), GTK_TYPE_WIDGET, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -334,7 +334,8 @@ gtk_frame_set_label (GtkFrame *frame, * * Return value: the text in the label, or %NULL if there * was no label widget or the lable widget was not - * a #GtkLabel. This value must be freed with g_free(). + * a #GtkLabel. This string is owned by GTK+ and + * must not be modified or freed. **/ G_CONST_RETURN gchar * gtk_frame_get_label (GtkFrame *frame) diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 73e198c18..22ec05394 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -182,7 +182,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) g_object_class_install_property (gobject_class, PROP_SHADOW, g_param_spec_enum ("shadow", NULL, - _("Deprecated property, use shadow_type instead."), + _("Deprecated property, use shadow_type instead"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_ETCHED_OUT, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -190,7 +190,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) PROP_SHADOW_TYPE, g_param_spec_enum ("shadow_type", _("Shadow type"), - _("Appearance of the shadow that surrounds the container."), + _("Appearance of the shadow that surrounds the container"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_ETCHED_OUT, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -199,7 +199,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) PROP_HANDLE_POSITION, g_param_spec_enum ("handle_position", _("Handle position"), - _("Position of the handle relative to the child widget."), + _("Position of the handle relative to the child widget"), GTK_TYPE_POSITION_TYPE, GTK_POS_LEFT, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -208,7 +208,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) PROP_SNAP_EDGE, g_param_spec_enum ("snap_edge", _("Snap edge"), - _("Side of the handlebox that's lined up with the docking point to dock the handlebox."), + _("Side of the handlebox that's lined up with the docking point to dock the handlebox"), GTK_TYPE_POSITION_TYPE, GTK_POS_TOP, G_PARAM_READABLE | G_PARAM_WRITABLE)); diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 2f9ad888f..548511cd1 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1754,11 +1754,12 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source, * gtk_icon_source_get_filename: * @source: a #GtkIconSource * - * Retrieves the source filename, or %NULL if none is set. The + * Retrieves the source filename, or %NULL if none is set. The * filename is not a copy, and should not be modified or expected to * persist beyond the lifetime of the icon source. * - * Return value: image filename + * Return value: image filename. This string must not be modified + * or freed. **/ G_CONST_RETURN gchar* gtk_icon_source_get_filename (const GtkIconSource *source) diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index ffb49be09..967fd29df 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -127,7 +127,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_PIXBUF, g_param_spec_object ("pixbuf", _("Pixbuf"), - _("A GdkPixbuf to display."), + _("A GdkPixbuf to display"), GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -135,7 +135,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_PIXMAP, g_param_spec_object ("pixmap", _("Pixmap"), - _("A GdkPixmap to display."), + _("A GdkPixmap to display"), GDK_TYPE_PIXMAP, G_PARAM_READWRITE)); @@ -143,7 +143,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_IMAGE, g_param_spec_object ("image", _("Image"), - _("A GdkImage to display."), + _("A GdkImage to display"), GDK_TYPE_IMAGE, G_PARAM_READWRITE)); @@ -159,7 +159,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_FILE, g_param_spec_string ("file", _("Filename"), - _("Filename to load and display."), + _("Filename to load and display"), NULL, G_PARAM_WRITABLE)); @@ -168,7 +168,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_STOCK, g_param_spec_string ("stock", _("Stock ID"), - _("Stock ID for a stock image to display."), + _("Stock ID for a stock image to display"), NULL, G_PARAM_READWRITE)); @@ -176,7 +176,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_ICON_SET, g_param_spec_boxed ("icon_set", _("Icon set"), - _("Icon set to display."), + _("Icon set to display"), GTK_TYPE_ICON_SET, G_PARAM_READWRITE)); @@ -184,7 +184,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_ICON_SIZE, g_param_spec_int ("icon_size", _("Icon size"), - _("Size to use for stock icon or icon set."), + _("Size to use for stock icon or icon set"), 0, G_MAXINT, DEFAULT_ICON_SIZE, G_PARAM_READWRITE)); @@ -193,7 +193,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_PIXBUF_ANIMATION, g_param_spec_object ("pixbuf_animation", _("Animation"), - _("GdkPixbufAnimation to display."), + _("GdkPixbufAnimation to display"), GDK_TYPE_PIXBUF_ANIMATION, G_PARAM_READWRITE)); @@ -201,7 +201,7 @@ gtk_image_class_init (GtkImageClass *class) PROP_STORAGE_TYPE, g_param_spec_enum ("storage_type", _("Storage type"), - _("The representation being used for image data."), + _("The representation being used for image data"), GTK_TYPE_IMAGE_TYPE, GTK_IMAGE_EMPTY, G_PARAM_READABLE)); diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c index 0b23fd085..5165c3e60 100644 --- a/gtk/gtkinvisible.c +++ b/gtk/gtkinvisible.c @@ -111,7 +111,7 @@ gtk_invisible_class_init (GtkInvisibleClass *class) PROP_SCREEN, g_param_spec_object ("screen", _("Screen"), - _("The screen where this window will be displayed."), + _("The screen where this window will be displayed"), GDK_TYPE_SCREEN, G_PARAM_READWRITE)); } diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index c2575b11d..2229417ec 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -590,8 +590,8 @@ gtk_item_factory_from_widget (GtkWidget *widget) /** * gtk_item_factory_path_from_widget: * @widget: a widget - * @returns: the full path to @widget if it been created by an item factory, - * %NULL otherwise. This value is owned by GTK+ and must not be + * @returns: the full path to @widget if it has been created by an item + * factory, %NULL otherwise. This value is owned by GTK+ and must not be * modified or freed. * * If @widget has been created by an item factory, returns the full path diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 16912a52f..90b723038 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -278,21 +278,21 @@ gtk_label_class_init (GtkLabelClass *class) PROP_LABEL, g_param_spec_string ("label", _("Label"), - _("The text of the label."), + _("The text of the label"), NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_ATTRIBUTES, g_param_spec_boxed ("attributes", _("Attributes"), - _("A list of style attributes to apply to the text of the label."), + _("A list of style attributes to apply to the text of the label"), PANGO_TYPE_ATTR_LIST, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_USE_MARKUP, g_param_spec_boolean ("use_markup", _("Use markup"), - _("The text of the label includes XML markup. See pango_parse_markup()."), + _("The text of the label includes XML markup. See pango_parse_markup()"), FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -307,7 +307,7 @@ gtk_label_class_init (GtkLabelClass *class) PROP_JUSTIFY, g_param_spec_enum ("justify", _("Justification"), - _("The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that."), + _("The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"), GTK_TYPE_JUSTIFICATION, GTK_JUSTIFY_LEFT, G_PARAM_READWRITE)); @@ -316,7 +316,7 @@ gtk_label_class_init (GtkLabelClass *class) PROP_PATTERN, g_param_spec_string ("pattern", _("Pattern"), - _("A string with _ characters in positions correspond to characters in the text to underline."), + _("A string with _ characters in positions correspond to characters in the text to underline"), NULL, G_PARAM_WRITABLE)); @@ -324,21 +324,21 @@ gtk_label_class_init (GtkLabelClass *class) PROP_WRAP, g_param_spec_boolean ("wrap", _("Line wrap"), - _("If set, wrap lines if the text becomes too wide."), + _("If set, wrap lines if the text becomes too wide"), FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_SELECTABLE, g_param_spec_boolean ("selectable", _("Selectable"), - _("Whether the label text can be selected with the mouse."), + _("Whether the label text can be selected with the mouse"), FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_MNEMONIC_KEYVAL, g_param_spec_uint ("mnemonic_keyval", _("Mnemonic key"), - _("The mnemonic accelerator key for this label."), + _("The mnemonic accelerator key for this label"), 0, G_MAXUINT, GDK_VoidSymbol, @@ -348,7 +348,7 @@ gtk_label_class_init (GtkLabelClass *class) g_param_spec_object ("mnemonic_widget", _("Mnemonic widget"), _("The widget to be activated when the label's mnemonic " - "key is pressed."), + "key is pressed"), GTK_TYPE_WIDGET, G_PARAM_READWRITE)); @@ -356,7 +356,7 @@ gtk_label_class_init (GtkLabelClass *class) PROP_CURSOR_POSITION, g_param_spec_int ("cursor_position", _("Cursor Position"), - _("The current position of the insertion cursor in chars."), + _("The current position of the insertion cursor in chars"), 0, G_MAXINT, 0, @@ -366,7 +366,7 @@ gtk_label_class_init (GtkLabelClass *class) PROP_SELECTION_BOUND, g_param_spec_int ("selection_bound", _("Selection Bound"), - _("The position of the opposite end of the selection from the cursor in chars."), + _("The position of the opposite end of the selection from the cursor in chars"), 0, G_MAXINT, 0, @@ -929,7 +929,8 @@ gtk_label_set_text (GtkLabel *label, * * Sets a #PangoAttrList; the attributes in the list are applied to the * label text. The attributes set with this function will be ignored - * if label->use_underline or label->use_markup is %TRUE. + * if the "use_underline" property or the "use_markup" property + * is %TRUE. **/ void gtk_label_set_attributes (GtkLabel *label, diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 1f636b128..e48968fc1 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -621,7 +621,7 @@ gtk_layout_class_init (GtkLayoutClass *class) PROP_HADJUSTMENT, g_param_spec_object ("hadjustment", _("Horizontal adjustment"), - _("The GtkAdjustment for the horizontal position."), + _("The GtkAdjustment for the horizontal position"), GTK_TYPE_ADJUSTMENT, G_PARAM_READWRITE)); @@ -629,7 +629,7 @@ gtk_layout_class_init (GtkLayoutClass *class) PROP_VADJUSTMENT, g_param_spec_object ("vadjustment", _("Vertical adjustment"), - _("The GtkAdjustment for the vertical position."), + _("The GtkAdjustment for the vertical position"), GTK_TYPE_ADJUSTMENT, G_PARAM_READWRITE)); @@ -637,7 +637,7 @@ gtk_layout_class_init (GtkLayoutClass *class) PROP_WIDTH, g_param_spec_uint ("width", _("Width"), - _("The width of the layout."), + _("The width of the layout"), 0, G_MAXINT, 100, @@ -646,7 +646,7 @@ gtk_layout_class_init (GtkLayoutClass *class) PROP_HEIGHT, g_param_spec_uint ("height", _("Height"), - _("The height of the layout."), + _("The height of the layout"), 0, G_MAXINT, 100, diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index feda2524e..d2ff19305 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -223,7 +223,7 @@ gtk_menu_class_init (GtkMenuClass *class) PROP_TEAROFF_TITLE, g_param_spec_string ("tearoff-title", _("Tearoff Title"), - _("A title that may be displayed by the window manager when this menu is torn-off."), + _("A title that may be displayed by the window manager when this menu is torn-off"), "", G_PARAM_READABLE | G_PARAM_WRITABLE)); object_class->destroy = gtk_menu_destroy; @@ -293,7 +293,7 @@ gtk_menu_class_init (GtkMenuClass *class) gtk_settings_install_property (g_param_spec_boolean ("gtk-can-change-accels", _("Can change accelerators"), - _("Whether menu accelerators can be changed by pressing a key over the menu item."), + _("Whether menu accelerators can be changed by pressing a key over the menu item"), FALSE, G_PARAM_READWRITE)); } @@ -1286,7 +1286,8 @@ gtk_menu_set_title (GtkMenu *menu, * Returns the title of the menu. See gtk_menu_set_title(). * * Return value: the title of the menu, or %NULL if the menu has no - * title set on it. + * title set on it. This string is owned by the widget and should + * not be modified or freed. **/ G_CONST_RETURN gchar * gtk_menu_get_title (GtkMenu *menu) diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index ed85eab58..cd151ef99 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -120,7 +120,7 @@ gtk_progress_class_init (GtkProgressClass *class) PROP_ACTIVITY_MODE, g_param_spec_boolean ("activity_mode", _("Activity mode"), - _("If TRUE the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something that you don't know how long it will take."), + _("If TRUE the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something that you don't know how long it will take"), FALSE, G_PARAM_READWRITE)); diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 98c07b0a4..7e6bb152f 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -993,7 +993,8 @@ gtk_progress_bar_set_orientation (GtkProgressBar *pbar, * to the text, not a copy of it, so will become invalid * if you change the text in the progress bar. * - * Return value: text, or %NULL; don't free the string + * Return value: text, or %NULL; this string is owned by the widget + * and should not be modified or freed. **/ G_CONST_RETURN gchar* gtk_progress_bar_get_text (GtkProgressBar *pbar) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 2f917269e..efdbc3e5d 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -234,14 +234,14 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) PROP_HADJUSTMENT, g_param_spec_object ("hadjustment", _("Horizontal Adjustment"), - _("The GtkAdjustment for the horizontal position."), + _("The GtkAdjustment for the horizontal position"), GTK_TYPE_ADJUSTMENT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (gobject_class, PROP_VADJUSTMENT, g_param_spec_object ("vadjustment", _("Vertical Adjustment"), - _("The GtkAdjustment for the vertical position."), + _("The GtkAdjustment for the vertical position"), GTK_TYPE_ADJUSTMENT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (gobject_class, diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 28cf91b5f..886d07b89 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -241,7 +241,7 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass) g_param_spec_enum ("mode", _("Mode"), _("The directions in which the size group effects the requested sizes" - " of its component widgets."), + " of its component widgets"), GTK_TYPE_SIZE_GROUP_MODE, GTK_SIZE_GROUP_HORIZONTAL, G_PARAM_READWRITE)); diff --git a/gtk/gtktable.c b/gtk/gtktable.c index a8c7c82ae..d7d66cf26 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -226,7 +226,7 @@ gtk_table_class_init (GtkTableClass *class) CHILD_PROP_X_OPTIONS, g_param_spec_flags ("x_options", _("Horizontal options"), - _("Options specifying the horizontal behaviour of the child."), + _("Options specifying the horizontal behaviour of the child"), GTK_TYPE_ATTACH_OPTIONS, GTK_EXPAND | GTK_FILL, G_PARAM_READWRITE)); gtk_container_class_install_child_property (container_class, diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 7f4e978ce..6c6cd7fb5 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -853,7 +853,7 @@ gtk_text_iter_get_visible_line_index (const GtkTextIter *iter) * @iter: an iterator * * Returns the Unicode character at this iterator. (Equivalent to - * operator* on a C++ iterator.) If the iterator points at a + * operator* on a C++ iterator.) If the element at this iterator is a * non-character element, such as an image embedded in the buffer, the * Unicode "unknown" character 0xFFFC is returned. If invoked on * the end iterator, zero is returned; zero is not a valid Unicode character. @@ -999,8 +999,8 @@ gtk_text_iter_get_visible_text (const GtkTextIter *start, * gtk_text_iter_get_pixbuf: * @iter: an iterator * - * If the location pointed to by @iter contains a pixbuf, the pixbuf - * is returned (with no new reference count added). Otherwise, + * If the element at @iter is a pixbuf, the pixbuf is returned + * (with no new reference count added). Otherwise, * %NULL is returned. * * Return value: the pixbuf at @iter @@ -1029,7 +1029,7 @@ gtk_text_iter_get_pixbuf (const GtkTextIter *iter) * gtk_text_iter_get_child_anchor: * @iter: an iterator * - * If the location pointed to by @iter contains a child anchor, the + * If the location at @iter contains a child anchor, the * anchor is returned (with no new reference count added). Otherwise, * %NULL is returned. * @@ -3392,7 +3392,7 @@ gtk_text_iter_forward_cursor_position (GtkTextIter *iter) * * Like gtk_text_iter_forward_cursor_position(), but moves backward. * - * Return value: %TRUE if we moved and the new position is dereferenceable + * Return value: %TRUE if we moved **/ gboolean gtk_text_iter_backward_cursor_position (GtkTextIter *iter) diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 3cb2fcad9..59653791c 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -197,7 +197,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_NAME, g_param_spec_string ("name", _("Tag name"), - _("Name used to refer to the text tag. NULL for anonymous tags."), + _("Name used to refer to the text tag. NULL for anonymous tags"), NULL, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); @@ -308,7 +308,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_STYLE, g_param_spec_enum ("style", _("Font style"), - _("Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC."), + _("Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"), PANGO_TYPE_STYLE, PANGO_STYLE_NORMAL, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -317,7 +317,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_VARIANT, g_param_spec_enum ("variant", _("Font variant"), - _("Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS."), + _("Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"), PANGO_TYPE_VARIANT, PANGO_VARIANT_NORMAL, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -326,7 +326,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_WEIGHT, g_param_spec_int ("weight", _("Font weight"), - _("Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD."), + _("Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD"), 0, G_MAXINT, PANGO_WEIGHT_NORMAL, @@ -337,7 +337,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_STRETCH, g_param_spec_enum ("stretch", _("Font stretch"), - _("Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED."), + _("Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"), PANGO_TYPE_STRETCH, PANGO_STRETCH_NORMAL, G_PARAM_READABLE | G_PARAM_WRITABLE)); @@ -346,7 +346,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_SIZE, g_param_spec_int ("size", _("Font size"), - _("Font size in Pango units."), + _("Font size in Pango units"), 0, G_MAXINT, 0, @@ -356,7 +356,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_SCALE, g_param_spec_double ("scale", _("Font scale"), - _("Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE."), + _("Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE"), 0.0, G_MAXDOUBLE, 1.0, @@ -385,7 +385,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) PROP_LANGUAGE, g_param_spec_string ("language", _("Language"), - _("The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it."), + _("The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it"), NULL, G_PARAM_READABLE | G_PARAM_WRITABLE)); diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 52f54fe6f..f74df6b09 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -112,6 +112,7 @@ typedef struct _GtkTextAppearance GtkTextAppearance; struct _GtkTextAppearance { + /*< public >*/ GdkColor bg_color; GdkColor fg_color; GdkBitmap *bg_stipple; @@ -120,11 +121,13 @@ struct _GtkTextAppearance /* super/subscript rise, can be negative */ gint rise; + /*< private >*/ /* I'm not sure this can really be used without breaking some things * an app might do :-/ */ gpointer padding1; - + + /*< public >*/ guint underline : 4; /* PangoUnderline */ guint strikethrough : 1; @@ -142,6 +145,7 @@ struct _GtkTextAppearance guint inside_selection : 1; guint is_text : 1; + /*< private >*/ guint pad1 : 1; guint pad2 : 1; guint pad3 : 1; @@ -150,8 +154,10 @@ struct _GtkTextAppearance struct _GtkTextAttributes { + /*< private >*/ guint refcount; + /*< public >*/ GtkTextAppearance appearance; GtkJustification justification; @@ -183,11 +189,13 @@ struct _GtkTextAttributes PangoLanguage *language; + /*< private >*/ /* I'm not sure this can really be used without breaking some things * an app might do :-/ */ gpointer padding1; - + + /*< public >*/ /* hide the text */ guint invisible : 1; @@ -202,6 +210,7 @@ struct _GtkTextAttributes /* colors are allocated etc. */ guint realized : 1; + /*< private >*/ guint pad1 : 1; guint pad2 : 1; guint pad3 : 1; diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 739fc5bc4..907f4a64c 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -139,7 +139,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class) PROP_INCONSISTENT, g_param_spec_boolean ("inconsistent", _("Inconsistent"), - _("If the toggle button is in an \"in between\" state."), + _("If the toggle button is in an \"in between\" state"), FALSE, G_PARAM_READWRITE)); diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 04bce527d..842e09c31 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -886,12 +886,15 @@ gtk_tree_model_iter_next (GtkTreeModel *tree_model, * gtk_tree_model_iter_children: * @tree_model: A #GtkTreeModel. * @iter: The new #GtkTreeIter to be set to the child. - * @parent: The #GtkTreeIter. + * @parent: The #GtkTreeIter, or %NULL * * Sets @iter to point to the first child of @parent. If @parent has no children, * %FALSE is returned and @iter is set to be invalid. @parent will remain a valid * node after this function has been called. * + * If @parent is %NULL returns the first node, equivalent to + * <literal>gtk_tree_model_get_iter_first (tree_model, iter);</literal> + * * Return value: %TRUE, if @child has been set to the first child. **/ gboolean diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index 739936052..88df17bcb 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -866,7 +866,7 @@ gtk_tree_selection_path_is_selected (GtkTreeSelection *selection, * @selection: A #GtkTreeSelection * @iter: A valid #GtkTreeIter * - * Returns %TRUE if the row pointed to by @path is currently selected. + * Returns %TRUE if the row at @iter is currently selected. * * Return value: %TRUE, if @iter is selected **/ diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 4c3f8bbf8..a31246253 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -1215,10 +1215,10 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store, * @sibling: A valid #GtkTreeIter, or %NULL * * Inserts a new row after @sibling. If @sibling is %NULL, then the row will be - * prepended to the beginning of the @parent 's children. If @parent and - * @sibling are %NULL, then the row will be prepended to the toplevel. If both - * @sibling and @parent are set, then @parent must be the parent of @sibling. - * When @sibling is set, @parent is optional. + * prepended to @parent 's children. If @parent and @sibling are %NULL, then + * the row will be prepended to the toplevel. If both @sibling and @parent are + * set, then @parent must be the parent of @sibling. When @sibling is set, + * @parent is optional. * * @iter will be changed to point to this new row. The row will be empty after * this function is called. To fill in values, you need to call diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 16d9760e0..44681f83c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -600,7 +600,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("expander_size", _("Expander Size"), - _("Size of the expander arrow."), + _("Size of the expander arrow"), 0, G_MAXINT, _TREE_VIEW_EXPANDER_SIZE, @@ -609,7 +609,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("vertical_separator", _("Vertical Separator Width"), - _("Vertical space between cells. Must be an even number."), + _("Vertical space between cells. Must be an even number"), 0, G_MAXINT, _TREE_VIEW_VERTICAL_SEPARATOR, @@ -618,7 +618,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("horizontal_separator", _("Horizontal Separator Width"), - _("Horizontal space between cells. Must be an even number."), + _("Horizontal space between cells. Must be an even number"), 0, G_MAXINT, _TREE_VIEW_HORIZONTAL_SEPARATOR, @@ -627,14 +627,14 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) gtk_widget_class_install_style_property (widget_class, g_param_spec_boolean ("allow_rules", _("Allow Rules"), - _("Allow drawing of alternating color rows."), + _("Allow drawing of alternating color rows"), TRUE, G_PARAM_READABLE)); gtk_widget_class_install_style_property (widget_class, g_param_spec_boolean ("indent_expanders", _("Indent Expanders"), - _("Make the expanders indented."), + _("Make the expanders indented"), TRUE, G_PARAM_READABLE)); /* Signals */ diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index b57fed190..957c8b793 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1905,9 +1905,10 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, * gtk_tree_view_column_get_title: * @tree_column: A #GtkTreeViewColumn. * - * Returns the title of the widget. This value should not be modified. + * Returns the title of the widget. * - * Return value: the title of the column. + * Return value: the title of the column. This string should not be + * modified or freed. **/ G_CONST_RETURN gchar * gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column) diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 7aaf5593e..1a41d758a 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -130,7 +130,7 @@ gtk_viewport_class_init (GtkViewportClass *class) PROP_HADJUSTMENT, g_param_spec_object ("hadjustment", _("Horizontal adjustment"), - _("The GtkAdjustment that determines the values of the horizontal position for this viewport."), + _("The GtkAdjustment that determines the values of the horizontal position for this viewport"), GTK_TYPE_ADJUSTMENT, G_PARAM_READWRITE)); @@ -138,7 +138,7 @@ gtk_viewport_class_init (GtkViewportClass *class) PROP_VADJUSTMENT, g_param_spec_object ("vadjustment", _("Vertical adjustment"), - _("The GtkAdjustment that determines the values of the vertical position for this viewport."), + _("The GtkAdjustment that determines the values of the vertical position for this viewport"), GTK_TYPE_ADJUSTMENT, G_PARAM_READWRITE)); @@ -146,7 +146,7 @@ gtk_viewport_class_init (GtkViewportClass *class) PROP_SHADOW_TYPE, g_param_spec_enum ("shadow_type", _("Shadow type"), - _("Determines how the shadowed box around the viewport is drawn."), + _("Determines how the shadowed box around the viewport is drawn"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_IN, G_PARAM_READWRITE)); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f48ddab26..f971937dd 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -397,7 +397,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) PROP_PARENT, g_param_spec_object ("parent", _("Parent widget"), - _("The parent widget of this widget. Must be a Container widget."), + _("The parent widget of this widget. Must be a Container widget"), GTK_TYPE_CONTAINER, G_PARAM_READWRITE)); @@ -405,7 +405,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) PROP_WIDTH_REQUEST, g_param_spec_int ("width_request", _("Width request"), - _("Override for width request of the widget, or -1 if natural request should be used."), + _("Override for width request of the widget, or -1 if natural request should be used"), -1, G_MAXINT, -1, @@ -414,7 +414,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) PROP_HEIGHT_REQUEST, g_param_spec_int ("height_request", _("Height request"), - _("Override for height request of the widget, or -1 if natural request should be used."), + _("Override for height request of the widget, or -1 if natural request should be used"), -1, G_MAXINT, -1, @@ -479,7 +479,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) PROP_RECEIVES_DEFAULT, g_param_spec_boolean ("receives_default", _("Receives default"), - _("If TRUE, the widget will receive the default action when it is focused."), + _("If TRUE, the widget will receive the default action when it is focused"), FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -493,14 +493,14 @@ gtk_widget_class_init (GtkWidgetClass *klass) PROP_STYLE, g_param_spec_object ("style", _("Style"), - _("The style of the widget, which contains information about how it will look (colors etc)."), + _("The style of the widget, which contains information about how it will look (colors etc)"), GTK_TYPE_STYLE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_EVENTS, g_param_spec_flags ("events", _("Events"), - _("The event mask that decides what kind of GdkEvents this widget gets."), + _("The event mask that decides what kind of GdkEvents this widget gets"), GDK_TYPE_EVENT_MASK, GDK_STRUCTURE_MASK, G_PARAM_READWRITE)); @@ -508,7 +508,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) PROP_EXTENSION_EVENTS, g_param_spec_enum ("extension_events", _("Extension events"), - _("The mask that decides what kind of extension events this widget gets."), + _("The mask that decides what kind of extension events this widget gets"), GDK_TYPE_EXTENSION_MODE, GDK_EXTENSION_EVENTS_NONE, G_PARAM_READWRITE)); @@ -1058,27 +1058,27 @@ gtk_widget_class_init (GtkWidgetClass *klass) gtk_widget_class_install_style_property (klass, g_param_spec_boolean ("interior_focus", _("Interior Focus"), - _("Whether to draw the focus indicator inside widgets."), + _("Whether to draw the focus indicator inside widgets"), TRUE, G_PARAM_READABLE)); gtk_widget_class_install_style_property (klass, g_param_spec_int ("focus-line-width", _("Focus linewidth"), - _("Width, in pixels, of the focus indicator line."), + _("Width, in pixels, of the focus indicator line"), 0, G_MAXINT, 1, G_PARAM_READWRITE)); gtk_widget_class_install_style_property (klass, g_param_spec_string ("focus-line-pattern", _("Focus line dash pattern"), - _("Dash pattern used to draw the focus indicator."), + _("Dash pattern used to draw the focus indicator"), "\1\1", G_PARAM_READWRITE)); gtk_widget_class_install_style_property (klass, g_param_spec_int ("focus-padding", _("Focus padding"), - _("Width, in pixels, between focus indicator and the widget 'box'."), + _("Width, in pixels, between focus indicator and the widget 'box'"), 0, G_MAXINT, 1, G_PARAM_READWRITE)); gtk_widget_class_install_style_property (klass, @@ -1090,7 +1090,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) gtk_widget_class_install_style_property (klass, g_param_spec_boxed ("secondary-cursor-color", _("Secondary cursor color"), - _("Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text."), + _("Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property (klass, @@ -3560,11 +3560,11 @@ gtk_widget_set_name (GtkWidget *widget, * gtk_widget_get_name: * @widget: a #GtkWidget * - * Retrieves the name of a widget. The return value should not be - * freed. See gtk_widget_set_name() for the significance of widget - * names. + * Retrieves the name of a widget. See gtk_widget_set_name() for the + * significance of widget names. * - * Return value: name of the widget + * Return value: name of the widget. This string is owned by GTK+ and + * should not be modified or freed **/ G_CONST_RETURN gchar* gtk_widget_get_name (GtkWidget *widget) @@ -4476,7 +4476,11 @@ gtk_widget_create_pango_layout (GtkWidget *widget, * such as #GTK_ICON_SIZE_MENU. @detail should be a string that * identifies the widget or code doing the rendering, so that * theme engines can special-case rendering for that widget or code. - * + * + * The pixels in the returned #GdkPixbuf are shared with the rest of + * the application and should not be modified. The pixbuf should be freed + * after use with g_object_unref(). + * * Return value: a new pixbuf, or %NULL if the stock ID wasn't known **/ GdkPixbuf* diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 3463c0ab3..1429f5af6 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -232,20 +232,15 @@ struct _GtkWidgetClass * pointer. */ GtkObjectClass parent_class; + + /*< public >*/ - /* The signal to emit when a widget of this class is activated, - * gtk_widget_activate() handles the emission. - * Implementation of this signal is optional. - */ guint activate_signal; - /* This signal is emitted when a widget of this class is added - * to a scrolling aware parent, gtk_widget_set_scroll_adjustments() - * handles the emission. - * Implementation of this signal is optional. - */ guint set_scroll_adjustments_signal; + /*< private >*/ + /* seldomly overidden */ void (*dispatch_child_properties_changed) (GtkWidget *widget, guint n_pspecs, diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index f0d5abe2a..8113bbc29 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -427,7 +427,7 @@ gtk_window_class_init (GtkWindowClass *klass) g_param_spec_boolean ("allow_shrink", _("Allow Shrink"), /* xgettext:no-c-format */ - _("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea."), + _("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"), FALSE, G_PARAM_READWRITE)); @@ -435,7 +435,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_ALLOW_GROW, g_param_spec_boolean ("allow_grow", _("Allow Grow"), - _("If TRUE, users can expand the window beyond its minimum size."), + _("If TRUE, users can expand the window beyond its minimum size"), TRUE, G_PARAM_READWRITE)); @@ -443,7 +443,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_RESIZABLE, g_param_spec_boolean ("resizable", _("Resizable"), - _("If TRUE, users can resize the window."), + _("If TRUE, users can resize the window"), TRUE, G_PARAM_READWRITE)); @@ -451,7 +451,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_MODAL, g_param_spec_boolean ("modal", _("Modal"), - _("If TRUE, the window is modal (other windows are not usable while this one is up)."), + _("If TRUE, the window is modal (other windows are not usable while this one is up)"), FALSE, G_PARAM_READWRITE)); @@ -459,7 +459,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_WIN_POS, g_param_spec_enum ("window_position", _("Window Position"), - _("The initial position of the window."), + _("The initial position of the window"), GTK_TYPE_WINDOW_POSITION, GTK_WIN_POS_NONE, G_PARAM_READWRITE)); @@ -468,7 +468,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_DEFAULT_WIDTH, g_param_spec_int ("default_width", _("Default Width"), - _("The default width of the window, used when initially showing the window."), + _("The default width of the window, used when initially showing the window"), -1, G_MAXINT, -1, @@ -478,7 +478,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_DEFAULT_HEIGHT, g_param_spec_int ("default_height", _("Default Height"), - _("The default height of the window, used when initially showing the window."), + _("The default height of the window, used when initially showing the window"), -1, G_MAXINT, -1, @@ -504,7 +504,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_SCREEN, g_param_spec_object ("screen", _("Screen"), - _("The screen where this window will be displayed."), + _("The screen where this window will be displayed"), GDK_TYPE_SCREEN, G_PARAM_READWRITE)); |