From 356df7f65002a47516b542ace1fe88badf9d4965 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sat, 25 Oct 2003 19:58:51 +0000 Subject: [PATCH] Make this function take an index and a GtkToolItem. Thu Oct 23 21:55:10 2003 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make this function take an index and a GtkToolItem. * tests/testtoolbar.c (main): Make "Show Arrow" default to true. Make one of the separators !draw and expand. Update for new highlight_drop_location() API. * gtk/gtktoolitem.[ch]: Remove "pack_end" property * gtk/gtktoolbar.h: Formatting fixes. * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow separator tool items to expand. (logical_to_physical, physical_to_logical): Fix off-by-one errors (Fix #125472, Marco Pesenti Gritti) * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also return FALSE, not TRUE. (gtk_separator_too_item_{set|get}_property, (gtk_separator_tool_item_{set|get}_draw): new functions --- ChangeLog | 24 + ChangeLog.pre-2-10 | 24 + ChangeLog.pre-2-4 | 24 + ChangeLog.pre-2-6 | 24 + ChangeLog.pre-2-8 | 24 + docs/reference/ChangeLog | 5 + docs/reference/gtk/tmpl/gtk-unused.sgml | 157 ++ docs/reference/gtk/tmpl/gtkaccelgroup.sgml | 21 - docs/reference/gtk/tmpl/gtkaccellabel.sgml | 20 +- docs/reference/gtk/tmpl/gtkaction.sgml | 136 +- docs/reference/gtk/tmpl/gtkadjustment.sgml | 30 +- docs/reference/gtk/tmpl/gtkalignment.sgml | 80 +- docs/reference/gtk/tmpl/gtkarrow.sgml | 20 +- docs/reference/gtk/tmpl/gtkaspectframe.sgml | 40 +- docs/reference/gtk/tmpl/gtkbbox.sgml | 60 +- docs/reference/gtk/tmpl/gtkbox.sgml | 70 +- docs/reference/gtk/tmpl/gtkbutton.sgml | 180 +-- docs/reference/gtk/tmpl/gtkcalendar.sgml | 170 +-- docs/reference/gtk/tmpl/gtkcelleditable.sgml | 28 +- docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 130 +- .../gtk/tmpl/gtkcellrendererpixbuf.sgml | 16 +- .../gtk/tmpl/gtkcellrenderertext.sgml | 34 +- .../gtk/tmpl/gtkcellrenderertoggle.sgml | 56 +- docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 20 +- docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 54 +- docs/reference/gtk/tmpl/gtkclist.sgml | 382 ++--- docs/reference/gtk/tmpl/gtkcolorbutton.sgml | 54 +- docs/reference/gtk/tmpl/gtkcolorsel.sgml | 56 +- docs/reference/gtk/tmpl/gtkcombo.sgml | 50 +- docs/reference/gtk/tmpl/gtkcombobox.sgml | 74 +- docs/reference/gtk/tmpl/gtkcomboboxentry.sgml | 10 +- docs/reference/gtk/tmpl/gtkcontainer.sgml | 92 +- docs/reference/gtk/tmpl/gtkctree.sgml | 176 +-- docs/reference/gtk/tmpl/gtkcurve.sgml | 70 +- docs/reference/gtk/tmpl/gtkdialog.sgml | 76 +- docs/reference/gtk/tmpl/gtkeditable.sgml | 88 +- docs/reference/gtk/tmpl/gtkentry.sgml | 250 ++-- .../gtk/tmpl/gtkentrycompletion.sgml | 56 +- docs/reference/gtk/tmpl/gtkeventbox.sgml | 20 +- docs/reference/gtk/tmpl/gtkexpander.sgml | 84 +- docs/reference/gtk/tmpl/gtkfilechooser.sgml | 28 + docs/reference/gtk/tmpl/gtkfilesel.sgml | 30 +- docs/reference/gtk/tmpl/gtkfixed.sgml | 20 +- docs/reference/gtk/tmpl/gtkfontbutton.sgml | 74 +- docs/reference/gtk/tmpl/gtkfontsel.sgml | 30 +- docs/reference/gtk/tmpl/gtkframe.sgml | 60 +- docs/reference/gtk/tmpl/gtkhandlebox.sgml | 94 +- docs/reference/gtk/tmpl/gtkicontheme.sgml | 14 +- docs/reference/gtk/tmpl/gtkimage.sgml | 100 +- docs/reference/gtk/tmpl/gtkimagemenuitem.sgml | 10 +- docs/reference/gtk/tmpl/gtkimcontext.sgml | 94 +- docs/reference/gtk/tmpl/gtkinputdialog.sgml | 16 +- docs/reference/gtk/tmpl/gtkinvisible.sgml | 10 +- docs/reference/gtk/tmpl/gtkitem.sgml | 42 +- docs/reference/gtk/tmpl/gtklabel.sgml | 170 +-- docs/reference/gtk/tmpl/gtklayout.sgml | 78 +- docs/reference/gtk/tmpl/gtklist.sgml | 56 +- docs/reference/gtk/tmpl/gtklistitem.sgml | 72 +- docs/reference/gtk/tmpl/gtkmenu.sgml | 96 +- docs/reference/gtk/tmpl/gtkmenubar.sgml | 20 +- docs/reference/gtk/tmpl/gtkmenuitem.sgml | 102 +- docs/reference/gtk/tmpl/gtkmenushell.sgml | 98 +- docs/reference/gtk/tmpl/gtkmessagedialog.sgml | 30 +- docs/reference/gtk/tmpl/gtkmisc.sgml | 40 +- docs/reference/gtk/tmpl/gtknotebook.sgml | 290 ++-- docs/reference/gtk/tmpl/gtkobject.sgml | 28 +- docs/reference/gtk/tmpl/gtkoldeditable.sgml | 54 +- docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 44 +- docs/reference/gtk/tmpl/gtkpaned.sgml | 152 +- docs/reference/gtk/tmpl/gtkplug.sgml | 14 +- docs/reference/gtk/tmpl/gtkpreview.sgml | 10 +- docs/reference/gtk/tmpl/gtkprogress.sgml | 40 +- docs/reference/gtk/tmpl/gtkprogressbar.sgml | 90 +- docs/reference/gtk/tmpl/gtkradioaction.sgml | 26 +- docs/reference/gtk/tmpl/gtkradiobutton.sgml | 10 +- docs/reference/gtk/tmpl/gtkrange.sgml | 142 +- docs/reference/gtk/tmpl/gtkruler.sgml | 40 +- docs/reference/gtk/tmpl/gtkscale.sgml | 98 +- .../reference/gtk/tmpl/gtkscrolledwindow.sgml | 104 +- .../gtk/tmpl/gtkseparatortoolitem.sgml | 10 + docs/reference/gtk/tmpl/gtksettings.sgml | 95 -- docs/reference/gtk/tmpl/gtksizegroup.sgml | 10 +- docs/reference/gtk/tmpl/gtksocket.sgml | 44 +- docs/reference/gtk/tmpl/gtkspinbutton.sgml | 154 +- docs/reference/gtk/tmpl/gtkstatusbar.sgml | 56 +- docs/reference/gtk/tmpl/gtktable.sgml | 130 +- docs/reference/gtk/tmpl/gtktext.sgml | 62 +- docs/reference/gtk/tmpl/gtktextbuffer.sgml | 218 +-- docs/reference/gtk/tmpl/gtktexttag.sgml | 280 ++-- docs/reference/gtk/tmpl/gtktexttagtable.sgml | 50 +- docs/reference/gtk/tmpl/gtktextview.sgml | 366 ++--- docs/reference/gtk/tmpl/gtktipsquery.sgml | 100 +- docs/reference/gtk/tmpl/gtktoggleaction.sgml | 24 +- docs/reference/gtk/tmpl/gtktogglebutton.sgml | 46 +- .../gtk/tmpl/gtktoggletoolbutton.sgml | 14 +- docs/reference/gtk/tmpl/gtktoolbar.sgml | 212 +-- docs/reference/gtk/tmpl/gtktoolbutton.sgml | 64 +- docs/reference/gtk/tmpl/gtktoolitem.sgml | 100 +- docs/reference/gtk/tmpl/gtktree.sgml | 46 +- docs/reference/gtk/tmpl/gtktreeitem.sgml | 28 +- docs/reference/gtk/tmpl/gtktreemodel.sgml | 90 +- .../gtk/tmpl/gtktreemodelfilter.sgml | 20 +- docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 10 +- docs/reference/gtk/tmpl/gtktreeselection.sgml | 20 +- docs/reference/gtk/tmpl/gtktreesortable.sgml | 14 +- docs/reference/gtk/tmpl/gtktreeview.sgml | 450 +++--- .../reference/gtk/tmpl/gtktreeviewcolumn.sgml | 164 +- docs/reference/gtk/tmpl/gtkuimanager.sgml | 50 +- docs/reference/gtk/tmpl/gtkviewport.sgml | 48 +- docs/reference/gtk/tmpl/gtkwidget.sgml | 1330 ++++++++--------- docs/reference/gtk/tmpl/gtkwindow.sgml | 292 ++-- gtk/gtkseparatortoolitem.c | 181 ++- gtk/gtkseparatortoolitem.h | 12 +- gtk/gtktoolbar.c | 368 ++--- gtk/gtktoolbar.h | 25 +- gtk/gtktoolitem.c | 47 - gtk/gtktoolitem.h | 4 - 117 files changed, 5491 insertions(+), 5254 deletions(-) diff --git a/ChangeLog b/ChangeLog index 916df093df..1018811006 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +Thu Oct 23 21:55:10 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make + this function take an index and a GtkToolItem. + + * tests/testtoolbar.c (main): Make "Show Arrow" default to + true. Make one of the separators !draw and expand. + Update for new highlight_drop_location() API. + + * gtk/gtktoolitem.[ch]: Remove "pack_end" property + + * gtk/gtktoolbar.h: Formatting fixes. + + * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow + separator tool items to expand. + (logical_to_physical, physical_to_logical): Fix off-by-one errors + (Fix #125472, Marco Pesenti Gritti) + + * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. + (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also + return FALSE, not TRUE. + (gtk_separator_too_item_{set|get}_property, + (gtk_separator_tool_item_{set|get}_draw): new functions + Fri Oct 24 16:54:04 2003 Owen Taylor * === Released 2.3.0 === diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 916df093df..1018811006 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,27 @@ +Thu Oct 23 21:55:10 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make + this function take an index and a GtkToolItem. + + * tests/testtoolbar.c (main): Make "Show Arrow" default to + true. Make one of the separators !draw and expand. + Update for new highlight_drop_location() API. + + * gtk/gtktoolitem.[ch]: Remove "pack_end" property + + * gtk/gtktoolbar.h: Formatting fixes. + + * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow + separator tool items to expand. + (logical_to_physical, physical_to_logical): Fix off-by-one errors + (Fix #125472, Marco Pesenti Gritti) + + * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. + (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also + return FALSE, not TRUE. + (gtk_separator_too_item_{set|get}_property, + (gtk_separator_tool_item_{set|get}_draw): new functions + Fri Oct 24 16:54:04 2003 Owen Taylor * === Released 2.3.0 === diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 916df093df..1018811006 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,27 @@ +Thu Oct 23 21:55:10 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make + this function take an index and a GtkToolItem. + + * tests/testtoolbar.c (main): Make "Show Arrow" default to + true. Make one of the separators !draw and expand. + Update for new highlight_drop_location() API. + + * gtk/gtktoolitem.[ch]: Remove "pack_end" property + + * gtk/gtktoolbar.h: Formatting fixes. + + * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow + separator tool items to expand. + (logical_to_physical, physical_to_logical): Fix off-by-one errors + (Fix #125472, Marco Pesenti Gritti) + + * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. + (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also + return FALSE, not TRUE. + (gtk_separator_too_item_{set|get}_property, + (gtk_separator_tool_item_{set|get}_draw): new functions + Fri Oct 24 16:54:04 2003 Owen Taylor * === Released 2.3.0 === diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 916df093df..1018811006 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,27 @@ +Thu Oct 23 21:55:10 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make + this function take an index and a GtkToolItem. + + * tests/testtoolbar.c (main): Make "Show Arrow" default to + true. Make one of the separators !draw and expand. + Update for new highlight_drop_location() API. + + * gtk/gtktoolitem.[ch]: Remove "pack_end" property + + * gtk/gtktoolbar.h: Formatting fixes. + + * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow + separator tool items to expand. + (logical_to_physical, physical_to_logical): Fix off-by-one errors + (Fix #125472, Marco Pesenti Gritti) + + * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. + (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also + return FALSE, not TRUE. + (gtk_separator_too_item_{set|get}_property, + (gtk_separator_tool_item_{set|get}_draw): new functions + Fri Oct 24 16:54:04 2003 Owen Taylor * === Released 2.3.0 === diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 916df093df..1018811006 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,27 @@ +Thu Oct 23 21:55:10 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_highlight_drop_location): Make + this function take an index and a GtkToolItem. + + * tests/testtoolbar.c (main): Make "Show Arrow" default to + true. Make one of the separators !draw and expand. + Update for new highlight_drop_location() API. + + * gtk/gtktoolitem.[ch]: Remove "pack_end" property + + * gtk/gtktoolbar.h: Formatting fixes. + + * gtk/gtktoolbar.c: Remove "pack_end" child property. Allow + separator tool items to expand. + (logical_to_physical, physical_to_logical): Fix off-by-one errors + (Fix #125472, Marco Pesenti Gritti) + + * gtk/gtkseparatortoolitem.[ch]: Add new "draw" property. + (gtk_separator_tool_item_expose) only draw if "draw" is TRUE. Also + return FALSE, not TRUE. + (gtk_separator_too_item_{set|get}_property, + (gtk_separator_tool_item_{set|get}_draw): new functions + Fri Oct 24 16:54:04 2003 Owen Taylor * === Released 2.3.0 === diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index c76871ca8d..64a9ce7bcb 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 24 13:15:32 2003 Soeren Sandmann + + * gtk/tmpl/gtktoolbar.sgml, gtk/tmpl/gtkseparatortoolitem.sgml: + Mention the "expand" and "draw" trick for separator tool items. + Fri Oct 24 17:21:04 2003 Owen Taylor * gdk-pixbuf/Makefile.am gtk/Makefile.am: Distribute generated diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index fa5831aaab..3ae230a9b6 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -525,6 +525,27 @@ This is a private struct used by GTK+ internally, don't worry about it. @object: @signal_id: + + + + + +@accelgroup: the object which received the signal. +@arg1: +@arg2: +@arg3: +@Returns: + + + + + + +@accelgroup: the object which received the signal. +@arg1: +@arg2: +@arg3: + @@ -1065,24 +1086,138 @@ after other user handlers and the default handler. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1259,6 +1394,12 @@ produce superscript and subscript. + + + + + + @@ -2911,6 +3052,22 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de @Returns: + + + + + +@tool_item: +@Returns: + + + + + + +@tool_item: +@pack_end: + diff --git a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml index 21bbf98fa4..ecefb40f97 100644 --- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml +++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml @@ -37,27 +37,6 @@ An object representing and maintaining a group of accelerators. - - - - - -@accelgroup: the object which received the signal. -@arg1: -@arg2: -@arg3: -@Returns: - - - - - - -@accelgroup: the object which received the signal. -@arg1: -@arg2: -@arg3: - diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index 0d8ec122dc..222c0ec661 100644 --- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml +++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml @@ -85,16 +85,6 @@ should be accessed using the functions below. - - - - - - - - - - Creates a new #GtkAccelLabel. @@ -155,3 +145,13 @@ accelerators are added or removed from the associated widget. @Returns: always returns %FALSE. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkaction.sgml b/docs/reference/gtk/tmpl/gtkaction.sgml index 59bcd796f8..cbe3eecbf9 100644 --- a/docs/reference/gtk/tmpl/gtkaction.sgml +++ b/docs/reference/gtk/tmpl/gtkaction.sgml @@ -55,74 +55,6 @@ and should not be accessed directly. - - - - - -@action: the object which received the signal. - - - - - - -@action: the object which received the signal. -@widget: - - - - - - -@action: the object which received the signal. -@widget: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -247,3 +179,71 @@ and should not be accessed directly. @accel_group: + + + + + +@action: the object which received the signal. + + + + + + +@action: the object which received the signal. +@widget: + + + + + + +@action: the object which received the signal. +@widget: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkadjustment.sgml b/docs/reference/gtk/tmpl/gtkadjustment.sgml index 117273e969..3d4a86ec3e 100644 --- a/docs/reference/gtk/tmpl/gtkadjustment.sgml +++ b/docs/reference/gtk/tmpl/gtkadjustment.sgml @@ -79,21 +79,6 @@ In a #GtkScrollbar this is the size of the area which is currently visible. - - -Emitted when one or more of the #GtkAdjustment fields have been changed, -other than the value field. - - -@adjustment: the object which received the signal. - - - -Emitted when the #GtkAdjustment value field has been changed. - - -@adjustment: the object which received the signal. - Creates a new #GtkAdjustment. @@ -168,3 +153,18 @@ changed the #GtkAdjustment value field. @adjustment: + + +Emitted when one or more of the #GtkAdjustment fields have been changed, +other than the value field. + + +@adjustment: the object which received the signal. + + + +Emitted when the #GtkAdjustment value field has been changed. + + +@adjustment: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkalignment.sgml b/docs/reference/gtk/tmpl/gtkalignment.sgml index 24c0af8263..e1994767dd 100644 --- a/docs/reference/gtk/tmpl/gtkalignment.sgml +++ b/docs/reference/gtk/tmpl/gtkalignment.sgml @@ -34,46 +34,6 @@ be accessed using the functions below. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkAlignment. @@ -136,3 +96,43 @@ unused space, from 0 to 1. The values are similar to @xscale. @padding_right: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkarrow.sgml b/docs/reference/gtk/tmpl/gtkarrow.sgml index 8f7a05f575..89e4b7d7c8 100644 --- a/docs/reference/gtk/tmpl/gtkarrow.sgml +++ b/docs/reference/gtk/tmpl/gtkarrow.sgml @@ -57,16 +57,6 @@ an application.) - - - - - - - - - - Creates a new arrow widget. @@ -87,3 +77,13 @@ Sets the direction and style of the #GtkArrow, @arrow. @shadow_type: a valid #GtkShadowType. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkaspectframe.sgml b/docs/reference/gtk/tmpl/gtkaspectframe.sgml index 03b6aaccd8..a68fe393f1 100644 --- a/docs/reference/gtk/tmpl/gtkaspectframe.sgml +++ b/docs/reference/gtk/tmpl/gtkaspectframe.sgml @@ -26,26 +26,6 @@ a frame around the child. The frame will be - - - - - - - - - - - - - - - - - - - - Create a new #GtkAspectFrame. @@ -83,3 +63,23 @@ to 1.0 (right aligned) ratio is taken from the requistion of the child. + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml index 1133fa6164..fddb0f4347 100644 --- a/docs/reference/gtk/tmpl/gtkbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbbox.sgml @@ -52,36 +52,6 @@ This is a read-only struct; no members should be modified directly. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Used internally only. @@ -200,3 +170,33 @@ box. @is_secondary: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml index 80dc6282b5..d4faa8dbe1 100644 --- a/docs/reference/gtk/tmpl/gtkbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbox.sgml @@ -135,41 +135,6 @@ field. @spacing: @homogeneous: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The #GtkBoxChild-struct holds a child widget of GtkBox and describes @@ -408,3 +373,38 @@ field in #GtkBoxChild-struct. in #GtkBoxChild-struct. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index 4b5c0be256..bc23ab0130 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -27,96 +27,6 @@ This should not be accessed directly. Use the accessor functions below. - - - - - -@button: the object which received the signal. - - - -Emitted when a button clicked on by the mouse and the cursor stays on the -button. If the cursor is not on the button when the mouse button is released, -the signal is not emitted. - - -@button: the object which received the signal. - - - -Emitted when the mouse cursor enters the region of the button. - - -@button: the object which received the signal. - - - -Emitted when the mouse cursor leaves the region of the button. - - -@button: the object which received the signal. - - - -Emitted when the button is initially pressed. - - -@button: the object which received the signal. - - - -Emitted when a button which is pressed is released, no matter where the -mouse cursor is. - - -@button: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkButton widget. To add a child widget to the button, @@ -292,3 +202,93 @@ Returns the current relief style of the given #GtkButton. @Returns: + + + + + +@button: the object which received the signal. + + + +Emitted when a button clicked on by the mouse and the cursor stays on the +button. If the cursor is not on the button when the mouse button is released, +the signal is not emitted. + + +@button: the object which received the signal. + + + +Emitted when the mouse cursor enters the region of the button. + + +@button: the object which received the signal. + + + +Emitted when the mouse cursor leaves the region of the button. + + +@button: the object which received the signal. + + + +Emitted when the button is initially pressed. + + +@button: the object which received the signal. + + + +Emitted when a button which is pressed is released, no matter where the +mouse cursor is. + + +@button: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml index f5a1552b72..0d6bc29002 100644 --- a/docs/reference/gtk/tmpl/gtkcalendar.sgml +++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml @@ -65,91 +65,6 @@ are 0-11) while selected_day is one-based - - -Emitted when the user selects a day. - - -@calendar: the object which received the signal. - - - - - - -@calendar: the object which received the signal. - - - -Emitted when the user clicks a button to change the selected month on a -calendar. - - -@calendar: the object which received the signal. - - - - - - -@calendar: the object which received the signal. - - - - - - -@calendar: the object which received the signal. - - - - - - -@calendar: the object which received the signal. - - - - - - -@calendar: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - These options can be used to influence the display and behaviour of a #GtkCalendar. @@ -276,3 +191,88 @@ gtk_calendar_freeze() are displayed. @calendar: a #GtkCalendar. + + +Emitted when the user selects a day. + + +@calendar: the object which received the signal. + + + + + + +@calendar: the object which received the signal. + + + +Emitted when the user clicks a button to change the selected month on a +calendar. + + +@calendar: the object which received the signal. + + + + + + +@calendar: the object which received the signal. + + + + + + +@calendar: the object which received the signal. + + + + + + +@calendar: the object which received the signal. + + + + + + +@calendar: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcelleditable.sgml b/docs/reference/gtk/tmpl/gtkcelleditable.sgml index d4f0aa5d09..6ef345d4ee 100644 --- a/docs/reference/gtk/tmpl/gtkcelleditable.sgml +++ b/docs/reference/gtk/tmpl/gtkcelleditable.sgml @@ -20,20 +20,6 @@ Interface for widgets which can are used for editing cells - - - - - -@celleditable: the object which received the signal. - - - - - - -@celleditable: the object which received the signal. - @@ -69,3 +55,17 @@ Interface for widgets which can are used for editing cells @cell_editable: + + + + + +@celleditable: the object which received the signal. + + + + + + +@celleditable: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml index fd36185868..3a35ee8fc0 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml @@ -66,71 +66,6 @@ it cannot be individually modified. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -209,3 +144,68 @@ it cannot be individually modified. @height: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml index 575380df17..ad20d1c39e 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml @@ -20,6 +20,14 @@ Renders a pixbuf in a cell + + + + + +@Returns: + + @@ -50,11 +58,3 @@ Renders a pixbuf in a cell - - - - - -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml index 09056b7a2c..1b569d4680 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml @@ -20,6 +20,23 @@ Renders text in a cell + + + + + +@Returns: + + + + + + + +@renderer: +@number_of_rows: + + @@ -199,20 +216,3 @@ Renders text in a cell - - - - - -@Returns: - - - - - - - -@renderer: -@number_of_rows: - - diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml index 12f75faf9d..769c3c542d 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml @@ -20,34 +20,6 @@ Renders a toggle button in a cell - - - - - -@cellrenderertoggle: the object which received the signal. -@arg1: - - - - - - - - - - - - - - - - - - - - - @@ -92,3 +64,31 @@ Renders a toggle button in a cell @setting: + + + + + +@cellrenderertoggle: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 2f6a954f2c..7b5e72c6ad 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -40,16 +40,6 @@ The important signal ('toggled') is also inherited from #GtkToggleButton. - - - - - - - - - - Creates a new #GtkCheckButton. @@ -76,3 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index 84b8166745..d263ed9419 100644 --- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml @@ -41,33 +41,6 @@ an application.) - - -This signal is emitted when the state of the check box is changed. - - - -A signal handler can examine the active -field of the #GtkCheckMenuItem-struct struct to discover the new state. - - -@checkmenuitem: the object which received the signal. - - - - - - - - - - - - - - - - Creates a new #GtkCheckMenuItem. @@ -175,3 +148,30 @@ Emits the GtkCheckMenuItem::toggled signal. @Returns: + + +This signal is emitted when the state of the check box is changed. + + + +A signal handler can examine the active +field of the #GtkCheckMenuItem-struct struct to discover the new state. + + +@checkmenuitem: the object which received the signal. + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkclist.sgml b/docs/reference/gtk/tmpl/gtkclist.sgml index 482b179b18..8b03ce965f 100644 --- a/docs/reference/gtk/tmpl/gtkclist.sgml +++ b/docs/reference/gtk/tmpl/gtkclist.sgml @@ -22,197 +22,6 @@ only private data, and should be accessed only via the CList API. - - -This signal is emitted when a column resize is aborted. - - -@clist: the object which received the signal. - - - -This signal is emitted when a column title is clicked. - - -@clist: The object which received the signal. -@column: The number of the column. - - - -This signal is emitted when a selection ends in a -multiple selection CList. - - -@clist: the object which received the signal. - - - -This signal is emitted when the selection is extended. - - -@clist: the object which received the signal. -@scroll_type: A #GtkScrollType value of any scrolling operation the -occured during the selection. -@position: A value between 0.0 and 1.0. -@auto_start_selection: %TRUE or %FALSE. - - - -This signal is emitted when a column is resized. - - -@clist: The object which received the signal. -@column: The number of the column -@width: The new width of the column. - - - -This signal is emitted when a row is moved. - - -@clist: The object which received the signal. -@arg1: The source position of the row. -@arg2: The destination position of the row. - - - -This signal is emitted when the CList is scrolled horizontally. - - -@clist: the object which received the signal. -@scroll_type: A #GtkScrollType value of how the scroll operation occured. -@position: a value between 0.0 and 1.0. - - - -This signal is emitted when the CList is scrolled vertically. - - -@clist: the object which received the signal. -@scroll_type: A #GtkScrollType value of how the scroll operation occured. -@position: A value between 0.0 and 1.0. - - - -This signal is emitted when all the rows are selected in a CList. - - -@clist: the object which received the signal. - - - -This signal is emitted when the user selects a row in the list. -It is emitted for every row that is selected in a multi-selection or -by calling gtk_clist_select_all(). - - -@clist: The object which received the signal. -@row: The row selected. -@column: The column where the selection occured. -@event: A #GdkEvent structure for the selection. - - - - - - -@clist: the object which received the signal. -@arg1: -@arg2: - - - -This signal is emitted when a drag-selection is started in -a multiple-selection CList. - - -@clist: the object which received the signal. - - - -This signal is emitted when "add mode" is toggled. - - -@clist: the object which received the signal. - - - - - - -@clist: The object which received the signal. - - - -This signal is emitted when an undo selection occurs in the CList, -probably via calling gtk_clist_undo_selection(). - - -@clist: the object which received the signal. - - - -This signal is emitted when all rows are unselected in a CList. - - -@clist: the object which received the signal. - - - -This signal is emitted when the user unselects a row in the list. -It is emitted for every row that is unselected in a multi-selection or -by calling gtk_clist_unselect_all(). It is also emitted for the -previously selected row in a "single" or "browse" mode CList. - - -@clist: The object which received the signal. -@row: The selected row -@column: The column where the selection occured. -@event: - - - -An integer value for a column. - - - - -A boolean value for determining if the user can re-order the CList's -columns. - - - - -An integer value representing the height of a row in pixels. - - - - -Sets the type of selection mode for the CList. - - - - -Sets the shadowing for the CList. - - - - - - - - - -A boolean value for setting whether the column titles can be -clicked. - - - - -A boolean value for setting whether to use icons during drag -operations. - - Identifies the type of element in the current cell of the CList. Cells can @@ -1302,3 +1111,194 @@ aspect of the #GtkCList widget. @adjustment: A pointer to a #GtkAdjustment widget, or NULL. + + +This signal is emitted when a column resize is aborted. + + +@clist: the object which received the signal. + + + +This signal is emitted when a column title is clicked. + + +@clist: The object which received the signal. +@column: The number of the column. + + + +This signal is emitted when a selection ends in a +multiple selection CList. + + +@clist: the object which received the signal. + + + +This signal is emitted when the selection is extended. + + +@clist: the object which received the signal. +@scroll_type: A #GtkScrollType value of any scrolling operation the +occured during the selection. +@position: A value between 0.0 and 1.0. +@auto_start_selection: %TRUE or %FALSE. + + + +This signal is emitted when a column is resized. + + +@clist: The object which received the signal. +@column: The number of the column +@width: The new width of the column. + + + +This signal is emitted when a row is moved. + + +@clist: The object which received the signal. +@arg1: The source position of the row. +@arg2: The destination position of the row. + + + +This signal is emitted when the CList is scrolled horizontally. + + +@clist: the object which received the signal. +@scroll_type: A #GtkScrollType value of how the scroll operation occured. +@position: a value between 0.0 and 1.0. + + + +This signal is emitted when the CList is scrolled vertically. + + +@clist: the object which received the signal. +@scroll_type: A #GtkScrollType value of how the scroll operation occured. +@position: A value between 0.0 and 1.0. + + + +This signal is emitted when all the rows are selected in a CList. + + +@clist: the object which received the signal. + + + +This signal is emitted when the user selects a row in the list. +It is emitted for every row that is selected in a multi-selection or +by calling gtk_clist_select_all(). + + +@clist: The object which received the signal. +@row: The row selected. +@column: The column where the selection occured. +@event: A #GdkEvent structure for the selection. + + + + + + +@clist: the object which received the signal. +@arg1: +@arg2: + + + +This signal is emitted when a drag-selection is started in +a multiple-selection CList. + + +@clist: the object which received the signal. + + + +This signal is emitted when "add mode" is toggled. + + +@clist: the object which received the signal. + + + + + + +@clist: The object which received the signal. + + + +This signal is emitted when an undo selection occurs in the CList, +probably via calling gtk_clist_undo_selection(). + + +@clist: the object which received the signal. + + + +This signal is emitted when all rows are unselected in a CList. + + +@clist: the object which received the signal. + + + +This signal is emitted when the user unselects a row in the list. +It is emitted for every row that is unselected in a multi-selection or +by calling gtk_clist_unselect_all(). It is also emitted for the +previously selected row in a "single" or "browse" mode CList. + + +@clist: The object which received the signal. +@row: The selected row +@column: The column where the selection occured. +@event: + + + +An integer value for a column. + + + + +A boolean value for determining if the user can re-order the CList's +columns. + + + + +An integer value representing the height of a row in pixels. + + + + +Sets the type of selection mode for the CList. + + + + +Sets the shadowing for the CList. + + + + + + + + + +A boolean value for setting whether the column titles can be +clicked. + + + + +A boolean value for setting whether to use icons during drag +operations. + + diff --git a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml index cac76e59b3..ff1217dab6 100644 --- a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml @@ -21,33 +21,6 @@ selection dialog to change the color. It is suitable widget for selecting a colo - - - - - -@colorbutton: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - @@ -137,3 +110,30 @@ selection dialog to change the color. It is suitable widget for selecting a colo @Returns: + + + + + +@colorbutton: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml index 844fd5c016..9d02693079 100644 --- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml @@ -25,34 +25,6 @@ and should be accessed using the functions below. - - -This signal is emitted when the color changes in the #GtkColorSelection -according to its update policy. - - -@colorselection: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - @@ -286,3 +258,31 @@ time. @color: + + +This signal is emitted when the color changes in the #GtkColorSelection +according to its update policy. + + +@colorselection: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index d1436e337a..30db1ddba9 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -106,31 +106,6 @@ an application.) @entry: @list: - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkCombo. @@ -220,3 +195,28 @@ instead. @combo: a #GtkCombo. + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcombobox.sgml b/docs/reference/gtk/tmpl/gtkcombobox.sgml index a911d26f9e..4d05ec1096 100644 --- a/docs/reference/gtk/tmpl/gtkcombobox.sgml +++ b/docs/reference/gtk/tmpl/gtkcombobox.sgml @@ -20,43 +20,6 @@ GtkComboBox - - - - - -@combobox: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -156,3 +119,40 @@ GtkComboBox @text: + + + + + +@combobox: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml index ad9df47cdf..bb29bdc592 100644 --- a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml +++ b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml @@ -20,11 +20,6 @@ GtkComboBoxEntry - - - - - @@ -44,3 +39,8 @@ GtkComboBoxEntry @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index 1651d4147d..d8c13bf31a 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -102,52 +102,6 @@ changes, use gtk_widget_child_notify(). - - - - - -@container: the object which received the signal. -@widget: - - - - - - -@container: the object which received the signal. - - - - - - -@container: the object which received the signal. -@widget: - - - - - - -@container: the object which received the signal. -@widget: - - - - - - - - - - - - - - - - @@ -510,3 +464,49 @@ Does the same as gtk_container_get_children(). @class: + + + + + +@container: the object which received the signal. +@widget: + + + + + + +@container: the object which received the signal. + + + + + + +@container: the object which received the signal. +@widget: + + + + + + +@container: the object which received the signal. +@widget: + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkctree.sgml b/docs/reference/gtk/tmpl/gtkctree.sgml index 204d2c64ae..996dcda933 100644 --- a/docs/reference/gtk/tmpl/gtkctree.sgml +++ b/docs/reference/gtk/tmpl/gtkctree.sgml @@ -75,94 +75,6 @@ node. - - -The row which has the focus is either collapsed or expanded -or toggled. - - -@ctree: the object which received the signal. -@expansion: What is being done. - - - -Emitted when a node is collapsed. - - -@ctree: the object which received the signal. -@node: - - - -Emitted when a node is expanded. - - -@ctree: the object which received the signal. -@node: - - - -Emitted when a node is moved. - - -@ctree: the object which received the signal. -@node: The node that is moved. -@new_parent: The new parent of the node. -@new_sibling: The new sibling of the node. - - - -Emitted when a row is selected. - - -@ctree: the object which received the signal. -@node: The node corresponding to the selected row. -@column: The column which was selected. - - - -Emitted when a node is unselected. - - -@ctree: the object which received the signal. -@node: The node corresponding to the selected row. -@column: - - - -The style of the expander buttons. - - - - -The number of pixels to indent the tree levels. - - - - -The style of the lines in the tree graphic. - - - - -The number of columns in the tree. - - - - -FIXME - - - - -The number of pixels between the tree and the columns. - - - - -The column in which the actual tree graphic appears. - - Used to get the #GtkCTreeRow structure corresponding to the given #GtkCTreeNode. @@ -1251,3 +1163,91 @@ criteria etc. @show_stub: + + +The row which has the focus is either collapsed or expanded +or toggled. + + +@ctree: the object which received the signal. +@expansion: What is being done. + + + +Emitted when a node is collapsed. + + +@ctree: the object which received the signal. +@node: + + + +Emitted when a node is expanded. + + +@ctree: the object which received the signal. +@node: + + + +Emitted when a node is moved. + + +@ctree: the object which received the signal. +@node: The node that is moved. +@new_parent: The new parent of the node. +@new_sibling: The new sibling of the node. + + + +Emitted when a row is selected. + + +@ctree: the object which received the signal. +@node: The node corresponding to the selected row. +@column: The column which was selected. + + + +Emitted when a node is unselected. + + +@ctree: the object which received the signal. +@node: The node corresponding to the selected row. +@column: + + + +The style of the expander buttons. + + + + +The number of pixels to indent the tree levels. + + + + +The style of the lines in the tree graphic. + + + + +The number of columns in the tree. + + + + +FIXME + + + + +The number of pixels between the tree and the columns. + + + + +The column in which the actual tree graphic appears. + + diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml index 9395dcf8be..674e39ba3f 100644 --- a/docs/reference/gtk/tmpl/gtkcurve.sgml +++ b/docs/reference/gtk/tmpl/gtkcurve.sgml @@ -48,41 +48,6 @@ should be accessed using the functions below. - - -Emitted when the curve type has been changed. -The curve type can be changed explicitly with a call to -gtk_curve_set_curve_type(). It is also changed as a side-effect of -calling gtk_curve_reset() or gtk_curve_set_gamma(). - - -@curve: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkCurve. @@ -159,3 +124,38 @@ curve will be changed as little as possible. @type: the type of the curve. + + +Emitted when the curve type has been changed. +The curve type can be changed explicitly with a call to +gtk_curve_set_curve_type(). It is also changed as a side-effect of +calling gtk_curve_reset() or gtk_curve_set_gamma(). + + +@curve: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index b6e02e982b..09e1cf873b 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -140,44 +140,6 @@ as any other #GtkHButtonBox. @vbox: @action_area: - - - - - -@dialog: the object which received the signal. - - - -Emitted when an action widget is clicked, the dialog receives a delete event, or -the application programmer calls gtk_dialog_response(). On a delete event, the -response ID is #GTK_RESPONSE_NONE. Otherwise, it depends on which action widget -was clicked. - - -@dialog: the object which received the signal. -@arg1: the response ID - - - - - - - - - - - - - - - - - - - - - @@ -314,3 +276,41 @@ directly, but into the @vbox and @action_area, as described above. @setting: + + + + + +@dialog: the object which received the signal. + + + +Emitted when an action widget is clicked, the dialog receives a delete event, or +the application programmer calls gtk_dialog_response(). On a delete event, the +response ID is #GTK_RESPONSE_NONE. Otherwise, it depends on which action widget +was clicked. + + +@dialog: the object which received the signal. +@arg1: the response ID + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml index c999fe84cd..b1b10be105 100644 --- a/docs/reference/gtk/tmpl/gtkeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkeditable.sgml @@ -87,50 +87,6 @@ editable by the user. - - -Indicates that the user has changed the contents -of the widget. - - -@editable: the object which received the signal. - - - -This signal is emitted when text is deleted from -the widget by the user. The default handler for -this signal will normally be responsible for inserting -the text, so by connecting to this signal and then -stopping the signal with gtk_signal_emit_stop(), it -is possible to modify the inserted text, or prevent -it from being inserted entirely. The @start_pos -and @end_pos parameters are interpreted as for -gtk_editable_delete_text() - - -@editable: the object which received the signal. -@start_pos: the starting position. -@end_pos: the end position. - - - -This signal is emitted when text is inserted into -the widget by the user. The default handler for -this signal will normally be responsible for inserting -the text, so by connecting to this signal and then -stopping the signal with gtk_signal_emit_stop(), it -is possible to modify the inserted text, or prevent -it from being inserted entirely. - - -@editable: the object which received the signal. -@new_text: the new text to insert. -@new_text_length: the length of the new text. -@position: the position at which to insert the new text. - this is an in-out paramter. After the signal - emission is finished, it should point after - the newly inserted text. - Selects a region of text. The characters that @@ -291,3 +247,47 @@ widget or not. @Returns: + + +Indicates that the user has changed the contents +of the widget. + + +@editable: the object which received the signal. + + + +This signal is emitted when text is deleted from +the widget by the user. The default handler for +this signal will normally be responsible for inserting +the text, so by connecting to this signal and then +stopping the signal with gtk_signal_emit_stop(), it +is possible to modify the inserted text, or prevent +it from being inserted entirely. The @start_pos +and @end_pos parameters are interpreted as for +gtk_editable_delete_text() + + +@editable: the object which received the signal. +@start_pos: the starting position. +@end_pos: the end position. + + + +This signal is emitted when text is inserted into +the widget by the user. The default handler for +this signal will normally be responsible for inserting +the text, so by connecting to this signal and then +stopping the signal with gtk_signal_emit_stop(), it +is possible to modify the inserted text, or prevent +it from being inserted entirely. + + +@editable: the object which received the signal. +@new_text: the new text to insert. +@new_text_length: the length of the new text. +@position: the position at which to insert the new text. + this is an in-out paramter. After the signal + emission is finished, it should point after + the newly inserted text. + diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index cfb42b5b02..0dd3da7768 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -31,131 +31,6 @@ The #GtkEntry-struct struct contains only private data. - - - - - -@entry: the object which received the signal. - - - - - - -@entry: the object which received the signal. - - - - - - -@entry: the object which received the signal. - - - - - - -@entry: the object which received the signal. -@arg1: -@arg2: - - - - - - -@entry: the object which received the signal. -@arg1: - - - - - - -@entry: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@entry: the object which received the signal. - - - - - - -@entry: the object which received the signal. -@arg1: - - - - - - -@entry: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkEntry widget. @@ -408,3 +283,128 @@ use gtk_editable_set_editable() instead. @Returns: + + + + + +@entry: the object which received the signal. + + + + + + +@entry: the object which received the signal. + + + + + + +@entry: the object which received the signal. + + + + + + +@entry: the object which received the signal. +@arg1: +@arg2: + + + + + + +@entry: the object which received the signal. +@arg1: + + + + + + +@entry: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@entry: the object which received the signal. + + + + + + +@entry: the object which received the signal. +@arg1: + + + + + + +@entry: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml index 57db032772..06fb8ca88f 100644 --- a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml +++ b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml @@ -20,34 +20,6 @@ GtkEntryCompletion - - - - - -@entrycompletion: the object which received the signal. -@arg1: - - - - - - -@entrycompletion: the object which received the signal. -@arg1: -@arg2: -@Returns: - - - - - - - - - - - @@ -170,3 +142,31 @@ GtkEntryCompletion @column: + + + + + +@entrycompletion: the object which received the signal. +@arg1: + + + + + + +@entrycompletion: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkeventbox.sgml b/docs/reference/gtk/tmpl/gtkeventbox.sgml index f5fc0dc4e3..309958a1f3 100644 --- a/docs/reference/gtk/tmpl/gtkeventbox.sgml +++ b/docs/reference/gtk/tmpl/gtkeventbox.sgml @@ -23,16 +23,6 @@ should be accessed using the functions below. - - - - - - - - - - Creates a new #GtkEventBox. @@ -77,3 +67,13 @@ Creates a new #GtkEventBox. @Returns: + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkexpander.sgml b/docs/reference/gtk/tmpl/gtkexpander.sgml index 1fef30256f..cb4869b86b 100644 --- a/docs/reference/gtk/tmpl/gtkexpander.sgml +++ b/docs/reference/gtk/tmpl/gtkexpander.sgml @@ -21,48 +21,6 @@ the triangles used in a #GtkTreeView. - - - - - -@expander: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -171,3 +129,45 @@ the triangles used in a #GtkTreeView. @Returns: + + + + + +@expander: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkfilechooser.sgml b/docs/reference/gtk/tmpl/gtkfilechooser.sgml index f989347e6a..b4a45cd9c0 100644 --- a/docs/reference/gtk/tmpl/gtkfilechooser.sgml +++ b/docs/reference/gtk/tmpl/gtkfilechooser.sgml @@ -467,3 +467,31 @@ End: --> + + + + + +@filechooser: the object which received the signal. + + + + + + +@filechooser: the object which received the signal. + + + + + + +@filechooser: the object which received the signal. + + + + + + +@filechooser: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkfilesel.sgml b/docs/reference/gtk/tmpl/gtkfilesel.sgml index d4f25ad4db..bcf06fdbe4 100644 --- a/docs/reference/gtk/tmpl/gtkfilesel.sgml +++ b/docs/reference/gtk/tmpl/gtkfilesel.sgml @@ -140,21 +140,6 @@ The #GtkFileSelection struct contains the following #GtkWidget fields: @button_area: @action_area: - - - - - - - - - - - - - - - Creates a new file selection dialog box. By default it will contain a #GtkTreeView of the application's current working directory, and a file listing. Operation buttons that allow the user to create a directory, delete files and rename files, are also present. @@ -235,3 +220,18 @@ Hides the file operation buttons that normally appear at the top of the dialog. @Returns: + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml index 28cba109fa..a4f686b0aa 100644 --- a/docs/reference/gtk/tmpl/gtkfixed.sgml +++ b/docs/reference/gtk/tmpl/gtkfixed.sgml @@ -84,16 +84,6 @@ their positions. - - - - - - - - - - The #GtkFixedChild-struct struct contains the following fields. @@ -176,3 +166,13 @@ Moves a child of a #GtkFixed container to the given position. @has_window: + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkfontbutton.sgml b/docs/reference/gtk/tmpl/gtkfontbutton.sgml index abad175f2c..641e3a010c 100644 --- a/docs/reference/gtk/tmpl/gtkfontbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkfontbutton.sgml @@ -21,43 +21,6 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe - - - - - -@fontbutton: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -184,3 +147,40 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe @Returns: + + + + + +@fontbutton: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml index 477a23a95a..ab9854e620 100644 --- a/docs/reference/gtk/tmpl/gtkfontsel.sgml +++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml @@ -52,21 +52,6 @@ only be accessed using the functions below. - - - - - - - - - - - - - - - Creates a new #GtkFontSelection. @@ -122,3 +107,18 @@ Sets the text displayed in the preview area. @text: the text to display in the preview area. + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml index fe897e1511..b1ea262cd0 100644 --- a/docs/reference/gtk/tmpl/gtkframe.sgml +++ b/docs/reference/gtk/tmpl/gtkframe.sgml @@ -24,36 +24,6 @@ label can be controlled with gtk_frame_set_label_align(). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create a new Frame, with optional label @label. @@ -145,3 +115,33 @@ Set the shadow type for the Frame widget. @Returns: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml index 55a595c171..a00c8127ac 100644 --- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml +++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml @@ -77,53 +77,6 @@ child is attached or detached. - - -This signal is emitted when the contents of the -handlebox are reattached to the main window. - - -@handlebox: the object which received the signal. -@widget: the child widget of the handlebox. - (this argument provides no extra information - and is here only for backwards-compatibility) - - - -This signal is emitted when the contents of the -handlebox are detached from the main window. - - -@handlebox: the object which received the signal. -@widget: the child widget of the handlebox. - (this argument provides no extra information - and is here only for backwards-compatibility) - - - - - - - - - - - - - - - - - - - - - - - - - - Create a new handle box. @@ -202,3 +155,50 @@ in the future. @Returns: + + +This signal is emitted when the contents of the +handlebox are reattached to the main window. + + +@handlebox: the object which received the signal. +@widget: the child widget of the handlebox. + (this argument provides no extra information + and is here only for backwards-compatibility) + + + +This signal is emitted when the contents of the +handlebox are detached from the main window. + + +@handlebox: the object which received the signal. +@widget: the child widget of the handlebox. + (this argument provides no extra information + and is here only for backwards-compatibility) + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkicontheme.sgml b/docs/reference/gtk/tmpl/gtkicontheme.sgml index 16d85910c7..5eb7f3dd40 100644 --- a/docs/reference/gtk/tmpl/gtkicontheme.sgml +++ b/docs/reference/gtk/tmpl/gtkicontheme.sgml @@ -118,13 +118,6 @@ gtk_icon_theme_set_custom_theme(). - - - - - -@icontheme: the object which received the signal. - @@ -396,3 +389,10 @@ gtk_icon_theme_set_custom_theme(). @Returns: + + + + + +@icontheme: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml index f94ddcbb9e..51a5e6d12e 100644 --- a/docs/reference/gtk/tmpl/gtkimage.sgml +++ b/docs/reference/gtk/tmpl/gtkimage.sgml @@ -108,56 +108,6 @@ below. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Describes the image data representation used by a #GtkImage. If you @@ -409,3 +359,53 @@ Gets the #GtkImage. @mask: a #GdkBitmap that indicates which parts of the image should be transparent. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml index 91aa18eeb2..d9c35fb722 100644 --- a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml @@ -24,11 +24,6 @@ fill in the text label. - - - - - @@ -86,3 +81,8 @@ fill in the text label. @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml index c9d81d8bd1..c85cf1fdd6 100644 --- a/docs/reference/gtk/tmpl/gtkimcontext.sgml +++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml @@ -20,53 +20,6 @@ Base class for input method contexts - - - - - -@imcontext: the object which received the signal. -@arg1: - - - - - - -@imcontext: the object which received the signal. -@arg1: -@arg2: -@Returns: - - - - - - -@imcontext: the object which received the signal. - - - - - - -@imcontext: the object which received the signal. - - - - - - -@imcontext: the object which received the signal. - - - - - - -@imcontext: the object which received the signal. -@Returns: - @@ -172,3 +125,50 @@ Base class for input method contexts @Returns: + + + + + +@imcontext: the object which received the signal. +@arg1: + + + + + + +@imcontext: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + +@imcontext: the object which received the signal. + + + + + + +@imcontext: the object which received the signal. + + + + + + +@imcontext: the object which received the signal. + + + + + + +@imcontext: the object which received the signal. +@Returns: + diff --git a/docs/reference/gtk/tmpl/gtkinputdialog.sgml b/docs/reference/gtk/tmpl/gtkinputdialog.sgml index bf5210516a..436f014e0f 100644 --- a/docs/reference/gtk/tmpl/gtkinputdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkinputdialog.sgml @@ -43,6 +43,14 @@ immediately. + + +Creates a new #GtkInputDialog. + + +@Returns: the new #GtkInputDialog. + + This signal is emitted when the user changes the @@ -63,11 +71,3 @@ mode of a device from #GDK_MODE_DISABLED to a @inputdialog: the object which received the signal. @deviceid: The ID of the newly enabled device. - - -Creates a new #GtkInputDialog. - - -@Returns: the new #GtkInputDialog. - - diff --git a/docs/reference/gtk/tmpl/gtkinvisible.sgml b/docs/reference/gtk/tmpl/gtkinvisible.sgml index 95718df86d..d8d138bee0 100644 --- a/docs/reference/gtk/tmpl/gtkinvisible.sgml +++ b/docs/reference/gtk/tmpl/gtkinvisible.sgml @@ -25,11 +25,6 @@ The #GtkInvisible-struct struct contains no public fields. - - - - - @@ -64,3 +59,8 @@ The #GtkInvisible-struct struct contains no public fields. @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtkitem.sgml b/docs/reference/gtk/tmpl/gtkitem.sgml index 8964eb09bd..f800623b3a 100644 --- a/docs/reference/gtk/tmpl/gtkitem.sgml +++ b/docs/reference/gtk/tmpl/gtkitem.sgml @@ -22,27 +22,6 @@ should be accessed using the functions below. - - -Emitted when the item is deselected. - - -@item: the object which received the signal. - - - -Emitted when the item is selected. - - -@item: the object which received the signal. - - - -Emitted when the item is toggled. - - -@item: the object which received the signal. - Emits the "select" signal on the given item. @@ -67,3 +46,24 @@ Emits the "toggle" signal on the given item. @item: a #GtkItem. + + +Emitted when the item is deselected. + + +@item: the object which received the signal. + + + +Emitted when the item is selected. + + +@item: the object which received the signal. + + + +Emitted when the item is toggled. + + +@item: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index 9272fdeb05..638268e18f 100644 --- a/docs/reference/gtk/tmpl/gtklabel.sgml +++ b/docs/reference/gtk/tmpl/gtklabel.sgml @@ -145,91 +145,6 @@ described below. - - - - - -@label: the object which received the signal. - - - - - - -@label: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@label: the object which received the signal. -@arg1: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -531,3 +446,88 @@ Gtk+ 1.0.x. @setting: + + + + + +@label: the object which received the signal. + + + + + + +@label: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@label: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml index 6870889a99..24c2107310 100644 --- a/docs/reference/gtk/tmpl/gtklayout.sgml +++ b/docs/reference/gtk/tmpl/gtklayout.sgml @@ -34,45 +34,6 @@ area. @bin_window: - - - - - -@layout: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -181,3 +142,42 @@ area. @adjustment: + + + + + +@layout: the object which received the signal. +@arg1: +@arg2: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtklist.sgml b/docs/reference/gtk/tmpl/gtklist.sgml index 37c9cbb4ed..6655883315 100644 --- a/docs/reference/gtk/tmpl/gtklist.sgml +++ b/docs/reference/gtk/tmpl/gtklist.sgml @@ -35,34 +35,6 @@ type. - - -The child @widget has just been selected. - - -@list: the object which received the signal. -@widget: the newly selected child. - - - -The selection of the widget has just changed. - - -@list: the object which received the signal. - - - -The child @widget has just been unselected. - - -@list: the object which received the signal. -@widget: the newly unselected child. - - - - - - Creates a new #GtkList. @@ -360,3 +332,31 @@ effect if a drag selection is not active. @list: the list widget. + + +The child @widget has just been selected. + + +@list: the object which received the signal. +@widget: the newly selected child. + + + +The selection of the widget has just changed. + + +@list: the object which received the signal. + + + +The child @widget has just been unselected. + + +@list: the object which received the signal. +@widget: the newly unselected child. + + + + + + diff --git a/docs/reference/gtk/tmpl/gtklistitem.sgml b/docs/reference/gtk/tmpl/gtklistitem.sgml index 0682386b1e..9009e0ff36 100644 --- a/docs/reference/gtk/tmpl/gtklistitem.sgml +++ b/docs/reference/gtk/tmpl/gtklistitem.sgml @@ -30,6 +30,42 @@ only be accessed using the functions below. + + +Creates a new #GtkListitem. + + +@Returns: a new #GtkListItem. + + + + +Creates a new #GtkListItem with a child label containing the given string. + + +@label: the string to use for the child label. +@Returns: a new #GtkListItem with a child #GtkLabel with the text set to +@label. + + + + +Selects the item, by emitting the item's "select" signal. +Depending on the selection mode of the list, this may cause other items to +be deselected. + + +@list_item: a #GtkListItem. + + + + +Deselects the item, by emitting the item's "deselect" signal. + + +@list_item: a #GtkListItem. + + @@ -107,39 +143,3 @@ only be accessed using the functions below. @listitem: the object which received the signal. - - -Creates a new #GtkListitem. - - -@Returns: a new #GtkListItem. - - - - -Creates a new #GtkListItem with a child label containing the given string. - - -@label: the string to use for the child label. -@Returns: a new #GtkListItem with a child #GtkLabel with the text set to -@label. - - - - -Selects the item, by emitting the item's "select" signal. -Depending on the selection mode of the list, this may cause other items to -be deselected. - - -@list_item: a #GtkListItem. - - - - -Deselects the item, by emitting the item's "deselect" signal. - - -@list_item: a #GtkListItem. - - diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index 1b5614ef09..7c94065f03 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -83,54 +83,6 @@ should be accessed using the functions below. - - - - - -@menu: the object which received the signal. -@arg1: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkMenu. @@ -388,3 +340,51 @@ will be called when the menu is later detached from the widget. @menu: the #GtkMenu being detached. + + + + + +@menu: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml index fca557f76a..16b3972408 100644 --- a/docs/reference/gtk/tmpl/gtkmenubar.sgml +++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml @@ -20,16 +20,6 @@ The #GtkMenuBar struct contains the following fields. (These fields should be co - - - - - - - - - - Creates the new #GtkMenuBar @@ -74,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. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml index 90b8c7ff92..c016367fb0 100644 --- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml @@ -39,57 +39,6 @@ only a few are really useful. - - -Emitted when the item is activated. - - -@menuitem: the object which received the signal. - - - -Emitted when the item is activated, but also if the menu item has a -submenu. For normal applications, the relevant signal is "activate". - - -@menuitem: the object which received the signal. - - - - - - -@menuitem: the object which received the signal. -@arg1: - - - - - - -@menuitem: the object which received the signal. -@arg1: - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkMenuItem. @@ -221,3 +170,54 @@ Sets the menu item to be right-justified. Only useful for menu bars. @Returns: + + +Emitted when the item is activated. + + +@menuitem: the object which received the signal. + + + +Emitted when the item is activated, but also if the menu item has a +submenu. For normal applications, the relevant signal is "activate". + + +@menuitem: the object which received the signal. + + + + + + +@menuitem: the object which received the signal. +@arg1: + + + + + + +@menuitem: the object which received the signal. +@arg1: + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index 9e08cab8ab..e5009d44be 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -41,55 +41,6 @@ an application.) - - -An action signal that activates the current menu item within the menu -shell. - - -@menushell: the object which received the signal. -@force_hide: if TRUE, hide the menu after activating the menu item. - - - -An action signal which cancels the selection within the menu shell. -Causes the GtkMenuShell::selection-done signal to be emitted. - - -@menushell: the object which received the signal. - - - - - - -@menushell: the object which received the signal. -@arg1: - - - -This signal is emitted when a menu shell is deactivated. - - -@menushell: the object which received the signal. - - - -An action signal which moves the current menu item in the direction -specified by @direction. - - -@menushell: the object which received the signal. -@direction: the direction to move. - - - -This signal is emitted when a selection has been completed within a menu -shell. - - -@menushell: the object which received the signal. - Adds a new #GtkMenuItem to the end of the menu shell's item list. @@ -202,3 +153,52 @@ An enumeration representing directional movements within a menu. @GTK_MENU_DIR_NEXT: @GTK_MENU_DIR_PREV: + + +An action signal that activates the current menu item within the menu +shell. + + +@menushell: the object which received the signal. +@force_hide: if TRUE, hide the menu after activating the menu item. + + + +An action signal which cancels the selection within the menu shell. +Causes the GtkMenuShell::selection-done signal to be emitted. + + +@menushell: the object which received the signal. + + + + + + +@menushell: the object which received the signal. +@arg1: + + + +This signal is emitted when a menu shell is deactivated. + + +@menushell: the object which received the signal. + + + +An action signal which moves the current menu item in the direction +specified by @direction. + + +@menushell: the object which received the signal. +@direction: the direction to move. + + + +This signal is emitted when a selection has been completed within a menu +shell. + + +@menushell: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml index e93eb22f54..a3a0adff72 100644 --- a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml +++ b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml @@ -64,21 +64,6 @@ You might do a non-modal #GtkMessageDialog as follows: - - - - - - - - - - - - - - - The type of message being displayed in the dialog. @@ -131,3 +116,18 @@ then call gtk_dialog_add_buttons(). @Returns: + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkmisc.sgml b/docs/reference/gtk/tmpl/gtkmisc.sgml index 5a7ac4cf53..2658825465 100644 --- a/docs/reference/gtk/tmpl/gtkmisc.sgml +++ b/docs/reference/gtk/tmpl/gtkmisc.sgml @@ -60,26 +60,6 @@ in pixels. - - - - - - - - - - - - - - - - - - - - Sets the alignment of the widget. @@ -122,3 +102,23 @@ in pixels. @ypad: + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index d2f35c20c6..69bb714914 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -36,151 +36,6 @@ will be a popup menu allowing the users to switch pages. - - - - - -@notebook: the object which received the signal. -@arg1: - -@Returns: - - - - - - -@notebook: the object which received the signal. -@arg1: -@Returns: - - - - - - -@notebook: the object which received the signal. -@arg1: - - - - - - -@notebook: the object which received the signal. -@arg1: -@Returns: - - - -Emitted when the user or a function changes the current page. - - -@notebook: the object which received the signal. -@page: the new current page -@page_num: the index of the page - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. @@ -554,3 +409,148 @@ gtk_notebook_set_current_page() instead. @page_num: + + + + + +@notebook: the object which received the signal. +@arg1: + +@Returns: + + + + + + +@notebook: the object which received the signal. +@arg1: +@Returns: + + + + + + +@notebook: the object which received the signal. +@arg1: + + + + + + +@notebook: the object which received the signal. +@arg1: +@Returns: + + + +Emitted when the user or a function changes the current page. + + +@notebook: the object which received the signal. +@page: the new current page +@page_num: the index of the page + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml index 301d5552a3..0987193e58 100644 --- a/docs/reference/gtk/tmpl/gtkobject.sgml +++ b/docs/reference/gtk/tmpl/gtkobject.sgml @@ -98,20 +98,6 @@ The object itself. You should never use these members directly - - - -Signals that all holders of a reference to the #GtkObject should release -the reference that they hold. May result in finalization of the object -if all references are released. - - -@object: the object which received the signal. - - - - - - Gets the type of an object. @@ -511,3 +497,17 @@ Useless deprecated macro. Ignore it. + + +Signals that all holders of a reference to the #GtkObject should release +the reference that they hold. May result in finalization of the object +if all references are released. + + +@object: the object which received the signal. + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkoldeditable.sgml b/docs/reference/gtk/tmpl/gtkoldeditable.sgml index af5afafb3c..5dbcaef198 100644 --- a/docs/reference/gtk/tmpl/gtkoldeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkoldeditable.sgml @@ -24,6 +24,33 @@ Base class for text-editing widgets @selection_end_pos: @has_selection: + + + + + +@editable: +@time_: + + + + + + + +@old_editable: +@claim: +@time_: + + + + + + + +@old_editable: + + @@ -136,30 +163,3 @@ Base class for text-editing widgets - - - - - -@editable: -@time_: - - - - - - - -@old_editable: -@claim: -@time_: - - - - - - - -@old_editable: - - diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index c2cf8f8528..f648d70a87 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -32,28 +32,6 @@ should be accessed using the functions below. - - - - - -@optionmenu: the object which received the signal. - - - - - - - - - - - - - - - - Creates a new #GtkOptionMenu. @@ -110,3 +88,25 @@ selected value for the option menu. @Returns: + + + + + +@optionmenu: the object which received the signal. + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml index 77e11444ca..0845dc727d 100644 --- a/docs/reference/gtk/tmpl/gtkpaned.sgml +++ b/docs/reference/gtk/tmpl/gtkpaned.sgml @@ -73,82 +73,6 @@ gtk_widget_set_size_request (frame2, 50, -1); - - - - - -@paned: the object which received the signal. -@Returns: - - - - - - -@paned: the object which received the signal. -@Returns: - - - - - - -@paned: the object which received the signal. -@arg1: -@Returns: - - - - - - -@paned: the object which received the signal. -@arg1: -@Returns: - - - - - - -@paned: the object which received the signal. -@arg1: -@Returns: - - - - - - -@paned: the object which received the signal. -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - Adds a child to the top or left pane with @@ -230,3 +154,79 @@ gutter (the area between the two panes). It does nothing now. @Returns: + + + + + +@paned: the object which received the signal. +@Returns: + + + + + + +@paned: the object which received the signal. +@Returns: + + + + + + +@paned: the object which received the signal. +@arg1: +@Returns: + + + + + + +@paned: the object which received the signal. +@arg1: +@Returns: + + + + + + +@paned: the object which received the signal. +@arg1: +@Returns: + + + + + + +@paned: the object which received the signal. +@Returns: + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkplug.sgml b/docs/reference/gtk/tmpl/gtkplug.sgml index 3f5d754c22..8bb496e4c5 100644 --- a/docs/reference/gtk/tmpl/gtkplug.sgml +++ b/docs/reference/gtk/tmpl/gtkplug.sgml @@ -34,13 +34,6 @@ inside the first applications window. - - - - - -@plug: the object which received the signal. - @@ -86,3 +79,10 @@ inside the first applications window. @Returns: + + + + + +@plug: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml index e0560a79cc..e20db705bd 100644 --- a/docs/reference/gtk/tmpl/gtkpreview.sgml +++ b/docs/reference/gtk/tmpl/gtkpreview.sgml @@ -32,11 +32,6 @@ should be accessed using the functions below. - - - - - Contains information about global properties @@ -260,3 +255,8 @@ once used for changing the colormap and visual on the fly. + + + + + diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml index 57dc846e11..9b418531e8 100644 --- a/docs/reference/gtk/tmpl/gtkprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkprogress.sgml @@ -23,26 +23,6 @@ and should be accessed using the functions below. - - - - - - - - - - - - - - - - - - - - Controls whether progress text is shown. @@ -207,3 +187,23 @@ the #GtkProgress. @max: the maximum progress value. + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index c86e50ef9e..250d2d604f 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -63,51 +63,6 @@ and should be accessed using the functions below. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new #GtkProgressBar. @@ -276,3 +231,48 @@ gtk_progress_set_percentage() instead. @percentage: the new percent complete value. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkradioaction.sgml b/docs/reference/gtk/tmpl/gtkradioaction.sgml index c32924d4da..41dc3e67ae 100644 --- a/docs/reference/gtk/tmpl/gtkradioaction.sgml +++ b/docs/reference/gtk/tmpl/gtkradioaction.sgml @@ -23,19 +23,6 @@ only private members and should not be accessed directly. - - - - - -@radioaction: the object which received the signal. -@arg1: - - - - - - @@ -63,3 +50,16 @@ only private members and should not be accessed directly. @Returns: + + + + + +@radioaction: the object which received the signal. +@arg1: + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkradiobutton.sgml b/docs/reference/gtk/tmpl/gtkradiobutton.sgml index e2bfbc1a15..57379a23b2 100644 --- a/docs/reference/gtk/tmpl/gtkradiobutton.sgml +++ b/docs/reference/gtk/tmpl/gtkradiobutton.sgml @@ -91,11 +91,6 @@ functions below. - - -Sets a new group for a radio button. - - Creates a new #GtkRadioButton. To be of any practical value, a widget should @@ -188,3 +183,8 @@ Retrieves the group assigned to a radio button. as @radio_button. + + +Sets a new group for a radio button. + + diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index ea7f8c4440..20a5ca4115 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -20,77 +20,6 @@ Base class for widgets which visualize an adjustment - - - - - -@range: the object which received the signal. -@arg1: - - - -Virtual function that moves the slider. Used for keybindings. - - -@range: the #GtkRange -@arg1: - -@step: how to move the slider -@arg2: - - - -Emitted when the range value changes. - - -@range: the #GtkRange - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,3 +112,74 @@ Emitted when the range value changes. @value: + + + + + +@range: the object which received the signal. +@arg1: + + + +Virtual function that moves the slider. Used for keybindings. + + +@range: the #GtkRange +@arg1: + +@step: how to move the slider +@arg2: + + + +Emitted when the range value changes. + + +@range: the #GtkRange + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml index 65ba06bc20..e18e026fdb 100644 --- a/docs/reference/gtk/tmpl/gtkruler.sgml +++ b/docs/reference/gtk/tmpl/gtkruler.sgml @@ -37,26 +37,6 @@ points are really 1/72.27 in.) - - - - - - - - - - - - - - - - - - - - This should be points_per_unit. This is the size of the unit in 1/72nd's of an inch and has nothing to do with screen pixels. @@ -112,3 +92,23 @@ This sets the range of the ruler using gfloat lower, gfloat upper, gfloat positi @max_size: + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index 351ae89b11..8935f1164b 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -50,55 +50,6 @@ slider. - - -Signal which allows you to change how the scale value is displayed. Connect a -signal handler which returns an allocated string representing @value. -That string will then be used to display the scale's value. -Here's an example signal handler which displays a value 1.0 as -with "-->1.0<--". - -static gchar* -format_value_callback (GtkScale *scale, - gdouble value) -{ - return g_strdup_printf ("-->%0.*g<--", - gtk_scale_get_digits (scale), value); -} - - - -@scale: the object which received the signal. -@arg1: -@Returns: allocated string representing @value - -@value: value to format - - - - - - - - - - - - - - - - - - - - - - - - - - Sets the number of decimal places that are displayed in the value. Also causes @@ -158,3 +109,52 @@ Gets the position in which the current value is displayed. @Returns: the position in which the current value is displayed. + + +Signal which allows you to change how the scale value is displayed. Connect a +signal handler which returns an allocated string representing @value. +That string will then be used to display the scale's value. +Here's an example signal handler which displays a value 1.0 as +with "-->1.0<--". + +static gchar* +format_value_callback (GtkScale *scale, + gdouble value) +{ + return g_strdup_printf ("-->%0.*g<--", + gtk_scale_get_digits (scale), value); +} + + + +@scale: the object which received the signal. +@arg1: +@Returns: allocated string representing @value + +@value: value to format + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml index ced33698c7..d93ec9fcbf 100644 --- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml @@ -75,58 +75,6 @@ only be accessed using the functions below. - - - - - -@scrolledwindow: the object which received the signal. -@arg1: - - - - - - -@scrolledwindow: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new scrolled window. The two arguments are the scrolled @@ -277,3 +225,55 @@ Sets the #GtkAdjustment for the vertical scrollbar. @Returns: + + + + + +@scrolledwindow: the object which received the signal. +@arg1: + + + + + + +@scrolledwindow: the object which received the signal. +@arg1: +@arg2: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml b/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml index 167d49e474..a9a9d4ffd6 100644 --- a/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml +++ b/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml @@ -10,6 +10,11 @@ A toolbar item that separates groups of other toolbar items. #GtkToolItems. Depending on the theme, a #GtkSeparatorToolItem will often look like a vertical line on horizontally docked toolbars. + +If the property "expand" is #TRUE and the property "draw" is #FALSE, a +#GtkSeparatorToolItem will act as a "spring" that forces other items +to the ends of the toolbar. + Use gtk_separator_tool_item_new() to create a new #GtkSeparatorToolItem. @@ -44,3 +49,8 @@ should only be accessed through the functions described below. @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index e15fd0393d..6cdd80f7fc 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -20,101 +20,6 @@ Sharing settings between applications - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/reference/gtk/tmpl/gtksizegroup.sgml b/docs/reference/gtk/tmpl/gtksizegroup.sgml index d55f35cec0..c8c99710ee 100644 --- a/docs/reference/gtk/tmpl/gtksizegroup.sgml +++ b/docs/reference/gtk/tmpl/gtksizegroup.sgml @@ -56,11 +56,6 @@ reached from the widget by a chain of size groups of type - - - - - @@ -118,3 +113,8 @@ reached from the widget by a chain of size groups of type @widget: + + + + + diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index fa45e8aaea..7bb277802b 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -100,28 +100,6 @@ never be set by an application.) - - -This signal is emitted when a client is successfully -added to the socket. - - -@socket: the object which received the signal. - -@socket_: the object which received the signal. - - - -This signal is emitted when a client is removed from the socket. The -default action is to destroy the #GtkSocket widget, so if you want to -reuse it you must add a signal handler that returns %TRUE. - - -@socket: the object which received the signal. -@Returns: - -@socket_: the object which received the signal. - @@ -157,3 +135,25 @@ reuse it you must add a signal handler that returns %TRUE. @Returns: + + +This signal is emitted when a client is successfully +added to the socket. + + +@socket: the object which received the signal. + +@socket_: the object which received the signal. + + + +This signal is emitted when a client is removed from the socket. The +default action is to destroy the #GtkSocket widget, so if you want to +reuse it you must add a signal handler that returns %TRUE. + + +@socket: the object which received the signal. +@Returns: + +@socket_: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml index a9fba39929..88a3426747 100644 --- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml @@ -104,83 +104,6 @@ and should only be modified using the functions below. - - - - - -@spinbutton: the object which received the signal. -@arg1: - - - - - - -@spinbutton: the object which received the signal. -@arg1: -@Returns: - - - - - - -@spinbutton: the object which received the signal. -@Returns: - - - - - - -@spinbutton: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -the type of border that surrounds the arrows of a spin button. - - @@ -478,3 +401,80 @@ use gtk_spin_button_get_value() instead. + + + + + +@spinbutton: the object which received the signal. +@arg1: + + + + + + +@spinbutton: the object which received the signal. +@arg1: +@Returns: + + + + + + +@spinbutton: the object which received the signal. +@Returns: + + + + + + +@spinbutton: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +the type of border that surrounds the arrows of a spin button. + + diff --git a/docs/reference/gtk/tmpl/gtkstatusbar.sgml b/docs/reference/gtk/tmpl/gtkstatusbar.sgml index f6f490857b..6c58b77771 100644 --- a/docs/reference/gtk/tmpl/gtkstatusbar.sgml +++ b/docs/reference/gtk/tmpl/gtkstatusbar.sgml @@ -52,34 +52,6 @@ Contains private data that should be modified with the functions described below - - -Is emitted whenever a new message is popped off a statusbar's stack. - - -@statusbar: the object which received the signal. -@context_id: the context id of the relevant message/statusbar. -@text: the message that was just popped. - - - -Is emitted whenever a new message gets pushed onto a statusbar's stack. - - -@statusbar: the object which received the signal. -@context_id: the context id of the relevant message/statusbar. -@text: the message that was pushed. - - - - - - - - - - - Creates a new #GtkStatusbar ready for messages. @@ -148,3 +120,31 @@ Returns whether the statusbar has a resize grip. @Returns: %TRUE if the statusbar has a resize grip. + + +Is emitted whenever a new message is popped off a statusbar's stack. + + +@statusbar: the object which received the signal. +@context_id: the context id of the relevant message/statusbar. +@text: the message that was just popped. + + + +Is emitted whenever a new message gets pushed onto a statusbar's stack. + + +@statusbar: the object which received the signal. +@context_id: the context id of the relevant message/statusbar. +@text: the message that was pushed. + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index d2c380a425..c3b93d9267 100644 --- a/docs/reference/gtk/tmpl/gtktable.sgml +++ b/docs/reference/gtk/tmpl/gtktable.sgml @@ -55,71 +55,6 @@ The GtkTable structure holds the data for the actual ta - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The widget field is a pointer to the widget that @@ -316,3 +251,68 @@ to %FALSE if this is not your desired behaviour. @Returns: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktext.sgml b/docs/reference/gtk/tmpl/gtktext.sgml index 3559a2513d..fc83784f91 100644 --- a/docs/reference/gtk/tmpl/gtktext.sgml +++ b/docs/reference/gtk/tmpl/gtktext.sgml @@ -30,37 +30,6 @@ Listed below are a few exceptions and how to use them. - - - - - -@text: the object which received the signal. -@arg1: -@arg2: - - - -Used by the #GtkText widget to keep track of the size of its horizontal -text. - - - - -Boolean value indicating whether line wrap is enabled or not. - - - - -Used by the #GtkText widget to keep track of the size of its vertical -text. - - - - -Boolean value indicated whether word wrap is enabled or not. - - Internal #GtkText data type. @@ -233,3 +202,34 @@ Returns the character at the given index within the #GtkText widget. @index: the number of characters from the upper left corner + + + + + +@text: the object which received the signal. +@arg1: +@arg2: + + + +Used by the #GtkText widget to keep track of the size of its horizontal +text. + + + + +Boolean value indicating whether line wrap is enabled or not. + + + + +Used by the #GtkText widget to keep track of the size of its vertical +text. + + + + +Boolean value indicated whether word wrap is enabled or not. + + diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index fcd641f8a9..44ee0a1753 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -29,115 +29,6 @@ types related to the text widget and how they work together. - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@textbuffer: the object which received the signal. - - - - - - -@textbuffer: the object which received the signal. - - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textbuffer: the object which received the signal. - - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: -@arg3: - -@arg4: - - - - - - -@textbuffer: the object which received the signal. -@arg1: - - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textbuffer: the object which received the signal. - - - - - - -@textbuffer: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - @@ -737,3 +628,112 @@ types related to the text widget and how they work together. @clipboard: + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@textbuffer: the object which received the signal. + + + + + + +@textbuffer: the object which received the signal. + + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textbuffer: the object which received the signal. + + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: +@arg3: + +@arg4: + + + + + + +@textbuffer: the object which received the signal. +@arg1: + + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textbuffer: the object which received the signal. + + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index c806b513a8..dd5f871a59 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -38,6 +38,146 @@ planned to be implemented in future releases. + + +Describes a type of line wrapping. + + +@GTK_WRAP_NONE: do not wrap lines; just make the text area wider +@GTK_WRAP_CHAR: wrap text, breaking lines anywhere the cursor can + appear (between characters, usually - if you want to + be technical, between graphemes, see + pango_get_log_attrs()) +@GTK_WRAP_WORD: wrap text, breaking lines in between words +@GTK_WRAP_WORD_CHAR: wrap text, breaking lines in between words, or if + that is not enough, also between graphemes. + + + +Using #GtkTextAttributes directly should rarely be necessary. It's +primarily useful with gtk_text_iter_get_attributes(). As with most +GTK+ structs, the fields in this struct should only be read, never +modified directly. + + +@appearance: pointer to sub-struct containing certain attributes +@justification: +@direction: +@font: +@font_scale: +@left_margin: +@indent: +@right_margin: +@pixels_above_lines: +@pixels_below_lines: +@pixels_inside_wrap: +@tabs: +@wrap_mode: +@language: +@invisible: +@bg_full_height: +@editable: +@realized: + + + + + + +@name: +@Returns: + + + + + + + +@tag: +@Returns: + + + + + + + +@tag: +@priority: + + + + + + + +@tag: +@event_object: +@event: +@iter: +@Returns: + + + + + + + +@bg_color: +@fg_color: +@bg_stipple: +@fg_stipple: +@rise: +@underline: +@strikethrough: +@draw_bg: +@inside_selection: +@is_text: + + + + + + +@Returns: + + + + + + + +@src: +@Returns: + +@dest: + + + + + + + +@src: +@dest: + + + + + + + +@values: + + + + + + + +@values: + + @@ -354,143 +494,3 @@ planned to be implemented in future releases. - - -Describes a type of line wrapping. - - -@GTK_WRAP_NONE: do not wrap lines; just make the text area wider -@GTK_WRAP_CHAR: wrap text, breaking lines anywhere the cursor can - appear (between characters, usually - if you want to - be technical, between graphemes, see - pango_get_log_attrs()) -@GTK_WRAP_WORD: wrap text, breaking lines in between words -@GTK_WRAP_WORD_CHAR: wrap text, breaking lines in between words, or if - that is not enough, also between graphemes. - - - -Using #GtkTextAttributes directly should rarely be necessary. It's -primarily useful with gtk_text_iter_get_attributes(). As with most -GTK+ structs, the fields in this struct should only be read, never -modified directly. - - -@appearance: pointer to sub-struct containing certain attributes -@justification: -@direction: -@font: -@font_scale: -@left_margin: -@indent: -@right_margin: -@pixels_above_lines: -@pixels_below_lines: -@pixels_inside_wrap: -@tabs: -@wrap_mode: -@language: -@invisible: -@bg_full_height: -@editable: -@realized: - - - - - - -@name: -@Returns: - - - - - - - -@tag: -@Returns: - - - - - - - -@tag: -@priority: - - - - - - - -@tag: -@event_object: -@event: -@iter: -@Returns: - - - - - - - -@bg_color: -@fg_color: -@bg_stipple: -@fg_stipple: -@rise: -@underline: -@strikethrough: -@draw_bg: -@inside_selection: -@is_text: - - - - - - -@Returns: - - - - - - - -@src: -@Returns: - -@dest: - - - - - - - -@src: -@dest: - - - - - - - -@values: - - - - - - - -@values: - - diff --git a/docs/reference/gtk/tmpl/gtktexttagtable.sgml b/docs/reference/gtk/tmpl/gtktexttagtable.sgml index c27f6abbe6..bdae305c3b 100644 --- a/docs/reference/gtk/tmpl/gtktexttagtable.sgml +++ b/docs/reference/gtk/tmpl/gtktexttagtable.sgml @@ -27,31 +27,6 @@ types related to the text widget and how they work together. - - - - - -@texttagtable: the object which received the signal. -@arg1: - - - - - - -@texttagtable: the object which received the signal. -@arg1: -@arg2: - - - - - - -@texttagtable: the object which received the signal. -@arg1: - @@ -116,3 +91,28 @@ types related to the text widget and how they work together. @Returns: + + + + + +@texttagtable: the object which received the signal. +@arg1: + + + + + + +@texttagtable: the object which received the signal. +@arg1: +@arg2: + + + + + + +@texttagtable: the object which received the signal. +@arg1: + diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml index 40feb5fb13..9ebedbc523 100644 --- a/docs/reference/gtk/tmpl/gtktextview.sgml +++ b/docs/reference/gtk/tmpl/gtktextview.sgml @@ -26,189 +26,6 @@ types related to the text widget and how they work together. - - - - - -@textview: the object which received the signal. - - - - - - -@textview: the object which received the signal. - - - - - - -@textview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textview: the object which received the signal. -@arg1: - - - - - - -@textview: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@textview: the object which received the signal. -@arg1: - - - - - - -@textview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textview: the object which received the signal. - - - - - - -@textview: the object which received the signal. -@arg1: - - - - - - -@textview: the object which received the signal. -@arg1: - - - - - - -@textview: the object which received the signal. - - - - - - -@textview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@textview: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -815,3 +632,186 @@ in an idle job in the background. + + + + + +@textview: the object which received the signal. + + + + + + +@textview: the object which received the signal. + + + + + + +@textview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textview: the object which received the signal. +@arg1: + + + + + + +@textview: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@textview: the object which received the signal. +@arg1: + + + + + + +@textview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textview: the object which received the signal. + + + + + + +@textview: the object which received the signal. +@arg1: + + + + + + +@textview: the object which received the signal. +@arg1: + + + + + + +@textview: the object which received the signal. + + + + + + +@textview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textview: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktipsquery.sgml b/docs/reference/gtk/tmpl/gtktipsquery.sgml index 8934b3c178..7d1f7b00b7 100644 --- a/docs/reference/gtk/tmpl/gtktipsquery.sgml +++ b/docs/reference/gtk/tmpl/gtktipsquery.sgml @@ -47,6 +47,56 @@ should be accessed using the functions below. + + +Creates a new #GtkTipsQuery. + + +@Returns: a new #GtkTipsQuery. + + + + +Starts a query. +The #GtkTipsQuery widget will take control of the mouse and as the mouse +moves it will display the tooltip of the widget beneath the mouse. + + +@tips_query: a #GtkTipsQuery. + + + + +Stops a query. + + +@tips_query: a #GtkTipsQuery. + + + + +Sets the widget which initiates the query, usually a button. +If the @caller is selected while the query is running, the query is +automatically stopped. + + +@tips_query: a #GtkTipsQuery. +@caller: the widget which initiates the query. + + + + +Sets the text to display when the query is not in effect, +and the text to display when the query is in effect but the widget beneath +the pointer has no tooltip. + + +@tips_query: a #GtkTipsQuery. +@label_inactive: the text to display when the query is not running. +@label_no_tip: the text to display when the query is running but the widget +beneath the pointer has no tooltip. + + Emitted when the query is started. @@ -108,53 +158,3 @@ The text to display in the #GtkTipsQuery widget when the query is running and the widget that the pointer is over has no tooltip. - - -Creates a new #GtkTipsQuery. - - -@Returns: a new #GtkTipsQuery. - - - - -Starts a query. -The #GtkTipsQuery widget will take control of the mouse and as the mouse -moves it will display the tooltip of the widget beneath the mouse. - - -@tips_query: a #GtkTipsQuery. - - - - -Stops a query. - - -@tips_query: a #GtkTipsQuery. - - - - -Sets the widget which initiates the query, usually a button. -If the @caller is selected while the query is running, the query is -automatically stopped. - - -@tips_query: a #GtkTipsQuery. -@caller: the widget which initiates the query. - - - - -Sets the text to display when the query is not in effect, -and the text to display when the query is in effect but the widget beneath -the pointer has no tooltip. - - -@tips_query: a #GtkTipsQuery. -@label_inactive: the text to display when the query is not running. -@label_no_tip: the text to display when the query is running but the widget -beneath the pointer has no tooltip. - - diff --git a/docs/reference/gtk/tmpl/gtktoggleaction.sgml b/docs/reference/gtk/tmpl/gtktoggleaction.sgml index 7703aee732..e2f62c0982 100644 --- a/docs/reference/gtk/tmpl/gtktoggleaction.sgml +++ b/docs/reference/gtk/tmpl/gtktoggleaction.sgml @@ -22,18 +22,6 @@ private members and should not be accessed directly. - - - - - -@toggleaction: the object which received the signal. - - - - - - @@ -78,3 +66,15 @@ private members and should not be accessed directly. @Returns: + + + + + +@toggleaction: the object which received the signal. + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml index 1809aa6429..23ac0d32e3 100644 --- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml +++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml @@ -83,29 +83,6 @@ The #GtkToggleButton struct contains private data only, and should be manipulate - - -Should be connected if you wish to perform an action whenever the -#GtkToggleButton's state is changed. - - -@togglebutton: the object which received the signal. - - - - - - - - - - - - - - - - Creates a new toggle button. A widget should be packed into the button, as in gtk_button_new(). @@ -205,3 +182,26 @@ This action causes the toggled signal to be emitted. @setting: + + +Should be connected if you wish to perform an action whenever the +#GtkToggleButton's state is changed. + + +@togglebutton: the object which received the signal. + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml index d95ad91163..7bf6e47627 100644 --- a/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml @@ -47,13 +47,6 @@ A #GtkToolItem containing a toggle button. - - - - - -@toggletoolbutton: the object which received the signal. - @@ -89,3 +82,10 @@ A #GtkToolItem containing a toggle button. @Returns: + + + + + +@toggletoolbutton: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 17f9ef063c..0646c537dc 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -12,9 +12,14 @@ A toolbar is created with a call to gtk_toolbar_new(). A toolbar can contain instances of a subclass of #GtkToolItem. To add a #GtkToolItem to the a toolbar, use gtk_toolbar_insert(). To remove an item from the toolbar use gtk_container_remove(). To add a button -to the toolbar, add an instance of #GtkToolButton. Toolbar items can -be visually grouped by adding instances of #GtkSeparatorToolItem to -the toolbar. +to the toolbar, add an instance of #GtkToolButton. + + +Toolbar items can be visually grouped by adding instances of +#GtkSeparatorToolItem to the toolbar. If a #GtkSeparatorToolItem has +the "expand" property set to #TRUE and the "draw" property set to +#FALSE the effect is to force all following items to the end of the +toolbar. Creating a context menu for the toolbar can be done by connecting to @@ -40,109 +45,6 @@ accessed through the function described below. - - - - - -@toolbar: the object which received the signal. -@arg1: -@Returns: - - - - - - -@toolbar: the object which received the signal. -@arg1: -@Returns: - - - - - - -@toolbar: the object which received the signal. -@orientation: the new #GtkOrientation of the toolbar. - - - - - - -@toolbar: the object which received the signal. -@Returns: -@: -@: -@Returns: -@: -@Returns: -@Returns: - - - - - - -@toolbar: -@style: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #GtkToolbarChildType is used to set the type of new elements that are added @@ -530,3 +432,101 @@ to a #GtkToolbar. @toolbar: + + + + + +@toolbar: the object which received the signal. +@arg1: +@Returns: + + + + + + +@toolbar: the object which received the signal. +@arg1: +@Returns: + + + + + + +@toolbar: the object which received the signal. +@orientation: the new #GtkOrientation of the toolbar. + + + + + + +@toolbar: the object which received the signal. +@Returns: +@: +@: +@Returns: +@: +@Returns: +@Returns: + + + + + + +@toolbar: +@style: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoolbutton.sgml index 1590ef4c14..cc49be6435 100644 --- a/docs/reference/gtk/tmpl/gtktoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbutton.sgml @@ -69,38 +69,6 @@ accessed with the function described below. - - - - - -@toolbutton: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -210,3 +178,35 @@ accessed with the function described below. @Returns: + + + + + +@toolbutton: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml index 7f7df20097..435d1aeadc 100644 --- a/docs/reference/gtk/tmpl/gtktoolitem.sgml +++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml @@ -49,47 +49,6 @@ accessed through the functions described below. - - - - - -@toolitem: the object which received the signal. -@Returns: - - - - - - -@toolitem: the object which received the signal. -@arg1: -@arg2: -@arg3: -@Returns: - - - - - - -@toolitem: the object which received the signal. - - - - - - - - - - - - - - - - @@ -134,24 +93,6 @@ accessed through the functions described below. @Returns: - - - - - -@tool_item: -@pack_end: - - - - - - - -@tool_item: -@Returns: - - @@ -300,3 +241,44 @@ accessed through the functions described below. @menu_item: + + + + + +@toolitem: the object which received the signal. +@Returns: + + + + + + +@toolitem: the object which received the signal. +@arg1: +@arg2: +@arg3: +@Returns: + + + + + + +@toolitem: the object which received the signal. + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktree.sgml b/docs/reference/gtk/tmpl/gtktree.sgml index 9f2a943a5f..96fe36fea2 100644 --- a/docs/reference/gtk/tmpl/gtktree.sgml +++ b/docs/reference/gtk/tmpl/gtktree.sgml @@ -45,29 +45,6 @@ struct _GtkTree - - -This signal is emitted by @tree whenever @widget is about to be selected. - - -@tree: the object which received the signal. -@widget: The child that is about to be selected. - - - -This signal is emitted by the root tree whenever the selection changes. - - -@tree: the object which received the signal. - - - -This signal is emitted by @tree whenever @widget is about to be unselected. - - -@tree: the object which received the signal. -@widget: The child that is about to be unselected. - A macro that returns a boolean value which indicates if @obj is a root tree or not. @@ -301,3 +278,26 @@ Removes the item @child from the #GtkTree @tree. @child: A pointer to the #GtkWidget that is to be removed from the tree. + + +This signal is emitted by @tree whenever @widget is about to be selected. + + +@tree: the object which received the signal. +@widget: The child that is about to be selected. + + + +This signal is emitted by the root tree whenever the selection changes. + + +@tree: the object which received the signal. + + + +This signal is emitted by @tree whenever @widget is about to be unselected. + + +@tree: the object which received the signal. +@widget: The child that is about to be unselected. + diff --git a/docs/reference/gtk/tmpl/gtktreeitem.sgml b/docs/reference/gtk/tmpl/gtktreeitem.sgml index 4719f5ad5b..6f404c54f7 100644 --- a/docs/reference/gtk/tmpl/gtktreeitem.sgml +++ b/docs/reference/gtk/tmpl/gtktreeitem.sgml @@ -26,20 +26,6 @@ prior to including the GTK+ header files. Use #GtkTreeView instead. - - - - - -@treeitem: the object which received the signal. - - - - - - -@treeitem: the object which received the signal. - @@ -114,3 +100,17 @@ prior to including the GTK+ header files. Use #GtkTreeView instead. @tree_item: + + + + + +@treeitem: the object which received the signal. + + + + + + +@treeitem: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 88612dc2d2..bac6191d23 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -199,51 +199,6 @@ enum - - - - - -@treemodel: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treemodel: the object which received the signal. -@arg1: - - - - - - -@treemodel: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treemodel: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treemodel: the object which received the signal. -@arg1: -@arg2: -@arg3: - The GtkTreeIter is the primary structure for @@ -860,3 +815,48 @@ versions of GTK+. @new_order: + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treemodel: the object which received the signal. +@arg1: + + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treemodel: the object which received the signal. +@arg1: +@arg2: +@arg3: + diff --git a/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml b/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml index cd09e3fdc0..4cad6f9fc3 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml @@ -20,16 +20,6 @@ GtkTreeModelFilter - - - - - - - - - - @@ -161,3 +151,13 @@ GtkTreeModelFilter @filter: + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml index fbd5fdf0c4..7f6bd3cd3b 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml @@ -20,11 +20,6 @@ A wrapper which makes an underlying tree model sortable - - - - - @@ -113,3 +108,8 @@ A wrapper which makes an underlying tree model sortable @Returns: + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index f17ee07ac3..b88d04c3aa 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -46,16 +46,6 @@ selected row). - - -Emitted whenever the selection has (possibly) changed. Please note that -this signal is mostly a hint. It may only be emitted once when a range -of rows are selected, and it may occasionally be emitted when nothing -has happened. - - -@treeselection: the object which received the signal. - A function used by gtk_tree_selection_set_select_function() to filter @@ -263,3 +253,13 @@ selected rows. It will be called on every selected row in the view. @end_path: + + +Emitted whenever the selection has (possibly) changed. Please note that +this signal is mostly a hint. It may only be emitted once when a range +of rows are selected, and it may occasionally be emitted when nothing +has happened. + + +@treeselection: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtktreesortable.sgml b/docs/reference/gtk/tmpl/gtktreesortable.sgml index f58e9e6ab1..9e96ee3f5e 100644 --- a/docs/reference/gtk/tmpl/gtktreesortable.sgml +++ b/docs/reference/gtk/tmpl/gtktreesortable.sgml @@ -20,13 +20,6 @@ The interface for sortable models used by GtkTreeView - - - - - -@treesortable: the object which received the signal. - @@ -113,3 +106,10 @@ The interface for sortable models used by GtkTreeView @Returns: + + + + + +@treesortable: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index 8d7bd7a8f6..84a67e37d5 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -21,231 +21,6 @@ linkend="GtkTreeModel">GtkTreeModel interface. - - - - - -@treeview: the object which received the signal. - - - - - - -@treeview: the object which received the signal. - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: -@arg3: -@Returns: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: -@Returns: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treeview: the object which received the signal. -@Returns: - - - - - - -@treeview: the object which received the signal. -@Returns: - - - - - - -@treeview: the object which received the signal. -@arg1: -@Returns: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: - - - - - - -@treeview: the object which received the signal. -@Returns: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: -@Returns: - - - - - - -@treeview: the object which received the signal. -@arg1: -@arg2: -@Returns: - - - - - - -@treeview: the object which received the signal. -@Returns: - - - - - - -@treeview: the object which received the signal. -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An enum for determining where a dropped row goes. @@ -964,3 +739,228 @@ Function used for #gtk_tree_view_map_expanded_rows. @destroy: + + + + + +@treeview: the object which received the signal. + + + + + + +@treeview: the object which received the signal. + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@arg3: +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@Returns: + + + + + + +@treeview: the object which received the signal. +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: + + + + + + +@treeview: the object which received the signal. +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + +@treeview: the object which received the signal. +@arg1: +@arg2: +@Returns: + + + + + + +@treeview: the object which received the signal. +@Returns: + + + + + + +@treeview: the object which received the signal. +@Returns: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 01b42eaec8..a65dc1b1a3 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -50,88 +50,6 @@ calling gtk_tree_view_column_set_cell_data_func() - - - - - -@treeviewcolumn: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -592,3 +510,85 @@ calling gtk_tree_view_column_set_cell_data_func() @cell: + + + + + +@treeviewcolumn: the object which received the signal. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml index 1037f9ccbe..084140e569 100644 --- a/docs/reference/gtk/tmpl/gtkuimanager.sgml +++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml @@ -184,31 +184,6 @@ members and should not be accessed directly. - - - - - -@uimanager: the object which received the signal. - - - - - - -@uimanager: the object which received the signal. -@widget: - - - - - - - - - - - @@ -381,3 +356,28 @@ what UI element to create. @self: + + + + + +@uimanager: the object which received the signal. + + + + + + +@uimanager: the object which received the signal. +@widget: + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkviewport.sgml b/docs/reference/gtk/tmpl/gtkviewport.sgml index b9bd883c8a..81d3acf89c 100644 --- a/docs/reference/gtk/tmpl/gtkviewport.sgml +++ b/docs/reference/gtk/tmpl/gtkviewport.sgml @@ -20,30 +20,6 @@ An adapter which makes widgets scrollable - - - - - -@viewport: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - @@ -108,3 +84,27 @@ An adapter which makes widgets scrollable @Returns: + + + + + +@viewport: the object which received the signal. +@arg1: +@arg2: + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 5bacbdc2af..8d986be030 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -41,671 +41,6 @@ gtk_widget_style_get_valist() to obtain the value of a style property. will be indicated by the #GTK_NO_WINDOW flag being set). @parent: - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@arg1: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@arg1: - - - - - - -@widget: the object which received the signal. -@drag_context: - - - - - - -@widget: the object which received the signal. -@drag_context: - - - - - - -@widget: the object which received the signal. -@drag_context: -@data: -@info: -@time: - -@time_: - - - - - - -@widget: the object which received the signal. -@drag_context: -@x: -@y: -@data: -@info: -@time: - -@time_: - - - - - - -@widget: the object which received the signal. -@drag_context: -@x: -@y: -@time: -@Returns: - -@time_: - - - - - - -@widget: the object which received the signal. -@drag_context: - - - - - - -@widget: the object which received the signal. -@drag_context: -@time: - -@time_: - - - - - - -@widget: the object which received the signal. -@drag_context: -@x: -@y: -@time: -@Returns: - -@time_: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@arg1: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@arg1: - - - - - - -@widget: the object which received the signal. - - - -Emitted when there is a chance in the hierarchy to -which a widget belong. More precisely, a widget is -anchored when its toplevel -ancestor is a #GtkWindow. This signal is emitted when -a widget changes from un-anchored to anchored or vice-versa. - - -@widget: the object which received the signal. -@widget2: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@arg1: -@Returns: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@old_parent: - - - - - - -@widget: the object which received the signal. -@Returns: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@arg1: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@data: -@info: -@time: - -@time_: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@data: -@time: - -@time_: - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@arg1: -@Returns: - - - - - - -@widget: the object which received the signal. -@allocation: - - - - - - -@widget: the object which received the signal. -@requisition: - - - - - - -@widget: the object which received the signal. -@state: - - - - - - -@widget: the object which received the signal. -@previous_style: - - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - -@widget: the object which received the signal. -@event: -@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - activate_signal @@ -2320,3 +1655,668 @@ This function is deprecated; it does nothing. @requisition: + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@arg1: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@arg1: + + + + + + +@widget: the object which received the signal. +@drag_context: + + + + + + +@widget: the object which received the signal. +@drag_context: + + + + + + +@widget: the object which received the signal. +@drag_context: +@data: +@info: +@time: + +@time_: + + + + + + +@widget: the object which received the signal. +@drag_context: +@x: +@y: +@data: +@info: +@time: + +@time_: + + + + + + +@widget: the object which received the signal. +@drag_context: +@x: +@y: +@time: +@Returns: + +@time_: + + + + + + +@widget: the object which received the signal. +@drag_context: + + + + + + +@widget: the object which received the signal. +@drag_context: +@time: + +@time_: + + + + + + +@widget: the object which received the signal. +@drag_context: +@x: +@y: +@time: +@Returns: + +@time_: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@arg1: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@arg1: + + + + + + +@widget: the object which received the signal. + + + +Emitted when there is a chance in the hierarchy to +which a widget belong. More precisely, a widget is +anchored when its toplevel +ancestor is a #GtkWindow. This signal is emitted when +a widget changes from un-anchored to anchored or vice-versa. + + +@widget: the object which received the signal. +@widget2: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@arg1: +@Returns: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@old_parent: + + + + + + +@widget: the object which received the signal. +@Returns: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@arg1: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@data: +@info: +@time: + +@time_: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@data: +@time: + +@time_: + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@arg1: +@Returns: + + + + + + +@widget: the object which received the signal. +@allocation: + + + + + + +@widget: the object which received the signal. +@requisition: + + + + + + +@widget: the object which received the signal. +@state: + + + + + + +@widget: the object which received the signal. +@previous_style: + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + +@widget: the object which received the signal. +@event: +@Returns: %TRUE to stop other handlers from being invoked for the event. %FALSE to propagate the event further. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index 0ee26fbb5f..7d1dde0e2b 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -20,152 +20,6 @@ Toplevel which can contain other widgets - - - - - -@window: the object which received the signal. - - - - - - -@window: the object which received the signal. - - - - - - -@window: the object which received the signal. -@event: -@Returns: - - - - - - -@window: the object which received the signal. - - - - - - -@window: the object which received the signal. -@arg1: - - - - - - -@window: the object which received the signal. -@widget: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -994,3 +848,149 @@ Deprecated alias for gtk_window_set_position(). @height: + + + + + +@window: the object which received the signal. + + + + + + +@window: the object which received the signal. + + + + + + +@window: the object which received the signal. +@event: +@Returns: + + + + + + +@window: the object which received the signal. + + + + + + +@window: the object which received the signal. +@arg1: + + + + + + +@window: the object which received the signal. +@widget: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c index 34015b888b..5fcefc25d8 100644 --- a/gtk/gtkseparatortoolitem.c +++ b/gtk/gtkseparatortoolitem.c @@ -36,26 +36,48 @@ #define MENU_ID "gtk-separator-tool-item-menu-id" -static void gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class); -static gboolean gtk_separator_tool_item_create_menu_proxy (GtkToolItem *item); -static void gtk_separator_tool_item_size_request (GtkWidget *widget, - - GtkRequisition *requisition); -static gboolean gtk_separator_tool_item_expose (GtkWidget *widget, - GdkEventExpose *event); -static void gtk_separator_tool_item_add (GtkContainer *container, - GtkWidget *child); -static GtkToolbarSpaceStyle get_space_style (GtkToolItem *tool_item); -static gint get_space_size (GtkToolItem *tool_item); +enum { + PROP_0, + PROP_DRAW +}; + +static void gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class); +static void gtk_separator_tool_item_init (GtkSeparatorToolItem *separator_item, + GtkSeparatorToolItemClass *class); +static gboolean gtk_separator_tool_item_create_menu_proxy (GtkToolItem *item); +static void gtk_separator_tool_item_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_separator_tool_item_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void gtk_separator_tool_item_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static gboolean gtk_separator_tool_item_expose (GtkWidget *widget, + GdkEventExpose *event); +static void gtk_separator_tool_item_add (GtkContainer *container, + GtkWidget *child); +static GtkToolbarSpaceStyle get_space_style (GtkToolItem *tool_item); +static gint get_space_size (GtkToolItem *tool_item); + + static GObjectClass *parent_class = NULL; +#define GTK_SEPARATOR_TOOL_ITEM_GET_PRIVATE(obj)(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemPrivate)) + +struct _GtkSeparatorToolItemPrivate +{ + guint draw : 1; +}; GType gtk_separator_tool_item_get_type (void) { static GType type = 0; - + if (!type) { static const GTypeInfo type_info = @@ -68,9 +90,9 @@ gtk_separator_tool_item_get_type (void) NULL, sizeof (GtkSeparatorToolItem), 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, + (GInstanceInitFunc) gtk_separator_tool_item_init, }; - + type = g_type_register_static (GTK_TYPE_TOOL_ITEM, "GtkSeparatorToolItem", &type_info, 0); } @@ -82,14 +104,14 @@ get_space_style (GtkToolItem *tool_item) { GtkToolbarSpaceStyle space_style = DEFAULT_SPACE_STYLE; GtkWidget *parent = GTK_WIDGET (tool_item)->parent; - + if (GTK_IS_TOOLBAR (parent)) { gtk_widget_style_get (parent, "space_style", &space_style, NULL); } - + return space_style; } @@ -105,27 +127,49 @@ get_space_size (GtkToolItem *tool_item) "space_size", &space_size, NULL); } - + return space_size; } static void gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class) { + GObjectClass *object_class; GtkContainerClass *container_class; GtkToolItemClass *toolitem_class; GtkWidgetClass *widget_class; - + parent_class = g_type_class_peek_parent (class); + object_class = (GObjectClass *)class; container_class = (GtkContainerClass *)class; toolitem_class = (GtkToolItemClass *)class; widget_class = (GtkWidgetClass *)class; + object_class->set_property = gtk_separator_tool_item_set_property; + object_class->get_property = gtk_separator_tool_item_get_property; widget_class->size_request = gtk_separator_tool_item_size_request; widget_class->expose_event = gtk_separator_tool_item_expose; toolitem_class->create_menu_proxy = gtk_separator_tool_item_create_menu_proxy; - + container_class->add = gtk_separator_tool_item_add; + + g_object_class_install_property (object_class, + PROP_DRAW, + g_param_spec_boolean ("draw", + _("Draw"), + _("Whether the separator is drawn, or just blank"), + TRUE, + G_PARAM_READWRITE)); + + g_type_class_add_private (object_class, sizeof (GtkSeparatorToolItemPrivate)); +} + +static void +gtk_separator_tool_item_init (GtkSeparatorToolItem *separator_item, + GtkSeparatorToolItemClass *class) +{ + separator_item->priv = GTK_SEPARATOR_TOOL_ITEM_GET_PRIVATE (separator_item); + separator_item->priv->draw = TRUE; } static void @@ -147,13 +191,51 @@ gtk_separator_tool_item_create_menu_proxy (GtkToolItem *item) return TRUE; } +static void +gtk_separator_tool_item_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GtkSeparatorToolItem *item = GTK_SEPARATOR_TOOL_ITEM (object); + + switch (prop_id) + { + case PROP_DRAW: + gtk_separator_tool_item_set_draw (item, g_value_get_boolean (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gtk_separator_tool_item_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GtkSeparatorToolItem *item = GTK_SEPARATOR_TOOL_ITEM (object); + + switch (prop_id) + { + case PROP_DRAW: + g_value_set_boolean (value, gtk_separator_tool_item_get_draw (item)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + static void gtk_separator_tool_item_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkToolItem *item = GTK_TOOL_ITEM (widget); GtkOrientation orientation = gtk_tool_item_get_orientation (item); - + if (orientation == GTK_ORIENTATION_HORIZONTAL) { requisition->width = get_space_size (item); @@ -171,18 +253,20 @@ gtk_separator_tool_item_expose (GtkWidget *widget, GdkEventExpose *event) { GtkToolItem *tool_item = GTK_TOOL_ITEM (widget); + GtkSeparatorToolItem *separator_tool_item = GTK_SEPARATOR_TOOL_ITEM (widget); gint space_size; GtkAllocation *allocation; GtkOrientation orientation; GdkRectangle *area; - if (get_space_style (tool_item) == GTK_TOOLBAR_SPACE_LINE) + if (separator_tool_item->priv->draw && + get_space_style (tool_item) == GTK_TOOLBAR_SPACE_LINE) { space_size = get_space_size (tool_item); allocation = &(widget->allocation); orientation = gtk_tool_item_get_orientation (tool_item); area = &(event->area); - + if (orientation == GTK_ORIENTATION_HORIZONTAL) { gtk_paint_vline (widget->style, widget->window, @@ -207,7 +291,7 @@ gtk_separator_tool_item_expose (GtkWidget *widget, } } - return TRUE; + return FALSE; } /** @@ -223,9 +307,58 @@ GtkToolItem * gtk_separator_tool_item_new (void) { GtkToolItem *self; - + self = g_object_new (GTK_TYPE_SEPARATOR_TOOL_ITEM, NULL); return self; } + +/** + * gtk_separator_tool_item_get_draw: + * @separator_tool_item: a #GtkSeparatorToolItem + * + * Returns whether @separator_tool_item is drawn as a + * line, or just blank. See gtk_separator_tool_item_set_draw(). + * + * Return value: #TRUE if @separator_tool_item is drawn as a line, or just blank. + * + * Since: 2.4 + **/ +gboolean +gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *separator_tool_item) +{ + g_return_val_if_fail (GTK_IS_SEPARATOR_TOOL_ITEM (separator_tool_item), FALSE); + + return separator_tool_item->priv->draw; +} + +/** + * gtk_separator_tool_item_set_draw: + * @separator_tool_item: a #GtkSeparatorToolItem + * @draw: whether @separator_tool_item is drawn as a vertical iln + * + * When @separator_tool_items is drawn as a vertical line, or just blank. + * Setting this #FALSE along with gtk_tool_item_set_expand() is useful + * to create an item that forces following items to the end of the toolbar. + * + * Since: 2.4 + **/ +void +gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *separator_tool_item, + gboolean draw) +{ + g_return_if_fail (GTK_IS_SEPARATOR_TOOL_ITEM (separator_tool_item)); + + draw = draw != FALSE; + + if (draw != separator_tool_item->priv->draw) + { + separator_tool_item->priv->draw = draw; + + gtk_widget_queue_draw (GTK_WIDGET (separator_tool_item)); + + g_object_notify (G_OBJECT (separator_tool_item), "draw"); + } +} + diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h index 952d1f9a8d..3a2fbdcfe8 100644 --- a/gtk/gtkseparatortoolitem.h +++ b/gtk/gtkseparatortoolitem.h @@ -33,12 +33,16 @@ G_BEGIN_DECLS #define GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM)) #define GTK_SEPARATOR_TOOL_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SEPARATOR_TOOL_ITEM, GtkSeparatorToolItemClass)) -typedef struct _GtkSeparatorToolItem GtkSeparatorToolItem; -typedef struct _GtkSeparatorToolItemClass GtkSeparatorToolItemClass; +typedef struct _GtkSeparatorToolItem GtkSeparatorToolItem; +typedef struct _GtkSeparatorToolItemClass GtkSeparatorToolItemClass; +typedef struct _GtkSeparatorToolItemPrivate GtkSeparatorToolItemPrivate; struct _GtkSeparatorToolItem { GtkToolItem parent; + + /*< private >*/ + GtkSeparatorToolItemPrivate *priv; }; struct _GtkSeparatorToolItemClass @@ -55,6 +59,10 @@ struct _GtkSeparatorToolItemClass GType gtk_separator_tool_item_get_type (void) G_GNUC_CONST; GtkToolItem *gtk_separator_tool_item_new (void); +gboolean gtk_separator_tool_item_get_draw (GtkSeparatorToolItem *item); +void gtk_separator_tool_item_set_draw (GtkSeparatorToolItem *tool_item, + gboolean draw); + G_END_DECLS #endif /* __GTK_SEPARATOR_TOOL_ITEM_H__ */ diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 81860a393c..42c318ecd1 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -72,8 +72,7 @@ enum { enum { CHILD_PROP_0, CHILD_PROP_EXPAND, - CHILD_PROP_HOMOGENEOUS, - CHILD_PROP_PACK_END, + CHILD_PROP_HOMOGENEOUS }; enum { @@ -220,6 +219,7 @@ struct _GtkToolbarPrivate gboolean leaving_dnd; gboolean in_dnd; gint n_overflow_items_when_dnd_started; + GtkToolItem *highlight_tool_item; }; static GtkContainerClass *parent_class = NULL; @@ -467,14 +467,6 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) TRUE, G_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_PACK_END, - g_param_spec_uint ("pack_end", - _("Pack End"), - _("Whether the item is positioned at the end of the toolbar"), - 0, G_MAXINT, 0, - G_PARAM_READWRITE)); - /* style properties */ gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("space_size", @@ -849,7 +841,6 @@ gtk_toolbar_size_request (GtkWidget *widget, gint max_homogeneous_child_height; gint homogeneous_size; gint long_req; - gint pack_end_size; gint pack_front_size; gint ipadding; GtkRequisition arrow_requisition; @@ -884,7 +875,6 @@ gtk_toolbar_size_request (GtkWidget *widget, else homogeneous_size = max_homogeneous_child_height; - pack_end_size = 0; pack_front_size = 0; for (list = priv->content; list != NULL; list = list->next) { @@ -911,10 +901,7 @@ gtk_toolbar_size_request (GtkWidget *widget, size = requisition.height; } - if (gtk_tool_item_get_pack_end (item)) - pack_end_size += size; - else - pack_front_size += size; + pack_front_size += size; } if (priv->show_arrow && priv->api_mode == NEW_API) @@ -929,14 +916,14 @@ gtk_toolbar_size_request (GtkWidget *widget, /* There is no point requesting space for the arrow if that would take * up more space than all the items combined */ - long_req = MIN (long_req, pack_front_size + pack_end_size); + long_req = MIN (long_req, pack_front_size); } else { arrow_requisition.height = 0; arrow_requisition.width = 0; - long_req = pack_end_size + pack_front_size; + long_req = pack_front_size; } if (toolbar->orientation == GTK_ORIENTATION_HORIZONTAL) @@ -1030,9 +1017,9 @@ gtk_toolbar_size_allocate (GtkWidget *widget, gint available_size; gint n_items; gint needed_size; - GList *content; GtkRequisition arrow_requisition; gint n_overflowed; + gboolean overflowing; widget->allocation = *allocation; @@ -1097,56 +1084,21 @@ gtk_toolbar_size_allocate (GtkWidget *widget, else size = available_size; - content = g_list_copy (priv->content); - n_overflowed = 0; - - /* calculate widths of pack end items */ - for (list = g_list_last (content), i = 0; list != NULL; list = list->prev, ++i) - { - ToolbarContent *content = list->data; - GtkToolItem *item = content->item; - GtkAllocation *allocation = &(allocations[n_items - i - 1]); - gint item_size; - - if (!gtk_tool_item_get_pack_end (item) || - !toolbar_item_visible (toolbar, item)) - continue; - - item_size = get_item_size (toolbar, GTK_WIDGET (item)); - if (item_size <= size) - { - size -= item_size; - allocation->width = item_size; - content->is_overflow = FALSE; - } - else - { - while (list) - { - content = list->data; - item = content->item; - if (gtk_tool_item_get_pack_end (item)) - content->is_overflow = TRUE; - ++n_overflowed; - list = list->prev; - } - break; - } - } /* calculate widths of pack front items */ - for (list = content, i = 0; list != NULL; list = list->next, ++i) + overflowing = FALSE; + for (list = priv->content, i = 0; list != NULL; list = list->next, ++i) { ToolbarContent *content = list->data; GtkToolItem *item = content->item; gint item_size; - if (gtk_tool_item_get_pack_end (item) || !toolbar_item_visible (toolbar, item)) + if (!toolbar_item_visible (toolbar, item)) continue; item_size = get_item_size (toolbar, GTK_WIDGET (item)); - if (item_size <= size) + if (item_size <= size && !overflowing) { size -= item_size; allocations[i].width = item_size; @@ -1154,16 +1106,9 @@ gtk_toolbar_size_allocate (GtkWidget *widget, } else { - while (list) - { - content = list->data; - item = content->item; - if (!gtk_tool_item_get_pack_end (item)) - content->is_overflow = TRUE; - ++n_overflowed; - list = list->next; - } - break; + ++n_overflowed; + content->is_overflow = TRUE; + overflowing = TRUE; } } @@ -1190,21 +1135,20 @@ gtk_toolbar_size_allocate (GtkWidget *widget, if (toolbar_item_visible (toolbar, item) && gtk_tool_item_get_expand (item) && - !content->is_overflow && - !GTK_IS_SEPARATOR_TOOL_ITEM (item)) + !content->is_overflow) { n_expand_items++; } } - for (list = content, i = 0; list != NULL; list = list->next, ++i) + for (list = priv->content, i = 0; list != NULL; list = list->next, ++i) { ToolbarContent *content = list->data; GtkToolItem *item = content->item; - if (toolbar_item_visible (toolbar, item) && gtk_tool_item_get_expand (item) && - !content->is_overflow && - !GTK_IS_SEPARATOR_TOOL_ITEM (item)) + if (toolbar_item_visible (toolbar, item) && + gtk_tool_item_get_expand (item) && + !content->is_overflow) { gint extra = size / n_expand_items; if (size % n_expand_items != 0) @@ -1219,16 +1163,14 @@ gtk_toolbar_size_allocate (GtkWidget *widget, g_assert (n_expand_items == 0); } - /* position pack front items */ + /* position regular items */ pos = border_width; - for (list = content, i = 0; list != NULL; list = list->next, ++i) + for (list = priv->content, i = 0; list != NULL; list = list->next, ++i) { ToolbarContent *content = list->data; GtkToolItem *item = content->item; - if (toolbar_item_visible (toolbar, item) && - !content->is_overflow && - !gtk_tool_item_get_pack_end (item)) + if (toolbar_item_visible (toolbar, item) && !content->is_overflow) { allocations[i].x = pos; allocations[i].y = border_width; @@ -1238,31 +1180,10 @@ gtk_toolbar_size_allocate (GtkWidget *widget, } } - /* position pack end items */ - pos = available_size + border_width; - for (list = g_list_last (content), i = 0; list != NULL; list = list->prev, ++i) - { - ToolbarContent *content = list->data; - GtkToolItem *item = content->item; - - if (toolbar_item_visible (toolbar, item) && - !content->is_overflow && - gtk_tool_item_get_pack_end (item)) - { - GtkAllocation *allocation = &(allocations[n_items - i - 1]); - - allocation->x = pos - allocation->width; - allocation->y = border_width; - allocation->height = short_size; - - pos -= allocation->width; - } - } - /* position arrow */ if (need_arrow) { - arrow_allocation.x = pos - arrow_allocation.width; + arrow_allocation.x = available_size - border_width - arrow_allocation.width; arrow_allocation.y = border_width; } @@ -1310,7 +1231,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget, } /* finally allocate the items */ - for (list = content, i = 0; list != NULL; list = list->next, i++) + for (list = priv->content, i = 0; list != NULL; list = list->next, i++) { ToolbarContent *content = list->data; GtkToolItem *item = content->item; @@ -1338,7 +1259,6 @@ gtk_toolbar_size_allocate (GtkWidget *widget, } g_free (allocations); - g_list_free (content); } static void @@ -1385,21 +1305,12 @@ gtk_toolbar_list_children_in_focus_order (GtkToolbar *toolbar, { ToolbarContent *content = list->data; GtkToolItem *item = content->item; - if (!gtk_tool_item_get_pack_end (item)) - result = g_list_prepend (result, item); + + result = g_list_prepend (result, item); } result = g_list_prepend (result, priv->arrow_button); - for (list = priv->content; list != NULL; list = list->next) - { - ToolbarContent *content = list->data; - GtkToolItem *item = content->item; - - if (gtk_tool_item_get_pack_end (item)) - result = g_list_prepend (result, item); - } - rtl = (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL); /* move in logical order when @@ -1621,12 +1532,8 @@ find_drop_index (GtkToolbar *toolbar, ToolbarContent *content = list->data; GtkToolItem *item = content->item; - if (!gtk_tool_item_get_pack_end (item) && - toolbar_item_visible (toolbar, item) && - !content->is_overflow) - { - interesting_content = g_list_prepend (interesting_content, content); - } + if (toolbar_item_visible (toolbar, item) && !content->is_overflow) + interesting_content = g_list_prepend (interesting_content, content); } interesting_content = g_list_reverse (interesting_content); @@ -1806,8 +1713,6 @@ update_dnd_animation (gpointer data) gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar)); - GDK_THREADS_LEAVE(); - if (!cont) { priv->idle_id = 0; @@ -1818,9 +1723,13 @@ update_dnd_animation (gpointer data) priv->n_overflow_items_when_dnd_started = 0; } + GDK_THREADS_LEAVE(); + return FALSE; } + GDK_THREADS_LEAVE(); + return TRUE; } @@ -1854,19 +1763,117 @@ reset_all_placeholders (GtkToolbar *toolbar) g_timer_reset (priv->timer); } -void -gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar, - gint x, - gint y, - gint width, - gint height) +static gint +physical_to_logical (GtkToolbar *toolbar, gint physical) { - gint index; - ToolbarContent *content; GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); + GList *list; + int logical; + + g_assert (physical >= 0); + + logical = 0; + for (list = priv->content; list && physical > 0; list = list->next) + { + ToolbarContent *content = list->data; + + if (!content->is_placeholder) + logical++; + physical--; + } + + g_assert (physical == 0); + + return logical; +} + +static gint +logical_to_physical (GtkToolbar *toolbar, gint logical) +{ + GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); + GList *list; + gint physical; + + g_assert (logical >= 0); + + physical = 0; + for (list = priv->content; list && logical > 0; list = list->next) + { + ToolbarContent *content = list->data; + + if (!content->is_placeholder) + logical--; + physical++; + } + + g_assert (logical == 0); + return physical; +} + +static void +get_item_requisition (GtkToolbar *toolbar, + GtkToolItem *tool_item, + gint *width, + gint *height) +{ + GtkRequisition requisition; + + g_object_ref (G_OBJECT (tool_item)); + gtk_widget_set_parent (GTK_WIDGET (tool_item), GTK_WIDGET (toolbar)); + + gtk_widget_size_request (GTK_WIDGET (tool_item), &requisition); + *width = requisition.width; + *height = requisition.height; + + gtk_widget_unparent (GTK_WIDGET (tool_item)); + g_object_unref (G_OBJECT (tool_item)); +} + +/** + * gtk_toolbar_highlight_drop_location: + * @toolbar: a #GtkToolbar + * @index: the toolbar position to highlight, or -1 + * @tool_item: a #GtkToolbar that isn't part of a widget hierarchy + * + * Highlights the position on the toolbar indicated by @index to give + * an idea of how @toolbar would look if @tool_item was added to it at + * @index. + * + * After calling this function gtk_toolbar_unhighlight_drop_location() must + * be called before @tool_item can be added to any widget hierarchy. + * + * Since: 2.4 + **/ +void +gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar, + gint index, + GtkToolItem *tool_item) +{ + ToolbarContent *content; + GtkToolbarPrivate *priv; gint start_width, start_height; GList *list; + gint n_items; + GtkRequisition requisition; + g_return_if_fail (GTK_IS_TOOLBAR (toolbar)); + g_return_if_fail (GTK_IS_TOOL_ITEM (tool_item)); + + priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); + + if (tool_item != priv->highlight_tool_item) + { + if (priv->highlight_tool_item) + g_object_unref (priv->highlight_tool_item); + + gtk_object_sink (GTK_OBJECT (g_object_ref (tool_item))); + + priv->highlight_tool_item = tool_item; + + gtk_widget_set_parent (GTK_WIDGET (priv->highlight_tool_item), + GTK_WIDGET (toolbar)); + } + if (!priv->in_dnd) { priv->n_overflow_items_when_dnd_started = 0; @@ -1880,9 +1887,13 @@ gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar, priv->in_dnd = TRUE; priv->leaving_dnd = FALSE; - - index = find_drop_index (toolbar, x, y); + n_items = gtk_toolbar_get_n_items (toolbar); + if (index < 0 || index > n_items) + index = n_items; + + index = logical_to_physical (toolbar, index); + content = g_list_nth_data (priv->content, index); if (index > 0) @@ -1913,17 +1924,20 @@ gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar, g_assert (content); g_assert (content->is_placeholder); + gtk_widget_size_request (GTK_WIDGET (priv->highlight_tool_item), + &requisition); + if (content->start_width != start_width || content->start_height != start_height || - content->goal_width != width || - content->goal_height != height) + content->goal_width != requisition.width || + content->goal_height != requisition.height) { reset_all_placeholders (toolbar); content->start_width = start_width; - content->goal_width = width; + content->goal_width = requisition.width; content->start_height = start_height; - content->goal_height = height; + content->goal_height = requisition.height; ensure_idle_handler (toolbar); } @@ -1937,6 +1951,13 @@ gtk_toolbar_unhighlight_drop_location (GtkToolbar *toolbar) priv->leaving_dnd = TRUE; reset_all_placeholders (toolbar); ensure_idle_handler (toolbar); + + if (priv->highlight_tool_item) + { + gtk_widget_unparent (GTK_WIDGET (priv->highlight_tool_item)); + g_object_unref (priv->highlight_tool_item); + priv->highlight_tool_item = NULL; + } } static void @@ -1950,10 +1971,6 @@ gtk_toolbar_get_child_property (GtkContainer *container, switch (property_id) { - case CHILD_PROP_PACK_END: - g_value_set_boolean (value, gtk_tool_item_get_pack_end (item)); - break; - case CHILD_PROP_HOMOGENEOUS: g_value_set_boolean (value, gtk_tool_item_get_homogeneous (item)); break; @@ -1977,10 +1994,6 @@ gtk_toolbar_set_child_property (GtkContainer *container, { switch (property_id) { - case CHILD_PROP_PACK_END: - gtk_tool_item_set_pack_end (GTK_TOOL_ITEM (child), g_value_get_boolean (value)); - break; - case CHILD_PROP_HOMOGENEOUS: gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (child), g_value_get_boolean (value)); break; @@ -1988,7 +2001,7 @@ gtk_toolbar_set_child_property (GtkContainer *container, case CHILD_PROP_EXPAND: gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (child), g_value_get_boolean (value)); break; - + default: GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); break; @@ -2369,56 +2382,6 @@ gtk_toolbar_check_new_api (GtkToolbar *toolbar) return TRUE; } -static gint -physical_to_logical (GtkToolbar *toolbar, gint physical) -{ - GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); - GList *list; - int logical; - - if (physical < 0) - return -1; - - logical = 0; - for (list = priv->content; list; list = list->next) - { - ToolbarContent *content = list->data; - - if (!physical) - return logical; - - if (!content->is_placeholder) - logical++; - physical--; - } - return -1; -} - -static gint -logical_to_physical (GtkToolbar *toolbar, gint logical) -{ - GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); - GList *list; - gint physical; - - if (logical < 0) - return -1; - - physical = 0; - for (list = priv->content; list; list = list->next) - { - ToolbarContent *content = list->data; - - if (!logical) - return physical; - - if (!content->is_placeholder) - logical--; - physical++; - } - return -1; -} - static void gtk_toolbar_insert_tool_item (GtkToolbar *toolbar, GtkToolItem *item, @@ -2524,8 +2487,10 @@ gtk_toolbar_insert (GtkToolbar *toolbar, if (!gtk_toolbar_check_new_api (toolbar)) return; - gtk_toolbar_insert_tool_item (toolbar, item, - logical_to_physical (toolbar, pos), FALSE); + if (pos >= 0) + pos = logical_to_physical (toolbar, pos); + + gtk_toolbar_insert_tool_item (toolbar, item, pos, FALSE); } /** @@ -2730,10 +2695,7 @@ gtk_toolbar_get_n_items (GtkToolbar *toolbar) priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); - if (!priv->content) - return 0; - - return physical_to_logical (toolbar, g_list_length (priv->content) - 1); + return physical_to_logical (toolbar, g_list_length (priv->content)); } /** @@ -2952,10 +2914,10 @@ gtk_toolbar_get_drop_index (GtkToolbar *toolbar, gint y) { g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE); - + if (!gtk_toolbar_check_new_api (toolbar)) return -1; - + return physical_to_logical (toolbar, find_drop_index (toolbar, x, y)); } diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 0e0f50d557..ec61e8f609 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -45,7 +45,7 @@ #include #include -#endif +#endif /* GTK_DISABLE_DEPRECATED */ G_BEGIN_DECLS @@ -91,7 +91,8 @@ typedef struct _GtkToolbarPrivate GtkToolbarPrivate; struct _GtkToolbar { GtkContainer container; - + + /*< private >*/ gint num_children; GList *children; GtkOrientation orientation; @@ -115,9 +116,9 @@ struct _GtkToolbarClass GtkContainerClass parent_class; /* signals */ - void (* orientation_changed) (GtkToolbar *toolbar, + void (* orientation_changed) (GtkToolbar *toolbar, GtkOrientation orientation); - void (* style_changed) (GtkToolbar *toolbar, + void (* style_changed) (GtkToolbar *toolbar, GtkToolbarStyle style); gboolean (* popup_context_menu) (GtkToolbar *toolbar, gint x, @@ -140,29 +141,27 @@ gint gtk_toolbar_get_item_index (GtkToolbar *toolbar, gint gtk_toolbar_get_n_items (GtkToolbar *toolbar); GtkToolItem * gtk_toolbar_get_nth_item (GtkToolbar *toolbar, gint n); +gboolean gtk_toolbar_get_show_arrow (GtkToolbar *toolbar); void gtk_toolbar_set_show_arrow (GtkToolbar *toolbar, gboolean show_arrow); +GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar); void gtk_toolbar_set_orientation (GtkToolbar *toolbar, GtkOrientation orientation); +gboolean gtk_toolbar_get_tooltips (GtkToolbar *toolbar); void gtk_toolbar_set_tooltips (GtkToolbar *toolbar, gboolean enable); -gboolean gtk_toolbar_get_show_arrow (GtkToolbar *toolbar); -GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar); GtkToolbarStyle gtk_toolbar_get_style (GtkToolbar *toolbar); -GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar); -gboolean gtk_toolbar_get_tooltips (GtkToolbar *toolbar); -GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar); void gtk_toolbar_set_style (GtkToolbar *toolbar, GtkToolbarStyle style); void gtk_toolbar_unset_style (GtkToolbar *toolbar); +GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar); +GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar); gint gtk_toolbar_get_drop_index (GtkToolbar *toolbar, gint x, gint y); void gtk_toolbar_highlight_drop_location (GtkToolbar *toolbar, - gint x, - gint y, - gint width, - gint height); + gint index, + GtkToolItem *tool_item); void gtk_toolbar_unhighlight_drop_location (GtkToolbar *toolbar); diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index 8ec7a0ad2a..e7ac11a536 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -54,7 +54,6 @@ struct _GtkToolItemPrivate guint visible_vertical : 1; guint homogeneous : 1; guint expand : 1; - guint pack_end : 1; guint use_drag_window : 1; guint is_important : 1; @@ -671,52 +670,6 @@ gtk_tool_item_get_expand (GtkToolItem *tool_item) return tool_item->priv->expand; } -/** - * gtk_tool_item_set_pack_end: - * @tool_item: a #GtkToolItem: - * @pack_end: whether @tool_item is allocated at the end of the toolbar. - * - * Sets whether @tool_item is allocated at the end of the toolbar. This is - * useful for #GtkToolItems that are used as "throbbers" in - * web-browser-type applications. - * - * Since: 2.4 - **/ -void -gtk_tool_item_set_pack_end (GtkToolItem *tool_item, - gboolean pack_end) -{ - g_return_if_fail (GTK_IS_TOOL_ITEM (tool_item)); - - pack_end = pack_end != FALSE; - - if (tool_item->priv->pack_end != pack_end) - { - tool_item->priv->pack_end = pack_end; - gtk_widget_child_notify (GTK_WIDGET (tool_item), "pack_end"); - gtk_widget_queue_resize (GTK_WIDGET (tool_item)); - } -} - -/** - * gtk_tool_item_get_pack_end: - * @tool_item: a #GtkToolItem: - * - * Returns whether @tool_item is packed at the end of the toolbar. - * See gtk_tool_item_set_pack_end(). - * - * Return value: %TRUE if @tool_item is packed at the end of the toolbar. - * - * Since: 2.4 - **/ -gboolean -gtk_tool_item_get_pack_end (GtkToolItem *tool_item) -{ - g_return_val_if_fail (GTK_IS_TOOL_ITEM (tool_item), FALSE); - - return tool_item->priv->pack_end; -} - /** * gtk_tool_item_set_homogeneous: * @tool_item: a #GtkToolItem: diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h index d5a6f8c225..5c29701c7a 100644 --- a/gtk/gtktoolitem.h +++ b/gtk/gtktoolitem.h @@ -78,10 +78,6 @@ void gtk_tool_item_set_expand (GtkToolItem *tool_item, gboolean expand); gboolean gtk_tool_item_get_expand (GtkToolItem *tool_item); -void gtk_tool_item_set_pack_end (GtkToolItem *tool_item, - gboolean pack_end); -gboolean gtk_tool_item_get_pack_end (GtkToolItem *tool_item); - void gtk_tool_item_set_tooltip (GtkToolItem *tool_item, GtkTooltips *tooltips, const gchar *tip_text,