summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-11-14 16:36:20 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-11-14 16:36:20 +0000
commit30beffe1d1bd2ee1671bde8485dde9dc90f85ac3 (patch)
tree91b8e2ef129ab58c36a2c9cf32b9c9cdf872d5ef /docs
parent24a6f35b5cad91b075de7407c9e188acfd375241 (diff)
downloadgtk+-30beffe1d1bd2ee1671bde8485dde9dc90f85ac3.tar.gz
cd to srcdir before calling gtkdoc-fixref, distribute index.sgml.
Mon Nov 13 16:58:43 2000 Owen Taylor <otaylor@redhat.com> * {gtk,gdk,gdk-pixbuf}/Makefile.am: cd to srcdir before calling gtkdoc-fixref, distribute index.sgml. * gtk/gtk-docs.sgml gtk/Makefile.am gtk/gtk-sections.txt gtk/gtk.types: Update
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog8
-rw-r--r--docs/reference/gdk-pixbuf/Makefile.am4
-rw-r--r--docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt1
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/creating.sgml13
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml74
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml81
-rw-r--r--docs/reference/gdk/Makefile.am4
-rw-r--r--docs/reference/gdk/gdk-sections.txt1
-rw-r--r--docs/reference/gdk/tmpl/drawing.sgml13
-rw-r--r--docs/reference/gtk/Makefile.am5
-rw-r--r--docs/reference/gtk/gtk-docs.sgml23
-rw-r--r--docs/reference/gtk/gtk-sections.txt86
-rw-r--r--docs/reference/gtk/gtk.hierarchy9
-rw-r--r--docs/reference/gtk/gtk.types3
-rw-r--r--docs/reference/gtk/tmpl/gtk-unused.sgml370
-rw-r--r--docs/reference/gtk/tmpl/gtkeditable.sgml219
-rw-r--r--docs/reference/gtk/tmpl/gtkentry.sgml112
-rw-r--r--docs/reference/gtk/tmpl/gtkimcontext.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtkimmulticontext.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtkmain.sgml8
-rw-r--r--docs/reference/gtk/tmpl/gtkmenu.sgml10
-rw-r--r--docs/reference/gtk/tmpl/gtkmenuitem.sgml34
-rw-r--r--docs/reference/gtk/tmpl/gtkmodelsimple.sgml8
-rw-r--r--docs/reference/gtk/tmpl/gtkrc.sgml18
-rw-r--r--docs/reference/gtk/tmpl/gtkselection.sgml28
-rw-r--r--docs/reference/gtk/tmpl/gtksignal.sgml7
-rw-r--r--docs/reference/gtk/tmpl/gtktextbuffer.sgml10
-rw-r--r--docs/reference/gtk/tmpl/gtktextiter.sgml13
-rw-r--r--docs/reference/gtk/tmpl/gtktextmark.sgml2
-rw-r--r--docs/reference/gtk/tmpl/gtktexttag.sgml10
-rw-r--r--docs/reference/gtk/tmpl/gtkthemes.sgml52
-rw-r--r--docs/reference/gtk/tmpl/gtktree.sgml6
-rw-r--r--docs/reference/gtk/tmpl/gtktreemodel.sgml56
-rw-r--r--docs/reference/gtk/tmpl/gtktreeselection.sgml1
-rw-r--r--docs/reference/gtk/tmpl/gtktreestore.sgml2
35 files changed, 865 insertions, 444 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a6949f8773..dbc7fe8201 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 13 16:58:43 2000 Owen Taylor <otaylor@redhat.com>
+
+ * {gtk,gdk,gdk-pixbuf}/Makefile.am: cd to srcdir before
+ calling gtkdoc-fixref, distribute index.sgml.
+
+ * gtk/gtk-docs.sgml gtk/Makefile.am gtk/gtk-sections.txt
+ gtk/gtk.types: Update
+
2000-11-05 Havoc Pennington <hp@pobox.com>
* gtk/tmpl/gtktexttag.sgml: documented some of the object args
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 26da20fb38..1a071fb8c7 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -90,7 +90,7 @@ html:
test -d $(srcdir)/html || mkdir $(srcdir)/html
-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@echo '-- Fixing Crossreferences'
- gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
@@ -127,7 +127,7 @@ dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html
mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl
- -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+ -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
index a721ece386..10bbe8f9f0 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -65,6 +65,7 @@ gdk_pixbuf_new
gdk_pixbuf_new_from_data
gdk_pixbuf_new_from_xpm_data
gdk_pixbuf_new_from_inline
+gdk_pixbuf_new_subpixbuf
gdk_pixbuf_copy
</SECTION>
diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
index b98b4024fa..0bbce5405a 100644
--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
@@ -94,6 +94,19 @@ Creating a pixbuf from image data that is already in memory.
@Returns:
+<!-- ##### FUNCTION gdk_pixbuf_new_subpixbuf ##### -->
+<para>
+
+</para>
+
+@src_pixbuf:
+@src_x:
+@src_y:
+@width:
+@height:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_pixbuf_copy ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
index 8d5ba404d1..b9cea2ff9f 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
@@ -130,77 +130,3 @@ Application-driven progressive image loading.
@loader:
-<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
- <para>
- This signal is emitted when a significant area of the image being
- loaded has been updated. Normally it means that a complete
- scanline has been read in, but it could be a different area as
- well. Applications can use this signal to know when to repaint
- areas of an image that is being loaded.
- </para>
-
-@gdkpixbufloader: the object which received the signal.
-@arg1:
-@arg2:
-@arg3:
-@arg4:
-<!-- # Unused Parameters # -->
-@loader: Loader which emitted the signal.
-@x: X offset of upper-left corner of the updated area.
-@y: Y offset of upper-left corner of the updated area.
-@width: Width of updated area.
-@height: Height of updated area.
-
-<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
- <para>
- This signal is emitted when the pixbuf loader has been fed the
- initial amount of data that is required to figure out the size and
- format of the image that it will create. After this signal is
- emitted, applications can call gdk_pixbuf_loader_get_pixbuf() to
- fetch the partially-loaded pixbuf.
- </para>
-
-@gdkpixbufloader: the object which received the signal.
-<!-- # Unused Parameters # -->
-@loader: Loader which emitted the signal.
-
-<!-- ##### SIGNAL GdkPixbufLoader::frame-done ##### -->
- <para>
- This signal is emitted when a frame is done loading. It will be
- emitted for each frame in an animation data stream.
- </para>
-
-@gdkpixbufloader: the object which received the signal.
-@arg1:
-<!-- # Unused Parameters # -->
-@loader: Loader which emitted the signal.
-@frame: Frame which just completed loading.
-
-<!-- ##### SIGNAL GdkPixbufLoader::animation-done ##### -->
- <para>
- This signal is emitted when an animation is done loading.
- </para>
-
-@gdkpixbufloader: the object which received the signal.
-<!-- # Unused Parameters # -->
-@loader: Loader which emitted the signal.
-
-<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
- <para>
- This signal is emitted when gdk_pixbuf_loader_close() is called.
- It can be used by different parts of an application to receive
- notification when an image loader is closed by the code that
- drives it.
- </para>
-
-@gdkpixbufloader: the object which received the signal.
-<!-- # Unused Parameters # -->
-@loader: Loader which emitted the signal.
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
--->
-
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index f02ff63557..152dfaf4ec 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -65,6 +65,34 @@ End:
</para>
+<!-- ##### SIGNAL GdkPixbufLoader::animation-done ##### -->
+ <para>
+ This signal is emitted when an animation is done loading.
+ </para>
+
+@gdkpixbufloader: the object which received the signal.
+@loader: Loader which emitted the signal.
+
+<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
+ <para>
+ This signal is emitted when a significant area of the image being
+ loaded has been updated. Normally it means that a complete
+ scanline has been read in, but it could be a different area as
+ well. Applications can use this signal to know when to repaint
+ areas of an image that is being loaded.
+ </para>
+
+@gdkpixbufloader: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+@arg4:
+@loader: Loader which emitted the signal.
+@x: X offset of upper-left corner of the updated area.
+@y: Y offset of upper-left corner of the updated area.
+@width: Width of updated area.
+@height: Height of updated area.
+
<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable ##### -->
<para>
@@ -122,6 +150,17 @@ End:
</para>
+<!-- ##### SIGNAL GdkPixbufLoader::frame-done ##### -->
+ <para>
+ This signal is emitted when a frame is done loading. It will be
+ emitted for each frame in an animation data stream.
+ </para>
+
+@gdkpixbufloader: the object which received the signal.
+@arg1:
+@loader: Loader which emitted the signal.
+@frame: Frame which just completed loading.
+
<!-- ##### SECTION ./tmpl/xlib-init.sgml:Short_Description ##### -->
Initializing the &gdk-pixbuf; Xlib library.
@@ -155,6 +194,24 @@ Initializing the &gdk-pixbuf; Xlib library.
</para>
+<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
+ <para>
+ This signal is emitted when gdk_pixbuf_loader_close() is called.
+ It can be used by different parts of an application to receive
+ notification when an image loader is closed by the code that
+ drives it.
+ </para>
+
+@gdkpixbufloader: the object which received the signal.
+@loader: Loader which emitted the signal.
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
<!-- ##### ARG GnomeCanvasPixbuf:y_in_pixels ##### -->
<para>
Works in the same way as the <link
@@ -395,6 +452,18 @@ Rendering a pixbuf to a GDK drawable.
Getting parts of an X drawable's image data into a pixbuf.
+<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
+ <para>
+ This signal is emitted when the pixbuf loader has been fed the
+ initial amount of data that is required to figure out the size and
+ format of the image that it will create. After this signal is
+ emitted, applications can call gdk_pixbuf_loader_get_pixbuf() to
+ fetch the partially-loaded pixbuf.
+ </para>
+
+@gdkpixbufloader: the object which received the signal.
+@loader: Loader which emitted the signal.
+
<!-- ##### SECTION ./tmpl/xlib-rgb.sgml:Title ##### -->
XlibRGB
@@ -515,12 +584,6 @@ Getting parts of a drawable's image data into a pixbuf.
</para>
-<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
<!-- ##### SECTION ./tmpl/gnome-canvas-pixbuf.sgml:Long_Description ##### -->
<para>
This canvas item displays #GdkPixbuf images. It handles full
@@ -690,6 +753,12 @@ Getting parts of a drawable's image data into a pixbuf.
</refsect2>
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
<!-- ##### SECTION ./tmpl/xlib-rendering.sgml:Title ##### -->
Xlib Rendering
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index adccf29b7b..0caaeb723d 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -105,7 +105,7 @@ html:
test -d $(srcdir)/html || mkdir $(srcdir)/html
-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@echo '-- Fixing Crossreferences'
- gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
@@ -142,7 +142,7 @@ dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html
mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl
- -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+ -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index f5900c0de8..f06b366805 100644
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -281,6 +281,7 @@ gdk_draw_text_wc
gdk_draw_pixmap
gdk_draw_drawable
gdk_draw_image
+gdk_drawable_get_image
<SUBSECTION Standard>
GDK_DRAWABLE
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index ec3069fd6d..0c03abcc6d 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -388,3 +388,16 @@ the right edge of @image.
to the bottom edge of @image.
+<!-- ##### FUNCTION gdk_drawable_get_image ##### -->
+<para>
+
+</para>
+
+@drawable:
+@x:
+@y:
+@width:
+@height:
+@Returns:
+
+
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index bb7f4850b5..47012ad9ae 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -18,6 +18,7 @@ IGNORE_HFILES= \
gdk-pixbuf-loader.h \
gtkdebug.h \
gtkhsv.h \
+ gtkimmodule.h \
gtkimcontextsimple.h \
gtkintl.h \
gtkmarshal.h \
@@ -113,7 +114,7 @@ html:
test -d $(srcdir)/html || mkdir $(srcdir)/html
-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@echo '-- Fixing Crossreferences'
- gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
@@ -150,7 +151,7 @@ dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html
mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl
- -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+ -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index d088966cac..547edb3fe9 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -22,7 +22,8 @@
<!entity GtkData SYSTEM "sgml/gtkdata.sgml">
<!entity GtkDialog SYSTEM "sgml/gtkdialog.sgml">
<!entity GtkDrawingArea SYSTEM "sgml/gtkdrawingarea.sgml">
-<!entity GtkEditable SYSTEM "sgml/gtkeditable.sgml">
+<!entity gtk-GtkEditable SYSTEM "sgml/gtkeditable.sgml">
+<!entity GtkOldEditable SYSTEM "sgml/gtkoldeditable.sgml">
<!entity GtkEntry SYSTEM "sgml/gtkentry.sgml">
<!entity GtkEventBox SYSTEM "sgml/gtkeventbox.sgml">
<!entity GtkFileSelection SYSTEM "sgml/gtkfilesel.sgml">
@@ -41,6 +42,7 @@
<!entity GtkHSeparator SYSTEM "sgml/gtkhseparator.sgml">
<!entity GtkImage SYSTEM "sgml/gtkimage.sgml">
<!entity GtkIMContext SYSTEM "sgml/gtkimcontext.sgml">
+<!entity GtkIMContextSimple SYSTEM "sgml/gtkimcontextsimple.sgml">
<!entity GtkIMMulticontext SYSTEM "sgml/gtkimmulticontext.sgml">
<!entity GtkInputDialog SYSTEM "sgml/gtkinputdialog.sgml">
<!entity GtkInvisible SYSTEM "sgml/gtkinvisible.sgml">
@@ -54,7 +56,7 @@
<!entity GtkMenuBar SYSTEM "sgml/gtkmenubar.sgml">
<!entity GtkMenuItem SYSTEM "sgml/gtkmenuitem.sgml">
<!entity GtkMenuShell SYSTEM "sgml/gtkmenushell.sgml">
-<!entity gtk-GtkMessageDialog SYSTEM "sgml/gtkmessagedialog.sgml">
+<!entity GtkMessageDialog SYSTEM "sgml/gtkmessagedialog.sgml">
<!entity GtkMisc SYSTEM "sgml/gtkmisc.sgml">
<!entity GtkNotebook SYSTEM "sgml/gtknotebook.sgml">
<!entity GtkObject SYSTEM "sgml/gtkobject.sgml">
@@ -92,7 +94,8 @@
<!entity GtkTooltips SYSTEM "sgml/gtktooltips.sgml">
<!entity GtkTree SYSTEM "sgml/gtktree.sgml">
<!entity GtkTreeItem SYSTEM "sgml/gtktreeitem.sgml">
-<!entity gtk-gtktreemodel SYSTEM "sgml/gtktreemodel.sgml">
+<!entity gtk-GtkTreeModel SYSTEM "sgml/gtktreemodel.sgml">
+<!entity gtk-GtkTreeModelSort SYSTEM "sgml/gtktreemodelsort.sgml">
<!entity gtk-GtkTreeSelection SYSTEM "sgml/gtktreeselection.sgml">
<!entity gtk-GtkTreeStore SYSTEM "sgml/gtktreestore.sgml">
<!entity gtk-GtkTreeViewColumn SYSTEM "sgml/gtktreeviewcolumn.sgml">
@@ -129,6 +132,8 @@
<!entity gtk-Types SYSTEM "sgml/gtktypeutils.sgml">
<!entity gtk-Bindings SYSTEM "sgml/gtkbindings.sgml">
<!entity gtk-Standard-Enumerations SYSTEM "sgml/gtkenums.sgml">
+<!entity gtk-Stock-Items SYSTEM "sgml/gtkstock.sgml">
+<!entity gtk-Themeable-Stock-Images SYSTEM "sgml/gtkiconfactory.sgml">
<!entity index-Object-Tree SYSTEM "sgml/tree_index.sgml">
@@ -193,13 +198,16 @@ An advanced widget set.
&gtk-Feature-Test-Macros;
&gtk-Graphics-Contexts;
&gtk-Styles;
- &gtk-Themes;
+<!-- &gtk-Themes; -->
&gtk-Resource-Files;
&gtk-Keyboard-Accelerators;
&gtk-Selections;
+ &gtk-Clipboards;
&gtk-Drag-and-Drop;
&gtk-Signals;
&gtk-Object-Properties;
+ &gtk-Stock-Items;
+ &gtk-Themeable-Stock-Images;
&gtk-Types;
&gtk-Bindings;
&gtk-Standard-Enumerations;
@@ -218,6 +226,7 @@ An advanced widget set.
<title>Windows</title>
&GtkDialog;
&GtkInvisible;
+ &GtkMessageDialog;
&GtkPlug;
&GtkWindow;
</sect1>
@@ -262,12 +271,13 @@ An advanced widget set.
<sect1 id="TreeWidgetObjects">
<title>Tree and List Widget</title>
&gtk-TreeWidget;
- &gtk-gtktreemodel;
+ &gtk-GtkTreeModel;
&gtk-GtkTreeSelection;
&gtk-GtkTreeStore;
&gtk-GtkTreeViewColumn;
&gtk-GtkTreeView;
&gtk-GtkModelSimple;
+ &gtk-GtkTreeModelSort;
&gtk-GtkCellRenderer;
&gtk-GtkCellRendererPixbuf;
&gtk-GtkCellRendererText;
@@ -349,7 +359,8 @@ An advanced widget set.
&GtkBin;
&GtkBox;
&GtkContainer;
- &GtkEditable;
+ &gtk-GtkEditable;
+ &GtkOldEditable;
&GtkButtonBox;
&GtkMisc;
&GtkObject;
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 44bcc3e857..01814ee0e6 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -645,18 +645,16 @@ GTK_DRAWING_AREA_GET_CLASS
<SECTION>
<FILE>gtkeditable</FILE>
GtkEditable
-GtkTextFunction
<TITLE>GtkEditable</TITLE>
gtk_editable_select_region
+gtk_editable_get_selection_bounds
gtk_editable_insert_text
gtk_editable_delete_text
gtk_editable_get_chars
gtk_editable_cut_clipboard
gtk_editable_copy_clipboard
gtk_editable_paste_clipboard
-gtk_editable_claim_selection
gtk_editable_delete_selection
-gtk_editable_changed
gtk_editable_set_position
gtk_editable_get_position
gtk_editable_set_editable
@@ -671,6 +669,23 @@ GTK_EDITABLE_GET_CLASS
</SECTION>
<SECTION>
+<FILE>gtkoldeditable</FILE>
+<TITLE>GtkOldEditable</TITLE>
+GtkOldEditable
+GtkTextFunction
+gtk_old_editable_claim_selection
+gtk_old_editable_changed
+<SUBSECTION Standard>
+GTK_OLD_EDITABLE
+GTK_IS_OLD_EDITABLE
+GTK_TYPE_OLD_EDITABLE
+gtk_old_editable_get_type
+GTK_OLD_EDITABLE_CLASS
+GTK_IS_OLD_EDITABLE_CLASS
+GTK_OLD_EDITABLE_GET_CLASS
+</SECTION>
+
+<SECTION>
<FILE>gtkentry</FILE>
<TITLE>GtkEntry</TITLE>
GtkEntry
@@ -683,6 +698,7 @@ gtk_entry_set_position
gtk_entry_get_text
gtk_entry_select_region
gtk_entry_set_visibility
+gtk_entry_set_invisible_char
gtk_entry_set_editable
gtk_entry_set_max_length
<SUBSECTION Standard>
@@ -1002,6 +1018,7 @@ gtk_im_context_get_preedit_string
gtk_im_context_filter_keypress
gtk_im_context_focus_in
gtk_im_context_focus_out
+gtk_im_context_reset
<SUBSECTION Standard>
GTK_IM_CONTEXT
GTK_IS_IM_CONTEXT
@@ -1017,6 +1034,7 @@ GTK_IM_CONTEXT_GET_CLASS
<TITLE>GtkIMMulticontext</TITLE>
GtkIMMulticontext
gtk_im_multicontext_new
+gtk_im_multicontext_append_menuitems
<SUBSECTION Standard>
GTK_IM_MULTICONTEXT
GTK_IS_IM_MULTICONTEXT
@@ -1299,6 +1317,8 @@ gtk_menu_item_configure
gtk_menu_item_select
gtk_menu_item_deselect
gtk_menu_item_activate
+gtk_menu_item_toggle_size_request
+gtk_menu_item_toggle_size_allocate
gtk_menu_item_right_justify
<SUBSECTION Standard>
GTK_MENU_ITEM
@@ -2024,7 +2044,6 @@ 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_tags
gtk_text_buffer_modified
gtk_text_buffer_set_modified
gtk_text_buffer_delete_selection
@@ -2068,6 +2087,7 @@ gtk_text_iter_begins_tag
gtk_text_iter_ends_tag
gtk_text_iter_toggles_tag
gtk_text_iter_has_tag
+gtk_text_iter_get_tags
gtk_text_iter_editable
gtk_text_iter_starts_line
gtk_text_iter_ends_line
@@ -2112,7 +2132,7 @@ gtk_text_iter_spew
<TITLE>GtkTextMark</TITLE>
GtkTextMark
gtk_text_mark_set_visible
-gtk_text_mark_is_visible
+gtk_text_mark_get_visible
gtk_text_mark_get_deleted
gtk_text_mark_get_name
<SUBSECTION Standard>
@@ -2323,7 +2343,7 @@ GTK_TOOLTIPS_GET_CLASS
GtkTree
GTK_IS_ROOT_TREE
GTK_TREE_ROOT_TREE
-GTK_TREE_SELECTION
+GTK_TREE_SELECTION_OLD
GtkTreeViewMode
<TITLE>GtkTree</TITLE>
gtk_tree_new
@@ -2382,6 +2402,7 @@ GtkTreeIter
GtkTreePath
GtkTreeModel
GtkTreeModelIface
+GtkTreeModelFlags
gtk_tree_path_new
gtk_tree_path_new_from_string
gtk_tree_path_to_string
@@ -2397,6 +2418,9 @@ gtk_tree_path_next
gtk_tree_path_prev
gtk_tree_path_up
gtk_tree_path_down
+gtk_tree_iter_copy
+gtk_tree_iter_free
+gtk_tree_model_get_flags
gtk_tree_model_get_n_columns
gtk_tree_model_get_column_type
gtk_tree_model_get_iter
@@ -2408,6 +2432,8 @@ gtk_tree_model_iter_has_child
gtk_tree_model_iter_n_children
gtk_tree_model_iter_nth_child
gtk_tree_model_iter_parent
+gtk_tree_model_ref_iter
+gtk_tree_model_unref_iter
<SUBSECTION Standard>
GTK_TREE_MODEL
GTK_IS_TREE_MODEL
@@ -2416,6 +2442,27 @@ gtk_tree_model_get_type
</SECTION>
<SECTION>
+<FILE>gtktreemodelsort</FILE>
+<TITLE>GtkTreeModelSort</TITLE>
+GtkTreeModelSort
+GValueCompareFunc
+gtk_tree_model_sort_new
+gtk_tree_model_sort_new_with_model
+gtk_tree_model_sort_set_model
+gtk_tree_model_sort_set_sort_col
+gtk_tree_model_sort_set_compare
+gtk_tree_model_sort_resort
+gtk_tree_model_sort_convert_path
+<SUBSECTION Standard>
+GTK_TREE_MODEL_SORT
+GTK_IS_TREE_MODEL_SORT
+GTK_TYPE_TREE_MODEL_SORT
+gtk_tree_model_sort_get_type
+GTK_TREE_MODEL_SORT_CLASS
+GTK_IS_TREE_MODEL_SORT_CLASS
+</SECTION>
+
+<SECTION>
<FILE>gtktreeselection</FILE>
GtkTreeSelectionType
GtkTreeSelectionFunc
@@ -2450,7 +2497,7 @@ GTK_IS_TREE_SELECTION_CLASS
<TITLE>GtkTreeStore</TITLE>
GtkTreeStore
gtk_tree_store_new
-gtk_tree_store_new_with_values
+gtk_tree_store_new_with_types
gtk_tree_store_set_n_columns
gtk_tree_store_set_column_type
gtk_tree_store_set_cell
@@ -2557,6 +2604,7 @@ GtkTreeViewPrivate
<SECTION>
<FILE>gtkmodelsimple</FILE>
<TITLE>GtkModelSimple</TITLE>
+GtkModelSimple
gtk_model_simple_new
gtk_model_simple_node_changed
gtk_model_simple_node_inserted
@@ -3059,6 +3107,7 @@ gtk_key_snooper_remove
<SUBSECTION>
gtk_get_current_event
+gtk_get_current_event_time
gtk_get_event_widget
gtk_propagate_event
@@ -3188,12 +3237,14 @@ GTK_STYLE_GET_CLASS
<SECTION>
<FILE>gtkthemes</FILE>
<TITLE>Themes</TITLE>
+<SUBSECTION Private>
GtkThemeEngine
gtk_theme_engine_get
-gtk_theme_engine_ref
-gtk_theme_engine_unref
gtk_theme_engine_create_rc_style
-gtk_theme_engine_register_type
+GTK_THEME_ENGINE
+GTK_IS_THEME_ENGINE
+GTK_TYPE_THEME_ENGINE
+gtk_theme_engine_get_type
</SECTION>
<SECTION>
@@ -3220,6 +3271,8 @@ gtk_rc_parse_priority
gtk_rc_find_module_in_path
gtk_rc_find_pixmap_in_path
gtk_rc_get_module_dir
+gtk_rc_get_im_module_path
+gtk_rc_get_im_module_file
gtk_rc_get_theme_dir
gtk_rc_set_image_loader
gtk_rc_load_image
@@ -3290,8 +3343,11 @@ gtk_target_list_find
gtk_selection_owner_set
gtk_selection_add_target
gtk_selection_add_targets
+gtk_selection_clear_targets
gtk_selection_convert
gtk_selection_data_set
+gtk_selection_data_set_text
+gtk_selection_data_get_text
gtk_selection_remove_all
gtk_selection_data_copy
gtk_selection_data_free
@@ -3356,8 +3412,6 @@ gtk_drag_dest_handle_event
<FILE>gtksignal</FILE>
<TITLE>Signals</TITLE>
GTK_SIGNAL_OFFSET
-GtkSignalMarshal
-GtkSignalDestroy
GtkEmissionHook
GtkSignalRunType
gtk_signal_init
@@ -3389,12 +3443,12 @@ gtk_signal_handler_unblock_by_func
gtk_signal_handler_unblock_by_data
gtk_signal_handler_pending
gtk_signal_handler_pending_by_func
-gtk_signal_handler_pending_by_id
-gtk_signal_handlers_destroy
-gtk_signal_set_funcs
gtk_signal_add_emission_hook
-gtk_signal_add_emission_hook_full
gtk_signal_remove_emission_hook
+gtk_signal_default_marshaller
+
+<SUBSECTION Private>
+gtk_signal_compat_matched
</SECTION>
<SECTION>
diff --git a/docs/reference/gtk/gtk.hierarchy b/docs/reference/gtk/gtk.hierarchy
index 8c2379d4a3..411ccae3c8 100644
--- a/docs/reference/gtk/gtk.hierarchy
+++ b/docs/reference/gtk/gtk.hierarchy
@@ -30,6 +30,7 @@ GtkObject
GtkFileSelection
GtkFontSelectionDialog
GtkInputDialog
+ GtkMessageDialog
GtkPlug
GtkEventBox
GtkHandleBox
@@ -67,10 +68,8 @@ GtkObject
GtkCalendar
GtkDrawingArea
GtkCurve
- GtkEditable
- GtkEntry
- GtkSpinButton
- GtkText
+ GtkEntry
+ GtkSpinButton
GtkRuler
GtkHRuler
GtkVRuler
@@ -85,6 +84,8 @@ GtkObject
GtkHSeparator
GtkVSeparator
GtkInvisible
+ GtkOldEditable
+ GtkText
GtkPreview
GtkProgress
GtkProgressBar
diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types
index 8ad7b8c1e4..dfc7230fc1 100644
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -22,7 +22,6 @@ gtk_curve_get_type
gtk_data_get_type
gtk_dialog_get_type
gtk_drawing_area_get_type
-gtk_editable_get_type
gtk_entry_get_type
gtk_event_box_get_type
gtk_file_selection_get_type
@@ -54,8 +53,10 @@ gtk_menu_get_type
gtk_menu_bar_get_type
gtk_menu_item_get_type
gtk_menu_shell_get_type
+gtk_message_dialog_get_type
gtk_misc_get_type
gtk_notebook_get_type
+gtk_old_editable_get_type
gtk_object_get_type
gtk_option_menu_get_type
gtk_packer_get_type
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index d3873e1341..ba6f81c0f9 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -2,6 +2,15 @@
Debugging
+<!-- ##### SIGNAL GtkEditable::cut-clipboard ##### -->
+<para>
+An action signal. Causes the characters in the current
+selection to be copied to the clipboard and then deleted from
+the widget.
+</para>
+
+@editable: the object which received the signal.
+
<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Short_Description ##### -->
@@ -110,12 +119,29 @@ void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object,
@Returns:
+<!-- ##### FUNCTION gtk_theme_engine_create_rc_style ##### -->
+<para>
+
+</para>
+
+@engine:
+@Returns:
+
<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT ##### -->
<para>
</para>
+<!-- ##### FUNCTION gtk_tree_store_new_with_values ##### -->
+<para>
+
+</para>
+
+@n_columns:
+@Varargs:
+@Returns:
+
<!-- ##### SIGNAL GtkTextView::insert ##### -->
<para>
@@ -152,6 +178,13 @@ void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object,
</para>
+<!-- ##### ARG GtkEditable:editable ##### -->
+<para>
+A boolean indicating whether the widget is editable by
+the user.
+</para>
+
+
<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:See_Also ##### -->
<para>
@@ -210,20 +243,20 @@ A structure used to return values from @gtk_type_query.
@object_size:
@class_size:
-<!-- ##### MACRO gtk_widget_pop_visual ##### -->
+<!-- ##### FUNCTION gtk_text_buffer_get_clipboard_contents ##### -->
<para>
</para>
-@v:
+@buffer:
+@Returns:
-<!-- ##### FUNCTION gtk_text_buffer_get_clipboard_contents ##### -->
+<!-- ##### MACRO gtk_widget_pop_visual ##### -->
<para>
</para>
-@buffer:
-@Returns:
+@v:
<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK ##### -->
<para>
@@ -306,6 +339,21 @@ to gtk_signal_remove_emission_hook()).
@x:
@y:
+<!-- ##### STRUCT GtkThemeEngine ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_tags ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@Returns:
+
<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Short_Description ##### -->
@@ -317,6 +365,14 @@ Get the type of GtkIdentifier.
@Returns: GtkType -- the enumerated type of something.
+<!-- ##### FUNCTION gtk_theme_engine_get ##### -->
+<para>
+
+</para>
+
+@name:
+@Returns:
+
<!-- ##### MACRO gtk_marshal_BOOL__POINTER_INT_INT_UINT ##### -->
<para>
@@ -333,6 +389,13 @@ Get the type of GtkIdentifier.
@func_data:
@args:
+<!-- ##### FUNCTION gtk_theme_engine_ref ##### -->
+<para>
+
+</para>
+
+@engine:
+
<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT ##### -->
<para>
@@ -367,6 +430,35 @@ Get the type of GtkIdentifier.
</para>
+<!-- ##### SIGNAL GtkEditable::set-editable ##### -->
+<para>
+Determines if the user can edit the text in the editable
+widget or not. This is meant to be overriden by
+child classes and should not generally useful to
+applications.
+</para>
+
+@editable: the object which received the signal.
+@is_editable: %TRUE if the user is allowed to edit the text
+ in the widget.
+
+<!-- ##### SIGNAL GtkEditable::delete-text ##### -->
+<para>
+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()
+</para>
+
+@editable: the object which received the signal.
+@start_pos: the starting position.
+@end_pos: the end position.
+
<!-- ##### FUNCTION gtk_ruler_draw_ticks ##### -->
<para>
@@ -374,14 +466,14 @@ Get the type of GtkIdentifier.
@ruler: the gtkruler
-<!-- ##### FUNCTION gtk_selection_data_set_text ##### -->
+<!-- ##### SIGNAL GtkEditable::kill-line ##### -->
<para>
-
+An action signal. Delete a single line.
</para>
-@selection_data:
-@str:
-@Returns:
+@editable: the object which received the signal.
+@direction: the direction in which to delete. Positive
+ indicates forward deletion, negative, backwards deletion.
<!-- ##### FUNCTION gtk_themes_init ##### -->
<para>
@@ -485,6 +577,13 @@ Convert a gtk type into its sequence number
@textview: the object which received the signal.
+<!-- ##### FUNCTION gtk_theme_engine_unref ##### -->
+<para>
+
+</para>
+
+@engine:
+
<!-- ##### STRUCT GtkDialogButton ##### -->
<para>
Deprecated.
@@ -517,6 +616,17 @@ Deprecated.
@interactive:
@default_editable:
+<!-- ##### SIGNAL GtkEditable::activate ##### -->
+<para>
+Indicates that the user has activated the widget
+in some fashion. Generally, this will be done
+with a keystroke. (The default binding for this
+action is Return for #GtkEntry and
+Control-Return for #GtkText.)
+</para>
+
+@editable: the object which received the signal.
+
<!-- ##### ENUM GtkTextViewMovementStep ##### -->
<para>
@@ -553,6 +663,14 @@ Deprecated.
@obj:
+<!-- ##### SIGNAL GtkEditable::copy-clipboard ##### -->
+<para>
+An action signal. Causes the characters in the current selection to
+be copied to the clipboard.
+</para>
+
+@editable: the object which received the signal.
+
<!-- ##### FUNCTION gtk_menu_factory_remove_entries ##### -->
<para>
@@ -594,16 +712,6 @@ Deprecated.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
-<para>
-Internal function used by #GtkHPaned and #GtkVPaned
-</para>
-
-@paned:
-@allocation:
-@child1_req:
-@child2_req:
-
<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT_BOOL ##### -->
<para>
@@ -614,6 +722,16 @@ Internal function used by #GtkHPaned and #GtkVPaned
@func_data:
@args:
+<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
+<para>
+Internal function used by #GtkHPaned and #GtkVPaned
+</para>
+
+@paned:
+@allocation:
+@child1_req:
+@child2_req:
+
<!-- ##### MACRO gtk_marshal_NONE__POINTER_STRING_STRING ##### -->
<para>
@@ -687,6 +805,15 @@ Return the pointer to the type's children's types.
@type: GtkType
@Returns: pointer to a GList
+<!-- ##### SIGNAL GtkEditable::move-page ##### -->
+<para>
+An action signal. Move the cursor by pages.
+</para>
+
+@editable: the object which received the signal.
+@x: Number of pages to move the cursor horizontally.
+@y: Number of pages to move the cursor vertically.
+
<!-- ##### FUNCTION gtk_type_register_flags ##### -->
<para>
Register a new set of flags @values and give them the name in
@@ -705,14 +832,6 @@ Register a new set of flags @values and give them the name in
@textview: the object which received the signal.
@arg1:
-<!-- ##### FUNCTION gtk_selection_clear_targets ##### -->
-<para>
-
-</para>
-
-@widget:
-@selection:
-
<!-- ##### ENUM GtkPrivateFlags ##### -->
<para>
@@ -766,6 +885,14 @@ show the size if @show_size is true.
@type: GtkType
@show_size: gboolean
+<!-- ##### FUNCTION gtk_text_mark_is_visible ##### -->
+<para>
+
+</para>
+
+@mark:
+@Returns:
+
<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT_INT ##### -->
<para>
@@ -776,6 +903,15 @@ show the size if @show_size is true.
@func_data:
@args:
+<!-- ##### SIGNAL GtkEditable::kill-char ##### -->
+<para>
+An action signal. Delete a single character.
+</para>
+
+@editable: the object which received the signal.
+@direction: the direction in which to delete. Positive
+ indicates forward deletion, negative, backwards deletion.
+
<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Long_Description ##### -->
<para>
@@ -810,6 +946,25 @@ show the size if @show_size is true.
@mask:
@Returns:
+<!-- ##### SIGNAL GtkEditable::kill-word ##### -->
+<para>
+An action signal. Delete a single word.
+</para>
+
+@editable: the object which received the signal.
+@direction: the direction in which to delete. Positive
+ indicates forward deletion, negative, backwards deletion.
+
+<!-- ##### FUNCTION gtk_im_context_simple_add_table ##### -->
+<para>
+
+</para>
+
+@context_simple:
+@data:
+@max_seq_len:
+@n_seqs:
+
<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_UINT ##### -->
<para>
@@ -937,6 +1092,14 @@ Get the varargs type associated with @foreign_type
@foreign_type: GtkType
@Returns: GtkType
+<!-- ##### SIGNAL GtkEditable::changed ##### -->
+<para>
+Indicates that the user has changed the contents
+of the widget.
+</para>
+
+@editable: the object which received the signal.
+
<!-- ##### STRUCT GtkMenuFactory ##### -->
<para>
@@ -1068,14 +1231,6 @@ unless #may_be_blocked was specified. FALSE otherwise.
@wid:
-<!-- ##### FUNCTION gtk_selection_data_get_text ##### -->
-<para>
-
-</para>
-
-@selection_data:
-@Returns:
-
<!-- ##### FUNCTION gtk_marshal_BOOL__NONE ##### -->
<para>
@@ -1126,6 +1281,17 @@ Given the type of an object and a pointer to it, the object is freed.
Private Information
+<!-- ##### FUNCTION gtk_theme_engine_register_type ##### -->
+<para>
+
+</para>
+
+@engine:
+@parent_type:
+@type_name:
+@type_info:
+@Returns:
+
<!-- ##### FUNCTION gtk_menu_factory_find ##### -->
<para>
@@ -1146,6 +1312,15 @@ Private Information
@callback_data:
@widget:
+<!-- ##### SIGNAL GtkEditable::paste-clipboard ##### -->
+<para>
+An action signal. Causes the contents of the clipboard to
+be pasted into the editable widget at the current cursor
+position.
+</para>
+
+@editable: the object which received the signal.
+
<!-- ##### FUNCTION gtk_window_add_embedded_xid ##### -->
<para>
@@ -1201,6 +1376,15 @@ really an implementation detail).</para></listitem>
</para>
+<!-- ##### SIGNAL GtkEditable::move-word ##### -->
+<para>
+An action signal. Move the cursor by words.
+</para>
+
+@editable: the object which received the signal.
+@num_words: The number of words to move the
+cursor. (Can be negative).
+
<!-- ##### STRUCT GtkTreeViewPrivate ##### -->
<para>
@@ -1263,6 +1447,17 @@ really an implementation detail).</para></listitem>
@GTK_TEXT_DELETE_WHITESPACE:
@GTK_TEXT_DELETE_WHITESPACE_LEAVE_ONE:
+<!-- ##### STRUCT GtkIMContextSimple ##### -->
+<para>
+
+</para>
+
+@object:
+@tables:
+@compose_buffer:
+@tentative_match:
+@tentative_match_len:
+
<!-- ##### MACRO GTK_TYPE_FLAT_FIRST ##### -->
<para>
The first "flat" (no struct) enumerated type value.
@@ -1290,23 +1485,31 @@ The first "flat" (no struct) enumerated type value.
@buffer:
-<!-- ##### MACRO gtk_signal_default_marshaller ##### -->
+<!-- ##### STRUCT GtkTextTabArray ##### -->
<para>
-A marshaller that returns void and takes no extra parameters.
+
</para>
-<!-- ##### STRUCT GtkTextTabArray ##### -->
+<!-- ##### ARG GtkTextTag:overstrike ##### -->
<para>
</para>
-<!-- ##### ARG GtkTextTag:overstrike ##### -->
+<!-- ##### MACRO GTK_TREE_SELECTION ##### -->
<para>
+A macro that returns a GList that contains the selection of the root tree of @obj.
+</para>
+@obj: A pointer to the #GtkTree. @obj will accept any pointer, but it the pointer does not point to a #GtkTree, the results are undefined.
+
+<!-- ##### FUNCTION gtk_editable_changed ##### -->
+<para>
+Causes the "changed" signal to be emitted.
</para>
+@editable: a #GtkEditable widget.
<!-- ##### SIGNAL GtkTextView::move ##### -->
<para>
@@ -1341,6 +1544,34 @@ A marshaller that returns void and takes no extra parameters.
@mark:
@Returns:
+<!-- ##### SIGNAL GtkEditable::insert-text ##### -->
+<para>
+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.
+</para>
+
+@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.
+
+<!-- ##### FUNCTION gtk_editable_claim_selection ##### -->
+<para>
+Claim or disclaim ownership of the PRIMARY X selection.
+</para>
+
+@editable: a #GtkEditable widget.
+@claim: if %TRUE, claim the selection, otherwise, disclaim it.
+@time: the timestamp for claiming the selection.
+
<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT ##### -->
<para>
@@ -1358,6 +1589,15 @@ Get the array of signals defined for this object.
@obj: the object to fetch the signals from.
+<!-- ##### SIGNAL GtkEditable::move-to-column ##### -->
+<para>
+An action signal. Move the cursor to the given column.
+</para>
+
+@editable: the object which received the signal.
+@column: the column to move to. (A negative value indicates
+ the last column)
+
<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Title ##### -->
gtkenums.sgml
@@ -1372,6 +1612,14 @@ gtkenums.sgml
@func_data:
@args:
+<!-- ##### USER_FUNCTION GtkMenuCallback ##### -->
+<para>
+
+</para>
+
+@widget:
+@user_data:
+
<!-- ##### FUNCTION gtk_type_check_object_cast ##### -->
<para>
Given a pointer to a GtkTypeObject @type_object, and a GtkType @cast_type,
@@ -1382,14 +1630,6 @@ make sure that it's okay to cast @type_object into a @cast_type.
@cast_type: GtkType
@Returns: the same GtkTypeObject* as @type_object
-<!-- ##### USER_FUNCTION GtkMenuCallback ##### -->
-<para>
-
-</para>
-
-@widget:
-@user_data:
-
<!-- ##### FUNCTION gtk_themes_exit ##### -->
<para>
@@ -1407,9 +1647,9 @@ make sure that it's okay to cast @type_object into a @cast_type.
@func_data:
@args:
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Long_Description ##### -->
+<!-- ##### ARG GtkEditable:text_position ##### -->
<para>
-
+The position of the cursor.
</para>
@@ -1419,6 +1659,12 @@ make sure that it's okay to cast @type_object into a @cast_type.
</para>
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
<!-- ##### FUNCTION gtk_type_set_varargs_type ##### -->
<para>
Set the varargs type for a fundamental type @foreign_type.
@@ -1510,6 +1756,15 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS
@entries:
@nentries:
+<!-- ##### SIGNAL GtkEditable::move-to-row ##### -->
+<para>
+An action signal. Move the cursor to the given row.
+</para>
+
+@editable: the object which received the signal.
+@row: the row to move to. (A negative value indicates
+ the last row)
+
<!-- ##### FUNCTION gtk_signal_set_funcs ##### -->
<para>
These set default functions to call when the user didn't
@@ -1558,6 +1813,15 @@ gtk_font_selection_set_filter().
@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the
'Filter' page of the #GtkFontSelection widget.
+<!-- ##### SIGNAL GtkEditable::move-cursor ##### -->
+<para>
+An action signal. Move the cursor position.
+</para>
+
+@editable: the object which received the signal.
+@x: horizontal distance to move the cursor.
+@y: vertical distance to move the cursor.
+
<!-- ##### FUNCTION gtk_type_parent_class ##### -->
<para>
Return the class of the parent. Initialize the class if necessary.
@@ -1722,11 +1986,12 @@ object.
@arg1:
@arg2:
-<!-- ##### MACRO gtk_marshal_ENUM__ENUM ##### -->
+<!-- ##### FUNCTION gtk_container_register_toplevel ##### -->
<para>
</para>
+@container:
<!-- ##### MACRO gtk_widget_push_visual ##### -->
<para>
@@ -1736,12 +2001,11 @@ object.
@v:
@visual:
-<!-- ##### FUNCTION gtk_container_register_toplevel ##### -->
+<!-- ##### MACRO gtk_marshal_ENUM__ENUM ##### -->
<para>
</para>
-@container:
<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Title ##### -->
GtkIMContextSimple
diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml
index 087d675bcc..f5a3497aeb 100644
--- a/docs/reference/gtk/tmpl/gtkeditable.sgml
+++ b/docs/reference/gtk/tmpl/gtkeditable.sgml
@@ -91,20 +91,6 @@ editable by the user.</entry>
</tbody></tgroup></informaltable>
</para>
-@current_pos:
-@selection_start_pos:
-@selection_end_pos:
-@has_selection:
-
-<!-- ##### USER_FUNCTION GtkTextFunction ##### -->
-<para>
-Callback function for old method of setting key bindings.
-No longer publically used.
-</para>
-
-@editable:
-@time:
-
<!-- ##### FUNCTION gtk_editable_select_region ##### -->
<para>
@@ -121,6 +107,17 @@ of the text.
@end: the end position.
+<!-- ##### FUNCTION gtk_editable_get_selection_bounds ##### -->
+<para>
+
+</para>
+
+@editable:
+@start:
+@end:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_editable_insert_text ##### -->
<para>
Insert text at a given position.
@@ -196,16 +193,6 @@ the given widget at the current cursor position.
@editable: a #GtkEditable widget.
-<!-- ##### FUNCTION gtk_editable_claim_selection ##### -->
-<para>
-Claim or disclaim ownership of the PRIMARY X selection.
-</para>
-
-@editable: a #GtkEditable widget.
-@claim: if %TRUE, claim the selection, otherwise, disclaim it.
-@time: the timestamp for claiming the selection.
-
-
<!-- ##### FUNCTION gtk_editable_delete_selection ##### -->
<para>
Deletes the current contents of the widgets selection and
@@ -215,14 +202,6 @@ disclaims the selection.
@editable: a #GtkEditable widget.
-<!-- ##### FUNCTION gtk_editable_changed ##### -->
-<para>
-Causes the "changed" signal to be emitted.
-</para>
-
-@editable: a #GtkEditable widget.
-
-
<!-- ##### FUNCTION gtk_editable_set_position ##### -->
<para>
Sets the cursor position.
@@ -264,179 +243,3 @@ widget or not.
in the widget.
-<!-- ##### SIGNAL GtkEditable::activate ##### -->
-<para>
-Indicates that the user has activated the widget
-in some fashion. Generally, this will be done
-with a keystroke. (The default binding for this
-action is Return for #GtkEntry and
-Control-Return for #GtkText.)
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::changed ##### -->
-<para>
-Indicates that the user has changed the contents
-of the widget.
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::copy-clipboard ##### -->
-<para>
-An action signal. Causes the characters in the current selection to
-be copied to the clipboard.
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::cut-clipboard ##### -->
-<para>
-An action signal. Causes the characters in the current
-selection to be copied to the clipboard and then deleted from
-the widget.
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::delete-text ##### -->
-<para>
-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()
-</para>
-
-@editable: the object which received the signal.
-@start_pos: the starting position.
-@end_pos: the end position.
-
-<!-- ##### SIGNAL GtkEditable::insert-text ##### -->
-<para>
-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.
-</para>
-
-@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.
-
-<!-- ##### SIGNAL GtkEditable::kill-char ##### -->
-<para>
-An action signal. Delete a single character.
-</para>
-
-@editable: the object which received the signal.
-@direction: the direction in which to delete. Positive
- indicates forward deletion, negative, backwards deletion.
-
-<!-- ##### SIGNAL GtkEditable::kill-line ##### -->
-<para>
-An action signal. Delete a single line.
-</para>
-
-@editable: the object which received the signal.
-@direction: the direction in which to delete. Positive
- indicates forward deletion, negative, backwards deletion.
-
-<!-- ##### SIGNAL GtkEditable::kill-word ##### -->
-<para>
-An action signal. Delete a single word.
-</para>
-
-@editable: the object which received the signal.
-@direction: the direction in which to delete. Positive
- indicates forward deletion, negative, backwards deletion.
-
-<!-- ##### SIGNAL GtkEditable::move-cursor ##### -->
-<para>
-An action signal. Move the cursor position.
-</para>
-
-@editable: the object which received the signal.
-@x: horizontal distance to move the cursor.
-@y: vertical distance to move the cursor.
-
-<!-- ##### SIGNAL GtkEditable::move-page ##### -->
-<para>
-An action signal. Move the cursor by pages.
-</para>
-
-@editable: the object which received the signal.
-@x: Number of pages to move the cursor horizontally.
-@y: Number of pages to move the cursor vertically.
-
-<!-- ##### SIGNAL GtkEditable::move-to-column ##### -->
-<para>
-An action signal. Move the cursor to the given column.
-</para>
-
-@editable: the object which received the signal.
-@column: the column to move to. (A negative value indicates
- the last column)
-
-<!-- ##### SIGNAL GtkEditable::move-to-row ##### -->
-<para>
-An action signal. Move the cursor to the given row.
-</para>
-
-@editable: the object which received the signal.
-@row: the row to move to. (A negative value indicates
- the last row)
-
-<!-- ##### SIGNAL GtkEditable::move-word ##### -->
-<para>
-An action signal. Move the cursor by words.
-</para>
-
-@editable: the object which received the signal.
-@num_words: The number of words to move the
-cursor. (Can be negative).
-
-<!-- ##### SIGNAL GtkEditable::paste-clipboard ##### -->
-<para>
-An action signal. Causes the contents of the clipboard to
-be pasted into the editable widget at the current cursor
-position.
-</para>
-
-@editable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkEditable::set-editable ##### -->
-<para>
-Determines if the user can edit the text in the editable
-widget or not. This is meant to be overriden by
-child classes and should not generally useful to
-applications.
-</para>
-
-@editable: the object which received the signal.
-@is_editable: %TRUE if the user is allowed to edit the text
- in the widget.
-
-<!-- ##### ARG GtkEditable:text_position ##### -->
-<para>
-The position of the cursor.
-</para>
-
-<!-- ##### ARG GtkEditable:editable ##### -->
-<para>
-A boolean indicating whether the widget is editable by
-the user.
-</para>
-
diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml
index 73d3b22735..6c95fceab0 100644
--- a/docs/reference/gtk/tmpl/gtkentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkentry.sgml
@@ -147,6 +147,15 @@ elsewhere.
as plaintext.
+<!-- ##### FUNCTION gtk_entry_set_invisible_char ##### -->
+<para>
+
+</para>
+
+@entry:
+@ch:
+
+
<!-- ##### FUNCTION gtk_entry_set_editable ##### -->
<para>
Determines if the user can edit the text in the editable
@@ -171,6 +180,104 @@ to fit.
@max: the new maximum length.
+<!-- ##### SIGNAL GtkEntry::activate ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::changed ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::copy-clipboard ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::cut-clipboard ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::delete-from-cursor ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### SIGNAL GtkEntry::delete-text ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### SIGNAL GtkEntry::insert-at-cursor ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL GtkEntry::insert-text ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+
+<!-- ##### SIGNAL GtkEntry::move-cursor ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+
+<!-- ##### SIGNAL GtkEntry::paste-clipboard ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### SIGNAL GtkEntry::toggle-overwrite ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
+<!-- ##### ARG GtkEntry:text_position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkEntry:editable ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG GtkEntry:max_length ##### -->
<para>
Determines the maximum allowed length of the contents
@@ -183,3 +290,8 @@ Determines whether the contents of the entry widget
are visible or not. See gtk_entry_set_visibility().
</para>
+<!-- ##### ARG GtkEntry:invisible_char ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml
index 4bf8736f8b..32e369676d 100644
--- a/docs/reference/gtk/tmpl/gtkimcontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml
@@ -37,6 +37,7 @@ GtkIMContext
@context:
@str:
@attrs:
+@cursor_pos:
<!-- ##### FUNCTION gtk_im_context_filter_keypress ##### -->
@@ -65,6 +66,14 @@ GtkIMContext
@context:
+<!-- ##### FUNCTION gtk_im_context_reset ##### -->
+<para>
+
+</para>
+
+@context:
+
+
<!-- ##### SIGNAL GtkIMContext::commit ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
index 3d4505917a..8a70aa8593 100644
--- a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
@@ -28,3 +28,12 @@ GtkIMMulticontext
@Returns:
+<!-- ##### FUNCTION gtk_im_multicontext_append_menuitems ##### -->
+<para>
+
+</para>
+
+@context:
+@menushell:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index 64ca0090d7..b4e8506f81 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -635,6 +635,14 @@ This macro is deprecated. You should use G_PRIORITY_LOW instead.
@Returns:
+<!-- ##### FUNCTION gtk_get_current_event_time ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
<!-- ##### FUNCTION gtk_get_event_widget ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index b113b13676..7ba3409198 100644
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -91,30 +91,33 @@ Creates a new #GtkMenu.
@Returns: a new #GtkMenu.
-<!-- ##### FUNCTION gtk_menu_append ##### -->
+<!-- ##### MACRO gtk_menu_append ##### -->
<para>
Adds a new #GtkMenuItem to the end of the menu's item list.
</para>
+<!-- # Unused Parameters # -->
@menu: a #GtkMenu.
@child: The #GtkMenuItem to add.
-<!-- ##### FUNCTION gtk_menu_prepend ##### -->
+<!-- ##### MACRO gtk_menu_prepend ##### -->
<para>
Adds a new #GtkMenuItem to the beginning of the menu's item list.
</para>
+<!-- # Unused Parameters # -->
@menu: a #GtkMenu.
@child: The #GtkMenuItem to add.
-<!-- ##### FUNCTION gtk_menu_insert ##### -->
+<!-- ##### MACRO gtk_menu_insert ##### -->
<para>
Adds a new #GtkMenuItem to the menu's item list at the position
indicated by @position.
</para>
+<!-- # Unused Parameters # -->
@menu: a #GtkMenu.
@child: The #GtkMenuItem to add.
@position: The position in the item list where @child is added.
@@ -289,6 +292,7 @@ and @y parameters to the coordinates where the menu is to be drawn.
menu shall be drawn. This is an output parameter.
@y: address of the #gint representing the vertical position where the
menu shall be drawn. This is an output parameter.
+@push_in:
@user_data: the data supplied by the user in the gtk_menu_popup() @data
parameter.
diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index 16cb5bca39..9f048eb50e 100644
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -124,6 +124,24 @@ Emits the "activate" signal on the given item
@menu_item: the menu item
+<!-- ##### FUNCTION gtk_menu_item_toggle_size_request ##### -->
+<para>
+
+</para>
+
+@menu_item:
+@requisition:
+
+
+<!-- ##### FUNCTION gtk_menu_item_toggle_size_allocate ##### -->
+<para>
+
+</para>
+
+@menu_item:
+@allocation:
+
+
<!-- ##### FUNCTION gtk_menu_item_right_justify ##### -->
<para>
Sets the menu item to be right-justified. Only useful for menu bars.
@@ -147,3 +165,19 @@ submenu. For normal applications, the relevant signal is "activate".
@menuitem: the object which received the signal.
+<!-- ##### SIGNAL GtkMenuItem::toggle-size-allocate ##### -->
+<para>
+
+</para>
+
+@menuitem: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL GtkMenuItem::toggle-size-request ##### -->
+<para>
+
+</para>
+
+@menuitem: the object which received the signal.
+@arg1:
+
diff --git a/docs/reference/gtk/tmpl/gtkmodelsimple.sgml b/docs/reference/gtk/tmpl/gtkmodelsimple.sgml
index 110f8b98fd..85479fed2b 100644
--- a/docs/reference/gtk/tmpl/gtkmodelsimple.sgml
+++ b/docs/reference/gtk/tmpl/gtkmodelsimple.sgml
@@ -14,6 +14,14 @@ GtkModelSimple
</para>
+<!-- ##### STRUCT GtkModelSimple ##### -->
+<para>
+
+</para>
+
+@parent:
+@stamp:
+
<!-- ##### FUNCTION gtk_model_simple_new ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index f79231d519..041bbddd55 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -609,6 +609,8 @@ specific portions of a RC file.
@GTK_RC_TOKEN_HIGHEST:
@GTK_RC_TOKEN_ENGINE:
@GTK_RC_TOKEN_MODULE_PATH:
+@GTK_RC_TOKEN_IM_MODULE_PATH:
+@GTK_RC_TOKEN_IM_MODULE_FILE:
@GTK_RC_TOKEN_STOCK:
@GTK_RC_TOKEN_LTR:
@GTK_RC_TOKEN_RTL:
@@ -800,6 +802,22 @@ theme engines.
@Returns: The directory. (Must be freed with g_free())
+<!-- ##### FUNCTION gtk_rc_get_im_module_path ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_rc_get_im_module_file ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
<!-- ##### FUNCTION gtk_rc_get_theme_dir ##### -->
<para>
Returns the standard directory in which themes should
diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index 32717f272d..eac6944811 100644
--- a/docs/reference/gtk/tmpl/gtkselection.sgml
+++ b/docs/reference/gtk/tmpl/gtkselection.sgml
@@ -184,6 +184,15 @@ for a given widget and selection.
@ntargets: number of entries in @targets
+<!-- ##### FUNCTION gtk_selection_clear_targets ##### -->
+<para>
+
+</para>
+
+@widget:
+@selection:
+
+
<!-- ##### FUNCTION gtk_selection_convert ##### -->
<para>
Request the contents of a selection. When received,
@@ -214,6 +223,25 @@ Null terminates the stored data.
@length: length of the data
+<!-- ##### FUNCTION gtk_selection_data_set_text ##### -->
+<para>
+
+</para>
+
+@selection_data:
+@str:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_selection_data_get_text ##### -->
+<para>
+
+</para>
+
+@selection_data:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_selection_remove_all ##### -->
<para>
Removes all handlers and unsets ownership of all
diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index 36043aa943..992da38806 100644
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -839,3 +839,10 @@ Delete an emission hook. (see gtk_signal_add_emission_hook())
@hook_id: the id of the emission handler, returned by add_emission_hook().
+<!-- ##### MACRO gtk_signal_default_marshaller ##### -->
+<para>
+A marshaller that returns void and takes no extra parameters.
+</para>
+
+
+
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
index 1f0247ebcf..c8f072322b 100644
--- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -462,16 +462,6 @@ types related to the text widget and how they work together.
@end:
-<!-- ##### FUNCTION gtk_text_buffer_get_tags ##### -->
-<para>
-
-</para>
-
-@buffer:
-@iter:
-@Returns:
-
-
<!-- ##### FUNCTION gtk_text_buffer_modified ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml
index 85a57a0573..4fd0e08ca5 100644
--- a/docs/reference/gtk/tmpl/gtktextiter.sgml
+++ b/docs/reference/gtk/tmpl/gtktextiter.sgml
@@ -232,6 +232,15 @@ types related to the text widget and how they work together.
@Returns:
+<!-- ##### FUNCTION gtk_text_iter_get_tags ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_text_iter_editable ##### -->
<para>
@@ -502,6 +511,7 @@ types related to the text widget and how they work together.
@iter:
@pred:
@user_data:
+@limit:
@Returns:
@@ -513,6 +523,7 @@ types related to the text widget and how they work together.
@iter:
@pred:
@user_data:
+@limit:
@Returns:
@@ -527,6 +538,7 @@ types related to the text widget and how they work together.
@slice:
@match_start:
@match_end:
+@limit:
@Returns:
@@ -541,6 +553,7 @@ types related to the text widget and how they work together.
@slice:
@match_start:
@match_end:
+@limit:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml
index 2af2ab2d55..d9a9964183 100644
--- a/docs/reference/gtk/tmpl/gtktextmark.sgml
+++ b/docs/reference/gtk/tmpl/gtktextmark.sgml
@@ -70,7 +70,7 @@ Marks are typically created using the gtk_text_buffer_create_mark() function.
@setting:
-<!-- ##### FUNCTION gtk_text_mark_is_visible ##### -->
+<!-- ##### FUNCTION gtk_text_mark_get_visible ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml
index 01e74955c1..7b7ea346da 100644
--- a/docs/reference/gtk/tmpl/gtktexttag.sgml
+++ b/docs/reference/gtk/tmpl/gtktexttag.sgml
@@ -310,6 +310,11 @@ A #PangoTabArray indicating tabs for this text. Only used if the tag
applies to the first character in a paragraph.
</para>
+<!-- ##### ARG GtkTextTag:invisible ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG GtkTextTag:background_set ##### -->
<para>
@@ -420,3 +425,8 @@ applies to the first character in a paragraph.
</para>
+<!-- ##### ARG GtkTextTag:invisible_set ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkthemes.sgml b/docs/reference/gtk/tmpl/gtkthemes.sgml
index cb26d3115c..a72f2efc5d 100644
--- a/docs/reference/gtk/tmpl/gtkthemes.sgml
+++ b/docs/reference/gtk/tmpl/gtkthemes.sgml
@@ -14,55 +14,3 @@ Themes
</para>
-<!-- ##### STRUCT GtkThemeEngine ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_theme_engine_get ##### -->
-<para>
-
-</para>
-
-@name:
-@Returns:
-
-
-<!-- ##### FUNCTION gtk_theme_engine_ref ##### -->
-<para>
-
-</para>
-
-@engine:
-
-
-<!-- ##### FUNCTION gtk_theme_engine_unref ##### -->
-<para>
-
-</para>
-
-@engine:
-
-
-<!-- ##### FUNCTION gtk_theme_engine_create_rc_style ##### -->
-<para>
-
-</para>
-
-@engine:
-@Returns:
-
-
-<!-- ##### FUNCTION gtk_theme_engine_register_type ##### -->
-<para>
-
-</para>
-
-@engine:
-@parent_type:
-@type_name:
-@type_info:
-@Returns:
-
-
diff --git a/docs/reference/gtk/tmpl/gtktree.sgml b/docs/reference/gtk/tmpl/gtktree.sgml
index b302b587c9..08cfbd3b5e 100644
--- a/docs/reference/gtk/tmpl/gtktree.sgml
+++ b/docs/reference/gtk/tmpl/gtktree.sgml
@@ -57,12 +57,12 @@ If @obj is already a root tree, @obj is cast to #GtkTree and returned.
@obj: A pointer to the #GtkTree. @obj will accept any pointer, but if the pointer does not point to a #GtkTree, the results are undefined.
-<!-- ##### MACRO GTK_TREE_SELECTION ##### -->
+<!-- ##### MACRO GTK_TREE_SELECTION_OLD ##### -->
<para>
-A macro that returns a GList that contains the selection of the root tree of @obj.
+
</para>
-@obj: A pointer to the #GtkTree. @obj will accept any pointer, but it the pointer does not point to a #GtkTree, the results are undefined.
+@obj:
<!-- ##### ENUM GtkTreeViewMode ##### -->
diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml
index 43f66c0a50..52a372fc36 100644
--- a/docs/reference/gtk/tmpl/gtktreemodel.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml
@@ -29,6 +29,8 @@ gtktreemodel
@stamp:
@tree_node:
+@tree_node2:
+@tree_node3:
<!-- ##### STRUCT GtkTreePath ##### -->
<para>
@@ -52,6 +54,7 @@ gtktreemodel
@inserted:
@child_toggled:
@deleted:
+@get_flags:
@get_n_columns:
@get_column_type:
@get_iter:
@@ -63,6 +66,15 @@ gtktreemodel
@iter_n_children:
@iter_nth_child:
@iter_parent:
+@ref_iter:
+@unref_iter:
+
+<!-- ##### ENUM GtkTreeModelFlags ##### -->
+<para>
+
+</para>
+
+@GTK_TREE_MODEL_ITERS_PERSIST:
<!-- ##### FUNCTION gtk_tree_path_new ##### -->
<para>
@@ -195,6 +207,32 @@ gtktreemodel
@path:
+<!-- ##### FUNCTION gtk_tree_iter_copy ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_tree_iter_free ##### -->
+<para>
+
+</para>
+
+@iter:
+
+
+<!-- ##### FUNCTION gtk_tree_model_get_flags ##### -->
+<para>
+
+</para>
+
+@tree_model:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_tree_model_get_n_columns ##### -->
<para>
@@ -310,3 +348,21 @@ gtktreemodel
@Returns:
+<!-- ##### FUNCTION gtk_tree_model_ref_iter ##### -->
+<para>
+
+</para>
+
+@tree_model:
+@iter:
+
+
+<!-- ##### FUNCTION gtk_tree_model_unref_iter ##### -->
+<para>
+
+</para>
+
+@tree_model:
+@iter:
+
+
diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml
index b3d566d5b2..21408a18b6 100644
--- a/docs/reference/gtk/tmpl/gtktreeselection.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml
@@ -86,6 +86,7 @@ GtkTreeSelection
</para>
@selection:
+@model:
@iter:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index d5171103b7..45ce767c77 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -34,7 +34,7 @@ GtkTreeStore
@Returns:
-<!-- ##### FUNCTION gtk_tree_store_new_with_values ##### -->
+<!-- ##### FUNCTION gtk_tree_store_new_with_types ##### -->
<para>
</para>