summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2000-11-04 16:31:37 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-11-04 16:31:37 +0000
commit5f91b6fca673f7726acdc57c4f8e8b32be285458 (patch)
tree378afae9c25c1c3dcd847cba2f484fc1c374f50e
parentae9dbe51d24634502679fc60eb016356a7087454 (diff)
downloadgtk+-5f91b6fca673f7726acdc57c4f8e8b32be285458.tar.gz
Added a bunch of stuff from unused
2000-11-04 Havoc Pennington <hp@pobox.com> * gtk/gtk-sections.txt: Added a bunch of stuff from unused 2000-11-04 Havoc Pennington <hp@pobox.com> * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member list * docs/Changes-2.0.txt: Add note about gtk_container_get_toplevels() * gtk/gtktextview.h: formatting * gtk/gtktextview.c: don't start descriptions with "Returns", confuses gtk-doc
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLog.pre-2-013
-rw-r--r--ChangeLog.pre-2-1013
-rw-r--r--ChangeLog.pre-2-213
-rw-r--r--ChangeLog.pre-2-413
-rw-r--r--ChangeLog.pre-2-613
-rw-r--r--ChangeLog.pre-2-813
-rw-r--r--docs/Changes-2.0.txt8
-rw-r--r--docs/reference/ChangeLog4
-rw-r--r--docs/reference/gtk/gtk-sections.txt144
-rw-r--r--docs/reference/gtk/tmpl/gtk-unused.sgml1654
-rw-r--r--docs/reference/gtk/tmpl/gtkbutton.sgml20
-rw-r--r--docs/reference/gtk/tmpl/gtkdialog.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtkenums.sgml29
-rw-r--r--docs/reference/gtk/tmpl/gtkimage.sgml174
-rw-r--r--docs/reference/gtk/tmpl/gtklabel.sgml48
-rw-r--r--docs/reference/gtk/tmpl/gtkstyle.sgml25
-rw-r--r--docs/reference/gtk/tmpl/gtktextbuffer.sgml128
-rw-r--r--docs/reference/gtk/tmpl/gtktextiter.sgml18
-rw-r--r--docs/reference/gtk/tmpl/gtktextmark.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtktextview.sgml149
-rw-r--r--docs/reference/gtk/tmpl/gtkwidget.sgml12
-rw-r--r--docs/reference/gtk/tmpl/gtkwindow.sgml9
-rw-r--r--gtk/gtkenums.h2
-rw-r--r--gtk/gtktextview.c6
-rw-r--r--gtk/gtktextview.h6
26 files changed, 1705 insertions, 840 deletions
diff --git a/ChangeLog b/ChangeLog
index 378821bdd9..d467096e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 378821bdd9..d467096e98 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 378821bdd9..d467096e98 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 378821bdd9..d467096e98 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 378821bdd9..d467096e98 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 378821bdd9..d467096e98 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 378821bdd9..d467096e98 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkenums.h: remove trailing comma from GtkDeleteType member
+ list
+
+ * docs/Changes-2.0.txt: Add note about
+ gtk_container_get_toplevels()
+
+ * gtk/gtktextview.h: formatting
+
+ * gtk/gtktextview.c: don't start descriptions with "Returns",
+ confuses gtk-doc
+
Sat Nov 4 10:12:27 2000 Owen Taylor <otaylor@redhat.com>
* autogen.sh: When doing sanity checking on ACLOCAL_FLAGS,
diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt
index 0cdca5a4ee..c6460a6c1a 100644
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -1,4 +1,10 @@
-Incompatible Changes from GTK+-1.2 to GTK+-1.4:
+Incompatible Changes from GTK+-1.2 to GTK+-2.0:
+
+* gtk_container_get_toplevels() was removed and replaced with
+ gtk_window_list_toplevels(), which has different memory management
+ on the return value (gtk_window_list_toplevels() copies the GList
+ and also references each widget in the list, so you have to
+ g_list_free() the list after first unref'ing each list member).
* The gdk_time* functions have been removed. This functionality
has been unused since the main loop was moved into GLib
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 5c8e9ae41c..12b5a9c427 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-04 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtk-sections.txt: Added a bunch of stuff from unused
+
2000-11-01 Havoc Pennington <hp@redhat.com>
* gtk/tmpl/gtkmessagedialog.sgml: Check in these docs, I seem to
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 64296e3fe9..44bcc3e857 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -160,6 +160,8 @@ GTK_BOX_GET_CLASS
GtkButton
gtk_button_new
gtk_button_new_with_label
+gtk_button_new_accel
+gtk_button_new_stock
gtk_button_pressed
gtk_button_released
gtk_button_clicked
@@ -606,6 +608,7 @@ GTK_DATA_GET_CLASS
GtkDialog
<TITLE>GtkDialog</TITLE>
GtkDialogFlags
+GtkResponseType
gtk_dialog_new
gtk_dialog_new_with_buttons
gtk_dialog_run
@@ -952,6 +955,24 @@ GTK_HSEPARATOR_GET_CLASS
<FILE>gtkimage</FILE>
<TITLE>GtkImage</TITLE>
GtkImage
+gtk_image_get_icon_set
+gtk_image_get_image
+gtk_image_get_pixbuf
+gtk_image_get_pixmap
+gtk_image_get_stock
+gtk_image_get_storage_type
+gtk_image_new_from_file
+gtk_image_new_from_icon_set
+gtk_image_new_from_image
+gtk_image_new_from_pixbuf
+gtk_image_new_from_pixmap
+gtk_image_new_from_stock
+gtk_image_set_from_file
+gtk_image_set_from_icon_set
+gtk_image_set_from_image
+gtk_image_set_from_pixbuf
+gtk_image_set_from_pixmap
+gtk_image_set_from_stock
gtk_image_new
gtk_image_set
gtk_image_get
@@ -963,6 +984,13 @@ gtk_image_get_type
GTK_IMAGE_CLASS
GTK_IS_IMAGE_CLASS
GTK_IMAGE_GET_CLASS
+<SUBSECTION Private>
+GtkImageIconSetData
+GtkImageImageData
+GtkImagePixbufData
+GtkImagePixmapData
+GtkImageStockData
+GtkImageType
</SECTION>
<SECTION>
@@ -1964,18 +1992,24 @@ gtk_text_buffer_insert_at_cursor
gtk_text_buffer_insert_interactive
gtk_text_buffer_insert_interactive_at_cursor
gtk_text_buffer_insert_range
+gtk_text_buffer_insert_range_interactive
+gtk_text_buffer_insert_with_tags
+gtk_text_buffer_insert_with_tags_by_name
gtk_text_buffer_delete
gtk_text_buffer_delete_interactive
gtk_text_buffer_set_text
gtk_text_buffer_get_text
gtk_text_buffer_get_slice
gtk_text_buffer_insert_pixbuf
+gtk_text_buffer_create_child_anchor
gtk_text_buffer_create_mark
gtk_text_buffer_move_mark
+gtk_text_buffer_move_mark_by_name
gtk_text_buffer_delete_mark
gtk_text_buffer_delete_mark_by_name
gtk_text_buffer_get_mark
gtk_text_buffer_get_insert
+gtk_text_buffer_get_selection_bound
gtk_text_buffer_place_cursor
gtk_text_buffer_apply_tag
gtk_text_buffer_remove_tag
@@ -1985,14 +2019,19 @@ gtk_text_buffer_create_tag
gtk_text_buffer_get_iter_at_line_offset
gtk_text_buffer_get_iter_at_offset
gtk_text_buffer_get_iter_at_line
+gtk_text_buffer_get_iter_at_line_index
+gtk_text_buffer_get_iter_at_mark
+gtk_text_buffer_get_iter_at_child_anchor
gtk_text_buffer_get_last_iter
gtk_text_buffer_get_bounds
-gtk_text_buffer_get_iter_at_mark
gtk_text_buffer_get_tags
gtk_text_buffer_modified
gtk_text_buffer_set_modified
gtk_text_buffer_delete_selection
gtk_text_buffer_paste_clipboard
+gtk_text_buffer_copy_clipboard
+gtk_text_buffer_cut_clipboard
+gtk_text_buffer_paste_primary
gtk_text_buffer_get_selection_bounds
<SUBSECTION Standard>
GTK_TEXT_BUFFER
@@ -2024,6 +2063,7 @@ gtk_text_iter_get_visible_text
gtk_text_iter_get_pixbuf
gtk_text_iter_get_marks
gtk_text_iter_get_toggled_tags
+gtk_text_iter_get_child_anchor
gtk_text_iter_begins_tag
gtk_text_iter_ends_tag
gtk_text_iter_toggles_tag
@@ -2050,6 +2090,7 @@ gtk_text_iter_backward_word_start
gtk_text_iter_set_offset
gtk_text_iter_set_line
gtk_text_iter_set_line_offset
+gtk_text_iter_set_line_index
gtk_text_iter_forward_to_end
gtk_text_iter_forward_to_newline
gtk_text_iter_forward_to_tag_toggle
@@ -2073,6 +2114,15 @@ GtkTextMark
gtk_text_mark_set_visible
gtk_text_mark_is_visible
gtk_text_mark_get_deleted
+gtk_text_mark_get_name
+<SUBSECTION Standard>
+GTK_TEXT_MARK
+GTK_IS_TEXT_MARK
+GTK_TYPE_TEXT_MARK
+gtk_text_mark_get_type
+GTK_TEXT_MARK_CLASS
+GTK_IS_TEXT_MARK_CLASS
+GTK_TEXT_MARK_GET_CLASS
</SECTION>
<SECTION>
@@ -2126,6 +2176,7 @@ GTK_TEXT_TAG_TABLE_GET_CLASS
<FILE>gtktextview</FILE>
GtkTextView
<TITLE>GtkTextView</TITLE>
+GtkTextWindowType
gtk_text_view_new
gtk_text_view_new_with_buffer
gtk_text_view_set_buffer
@@ -2141,6 +2192,18 @@ gtk_text_view_get_editable
gtk_text_view_set_cursor_visible
gtk_text_view_get_cursor_visible
gtk_text_view_get_iter_location
+gtk_text_view_get_line_at_y
+gtk_text_view_get_line_yrange
+gtk_text_view_get_iter_at_location
+gtk_text_view_buffer_to_window_coords
+gtk_text_view_window_to_buffer_coords
+gtk_text_view_get_window
+gtk_text_view_get_window_type
+gtk_text_view_set_border_window_size
+gtk_text_view_set_text_window_size
+gtk_text_view_add_child_at_anchor
+gtk_text_view_add_child_in_window
+gtk_text_view_move_child
<SUBSECTION Standard>
GTK_TEXT_VIEW
GTK_IS_TEXT_VIEW
@@ -2149,6 +2212,11 @@ gtk_text_view_get_type
GTK_TEXT_VIEW_CLASS
GTK_IS_TEXT_VIEW_CLASS
GTK_TEXT_VIEW_GET_CLASS
+<SUBSECTION Private>
+GtkTextBTree
+GtkTextChildBody
+GtkTextPixbuf
+GtkTextWindow
</SECTION>
<SECTION>
@@ -2863,6 +2931,7 @@ gtk_widget_modify_font
gtk_widget_create_pango_context
gtk_widget_get_pango_context
gtk_widget_create_pango_layout
+gtk_widget_render_stock_icon
gtk_widget_pop_composite_child
gtk_widget_push_composite_child
gtk_widget_queue_clear
@@ -2905,6 +2974,7 @@ gtk_window_set_position
gtk_window_set_transient_for
gtk_window_set_destroy_with_parent
gtk_window_list_toplevels
+gtk_window_get_default_accel_group
<SUBSECTION Standard>
GTK_WINDOW
GTK_IS_WINDOW
@@ -3060,6 +3130,8 @@ gtk_style_unref
gtk_style_set_background
gtk_style_apply_default_background
gtk_style_apply_default_pixmap
+gtk_style_lookup_icon_set
+gtk_style_render_icon
gtk_draw_hline
gtk_draw_vline
gtk_draw_shadow
@@ -3461,10 +3533,12 @@ GtkAttachOptions
GtkButtonBoxStyle
GtkCornerType
GtkCurveType
+GtkDeleteType
GtkDirectionType
GtkJustification
GtkMatchType
GtkMetricType
+GtkMovementStep
GtkOrientation
GtkPackType
GtkPathPriorityType
@@ -3504,3 +3578,71 @@ gtk_menu_factory_remove_subfactory
gtk_menu_factory_find
</SECTION>
+<SECTION>
+<FILE>gtkstock</FILE>
+<TITLE>Stock Items</TITLE>
+GtkStockItem
+gtk_stock_add
+gtk_stock_add_static
+gtk_stock_item_copy
+gtk_stock_item_free
+gtk_stock_list_items
+gtk_stock_lookup
+<SUBSECTION Stock IDs>
+GTK_STOCK_BUTTON_APPLY
+GTK_STOCK_BUTTON_CANCEL
+GTK_STOCK_BUTTON_CLOSE
+GTK_STOCK_BUTTON_NO
+GTK_STOCK_BUTTON_OK
+GTK_STOCK_BUTTON_YES
+GTK_STOCK_DIALOG_ERROR
+GTK_STOCK_DIALOG_INFO
+GTK_STOCK_DIALOG_QUESTION
+GTK_STOCK_DIALOG_WARNING
+GTK_STOCK_HELP
+GTK_STOCK_NEW
+GTK_STOCK_OPEN
+GTK_STOCK_QUIT
+GTK_STOCK_SAVE
+GTK_STOCK_CLOSE
+</SECTION>
+
+
+<SECTION>
+<FILE>gtkiconfactory</FILE>
+<TITLE>Themeable Stock Images</TITLE>
+GtkIconSource
+GtkIconFactory
+GtkIconSet
+gtk_icon_source_copy
+gtk_icon_source_free
+gtk_icon_factory_add
+gtk_icon_factory_add_default
+gtk_icon_factory_lookup
+gtk_icon_factory_lookup_default
+gtk_icon_factory_new
+gtk_icon_factory_remove_default
+gtk_icon_set_add_source
+gtk_icon_set_copy
+gtk_icon_set_new
+gtk_icon_set_ref
+gtk_icon_set_render_icon
+gtk_icon_set_unref
+GTK_ICON_SIZE_MENU
+GTK_ICON_SIZE_BUTTON
+GTK_ICON_SIZE_SMALL_TOOLBAR
+GTK_ICON_SIZE_LARGE_TOOLBAR
+GTK_ICON_SIZE_DIALOG
+gtk_icon_size_lookup
+gtk_icon_size_register
+gtk_icon_size_register_alias
+<SUBSECTION Standard>
+GtkIconFactoryClass
+GTK_TYPE_ICON_FACTORY
+GTK_ICON_FACTORY
+GTK_IS_ICON_FACTORY
+GTK_ICON_FACTORY_CLASS
+GTK_ICON_FACTORY_GET_CLASS
+GTK_IS_ICON_FACTORY_CLASS
+gtk_icon_factory_get_type
+</SECTION> \ No newline at end of file
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 271b9a5a32..c71e6595b0 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1,224 +1,145 @@
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Title ##### -->
-Debugging
-
-
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Short_Description ##### -->
-
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Title ##### -->
+Menu Factory
-<!-- ##### MACRO gtk_marshal_NONE__BOXED ##### -->
+<!-- ##### MACRO GTK_WIDGET_IN_REPARENT ##### -->
<para>
</para>
+@obj:
-<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Long_Description ##### -->
-<refsect2>
-<title>What are Signal Marshallers?</title>
-<para>
-Marshals are functions which all have the same prototype:
-they take a #GtkObject, a #GtkSignalFunc, a #gpointer,
-and an array of argument values.
-The functions are names gtk_marshall_RETURNTYPE__PARAMTYPE1_PARAMTYPE2....
-</para>
-<para>
-They then call a native function: the GtkObject is the first
-parameter passed in. The arguments are passed in the native
-calling convention: chars, shorts, ints, longs may be packed
-on the stack, or tucked in registers: it doesn't matter
-because the same calling convention will be generated
-inside the gtkmarshal code as is expected where you define
-your handlers.
-</para>
-<para>
-So the function named:
-<programlisting>
-gtk_marshal_BOOL__POINTER_INT_INT_UINT(GtkObject*, GtkSignalFunc, gpointer, GtkArg*);
-</programlisting>
-will call the #GtkSignalFunc assuming it was a function with signature:
-<programlisting>
-gboolean sigfunc(gpointer,gint,gint,guint);
-</programlisting>
-</para>
-</refsect2>
-<refsect2>
-<title>Writing Custom Marshals</title>
-<para>
-Marshals are primarily used as arguments to gtk_signal_new().
-Sometimes, you may find that a marshaller you need isn't available
-in the standard list. Then you have to write your own.
-</para>
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER ##### -->
<para>
-If you wish to define a signal with a new type of argument list.
-Suppose you want 2 pointers and 2 integers.
-You would write:
-<programlisting>
-typedef int (*GtkSignal_INT__POINTER_POINTER_INT_INT)(
- gpointer, gpointer, gint, gint
-);
-void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg* args)
-{
- GtkSignal_NONE__POINTER_POINTER_INT_INT rfunc;
- gint* return_val;
- return_val = GTK_RETLOC_INT(args[4]);
- rfunc = (GtkSignal_INT__POINTER_POINTER_INT_INT)func;
- *return_val = (*rfunc)(object,
- GTK_VALUE_POINTER(args[0]),
- GTK_VALUE_POINTER(args[1]),
- GTK_VALUE_INT(args[2]),
- GTK_VALUE_INT(args[3]),
- func_data);
-}
-</programlisting>
</para>
-</refsect2>
-
-
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Short_Description ##### -->
-
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO gtk_marshal_NONE__UINT_STRING ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_paste_primary_selection ##### -->
<para>
</para>
+@buffer:
+@override_location:
+@time:
+@interactive:
+@default_editable:
-<!-- ##### MACRO GTK_PRIVATE_UNSET_FLAG ##### -->
+<!-- ##### ENUM GtkTextViewScrollType ##### -->
<para>
</para>
-@wid:
-@flag:
+@GTK_TEXT_SCROLL_TO_TOP:
+@GTK_TEXT_SCROLL_TO_BOTTOM:
+@GTK_TEXT_SCROLL_PAGE_DOWN:
+@GTK_TEXT_SCROLL_PAGE_UP:
-<!-- ##### MACRO GTK_WIDGET_REDRAW_PENDING ##### -->
+<!-- ##### MACRO gtk_widget_pop_visual ##### -->
<para>
</para>
-@obj:
+@v:
-<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT ##### -->
+<!-- ##### STRUCT GtkMenuFactory ##### -->
<para>
</para>
+@path:
+@type:
+@accel_group:
+@widget:
+@subfactories:
-<!-- ##### SIGNAL GtkTextView::insert ##### -->
+<!-- ##### FUNCTION gtk_selection_clear_targets ##### -->
<para>
</para>
-@textview: the object which received the signal.
-@arg1:
+@widget:
+@selection:
-<!-- ##### MACRO gtk_widget_set_default_visual ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT ##### -->
<para>
</para>
-@v:
-@visual:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_window_set_focus ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_find_regexp ##### -->
<para>
</para>
-@window:
-@focus:
+@buffer:
+@regexp:
+@start:
+@end:
+@Returns:
-<!-- ##### SECTION ./tmpl/gtkprivate.sgml:See_Also ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_find_string ##### -->
<para>
</para>
+@buffer:
+@iter:
+@str:
+@start:
+@end:
+@Returns:
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_ENUM ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_spew ##### -->
<para>
</para>
+@buffer:
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:See_Also ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__UINT_STRING ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_font_selection_set_filter ##### -->
-<para>
-Sets one of the two font filters, to limit the fonts shown.
-</para>
-
-@fontsel: a #GtkFontSelection.
-@filter_type: which of the two font filters to set, either
-#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter
-can be changed by the user, but the base filter is permanent.
-@font_type: the types of font to be shown. This is a bitwise combination of
-#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP,
-or #GTK_FONT_ALL to show all three font types.
-@foundries: a NULL-terminated array of strings containing foundry names which
-will be shown, or NULL to show all foundries.
-@weights: a NULL-terminated array of strings containing weight names which
-will be shown, or NULL to show all weights.
-@slants: a NULL-terminated array of strings containing slant names which
-will be shown, or NULL to show all slants.
-@setwidths: a NULL-terminated array of strings containing setwidth names which
-will be shown, or NULL to show all setwidths.
-@spacings: a NULL-terminated array of strings containing spacings which
-will be shown, or NULL to show all spacings.
-@charsets: a NULL-terminated array of strings containing charset names which
-will be shown, or NULL to show all charsets.
-
-<!-- ##### FUNCTION gtk_container_unregister_toplevel ##### -->
+<!-- ##### FUNCTION gtk_container_register_toplevel ##### -->
<para>
</para>
@container:
-<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Title ##### -->
-Signal Marshallers
-
-
-<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GtkTypeQuery ##### -->
-<para>
-A structure used to return values from @gtk_type_query.
-</para>
-
-@type:
-@type_name:
-@object_size:
-@class_size:
-
-<!-- ##### FUNCTION gtk_text_buffer_get_clipboard_contents ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT ##### -->
<para>
</para>
-@buffer:
-@Returns:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO gtk_widget_pop_visual ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_POINTER ##### -->
<para>
</para>
-@v:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK ##### -->
+<!-- ##### FUNCTION gtk_marshal_INT__POINTER ##### -->
<para>
</para>
@@ -228,191 +149,195 @@ A structure used to return values from @gtk_type_query.
@func_data:
@args:
-<!-- ##### USER_FUNCTION GtkSignalMarshal ##### -->
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Long_Description ##### -->
<para>
-This is currently a hack left in for a scheme wrapper library.
-It may be removed.
+
</para>
+
+
+<!-- ##### ENUM GtkFontType ##### -->
<para>
-Don't use it.
+A set of bit flags used to specify the type of fonts shown
+when calling gtk_font_selection_dialog_set_filter() or
+gtk_font_selection_set_filter().
</para>
-@object: The object which emits the signal.
-@data: The user data associated with the hook.
-@nparams: The number of parameters to the function.
-@args: The actual values of the arguments.
-@arg_types: The types of the arguments.
-@return_type: The type of the return value from the function
-or #GTK_TYPE_NONE for no return value.
+@GTK_FONT_BITMAP: bitmap fonts.
+@GTK_FONT_SCALABLE: scalable fonts.
+@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
+@GTK_FONT_ALL: a bitwise combination of all of the above.
-<!-- ##### FUNCTION gtk_signal_add_emission_hook_full ##### -->
+<!-- ##### MACRO GTK_TYPE_MAKE ##### -->
<para>
-Add an emission hook for a type of signal, for any object.
-(with control of what happens when the hook is
-destroyed).
+Combine a fundemantal type and a sequence number to create a gtk type.
</para>
-@signal_id: the type of signal add the hook for.
-@hook_func: the function to invoke to handle the hook.
-@data: the user data passed in to hook_func.
-@destroy: a function to invoke when the hook is destroyed,
-to clean up any allocation done just for this
-signal handler.
-@Returns: the id (that you may pass as a parameter
-to gtk_signal_remove_emission_hook()).
+@parent_t:
+@seqno:
-<!-- ##### FUNCTION gtk_text_buffer_paste_primary_selection ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_find ##### -->
<para>
</para>
-@buffer:
-@override_location:
-@time:
-@interactive:
-@default_editable:
+@factory:
+@path:
+@Returns:
+
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Title ##### -->
+GtkIMContextSimple
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT ##### -->
-<para>
+<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
+<para>
+Internal function used by #GtkHPaned and #GtkVPaned
</para>
-@object:
-@func:
-@func_data:
-@args:
+@paned:
+@allocation:
+@child1_req:
+@child2_req:
-<!-- ##### SIGNAL GtkTextView::copy-text ##### -->
+<!-- ##### SIGNAL GtkTextView::move-insert ##### -->
<para>
</para>
@textview: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
-<!-- ##### FUNCTION gtk_text_view_get_iter_at_pixel ##### -->
+<!-- ##### ARG GtkTextTag:overstrike_set ##### -->
<para>
</para>
-@text_view:
-@iter:
-@x:
-@y:
-
-<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Short_Description ##### -->
-
-
-<!-- ##### FUNCTION gtk_identifier_get_type ##### -->
+<!-- ##### FUNCTION gtk_trace_referencing ##### -->
<para>
-Get the type of GtkIdentifier.
+Private: print debugging information while doing a gtk_object_ref() or
+a gtk_object_unref().
</para>
-@Returns: GtkType -- the enumerated type of something.
+@object: object to reference or unreference.
+@func: name of caller's function to print (used within macros).
+@dummy: unused.
+@line: line number (used within macros).
+@do_ref: whether to reference or unreference.
-<!-- ##### MACRO gtk_marshal_BOOL__POINTER_INT_INT_UINT ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT_BOOL ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER ##### -->
+<!-- ##### MACRO GTK_TYPE_STRUCTURED_FIRST ##### -->
<para>
-
+The first structured enumerated type value.
</para>
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT ##### -->
+<!-- ##### FUNCTION gtk_text_mark_ref ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
-
-<!-- ##### FUNCTION gtk_marshal_NONE__NONE ##### -->
-<para>
+@mark:
+@Returns:
-</para>
+<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Title ##### -->
+Signal Marshallers
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### FUNCTION gtk_text_mark_deleted ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_STRING_STRING ##### -->
<para>
</para>
-@mark:
-@Returns:
-<!-- ##### MACRO gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER ##### -->
+<!-- ##### SIGNAL GtkTextView::scroll-text ##### -->
<para>
</para>
+@textview: the object which received the signal.
+@arg1:
-<!-- ##### FUNCTION gtk_ruler_draw_ticks ##### -->
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Long_Description ##### -->
<para>
</para>
-@ruler: the gtkruler
-<!-- ##### FUNCTION gtk_selection_data_set_text ##### -->
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Title ##### -->
+Private Information
+
+
+<!-- ##### SIGNAL GtkTextView::insert ##### -->
<para>
</para>
-@selection_data:
-@str:
-@Returns:
+@textview: the object which received the signal.
+@arg1:
-<!-- ##### FUNCTION gtk_themes_init ##### -->
+<!-- ##### FUNCTION gtk_signal_add_emission_hook_full ##### -->
<para>
-
+Add an emission hook for a type of signal, for any object.
+(with control of what happens when the hook is
+destroyed).
</para>
-@argc:
-@argv:
+@signal_id: the type of signal add the hook for.
+@hook_func: the function to invoke to handle the hook.
+@data: the user data passed in to hook_func.
+@destroy: a function to invoke when the hook is destroyed,
+to clean up any allocation done just for this
+signal handler.
+@Returns: the id (that you may pass as a parameter
+to gtk_signal_remove_emission_hook()).
-<!-- ##### FUNCTION gtk_type_register_enum ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER ##### -->
<para>
-Register a new set of enum @values and give them the name in
-@type_name.
+
</para>
-@type_name: must not be null.
-@values: GtkEnumValue*
-@Returns:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Title ##### -->
-Menu Factory
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Title ##### -->
+gtkenums.sgml
-<!-- ##### VARIABLE gtk_debug_flags ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO gtk_widget_set_visual ##### -->
+<!-- ##### FUNCTION gtk_type_set_varargs_type ##### -->
+<para>
+Set the varargs type for a fundamental type @foreign_type.
+</para>
+
+@foreign_type: Must be a GtkType with a sequence number of zero. Must not be a
+fundamental type.
+@varargs_type: Must be a GtkType which is either structured or flag, or NONE.
+
+<!-- ##### MACRO GTK_PRIVATE_SET_FLAG ##### -->
<para>
</para>
-@w:
-@v:
-@widget:
-@visual:
+@wid:
+@flag:
<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER ##### -->
<para>
@@ -420,14 +345,14 @@ Menu Factory
</para>
-<!-- ##### MACRO GTK_TYPE_SEQNO ##### -->
+<!-- ##### FUNCTION gtk_im_context_simple_new ##### -->
<para>
-Convert a gtk type into its sequence number
+
</para>
-@type:
+@Returns:
-<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:See_Also ##### -->
+<!-- ##### STRUCT GtkTextTabArray ##### -->
<para>
</para>
@@ -442,35 +367,44 @@ Convert a gtk type into its sequence number
@GTK_MENU_FACTORY_MENU_BAR:
@GTK_MENU_FACTORY_OPTION_MENU:
-<!-- ##### MACRO gtk_marshal_NONE__STRING ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_POINTER_UINT_UINT ##### -->
+<!-- ##### FUNCTION gtk_font_selection_set_filter ##### -->
<para>
-
+Sets one of the two font filters, to limit the fonts shown.
</para>
+@fontsel: a #GtkFontSelection.
+@filter_type: which of the two font filters to set, either
+#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter
+can be changed by the user, but the base filter is permanent.
+@font_type: the types of font to be shown. This is a bitwise combination of
+#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP,
+or #GTK_FONT_ALL to show all three font types.
+@foundries: a NULL-terminated array of strings containing foundry names which
+will be shown, or NULL to show all foundries.
+@weights: a NULL-terminated array of strings containing weight names which
+will be shown, or NULL to show all weights.
+@slants: a NULL-terminated array of strings containing slant names which
+will be shown, or NULL to show all slants.
+@setwidths: a NULL-terminated array of strings containing setwidth names which
+will be shown, or NULL to show all setwidths.
+@spacings: a NULL-terminated array of strings containing spacings which
+will be shown, or NULL to show all spacings.
+@charsets: a NULL-terminated array of strings containing charset names which
+will be shown, or NULL to show all charsets.
-<!-- ##### MACRO GTK_WIDGET_IS_OFFSCREEN ##### -->
+<!-- ##### MACRO GTK_WIDGET_LEAVE_PENDING ##### -->
<para>
</para>
@obj:
-<!-- ##### MACRO GTK_MAX_COMPOSE_LEN ##### -->
+<!-- ##### MACRO GTK_TYPE_NUM_BUILTINS ##### -->
<para>
-
+No idea.
</para>
-<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Short_Description ##### -->
-
-
-
<!-- ##### SIGNAL GtkTextView::cut-text ##### -->
<para>
@@ -478,13 +412,7 @@ Convert a gtk type into its sequence number
@textview: the object which received the signal.
-<!-- ##### STRUCT GtkDialogButton ##### -->
-<para>
-Deprecated.
-</para>
-
-
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_INT__POINTER_CHAR_CHAR ##### -->
<para>
</para>
@@ -494,36 +422,26 @@ Deprecated.
@func_data:
@args:
-<!-- ##### ARG GtkTextTag:overstrike_set ##### -->
+<!-- ##### ARG GtkTextTag:overstrike ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_text_buffer_cut ##### -->
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:See_Also ##### -->
<para>
</para>
-@buffer:
-@time:
-@interactive:
-@default_editable:
-<!-- ##### ENUM GtkTextViewMovementStep ##### -->
+<!-- ##### SIGNAL GtkTextView::copy-text ##### -->
<para>
</para>
-@GTK_TEXT_MOVEMENT_CHAR:
-@GTK_TEXT_MOVEMENT_POSITIONS:
-@GTK_TEXT_MOVEMENT_WORD:
-@GTK_TEXT_MOVEMENT_WRAPPED_LINE:
-@GTK_TEXT_MOVEMENT_LINE:
-@GTK_TEXT_MOVEMENT_LINE_ENDS:
-@GTK_TEXT_MOVEMENT_BUFFER_ENDS:
+@textview: the object which received the signal.
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_accel_group_marshal_remove ##### -->
<para>
</para>
@@ -533,41 +451,51 @@ Deprecated.
@func_data:
@args:
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:See_Also ##### -->
+<!-- ##### SIGNAL GtkTextView::delete ##### -->
<para>
</para>
+@textview: the object which received the signal.
+@arg1:
+@arg2:
-<!-- ##### MACRO GTK_CONTAINER_RESIZE_PENDING ##### -->
+<!-- ##### MACRO gtk_widget_push_visual ##### -->
<para>
</para>
-@obj:
+@v:
+@visual:
-<!-- ##### FUNCTION gtk_menu_factory_remove_entries ##### -->
-<para>
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Short_Description ##### -->
+
+
+<!-- ##### MACRO GTK_TYPE_IDENTIFIER ##### -->
+<para>
+Hide the name of gtk_identifier_get_type
</para>
-@factory:
-@entries:
-@nentries:
-<!-- ##### FUNCTION gtk_text_buffer_find_string ##### -->
+<!-- ##### FUNCTION gtk_themes_exit ##### -->
<para>
</para>
-@buffer:
-@iter:
-@str:
-@start:
-@end:
-@Returns:
+@error_code:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER ##### -->
+<!-- ##### STRUCT GtkTypeQuery ##### -->
+<para>
+A structure used to return values from @gtk_type_query.
+</para>
+
+@type:
+@type_name:
+@object_size:
+@class_size:
+
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT ##### -->
<para>
</para>
@@ -577,7 +505,7 @@ Deprecated.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_INT__INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT_BOOL ##### -->
<para>
</para>
@@ -587,7 +515,7 @@ Deprecated.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT_BOOL ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT ##### -->
<para>
</para>
@@ -597,80 +525,62 @@ Deprecated.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
+<!-- ##### MACRO GTK_TYPE_FLAT_FIRST ##### -->
<para>
-Internal function used by #GtkHPaned and #GtkVPaned
+The first "flat" (no struct) enumerated type value.
</para>
-@paned:
-@allocation:
-@child1_req:
-@child2_req:
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_STRING_STRING ##### -->
+<!-- ##### FUNCTION gtk_accel_group_marshal_add ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_trace_referencing ##### -->
+<!-- ##### MACRO GTK_PRIVATE_UNSET_FLAG ##### -->
<para>
-Private: print debugging information while doing a gtk_object_ref() or
-a gtk_object_unref().
-</para>
-@object: object to reference or unreference.
-@func: name of caller's function to print (used within macros).
-@dummy: unused.
-@line: line number (used within macros).
-@do_ref: whether to reference or unreference.
-
-<!-- ##### MACRO GTK_VALUE_CALLBACK ##### -->
-<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK
</para>
-@a:
+@wid:
+@flag:
-<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT_BOOL ##### -->
+<!-- ##### FUNCTION gtk_window_set_focus ##### -->
<para>
</para>
+@window:
+@focus:
-<!-- ##### ENUM GtkFontType ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__BOXED ##### -->
<para>
-A set of bit flags used to specify the type of fonts shown
-when calling gtk_font_selection_dialog_set_filter() or
-gtk_font_selection_set_filter().
+
</para>
-@GTK_FONT_BITMAP: bitmap fonts.
-@GTK_FONT_SCALABLE: scalable fonts.
-@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
-@GTK_FONT_ALL: a bitwise combination of all of the above.
-<!-- ##### MACRO GTK_TYPE_STRUCTURED_LAST ##### -->
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Long_Description ##### -->
<para>
-The last structured enumerated type value.
+
</para>
-<!-- ##### MACRO GTK_OBJECT_NSIGNALS ##### -->
+<!-- ##### MACRO GTK_VALUE_C_CALLBACK ##### -->
<para>
-Get the number of signals defined by this object.
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
</para>
-@obj: the object to query.
+@a:
-<!-- ##### FUNCTION gtk_menu_factory_remove_subfactory ##### -->
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:See_Also ##### -->
<para>
</para>
-@factory:
-@subfactory:
-@path:
<!-- ##### FUNCTION gtk_type_children_types ##### -->
<para>
@@ -680,86 +590,87 @@ Return the pointer to the type's children's types.
@type: GtkType
@Returns: pointer to a GList
-<!-- ##### FUNCTION gtk_type_register_flags ##### -->
+<!-- ##### MACRO GTK_PRIVATE_FLAGS ##### -->
<para>
-Register a new set of flags @values and give them the name in
-@type_name.
+
</para>
-@type_name: must not be null.
-@values: GtkFlagValue*
-@Returns:
+@wid:
-<!-- ##### FUNCTION gtk_selection_clear_targets ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_add_entries ##### -->
<para>
</para>
-@widget:
-@selection:
+@factory:
+@entries:
+@nentries:
-<!-- ##### SIGNAL GtkTextView::scroll-text ##### -->
+<!-- ##### MACRO GTK_WIDGET_IS_OFFSCREEN ##### -->
<para>
</para>
-@textview: the object which received the signal.
-@arg1:
+@obj:
-<!-- ##### ENUM GtkPrivateFlags ##### -->
+<!-- ##### FUNCTION gtk_identifier_get_type ##### -->
<para>
+Get the type of GtkIdentifier.
+</para>
+
+@Returns: GtkType -- the enumerated type of something.
+<!-- ##### FUNCTION gtk_type_describe_tree ##### -->
+<para>
+Given a @type, describe all of its children, and their children. Only
+show the size if @show_size is true.
</para>
-@PRIVATE_GTK_USER_STYLE:
-@PRIVATE_GTK_RESIZE_PENDING:
-@PRIVATE_GTK_RESIZE_NEEDED:
-@PRIVATE_GTK_LEAVE_PENDING:
-@PRIVATE_GTK_HAS_SHAPE_MASK:
-@PRIVATE_GTK_IN_REPARENT:
-@PRIVATE_GTK_DIRECTION_SET:
-@PRIVATE_GTK_DIRECTION_LTR:
+@type: GtkType
+@show_size: gboolean
-<!-- ##### FUNCTION gtk_type_set_chunk_alloc ##### -->
+<!-- ##### STRUCT GtkMenuPath ##### -->
<para>
-Set the mem_chunk size so it will hold @n_chunks of the objects of that @type.
+
</para>
-@type: There must be an unlocked TypeNode associated with this type otherwise nothing happens.
-@n_chunks:
+@path:
+@widget:
-<!-- ##### MACRO GTK_TYPE_STRUCTURED_FIRST ##### -->
+<!-- ##### FUNCTION gtk_signal_handler_pending_by_id ##### -->
<para>
-The first structured enumerated type value.
+Returns whether a connection id is valid (and optionally not blocked).
</para>
+@object: the object to search for the desired handler.
+@handler_id: the connection id.
+@may_be_blocked: whether it is acceptable to return a blocked
+handler.
+@Returns: TRUE if the signal exists and wasn't blocked,
+unless #may_be_blocked was specified. FALSE otherwise.
-<!-- ##### STRUCT GtkSignalQuery ##### -->
+<!-- ##### MACRO GTK_TYPE_SEQNO ##### -->
<para>
-This structure contains all the information about a particular
-signal: its name, the type it affects, the signature of the handlers,
-and its unique identifying integer.
+Convert a gtk type into its sequence number
</para>
-@object_type:
-@signal_id:
-@signal_name:
-@is_user_signal:
-@signal_flags:
-@return_val:
-@nparams:
-@params:
+@type:
-<!-- ##### FUNCTION gtk_type_describe_tree ##### -->
+<!-- ##### MACRO GTK_VALUE_CALLBACK ##### -->
<para>
-Given a @type, describe all of its children, and their children. Only
-show the size if @show_size is true.
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK
</para>
-@type: GtkType
-@show_size: gboolean
+@a:
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT_INT ##### -->
+<!-- ##### MACRO GTK_WIDGET_HAS_SHAPE_MASK ##### -->
+<para>
+
+</para>
+
+@obj:
+
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT ##### -->
<para>
</para>
@@ -769,45 +680,43 @@ show the size if @show_size is true.
@func_data:
@args:
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Long_Description ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_window_remove_embedded_xid ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__STRING_INT_POINTER ##### -->
<para>
</para>
-@window:
-@xid:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT ##### -->
+<!-- ##### FUNCTION gtk_type_register_enum ##### -->
<para>
-
+Register a new set of enum @values and give them the name in
+@type_name.
</para>
-@object:
-@func:
-@func_data:
-@args:
+@type_name: must not be null.
+@values: GtkEnumValue*
+@Returns:
-<!-- ##### FUNCTION gtk_text_iter_get_pixmap ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT ##### -->
<para>
</para>
-@iter:
-@pixmap:
-@mask:
-@Returns:
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_UINT ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT_INT ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
<!-- ##### FUNCTION gtk_font_selection_dialog_set_filter ##### -->
<para>
@@ -834,45 +743,34 @@ will be shown, or NULL to show all spacings.
@charsets: a NULL-terminated array of strings containing charset names which
will be shown, or NULL to show all charsets.
-<!-- ##### SIGNAL GtkTextView::delete-text ##### -->
+<!-- ##### MACRO GTK_VALUE_FOREIGN ##### -->
<para>
-
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
</para>
-@textview: the object which received the signal.
-@arg1:
-@arg2:
+@a:
-<!-- ##### FUNCTION gtk_container_get_toplevels ##### -->
+<!-- ##### MACRO gtk_widget_set_default_visual ##### -->
<para>
</para>
-@Returns:
-
-<!-- ##### MACRO GTK_TYPE_NUM_BUILTINS ##### -->
-<para>
-No idea.
-</para>
-
+@v:
+@visual:
-<!-- ##### MACRO GTK_TYPE_MAKE ##### -->
+<!-- ##### ENUM GtkPrivateFlags ##### -->
<para>
-Combine a fundemantal type and a sequence number to create a gtk type.
-</para>
-@parent_t:
-@seqno:
-
-<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Short_Description ##### -->
-Functions to adapt C structures to native calling convention.
-
-
-<!-- ##### MACRO GTK_TYPE_FLAT_LAST ##### -->
-<para>
-The last "flat" (no struct) enumerated type value.
</para>
+@PRIVATE_GTK_USER_STYLE:
+@PRIVATE_GTK_RESIZE_PENDING:
+@PRIVATE_GTK_RESIZE_NEEDED:
+@PRIVATE_GTK_LEAVE_PENDING:
+@PRIVATE_GTK_HAS_SHAPE_MASK:
+@PRIVATE_GTK_IN_REPARENT:
+@PRIVATE_GTK_DIRECTION_SET:
+@PRIVATE_GTK_DIRECTION_LTR:
<!-- ##### FUNCTION gtk_text_mark_unref ##### -->
<para>
@@ -881,17 +779,17 @@ The last "flat" (no struct) enumerated type value.
@mark:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER ##### -->
+<!-- ##### FUNCTION gtk_signal_query ##### -->
<para>
-
+Obtain information about a signal.
</para>
-@object:
-@func:
-@func_data:
-@args:
+@signal_id: the signal type identifier.
+@Returns: a pointer to a GtkSignalQuery structure
+which contains all the information, or NULL.
+The pointer is allocated just for you: you must g_free() it.
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER ##### -->
<para>
</para>
@@ -901,92 +799,77 @@ The last "flat" (no struct) enumerated type value.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_signal_handlers_destroy ##### -->
-<para>
-Destroy all the signal handlers connected to an object.
-This is done automatically when the object is destroyed.
-</para>
+<!-- ##### FUNCTION gtk_text_mark_deleted ##### -->
<para>
-This function is labeled private.
+
</para>
-@object: the object whose signal handlers should be destroyed.
+@mark:
+@Returns:
-<!-- ##### FUNCTION gtk_text_iter_in_region ##### -->
-<para>
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Short_Description ##### -->
-</para>
-@iter:
-@start:
-@end:
-@Returns:
-<!-- ##### FUNCTION gtk_type_get_varargs_type ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_cut ##### -->
<para>
-Get the varargs type associated with @foreign_type
+
</para>
-@foreign_type: GtkType
-@Returns: GtkType
+@buffer:
+@time:
+@interactive:
+@default_editable:
-<!-- ##### STRUCT GtkMenuFactory ##### -->
+<!-- ##### MACRO gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER ##### -->
<para>
</para>
-@path:
-@type:
-@accel_group:
-@widget:
-@subfactories:
-<!-- ##### MACRO GTK_VALUE_FOREIGN ##### -->
+<!-- ##### FUNCTION gtk_type_free ##### -->
<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
+Given the type of an object and a pointer to it, the object is freed.
</para>
-@a:
+@type: GtkType
+@mem: gpointer to the object
-<!-- ##### SIGNAL GtkTextView::paste-text ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_copy ##### -->
<para>
</para>
-@textview: the object which received the signal.
+@buffer:
+@time:
-<!-- ##### MACRO GTK_PRIVATE_SET_FLAG ##### -->
+<!-- ##### STRUCT GtkTextBTree ##### -->
<para>
</para>
-@wid:
-@flag:
-<!-- ##### FUNCTION gtk_ruler_draw_pos ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT ##### -->
<para>
</para>
-@ruler: the gtkruler
-<!-- ##### MACRO GTK_WIDGET_USER_STYLE ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT ##### -->
<para>
</para>
-@obj:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### ENUM GtkDebugFlag ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_POINTER_UINT_UINT ##### -->
<para>
</para>
-@GTK_DEBUG_OBJECTS:
-@GTK_DEBUG_MISC:
-@GTK_DEBUG_SIGNALS:
-@GTK_DEBUG_DND:
-@GTK_DEBUG_PLUGSOCKET:
<!-- ##### FUNCTION gtk_menu_factory_remove_paths ##### -->
<para>
@@ -997,70 +880,75 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
@paths:
@npaths:
-<!-- ##### FUNCTION gtk_type_query ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_destroy ##### -->
<para>
-Given a type, return various interesting parameters of the type.
+
</para>
-@type: GtkType
-@Returns: GtkTypeQuery*
+@factory:
-<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Long_Description ##### -->
+<!-- ##### MACRO GTK_TYPE_STRUCTURED_LAST ##### -->
+<para>
+The last structured enumerated type value.
+</para>
+
+
+<!-- ##### MACRO gtk_marshal_BOOL__POINTER_INT_INT_UINT ##### -->
<para>
</para>
-<!-- ##### MACRO GTK_TYPE_IDENTIFIER ##### -->
+<!-- ##### FUNCTION gtk_type_describe_heritage ##### -->
<para>
-Hide the name of gtk_identifier_get_type
+Print the types @type inherits from.
</para>
+@type: GtkType
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_selection_data_set_text ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@selection_data:
+@str:
+@Returns:
-<!-- ##### MACRO gtk_marshal_NONE__ENUM ##### -->
+<!-- ##### SIGNAL GtkTextView::delete-text ##### -->
<para>
</para>
+@textview: the object which received the signal.
+@arg1:
+@arg2:
-<!-- ##### FUNCTION gtk_signal_handler_pending_by_id ##### -->
+<!-- ##### FUNCTION gtk_container_get_toplevels ##### -->
<para>
-Returns whether a connection id is valid (and optionally not blocked).
+
</para>
-@object: the object to search for the desired handler.
-@handler_id: the connection id.
-@may_be_blocked: whether it is acceptable to return a blocked
-handler.
-@Returns: TRUE if the signal exists and wasn't blocked,
-unless #may_be_blocked was specified. FALSE otherwise.
+@Returns:
-<!-- ##### MACRO GTK_PRIVATE_FLAGS ##### -->
+<!-- ##### MACRO GTK_WIDGET_RESIZE_NEEDED ##### -->
<para>
</para>
-@wid:
+@obj:
-<!-- ##### FUNCTION gtk_selection_data_get_text ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER ##### -->
<para>
</para>
-@selection_data:
-@Returns:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_marshal_BOOL__NONE ##### -->
+<!-- ##### FUNCTION gtk_marshal_INT__INT ##### -->
<para>
</para>
@@ -1070,19 +958,21 @@ unless #may_be_blocked was specified. FALSE otherwise.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_type_free ##### -->
+<!-- ##### MACRO gtk_marshal_ENUM__ENUM ##### -->
<para>
-Given the type of an object and a pointer to it, the object is freed.
+
</para>
-@type: GtkType
-@mem: gpointer to the object
-<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Short_Description ##### -->
+<!-- ##### FUNCTION gtk_window_remove_embedded_xid ##### -->
+<para>
+</para>
+@window:
+@xid:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT ##### -->
<para>
</para>
@@ -1092,61 +982,69 @@ Given the type of an object and a pointer to it, the object is freed.
@func_data:
@args:
-<!-- ##### STRUCT GtkMenuPath ##### -->
+<!-- ##### FUNCTION gtk_signal_n_emissions ##### -->
<para>
-
+Find out the recursion depth of emissions for a particular type
+of signal and object. (So it will
+always return 0 or 1 if #GTK_RUN_NO_RECURSE is specified)
+This is a way to avoid recursion: you can see if
+you are currently running in that signal handler and emit it only
+if you are.
+</para>
+<para>Another way to look at it is that this number increases
+by one when #gtk_signal_emit(), et al, are called,
+and decreases by one when #gtk_signal_emit() returns.
</para>
-@path:
-@widget:
+@object: the object with the signal handler.
+@signal_id: the signal id.
+@Returns: the recursion depth of emissions of this signal for this
+object.
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT ##### -->
+<!-- ##### MACRO GTK_NOTE ##### -->
<para>
</para>
+@type:
+@action:
-<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Title ##### -->
-Private Information
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT ##### -->
+<para>
+</para>
-<!-- ##### FUNCTION gtk_menu_factory_find ##### -->
-<para>
+@object:
+@func:
+@func_data:
+@args:
+<!-- ##### STRUCT GtkDialogButton ##### -->
+<para>
+Deprecated.
</para>
-@factory:
-@path:
-@Returns:
-<!-- ##### STRUCT GtkMenuEntry ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT ##### -->
<para>
</para>
-@path:
-@accelerator:
-@callback:
-@callback_data:
-@widget:
-<!-- ##### FUNCTION gtk_window_add_embedded_xid ##### -->
+<!-- ##### FUNCTION gtk_type_query ##### -->
<para>
-
+Given a type, return various interesting parameters of the type.
</para>
-@window:
-@xid:
+@type: GtkType
+@Returns: GtkTypeQuery*
-<!-- ##### FUNCTION gtk_marshal_NONE__BOOL ##### -->
+<!-- ##### SIGNAL GtkTextView::paste-text ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@textview: the object which received the signal.
<!-- ##### FUNCTION gtk_color_selection_set_opacity ##### -->
<para>
@@ -1161,304 +1059,397 @@ the gtk_color_selection_get_color() function.
@use_opacity: a boolean indicating whether the opacity selection
is enabled.
-<!-- ##### FUNCTION gtk_marshal_INT__POINTER ##### -->
+<!-- ##### USER_FUNCTION GtkSignalMarshal ##### -->
<para>
-
+This is currently a hack left in for a scheme wrapper library.
+It may be removed.
+</para>
+<para>
+Don't use it.
</para>
-@object:
-@func:
-@func_data:
-@args:
+@object: The object which emits the signal.
+@data: The user data associated with the hook.
+@nparams: The number of parameters to the function.
+@args: The actual values of the arguments.
+@arg_types: The types of the arguments.
+@return_type: The type of the return value from the function
+or #GTK_TYPE_NONE for no return value.
-<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:See_Also ##### -->
+<!-- ##### MACRO GTK_WIDGET_USER_STYLE ##### -->
<para>
-<variablelist>
-<varlistentry>
-<term>#GtkSignal</term>
-<listitem><para>The signal handling functions (of which marshallers are
-really an implementation detail).</para></listitem>
-</varlistentry>
-
-</variablelist>
</para>
+@obj:
-<!-- ##### STRUCT GtkTreeViewPrivate ##### -->
+<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Short_Description ##### -->
+Functions to adapt C structures to native calling convention.
+
+
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_POINTER ##### -->
<para>
</para>
-@model:
-@flags:
-@tree:
-@tab_offset:
-@button_pressed_node:
-@button_pressed_tree:
-@children:
-@width:
-@height:
-@hadjustment:
-@vadjustment:
-@bin_window:
-@header_window:
-@anchor:
-@cursor:
-@cursor_drag:
-@xor_gc:
-@drag_pos:
-@x_drag:
-@prelight_node:
-@prelight_tree:
-@prelight_offset:
-@selection:
-@columns:
-@column:
-@header_height:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO GTK_WIDGET_RESIZE_NEEDED ##### -->
+<!-- ##### MACRO GTK_CONTAINER_RESIZE_PENDING ##### -->
<para>
</para>
@obj:
-<!-- ##### MACRO GTK_NOTE ##### -->
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:See_Also ##### -->
<para>
</para>
-@type:
-@action:
-<!-- ##### ENUM GtkTextViewDeleteType ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__BOOL ##### -->
<para>
</para>
-@GTK_TEXT_DELETE_CHAR:
-@GTK_TEXT_DELETE_HALF_WORD:
-@GTK_TEXT_DELETE_WHOLE_WORD:
-@GTK_TEXT_DELETE_HALF_WRAPPED_LINE:
-@GTK_TEXT_DELETE_WHOLE_WRAPPED_LINE:
-@GTK_TEXT_DELETE_HALF_LINE:
-@GTK_TEXT_DELETE_WHOLE_LINE:
-@GTK_TEXT_DELETE_WHITESPACE:
-@GTK_TEXT_DELETE_WHITESPACE_LEAVE_ONE:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO GTK_TYPE_FLAT_FIRST ##### -->
+<!-- ##### FUNCTION gtk_signal_set_funcs ##### -->
<para>
-The first "flat" (no struct) enumerated type value.
+These set default functions to call when the user didn't
+supply a function when connecting. (These are rarely
+used, and probably only for language bindings)
+</para>
+<para>
+By default, there are no such functions.
</para>
+@marshal_func: the function to invoke on every handlers for which there
+isn't a function pointer. May be NULL.
+@destroy_func: the function to invoke when each hook is destroyed.
+May be NULL.
-<!-- ##### FUNCTION gtk_menu_factory_new ##### -->
+<!-- ##### USER_FUNCTION GtkSignalDestroy ##### -->
<para>
+A function which you can use to clean up when the
+signal handler is destroyed.
+</para>
+<para>
+For example, if your handler requires a few variables
+that you made into a struct and allocated (using g_new()
+or something), then you will probably want to free
+it as soon as the hook is destroyed. This will
+allow you to do that. (For this in particular
+it is convenient to pass g_free() as a #GtkSignalDestroy
+function).
+</para>
+@data: The user data associated with the hook that is being
+destroyed.
+
+<!-- ##### FUNCTION gtk_type_set_chunk_alloc ##### -->
+<para>
+Set the mem_chunk size so it will hold @n_chunks of the objects of that @type.
</para>
-@type:
-@Returns:
+@type: There must be an unlocked TypeNode associated with this type otherwise nothing happens.
+@n_chunks:
-<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM ##### -->
+<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:See_Also ##### -->
<para>
+<variablelist>
+<varlistentry>
+<term>#GtkSignal</term>
+<listitem><para>The signal handling functions (of which marshallers are
+really an implementation detail).</para></listitem>
+</varlistentry>
+
+</variablelist>
</para>
-<!-- ##### FUNCTION gtk_text_buffer_spew ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_insert_pixmap ##### -->
<para>
</para>
@buffer:
+@iter:
+@pixmap:
+@mask:
-<!-- ##### MACRO gtk_signal_default_marshaller ##### -->
+<!-- ##### ENUM GtkTextViewMovementStep ##### -->
<para>
-A marshaller that returns void and takes no extra parameters.
+
</para>
+@GTK_TEXT_MOVEMENT_CHAR:
+@GTK_TEXT_MOVEMENT_POSITIONS:
+@GTK_TEXT_MOVEMENT_WORD:
+@GTK_TEXT_MOVEMENT_WRAPPED_LINE:
+@GTK_TEXT_MOVEMENT_LINE:
+@GTK_TEXT_MOVEMENT_LINE_ENDS:
+@GTK_TEXT_MOVEMENT_BUFFER_ENDS:
-<!-- ##### STRUCT GtkTextTabArray ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_INT_INT ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### ARG GtkTextTag:overstrike ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO GTK_WIDGET_HAS_SHAPE_MASK ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__OBJECT ##### -->
<para>
</para>
-@obj:
-<!-- ##### FUNCTION gtk_text_buffer_copy ##### -->
+<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Long_Description ##### -->
+<refsect2>
+<title>What are Signal Marshallers?</title>
+<para>
+Marshals are functions which all have the same prototype:
+they take a #GtkObject, a #GtkSignalFunc, a #gpointer,
+and an array of argument values.
+The functions are names gtk_marshall_RETURNTYPE__PARAMTYPE1_PARAMTYPE2....
+</para>
+<para>
+They then call a native function: the GtkObject is the first
+parameter passed in. The arguments are passed in the native
+calling convention: chars, shorts, ints, longs may be packed
+on the stack, or tucked in registers: it doesn't matter
+because the same calling convention will be generated
+inside the gtkmarshal code as is expected where you define
+your handlers.
+</para>
+<para>
+So the function named:
+<programlisting>
+gtk_marshal_BOOL__POINTER_INT_INT_UINT(GtkObject*, GtkSignalFunc, gpointer, GtkArg*);
+</programlisting>
+will call the #GtkSignalFunc assuming it was a function with signature:
+<programlisting>
+gboolean sigfunc(gpointer,gint,gint,guint);
+</programlisting>
+</para>
+</refsect2>
+<refsect2>
+<title>Writing Custom Marshals</title>
+<para>
+Marshals are primarily used as arguments to gtk_signal_new().
+Sometimes, you may find that a marshaller you need isn't available
+in the standard list. Then you have to write your own.
+</para>
<para>
+If you wish to define a signal with a new type of argument list.
+Suppose you want 2 pointers and 2 integers.
+You would write:
+<programlisting>
+typedef int (*GtkSignal_INT__POINTER_POINTER_INT_INT)(
+ gpointer, gpointer, gint, gint
+);
+void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg* args)
+{
+ GtkSignal_NONE__POINTER_POINTER_INT_INT rfunc;
+ gint* return_val;
+ return_val = GTK_RETLOC_INT(args[4]);
+ rfunc = (GtkSignal_INT__POINTER_POINTER_INT_INT)func;
+ *return_val = (*rfunc)(object,
+ GTK_VALUE_POINTER(args[0]),
+ GTK_VALUE_POINTER(args[1]),
+ GTK_VALUE_INT(args[2]),
+ GTK_VALUE_INT(args[3]),
+ func_data);
+}
+</programlisting>
</para>
+</refsect2>
-@buffer:
-@time:
-<!-- ##### FUNCTION gtk_text_mark_ref ##### -->
+<!-- ##### ENUM GtkFontFilterType ##### -->
<para>
-
+A set of bit flags used to specify the filter being set
+when calling gtk_font_selection_dialog_set_filter() or
+gtk_font_selection_set_filter().
</para>
-@mark:
-@Returns:
+@GTK_FONT_FILTER_BASE: the base filter, which can't be changed by the user.
+@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the
+'Filter' page of the #GtkFontSelection widget.
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT ##### -->
+<!-- ##### SIGNAL GtkTextView::move ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@textview: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
-<!-- ##### MACRO GTK_OBJECT_SIGNALS ##### -->
+<!-- ##### MACRO GTK_OBJECT_NSIGNALS ##### -->
<para>
-Get the array of signals defined for this object.
+Get the number of signals defined by this object.
</para>
-@obj: the object to fetch the signals from.
+@obj: the object to query.
-<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Title ##### -->
-gtkenums.sgml
+<!-- ##### STRUCT GtkSignalQuery ##### -->
+<para>
+This structure contains all the information about a particular
+signal: its name, the type it affects, the signature of the handlers,
+and its unique identifying integer.
+</para>
+@object_type:
+@signal_id:
+@signal_name:
+@is_user_signal:
+@signal_flags:
+@return_val:
+@nparams:
+@params:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT_POINTER ##### -->
+<!-- ##### FUNCTION gtk_icon_factory_get_type ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@Returns:
-<!-- ##### FUNCTION gtk_type_check_object_cast ##### -->
+<!-- ##### ENUM GtkDebugFlag ##### -->
<para>
-Given a pointer to a GtkTypeObject @type_object, and a GtkType @cast_type,
-make sure that it's okay to cast @type_object into a @cast_type.
+
</para>
-@type_object: GtkTypeObject*
-@cast_type: GtkType
-@Returns: the same GtkTypeObject* as @type_object
+@GTK_DEBUG_OBJECTS:
+@GTK_DEBUG_MISC:
+@GTK_DEBUG_SIGNALS:
+@GTK_DEBUG_DND:
+@GTK_DEBUG_PLUGSOCKET:
-<!-- ##### USER_FUNCTION GtkMenuCallback ##### -->
+<!-- ##### FUNCTION gtk_themes_init ##### -->
<para>
</para>
-@widget:
-@user_data:
+@argc:
+@argv:
-<!-- ##### FUNCTION gtk_themes_exit ##### -->
+<!-- ##### MACRO GTK_MAX_COMPOSE_LEN ##### -->
<para>
</para>
-@error_code:
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER ##### -->
+<!-- ##### FUNCTION gtk_window_set_default ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@window:
+@defaultw:
-<!-- ##### MACRO gtk_marshal_NONE__OBJECT ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__STRING ##### -->
<para>
</para>
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Long_Description ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__UINT ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_type_set_varargs_type ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__ENUM ##### -->
<para>
-Set the varargs type for a fundamental type @foreign_type.
+
</para>
-@foreign_type: Must be a GtkType with a sequence number of zero. Must not be a
-fundamental type.
-@varargs_type: Must be a GtkType which is either structured or flag, or NONE.
-<!-- ##### FUNCTION gtk_type_check_class_cast ##### -->
+<!-- ##### FUNCTION gtk_type_get_varargs_type ##### -->
<para>
-Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make
-sure that it's okay to cast something of that @klass into a @cast_type.
+Get the varargs type associated with @foreign_type
</para>
-@klass: GtkTypeClass*
-@cast_type: GtkType
-@Returns: Always return @klass.
+@foreign_type: GtkType
+@Returns: GtkType
-<!-- ##### FUNCTION gtk_menu_factory_destroy ##### -->
+<!-- ##### FUNCTION gtk_text_view_get_iter_at_pixel ##### -->
<para>
</para>
-@factory:
+@text_view:
+@iter:
+@x:
+@y:
-<!-- ##### FUNCTION gtk_signal_n_emissions ##### -->
+<!-- ##### FUNCTION gtk_signal_n_emissions_by_name ##### -->
<para>
Find out the recursion depth of emissions for a particular type
-of signal and object. (So it will
-always return 0 or 1 if #GTK_RUN_NO_RECURSE is specified)
-This is a way to avoid recursion: you can see if
-you are currently running in that signal handler and emit it only
-if you are.
-</para>
-<para>Another way to look at it is that this number increases
-by one when #gtk_signal_emit(), et al, are called,
-and decreases by one when #gtk_signal_emit() returns.
+of signal and object. Just like gtk_signal_n_emissions()
+except it will lookup the signal id for you.
</para>
@object: the object with the signal handler.
-@signal_id: the signal id.
+@name: the signal name.
@Returns: the recursion depth of emissions of this signal for this
object.
-<!-- ##### FUNCTION gtk_text_buffer_insert_pixmap ##### -->
+<!-- ##### FUNCTION gtk_container_unregister_toplevel ##### -->
<para>
</para>
-@buffer:
-@iter:
-@pixmap:
-@mask:
+@container:
-<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK_C_CALLBACK ##### -->
+<!-- ##### FUNCTION gtk_rc_init ##### -->
<para>
+Internal function.
+</para>
+
+<!-- ##### MACRO GTK_TYPE_FLAT_LAST ##### -->
+<para>
+The last "flat" (no struct) enumerated type value.
</para>
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_window_add_embedded_xid ##### -->
+<para>
+
+</para>
+
+@window:
+@xid:
+
+<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK_C_CALLBACK ##### -->
<para>
</para>
@@ -1468,50 +1459,56 @@ object.
@func_data:
@args:
-<!-- ##### MACRO GTK_VALUE_ARGS ##### -->
+<!-- ##### FUNCTION gtk_type_register_flags ##### -->
<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS
+Register a new set of flags @values and give them the name in
+@type_name.
</para>
-@a:
+@type_name: must not be null.
+@values: GtkFlagValue*
+@Returns:
-<!-- ##### FUNCTION gtk_menu_factory_add_entries ##### -->
+<!-- ##### SIGNAL GtkTextView::delete-at-cursor ##### -->
<para>
</para>
-@factory:
-@entries:
-@nentries:
+@textview: the object which received the signal.
+@arg1:
+@arg2:
-<!-- ##### FUNCTION gtk_signal_set_funcs ##### -->
-<para>
-These set default functions to call when the user didn't
-supply a function when connecting. (These are rarely
-used, and probably only for language bindings)
-</para>
+<!-- ##### FUNCTION gtk_menu_factory_new ##### -->
<para>
-By default, there are no such functions.
+
</para>
-@marshal_func: the function to invoke on every handlers for which there
-isn't a function pointer. May be NULL.
-@destroy_func: the function to invoke when each hook is destroyed.
-May be NULL.
+@type:
+@Returns:
-<!-- ##### FUNCTION gtk_im_context_simple_new ##### -->
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### MACRO gtk_widget_set_visual ##### -->
<para>
</para>
-@Returns:
+@w:
+@v:
+@widget:
+@visual:
-<!-- ##### FUNCTION gtk_type_describe_heritage ##### -->
+<!-- ##### MACRO gtk_signal_default_marshaller ##### -->
<para>
-Print the types @type inherits from.
+A marshaller that returns void and takes no extra parameters.
</para>
-@type: GtkType
+
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Short_Description ##### -->
+
+
<!-- ##### FUNCTION gtk_text_buffer_set_clipboard_contents ##### -->
<para>
@@ -1521,16 +1518,15 @@ Print the types @type inherits from.
@buffer:
@text:
-<!-- ##### ENUM GtkFontFilterType ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT_POINTER ##### -->
<para>
-A set of bit flags used to specify the filter being set
-when calling gtk_font_selection_dialog_set_filter() or
-gtk_font_selection_set_filter().
+
</para>
-@GTK_FONT_FILTER_BASE: the base filter, which can't be changed by the user.
-@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the
-'Filter' page of the #GtkFontSelection widget.
+@object:
+@func:
+@func_data:
+@args:
<!-- ##### FUNCTION gtk_type_parent_class ##### -->
<para>
@@ -1541,33 +1537,37 @@ Return NULL if anything goes wrong.
@type: GtkType
@Returns: gpointer to the klass.
-<!-- ##### USER_FUNCTION GtkSignalDestroy ##### -->
+<!-- ##### MACRO GTK_WIDGET_REDRAW_PENDING ##### -->
<para>
-A function which you can use to clean up when the
-signal handler is destroyed.
+
</para>
+
+@obj:
+
+<!-- ##### ENUM GtkTextViewDeleteType ##### -->
<para>
-For example, if your handler requires a few variables
-that you made into a struct and allocated (using g_new()
-or something), then you will probably want to free
-it as soon as the hook is destroyed. This will
-allow you to do that. (For this in particular
-it is convenient to pass g_free() as a #GtkSignalDestroy
-function).
+
</para>
-@data: The user data associated with the hook that is being
-destroyed.
+@GTK_TEXT_DELETE_CHAR:
+@GTK_TEXT_DELETE_HALF_WORD:
+@GTK_TEXT_DELETE_WHOLE_WORD:
+@GTK_TEXT_DELETE_HALF_WRAPPED_LINE:
+@GTK_TEXT_DELETE_WHOLE_WRAPPED_LINE:
+@GTK_TEXT_DELETE_HALF_LINE:
+@GTK_TEXT_DELETE_WHOLE_LINE:
+@GTK_TEXT_DELETE_WHITESPACE:
+@GTK_TEXT_DELETE_WHITESPACE_LEAVE_ONE:
-<!-- ##### FUNCTION gtk_window_set_default ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_get_clipboard_contents ##### -->
<para>
</para>
-@window:
-@defaultw:
+@buffer:
+@Returns:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK ##### -->
<para>
</para>
@@ -1577,164 +1577,192 @@ destroyed.
@func_data:
@args:
-<!-- ##### MACRO GTK_WIDGET_LEAVE_PENDING ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_INT_INT ##### -->
<para>
</para>
-@obj:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO gtk_marshal_NONE__UINT ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_remove_entries ##### -->
<para>
</para>
+@factory:
+@entries:
+@nentries:
-<!-- ##### FUNCTION gtk_accel_group_marshal_add ##### -->
+<!-- ##### FUNCTION gtk_type_check_class_cast ##### -->
<para>
-
+Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make
+sure that it's okay to cast something of that @klass into a @cast_type.
</para>
-@object:
-@func:
-@func_data:
-@args:
+@klass: GtkTypeClass*
+@cast_type: GtkType
+@Returns: Always return @klass.
-<!-- ##### MACRO GTK_WIDGET_IN_REPARENT ##### -->
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Long_Description ##### -->
<para>
</para>
-@obj:
-<!-- ##### FUNCTION gtk_marshal_INT__POINTER_CHAR_CHAR ##### -->
+<!-- ##### FUNCTION gtk_selection_data_get_text ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@selection_data:
+@Returns:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT ##### -->
+<!-- ##### USER_FUNCTION GtkMenuCallback ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@widget:
+@user_data:
-<!-- ##### FUNCTION gtk_accel_group_marshal_remove ##### -->
+<!-- ##### VARIABLE gtk_debug_flags ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### MACRO gtk_marshal_NONE__STRING_INT_POINTER ##### -->
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:See_Also ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_remove_subfactory ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@factory:
+@subfactory:
+@path:
-<!-- ##### FUNCTION gtk_rc_init ##### -->
-<para>
-Internal function.
-</para>
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Title ##### -->
+Debugging
-<!-- ##### FUNCTION gtk_signal_query ##### -->
+<!-- ##### FUNCTION gtk_type_check_object_cast ##### -->
<para>
-Obtain information about a signal.
+Given a pointer to a GtkTypeObject @type_object, and a GtkType @cast_type,
+make sure that it's okay to cast @type_object into a @cast_type.
</para>
-@signal_id: the signal type identifier.
-@Returns: a pointer to a GtkSignalQuery structure
-which contains all the information, or NULL.
-The pointer is allocated just for you: you must g_free() it.
+@type_object: GtkTypeObject*
+@cast_type: GtkType
+@Returns: the same GtkTypeObject* as @type_object
-<!-- ##### FUNCTION gtk_signal_n_emissions_by_name ##### -->
+<!-- ##### FUNCTION gtk_ruler_draw_pos ##### -->
<para>
-Find out the recursion depth of emissions for a particular type
-of signal and object. Just like gtk_signal_n_emissions()
-except it will lookup the signal id for you.
+
</para>
-@object: the object with the signal handler.
-@name: the signal name.
-@Returns: the recursion depth of emissions of this signal for this
-object.
+@ruler: the gtkruler
-<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:See_Also ##### -->
+<!-- ##### STRUCT GtkTreeViewPrivate ##### -->
<para>
</para>
+@model:
+@flags:
+@tree:
+@tab_offset:
+@button_pressed_node:
+@button_pressed_tree:
+@children:
+@width:
+@height:
+@hadjustment:
+@vadjustment:
+@bin_window:
+@header_window:
+@anchor:
+@cursor:
+@cursor_drag:
+@xor_gc:
+@drag_pos:
+@x_drag:
+@prelight_node:
+@prelight_tree:
+@prelight_offset:
+@selection:
+@columns:
+@column:
+@header_height:
-<!-- ##### SIGNAL GtkTextView::delete ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_UINT ##### -->
<para>
</para>
-@textview: the object which received the signal.
-@arg1:
-@arg2:
-<!-- ##### FUNCTION gtk_container_register_toplevel ##### -->
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:See_Also ##### -->
<para>
</para>
-@container:
-<!-- ##### MACRO gtk_marshal_ENUM__ENUM ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_ENUM ##### -->
<para>
</para>
-<!-- ##### MACRO gtk_widget_push_visual ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__NONE ##### -->
<para>
</para>
-@v:
-@visual:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Title ##### -->
-GtkIMContextSimple
+<!-- ##### FUNCTION gtk_signal_handlers_destroy ##### -->
+<para>
+Destroy all the signal handlers connected to an object.
+This is done automatically when the object is destroyed.
+</para>
+<para>
+This function is labeled private.
+</para>
+@object: the object whose signal handlers should be destroyed.
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT ##### -->
+<!-- ##### FUNCTION gtk_text_iter_get_pixmap ##### -->
<para>
</para>
+@iter:
+@pixmap:
+@mask:
+@Returns:
-<!-- ##### MACRO GTK_VALUE_C_CALLBACK ##### -->
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### MACRO GTK_OBJECT_SIGNALS ##### -->
<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
+Get the array of signals defined for this object.
</para>
-@a:
+@obj: the object to fetch the signals from.
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__NONE ##### -->
<para>
</para>
@@ -1744,55 +1772,53 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
@func_data:
@args:
-<!-- ##### SIGNAL GtkTextView::move-insert ##### -->
+<!-- ##### FUNCTION gtk_text_iter_in_region ##### -->
<para>
</para>
-@textview: the object which received the signal.
-@arg1:
-@arg2:
-@arg3:
+@iter:
+@start:
+@end:
+@Returns:
-<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Long_Description ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_add_subfactory ##### -->
<para>
</para>
+@factory:
+@subfactory:
+@path:
-<!-- ##### FUNCTION gtk_text_buffer_find_regexp ##### -->
+<!-- ##### STRUCT GtkMenuEntry ##### -->
<para>
</para>
-@buffer:
-@regexp:
-@start:
-@end:
-@Returns:
+@path:
+@accelerator:
+@callback:
+@callback_data:
+@widget:
-<!-- ##### FUNCTION gtk_menu_factory_add_subfactory ##### -->
+<!-- ##### FUNCTION gtk_ruler_draw_ticks ##### -->
<para>
</para>
-@factory:
-@subfactory:
-@path:
+@ruler: the gtkruler
-<!-- ##### ENUM GtkTextViewScrollType ##### -->
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Long_Description ##### -->
<para>
</para>
-@GTK_TEXT_SCROLL_TO_TOP:
-@GTK_TEXT_SCROLL_TO_BOTTOM:
-@GTK_TEXT_SCROLL_PAGE_DOWN:
-@GTK_TEXT_SCROLL_PAGE_UP:
-<!-- ##### STRUCT GtkTextBTree ##### -->
+<!-- ##### MACRO GTK_VALUE_ARGS ##### -->
<para>
-
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS
</para>
+@a:
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index 1daa98aa21..cf2dd0b7fd 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -45,6 +45,26 @@ text.
@Returns: The newly created #GtkButton widget.
+<!-- ##### FUNCTION gtk_button_new_accel ##### -->
+<para>
+
+</para>
+
+@uline_label:
+@accel_group:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_button_new_stock ##### -->
+<para>
+
+</para>
+
+@stock_id:
+@accel_group:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_button_pressed ##### -->
<para>
Emits a #GtkButton::pressed signal to the given #GtkButton.
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 4bc84eba01..2e835e982f 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -145,6 +145,15 @@ gtk_window_set_title(). See the #GtkWindow section for more).
@GTK_DIALOG_MODAL:
@GTK_DIALOG_DESTROY_WITH_PARENT:
+<!-- ##### ENUM GtkResponseType ##### -->
+<para>
+
+</para>
+
+@GTK_RESPONSE_NONE:
+@GTK_RESPONSE_REJECT:
+@GTK_RESPONSE_ACCEPT:
+
<!-- ##### FUNCTION gtk_dialog_new ##### -->
<para>
Creates a new dialog box. Widgets should not be packed into this #GtkWindow
diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml
index e740b63ec1..33beb4c95e 100644
--- a/docs/reference/gtk/tmpl/gtkenums.sgml
+++ b/docs/reference/gtk/tmpl/gtkenums.sgml
@@ -84,6 +84,20 @@ widget.
@GTK_CURVE_TYPE_SPLINE:
@GTK_CURVE_TYPE_FREE:
+<!-- ##### ENUM GtkDeleteType ##### -->
+<para>
+
+</para>
+
+@GTK_DELETE_CHARS:
+@GTK_DELETE_WORD_ENDS:
+@GTK_DELETE_WORDS:
+@GTK_DELETE_DISPLAY_LINES:
+@GTK_DELETE_DISPLAY_LINE_ENDS:
+@GTK_DELETE_PARAGRAPH_ENDS:
+@GTK_DELETE_PARAGRAPHS:
+@GTK_DELETE_WHITESPACE:
+
<!-- ##### ENUM GtkDirectionType ##### -->
<para>
@@ -128,6 +142,21 @@ Used for justifying the text inside a #GtkLabel widget. (See also
@GTK_INCHES:
@GTK_CENTIMETERS:
+<!-- ##### ENUM GtkMovementStep ##### -->
+<para>
+
+</para>
+
+@GTK_MOVEMENT_CHARS:
+@GTK_MOVEMENT_POSITIONS:
+@GTK_MOVEMENT_WORDS:
+@GTK_MOVEMENT_DISPLAY_LINES:
+@GTK_MOVEMENT_DISPLAY_LINE_ENDS:
+@GTK_MOVEMENT_PARAGRAPHS:
+@GTK_MOVEMENT_PARAGRAPH_ENDS:
+@GTK_MOVEMENT_PAGES:
+@GTK_MOVEMENT_BUFFER_ENDS:
+
<!-- ##### ENUM GtkOrientation ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml
index 4e6b178ac6..6f8bfdd021 100644
--- a/docs/reference/gtk/tmpl/gtkimage.sgml
+++ b/docs/reference/gtk/tmpl/gtkimage.sgml
@@ -28,6 +28,180 @@ below.
</para>
+<!-- ##### FUNCTION gtk_image_get_icon_set ##### -->
+<para>
+
+</para>
+
+@image:
+@icon_set:
+@size:
+
+
+<!-- ##### FUNCTION gtk_image_get_image ##### -->
+<para>
+
+</para>
+
+@image:
+@gdk_image:
+@mask:
+
+
+<!-- ##### FUNCTION gtk_image_get_pixbuf ##### -->
+<para>
+
+</para>
+
+@image:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_get_pixmap ##### -->
+<para>
+
+</para>
+
+@image:
+@pixmap:
+@mask:
+
+
+<!-- ##### FUNCTION gtk_image_get_stock ##### -->
+<para>
+
+</para>
+
+@image:
+@stock_id:
+@size:
+
+
+<!-- ##### FUNCTION gtk_image_get_storage_type ##### -->
+<para>
+
+</para>
+
+@image:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_new_from_file ##### -->
+<para>
+
+</para>
+
+@filename:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_new_from_icon_set ##### -->
+<para>
+
+</para>
+
+@icon_set:
+@size:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_new_from_image ##### -->
+<para>
+
+</para>
+
+@image:
+@mask:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_new_from_pixbuf ##### -->
+<para>
+
+</para>
+
+@pixbuf:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_new_from_pixmap ##### -->
+<para>
+
+</para>
+
+@pixmap:
+@mask:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_new_from_stock ##### -->
+<para>
+
+</para>
+
+@stock_id:
+@size:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_image_set_from_file ##### -->
+<para>
+
+</para>
+
+@image:
+@filename:
+
+
+<!-- ##### FUNCTION gtk_image_set_from_icon_set ##### -->
+<para>
+
+</para>
+
+@image:
+@icon_set:
+@size:
+
+
+<!-- ##### FUNCTION gtk_image_set_from_image ##### -->
+<para>
+
+</para>
+
+@image:
+@gdk_image:
+@mask:
+
+
+<!-- ##### FUNCTION gtk_image_set_from_pixbuf ##### -->
+<para>
+
+</para>
+
+@image:
+@pixbuf:
+
+
+<!-- ##### FUNCTION gtk_image_set_from_pixmap ##### -->
+<para>
+
+</para>
+
+@image:
+@pixmap:
+@mask:
+
+
+<!-- ##### FUNCTION gtk_image_set_from_stock ##### -->
+<para>
+
+</para>
+
+@image:
+@stock_id:
+@size:
+
+
<!-- ##### FUNCTION gtk_image_new ##### -->
<para>
Creates the new GtkImage using the value and the mask.
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 4e13d8f2c3..f26cf204ca 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -40,12 +40,44 @@ pass NULL to get an empty label widget.
@Returns: The newly allocated #GtkLabel widget
-<!-- ##### MACRO gtk_label_set ##### -->
+<!-- ##### FUNCTION gtk_label_set_text ##### -->
<para>
-Aliases gtk_label_set_text. Probably used for backward compatibility with
-Gtk+ 1.0.x.
+Sets the text within the #GtkLabel widget. It overwrites any text that
+was there before. Note that underlines that were there before do not
+get overwritten. If you want to erase underlines just send NULL to
+gtk_label_set_pattern().
+</para>
+
+@label: The #GtkLabel you want to set the text for.
+@str: The text you want to add.
+
+
+<!-- ##### FUNCTION gtk_label_set_attributes ##### -->
+<para>
+
+</para>
+
+@label:
+@attrs:
+
+
+<!-- ##### FUNCTION gtk_label_set_markup ##### -->
+<para>
+
+</para>
+
+@label:
+@str:
+
+
+<!-- ##### FUNCTION gtk_label_set_markup_with_accel ##### -->
+<para>
+
</para>
+@label:
+@str:
+@Returns:
<!-- ##### FUNCTION gtk_label_set_pattern ##### -->
@@ -108,16 +140,12 @@ by the edge of the widget if it exceeds the widget size.
@wrap: TRUE turns it on; FALSE turns it off.
-<!-- ##### FUNCTION gtk_label_set_text ##### -->
+<!-- ##### MACRO gtk_label_set ##### -->
<para>
-Sets the text within the #GtkLabel widget. It overwrites any text that
-was there before. Note that underlines that were there before do not
-get overwritten. If you want to erase underlines just send NULL to
-gtk_label_set_pattern().
+Aliases gtk_label_set_text. Probably used for backward compatibility with
+Gtk+ 1.0.x.
</para>
-@label: The #GtkLabel you want to set the text for.
-@str: The text you want to add.
<!-- ##### ARG GtkLabel:label ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index 618d49de6e..da03752f9c 100644
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -187,6 +187,31 @@ Styles
@h:
+<!-- ##### FUNCTION gtk_style_lookup_icon_set ##### -->
+<para>
+
+</para>
+
+@style:
+@stock_id:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_style_render_icon ##### -->
+<para>
+
+</para>
+
+@style:
+@source:
+@direction:
+@state:
+@size:
+@widget:
+@detail:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_draw_hline ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
index de02fed274..1f0247ebcf 100644
--- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -116,6 +116,45 @@ types related to the text widget and how they work together.
@end:
+<!-- ##### FUNCTION gtk_text_buffer_insert_range_interactive ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@start:
+@end:
+@default_editable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert_with_tags ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@text:
+@len:
+@first_tag:
+@Varargs:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert_with_tags_by_name ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@text:
+@len:
+@first_tag_name:
+@Varargs:
+
+
<!-- ##### FUNCTION gtk_text_buffer_delete ##### -->
<para>
@@ -191,6 +230,16 @@ types related to the text widget and how they work together.
@pixbuf:
+<!-- ##### FUNCTION gtk_text_buffer_create_child_anchor ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_text_buffer_create_mark ##### -->
<para>
@@ -213,6 +262,16 @@ types related to the text widget and how they work together.
@where:
+<!-- ##### FUNCTION gtk_text_buffer_move_mark_by_name ##### -->
+<para>
+
+</para>
+
+@buffer:
+@name:
+@where:
+
+
<!-- ##### FUNCTION gtk_text_buffer_delete_mark ##### -->
<para>
@@ -250,6 +309,15 @@ types related to the text widget and how they work together.
@Returns:
+<!-- ##### FUNCTION gtk_text_buffer_get_selection_bound ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_text_buffer_place_cursor ##### -->
<para>
@@ -344,33 +412,54 @@ types related to the text widget and how they work together.
@line_number:
-<!-- ##### FUNCTION gtk_text_buffer_get_last_iter ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_line_index ##### -->
<para>
</para>
@buffer:
@iter:
+@line_number:
+@byte_index:
-<!-- ##### FUNCTION gtk_text_buffer_get_bounds ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_mark ##### -->
<para>
</para>
@buffer:
-@start:
-@end:
+@iter:
+@mark:
-<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_mark ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_child_anchor ##### -->
<para>
</para>
@buffer:
@iter:
-@mark:
+@anchor:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_last_iter ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_bounds ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start:
+@end:
<!-- ##### FUNCTION gtk_text_buffer_get_tags ##### -->
@@ -424,6 +513,33 @@ types related to the text widget and how they work together.
@interactive:
+<!-- ##### FUNCTION gtk_text_buffer_copy_clipboard ##### -->
+<para>
+
+</para>
+
+@buffer:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_cut_clipboard ##### -->
+<para>
+
+</para>
+
+@buffer:
+@default_editable:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_paste_primary ##### -->
+<para>
+
+</para>
+
+@buffer:
+@override_location:
+@default_editable:
+
+
<!-- ##### FUNCTION gtk_text_buffer_get_selection_bounds ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml
index 188b392eda..85a57a0573 100644
--- a/docs/reference/gtk/tmpl/gtktextiter.sgml
+++ b/docs/reference/gtk/tmpl/gtktextiter.sgml
@@ -183,6 +183,15 @@ types related to the text widget and how they work together.
@Returns:
+<!-- ##### FUNCTION gtk_text_iter_get_child_anchor ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_text_iter_begins_tag ##### -->
<para>
@@ -429,6 +438,15 @@ types related to the text widget and how they work together.
@char_on_line:
+<!-- ##### FUNCTION gtk_text_iter_set_line_index ##### -->
+<para>
+
+</para>
+
+@iter:
+@byte_on_line:
+
+
<!-- ##### FUNCTION gtk_text_iter_forward_to_end ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml
index 155e327fe5..2af2ab2d55 100644
--- a/docs/reference/gtk/tmpl/gtktextmark.sgml
+++ b/docs/reference/gtk/tmpl/gtktextmark.sgml
@@ -88,3 +88,12 @@ Marks are typically created using the gtk_text_buffer_create_mark() function.
@Returns:
+<!-- ##### FUNCTION gtk_text_mark_get_name ##### -->
+<para>
+
+</para>
+
+@mark:
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index 82ce9d1ec0..446b5aed7f 100644
--- a/docs/reference/gtk/tmpl/gtktextview.sgml
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -26,6 +26,19 @@ types related to the text widget and how they work together.
</para>
+<!-- ##### ENUM GtkTextWindowType ##### -->
+<para>
+
+</para>
+
+@GTK_TEXT_WINDOW_PRIVATE:
+@GTK_TEXT_WINDOW_WIDGET:
+@GTK_TEXT_WINDOW_TEXT:
+@GTK_TEXT_WINDOW_LEFT:
+@GTK_TEXT_WINDOW_RIGHT:
+@GTK_TEXT_WINDOW_TOP:
+@GTK_TEXT_WINDOW_BOTTOM:
+
<!-- ##### FUNCTION gtk_text_view_new ##### -->
<para>
@@ -164,6 +177,138 @@ types related to the text widget and how they work together.
@location:
+<!-- ##### FUNCTION gtk_text_view_get_line_at_y ##### -->
+<para>
+
+</para>
+
+@text_view:
+@target_iter:
+@y:
+@line_top:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_line_yrange ##### -->
+<para>
+
+</para>
+
+@text_view:
+@iter:
+@y:
+@height:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_iter_at_location ##### -->
+<para>
+
+</para>
+
+@text_view:
+@iter:
+@x:
+@y:
+
+
+<!-- ##### FUNCTION gtk_text_view_buffer_to_window_coords ##### -->
+<para>
+
+</para>
+
+@text_view:
+@win:
+@buffer_x:
+@buffer_y:
+@window_x:
+@window_y:
+
+
+<!-- ##### FUNCTION gtk_text_view_window_to_buffer_coords ##### -->
+<para>
+
+</para>
+
+@text_view:
+@win:
+@window_x:
+@window_y:
+@buffer_x:
+@buffer_y:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_window ##### -->
+<para>
+
+</para>
+
+@text_view:
+@win:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_window_type ##### -->
+<para>
+
+</para>
+
+@text_view:
+@window:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_set_border_window_size ##### -->
+<para>
+
+</para>
+
+@text_view:
+@type:
+@size:
+
+
+<!-- ##### FUNCTION gtk_text_view_set_text_window_size ##### -->
+<para>
+
+</para>
+
+@text_view:
+@width:
+@height:
+
+
+<!-- ##### FUNCTION gtk_text_view_add_child_at_anchor ##### -->
+<para>
+
+</para>
+
+@text_view:
+@child:
+@anchor:
+
+
+<!-- ##### FUNCTION gtk_text_view_add_child_in_window ##### -->
+<para>
+
+</para>
+
+@text_view:
+@child:
+@which_window:
+@xpos:
+@ypos:
+
+
+<!-- ##### FUNCTION gtk_text_view_move_child ##### -->
+<para>
+
+</para>
+
+@text_view:
+@child:
+@xpos:
+@ypos:
+
+
<!-- ##### SIGNAL GtkTextView::copy-clipboard ##### -->
<para>
@@ -178,7 +323,7 @@ types related to the text widget and how they work together.
@textview: the object which received the signal.
-<!-- ##### SIGNAL GtkTextView::delete-at-cursor ##### -->
+<!-- ##### SIGNAL GtkTextView::delete-from-cursor ##### -->
<para>
</para>
@@ -195,7 +340,7 @@ types related to the text widget and how they work together.
@textview: the object which received the signal.
@arg1:
-<!-- ##### SIGNAL GtkTextView::move ##### -->
+<!-- ##### SIGNAL GtkTextView::move-cursor ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 40c8a0d32e..5b05c5e574 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -1169,6 +1169,18 @@ GtkWidget
@Returns:
+<!-- ##### FUNCTION gtk_widget_render_stock_icon ##### -->
+<para>
+
+</para>
+
+@widget:
+@stock_id:
+@size:
+@detail:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_widget_pop_composite_child ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index feb13700f8..b46bcd7b8a 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -236,6 +236,15 @@ it's larger
@Returns:
+<!-- ##### FUNCTION gtk_window_get_default_accel_group ##### -->
+<para>
+
+</para>
+
+@window:
+@Returns:
+
+
<!-- ##### SIGNAL GtkWindow::set-focus ##### -->
<para>
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 0fcdf510ab..07f958508b 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -78,7 +78,7 @@ typedef enum {
GTK_DELETE_DISPLAY_LINE_ENDS,
GTK_DELETE_PARAGRAPH_ENDS, /* like C-k in Emacs (or its reverse) */
GTK_DELETE_PARAGRAPHS, /* C-k in pico, kill whole line */
- GTK_DELETE_WHITESPACE, /* M-\ in Emacs */
+ GTK_DELETE_WHITESPACE /* M-\ in Emacs */
} GtkDeleteType;
/* Focus movement types */
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 11ecf86d26..ee0354d9d8 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -880,7 +880,7 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view,
* @iter: a #GtkTextIter
* @location: bounds of the character at @iter
*
- * Returns a rectangle which roughly contains the character at @iter.
+ * Gets a rectangle which roughly contains the character at @iter.
* The rectangle position is in buffer coordinates; use
* gtk_text_view_buffer_to_window_coords() to convert these
* coordinates to coordinates for one of the windows in the text view.
@@ -904,7 +904,7 @@ gtk_text_view_get_iter_location (GtkTextView *text_view,
* @y: return location for a y coordinate
* @height: return location for a height
*
- * Returns the y coordinate of the top of the line containing @iter,
+ * Gets the y coordinate of the top of the line containing @iter,
* and the height of the line. The coordinate is a buffer coordinate;
* convert to window coordinates with gtk_text_view_buffer_to_window_coords().
*
@@ -931,7 +931,7 @@ gtk_text_view_get_line_yrange (GtkTextView *text_view,
* @y: a y coordinate
* @line_top: return location for top coordinate of the line
*
- * Returns the #GtkTextIter at the start of the line containing
+ * Gets the #GtkTextIter at the start of the line containing
* the coordinate @y. @y is in buffer coordinates, convert from
* window coordinates with gtk_text_view_window_to_buffer_coords().
* If non-%NULL, @line_top will be filled with the coordinate of the top
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index f2c539df61..5d96ca7be8 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -59,7 +59,8 @@ typedef struct _GtkTextViewClass GtkTextViewClass;
/* Internal private type. */
typedef struct _GtkTextWindow GtkTextWindow;
-struct _GtkTextView {
+struct _GtkTextView
+{
GtkContainer parent_instance;
struct _GtkTextLayout *layout;
@@ -120,7 +121,8 @@ struct _GtkTextView {
GSList *children;
};
-struct _GtkTextViewClass {
+struct _GtkTextViewClass
+{
GtkContainerClass parent_class;
/* These are all RUN_ACTION signals for keybindings */