[gtk+] Make 3.0 parallel-installable to 2.x
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Make 3.0 parallel-installable to 2.x
- Date: Sat, 8 May 2010 05:25:48 +0000 (UTC)
commit 7447ef0fc24dc046b92b55e75c02ff0725b85680
Author: Matthias Clasen <mclasen redhat com>
Date: Sat May 8 01:18:53 2010 -0400
Make 3.0 parallel-installable to 2.x
In particular, rename
- libraries to lib*-3.0.so
- pc files to *-3.0.pc
- include paths to /usr/include/gtk-3.0/*
- module paths to /usr/lib/gtk-3.0/*
- rc files names to gtk-3.0/gtkrc
- commandline utilities to *-3.0
- adjust documentation
Also change the install location for unix-print headers to
/usr/include/gtk-3.0/unix-print/gtk.
Makefile.am | 57 +-
configure.ac | 22 +-
demos/Makefile.am | 4 +-
demos/gtk-demo/Makefile.am | 4 +-
docs/reference/gdk-pixbuf/Makefile.am | 8 +-
...xbuf-csource.xml => gdk-pixbuf-csource-3.0.xml} | 26 +-
...oaders.xml => gdk-pixbuf-query-loaders-3.0.xml} | 18 +-
docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 6 +-
docs/reference/gdk-pixbuf/tmpl/animation.sgml | 20 +-
docs/reference/gdk-pixbuf/tmpl/creating.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/file-loading.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/file-saving.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml | 4 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 30 +
.../tmpl/gdk-pixbuf-xlib-from-drawables.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml | 10 +
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 3 +
.../gdk-pixbuf/tmpl/initialization_versions.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/inline.sgml | 3 +
.../gdk-pixbuf/tmpl/module_interface.sgml | 4 +
docs/reference/gdk-pixbuf/tmpl/refcounting.sgml | 16 +-
docs/reference/gdk-pixbuf/tmpl/scaling.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/util.sgml | 3 +
docs/reference/gdk/tmpl/cairo_interaction.sgml | 3 +
docs/reference/gdk/tmpl/colors.sgml | 5 +
docs/reference/gdk/tmpl/cursors.sgml | 5 +
docs/reference/gdk/tmpl/dnd.sgml | 4 +
docs/reference/gdk/tmpl/drawing.sgml | 3 +
docs/reference/gdk/tmpl/event_structs.sgml | 3 +
docs/reference/gdk/tmpl/events.sgml | 7 +
docs/reference/gdk/tmpl/fonts.sgml | 3 +
docs/reference/gdk/tmpl/gcs.sgml | 3 +
docs/reference/gdk/tmpl/gdk-unused.sgml | 8 +
docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml | 4 +
docs/reference/gdk/tmpl/gdkdisplay.sgml | 4 +
docs/reference/gdk/tmpl/gdkdisplaymanager.sgml | 4 +
docs/reference/gdk/tmpl/gdkscreen.sgml | 4 +
docs/reference/gdk/tmpl/gdktesting.sgml | 3 +
docs/reference/gdk/tmpl/general.sgml | 18 +
docs/reference/gdk/tmpl/images.sgml | 3 +
docs/reference/gdk/tmpl/input.sgml | 3 +
docs/reference/gdk/tmpl/input_devices.sgml | 5 +
docs/reference/gdk/tmpl/keys.sgml | 13 +
docs/reference/gdk/tmpl/pango_interaction.sgml | 4 +
docs/reference/gdk/tmpl/pixbufs.sgml | 9 +
docs/reference/gdk/tmpl/pixmaps.sgml | 5 +
docs/reference/gdk/tmpl/properties.sgml | 3 +
docs/reference/gdk/tmpl/regions.sgml | 4 +
docs/reference/gdk/tmpl/rgb.sgml | 15 +-
docs/reference/gdk/tmpl/selections.sgml | 3 +
docs/reference/gdk/tmpl/threads.sgml | 6 +
docs/reference/gdk/tmpl/visuals.sgml | 8 +
docs/reference/gdk/tmpl/windows.sgml | 8 +-
docs/reference/gdk/tmpl/x_interaction.sgml | 8 +
docs/reference/gtk/Makefile.am | 15 +-
...der-convert.xml => gtk-builder-convert-3.0.xml} | 8 +-
docs/reference/gtk/gtk-docs.sgml | 6 +-
...modules-2.0.xml => gtk-query-immodules-3.0.xml} | 20 +-
...con-cache.xml => gtk-update-icon-cache-3.0.xml} | 44 +-
docs/reference/gtk/question_index.sgml | 2 +-
docs/reference/gtk/running.sgml | 92 +-
docs/reference/gtk/tmpl/gtk-unused.sgml | 4654 ++++++++++++++++++++
docs/reference/gtk/tmpl/gtkaccelmap.sgml | 4 +
docs/reference/gtk/tmpl/gtkactiongroup.sgml | 3 +
docs/reference/gtk/tmpl/gtkadjustment.sgml | 3 +
docs/reference/gtk/tmpl/gtkbindings.sgml | 29 +-
docs/reference/gtk/tmpl/gtkbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkcalendar.sgml | 26 +-
docs/reference/gtk/tmpl/gtkcelleditable.sgml | 3 +
docs/reference/gtk/tmpl/gtkcelllayout.sgml | 3 +
docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 3 +
docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml | 4 +
.../gtk/tmpl/gtkcellrendererprogress.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrendererspin.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrenderertext.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellview.sgml | 13 +-
docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 4 +
docs/reference/gtk/tmpl/gtkclipboard.sgml | 3 +
docs/reference/gtk/tmpl/gtkcolorbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkcolorsel.sgml | 31 +-
docs/reference/gtk/tmpl/gtkcolorseldlg.sgml | 3 +
docs/reference/gtk/tmpl/gtkcombobox.sgml | 5 +
docs/reference/gtk/tmpl/gtkcomboboxentry.sgml | 5 +
docs/reference/gtk/tmpl/gtkcontainer.sgml | 179 +-
docs/reference/gtk/tmpl/gtkdialog.sgml | 4 +
docs/reference/gtk/tmpl/gtkdnd.sgml | 25 +-
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 19 +-
docs/reference/gtk/tmpl/gtkeditable.sgml | 3 +
docs/reference/gtk/tmpl/gtkentry.sgml | 22 +
docs/reference/gtk/tmpl/gtkentrybuffer.sgml | 3 +
docs/reference/gtk/tmpl/gtkentrycompletion.sgml | 4 +
docs/reference/gtk/tmpl/gtkenums.sgml | 34 +-
docs/reference/gtk/tmpl/gtkeventbox.sgml | 4 +
docs/reference/gtk/tmpl/gtkexpander.sgml | 3 +
docs/reference/gtk/tmpl/gtkfeatures.sgml | 3 +
docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml | 25 +-
docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml | 13 +-
docs/reference/gtk/tmpl/gtkfilefilter.sgml | 4 +
docs/reference/gtk/tmpl/gtkfixed.sgml | 6 +
docs/reference/gtk/tmpl/gtkfontbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkfontsel.sgml | 13 +-
docs/reference/gtk/tmpl/gtkfontseldlg.sgml | 21 +-
docs/reference/gtk/tmpl/gtkframe.sgml | 3 +
docs/reference/gtk/tmpl/gtkgc.sgml | 3 +
docs/reference/gtk/tmpl/gtkhandlebox.sgml | 4 +
docs/reference/gtk/tmpl/gtkhbbox.sgml | 6 +
docs/reference/gtk/tmpl/gtkhpaned.sgml | 4 +
docs/reference/gtk/tmpl/gtkhruler.sgml | 4 +
docs/reference/gtk/tmpl/gtkhscale.sgml | 3 +
docs/reference/gtk/tmpl/gtkhscrollbar.sgml | 3 +
docs/reference/gtk/tmpl/gtkhseparator.sgml | 4 +
docs/reference/gtk/tmpl/gtkhsv.sgml | 4 +
docs/reference/gtk/tmpl/gtkiconfactory.sgml | 6 +
docs/reference/gtk/tmpl/gtkicontheme.sgml | 20 +
docs/reference/gtk/tmpl/gtkiconview.sgml | 4 +
docs/reference/gtk/tmpl/gtkimagemenuitem.sgml | 4 +
docs/reference/gtk/tmpl/gtkimcontext.sgml | 3 +
docs/reference/gtk/tmpl/gtkimcontextsimple.sgml | 4 +
docs/reference/gtk/tmpl/gtkimmulticontext.sgml | 4 +
docs/reference/gtk/tmpl/gtkinvisible.sgml | 4 +
docs/reference/gtk/tmpl/gtkitem.sgml | 3 +
docs/reference/gtk/tmpl/gtklabel.sgml | 23 +-
docs/reference/gtk/tmpl/gtklayout.sgml | 19 +-
docs/reference/gtk/tmpl/gtklinkbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtkliststore.sgml | 3 +
docs/reference/gtk/tmpl/gtkmain.sgml | 17 +
docs/reference/gtk/tmpl/gtkmenu.sgml | 4 +
docs/reference/gtk/tmpl/gtkmenubar.sgml | 35 +-
docs/reference/gtk/tmpl/gtkmenuitem.sgml | 20 +-
docs/reference/gtk/tmpl/gtkmenushell.sgml | 3 +
docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml | 14 +-
docs/reference/gtk/tmpl/gtkmisc.sgml | 3 +
docs/reference/gtk/tmpl/gtknotebook.sgml | 95 +-
docs/reference/gtk/tmpl/gtkobject.sgml | 351 +--
docs/reference/gtk/tmpl/gtkorientable.sgml | 3 +
docs/reference/gtk/tmpl/gtkpagesetup.sgml | 4 +
.../reference/gtk/tmpl/gtkpagesetupunixdialog.sgml | 3 +
docs/reference/gtk/tmpl/gtkpaned.sgml | 12 +
docs/reference/gtk/tmpl/gtkpapersize.sgml | 4 +
docs/reference/gtk/tmpl/gtkprintcontext.sgml | 3 +
docs/reference/gtk/tmpl/gtkprinter.sgml | 3 +
docs/reference/gtk/tmpl/gtkprintjob.sgml | 3 +
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 4 +
docs/reference/gtk/tmpl/gtkprintsettings.sgml | 4 +
docs/reference/gtk/tmpl/gtkprintunixdialog.sgml | 3 +
docs/reference/gtk/tmpl/gtkprogress.sgml | 3 +
docs/reference/gtk/tmpl/gtkprogressbar.sgml | 88 +-
docs/reference/gtk/tmpl/gtkradioaction.sgml | 3 +
docs/reference/gtk/tmpl/gtkradiobutton.sgml | 3 +
docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 10 +-
docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtkrange.sgml | 3 +
docs/reference/gtk/tmpl/gtkrc.sgml | 122 +-
docs/reference/gtk/tmpl/gtkrecentaction.sgml | 3 +
docs/reference/gtk/tmpl/gtkrecentchooser.sgml | 21 +-
.../reference/gtk/tmpl/gtkrecentchooserdialog.sgml | 3 +
docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml | 4 +
.../reference/gtk/tmpl/gtkrecentchooserwidget.sgml | 4 +
docs/reference/gtk/tmpl/gtkrecentfilter.sgml | 4 +
docs/reference/gtk/tmpl/gtkrecentmanager.sgml | 23 +-
docs/reference/gtk/tmpl/gtkruler.sgml | 3 +
docs/reference/gtk/tmpl/gtkscale.sgml | 3 +
docs/reference/gtk/tmpl/gtkscalebutton.sgml | 21 +-
docs/reference/gtk/tmpl/gtkscrollbar.sgml | 3 +
docs/reference/gtk/tmpl/gtkscrolledwindow.sgml | 3 +
docs/reference/gtk/tmpl/gtkselection.sgml | 12 +-
docs/reference/gtk/tmpl/gtkseparator.sgml | 3 +
docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml | 4 +
docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml | 4 +
docs/reference/gtk/tmpl/gtksettings.sgml | 4 +
docs/reference/gtk/tmpl/gtksizegroup.sgml | 3 +
docs/reference/gtk/tmpl/gtkspinbutton.sgml | 14 +-
docs/reference/gtk/tmpl/gtkstatusbar.sgml | 4 +
docs/reference/gtk/tmpl/gtkstatusicon.sgml | 13 +-
docs/reference/gtk/tmpl/gtkstyle.sgml | 82 +-
docs/reference/gtk/tmpl/gtktable.sgml | 3 +
docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml | 4 +
docs/reference/gtk/tmpl/gtktextbuffer.sgml | 3 +
docs/reference/gtk/tmpl/gtktextiter.sgml | 3 +
docs/reference/gtk/tmpl/gtktextmark.sgml | 3 +
docs/reference/gtk/tmpl/gtktexttag.sgml | 4 +
docs/reference/gtk/tmpl/gtktexttagtable.sgml | 4 +
docs/reference/gtk/tmpl/gtktextview.sgml | 41 +
docs/reference/gtk/tmpl/gtktoggleaction.sgml | 3 +
docs/reference/gtk/tmpl/gtktogglebutton.sgml | 4 +
docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtktoolbar.sgml | 229 +-
docs/reference/gtk/tmpl/gtktoolbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtktoolitem.sgml | 15 +-
docs/reference/gtk/tmpl/gtktooltip.sgml | 3 +
docs/reference/gtk/tmpl/gtktreednd.sgml | 3 +
docs/reference/gtk/tmpl/gtktreemodel.sgml | 29 +-
docs/reference/gtk/tmpl/gtktreemodelfilter.sgml | 3 +
docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 3 +
docs/reference/gtk/tmpl/gtktreeselection.sgml | 3 +
docs/reference/gtk/tmpl/gtktreesortable.sgml | 3 +
docs/reference/gtk/tmpl/gtktreestore.sgml | 3 +
docs/reference/gtk/tmpl/gtktreeview.sgml | 28 +-
docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml | 4 +
docs/reference/gtk/tmpl/gtktypeutils.sgml | 576 +---
docs/reference/gtk/tmpl/gtkuimanager.sgml | 4 +
docs/reference/gtk/tmpl/gtkwindow.sgml | 6 +
docs/reference/gtk/tmpl/gtkwindowgroup.sgml | 4 +
...-uninstalled.pc.in => gdk-3.0-uninstalled.pc.in | 2 +-
gdk-2.0.pc.in => gdk-3.0.pc.in | 4 +-
...alled.pc.in => gdk-pixbuf-3.0-uninstalled.pc.in | 0
gdk-pixbuf-2.0.pc.in => gdk-pixbuf-3.0.pc.in | 2 +-
gdk-pixbuf/Makefile.am | 54 +-
gdk-pixbuf/gdk-pixbuf-csource.c | 4 +-
gdk-pixbuf/queryloaders.c | 2 +-
gdk/Makefile.am | 52 +-
gdk/x11/Makefile.am | 2 +-
...uninstalled.pc.in => gtk+-3.0-uninstalled.pc.in | 2 +-
gtk+-2.0.pc.in => gtk+-3.0.pc.in | 4 +-
...ix-print-2.0.pc.in => gtk+-unix-print-3.0.pc.in | 4 +-
gtk/Makefile.am | 104 +-
...gtk-builder-convert => gtk-builder-convert-3.0} | 6 +-
gtk/gtkfilechooser.c | 4 +-
gtk/gtkimcontext.c | 2 +-
gtk/gtkmodules.c | 6 +-
gtk/gtkrc.c | 14 +-
gtk/tests/Makefile.am | 4 +-
modules/engines/ms-windows/Makefile.am | 4 +-
modules/engines/ms-windows/Theme/Makefile.am | 2 +-
.../Theme/{gtk-2.0 => gtk-3.0}/Makefile.am | 0
.../ms-windows/Theme/{gtk-2.0 => gtk-3.0}/gtkrc | 0
modules/engines/pixbuf/Makefile.am | 10 +-
modules/input/Makefile.am | 22 +-
modules/other/gail/Makefile.am | 2 +-
modules/printbackends/cups/Makefile.am | 2 +-
modules/printbackends/file/Makefile.am | 2 +-
modules/printbackends/lpr/Makefile.am | 4 +-
modules/printbackends/test/Makefile.am | 2 +-
perf/Makefile.am | 2 +-
tests/Makefile.am | 10 +-
242 files changed, 5986 insertions(+), 2393 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 669c8d6..4862090 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ include $(top_srcdir)/Makefile.decl
SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
-# require automake 1.4
AUTOMAKE_OPTIONS = 1.7
ACLOCAL_AMFLAGS = -I m4
@@ -132,36 +131,36 @@ MAINTAINERCLEANFILES = \
GDKTARGET= gdktarget@
## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
- rm -f gtk+-$(GDKTARGET)-2.0.pc && \
- cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
+gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
+ rm -f gtk+-$(GDKTARGET)-3.0.pc && \
+ cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
-gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
- rm -f gdk-$(GDKTARGET)-2.0.pc && \
- cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
+gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
+ rm -f gdk-$(GDKTARGET)-3.0.pc && \
+ cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
-gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
- rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
- cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
+gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+ rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
+ cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
-gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
- rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
- cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
+gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
+ rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
+ cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
+pkgconfig_DATA= gdk-pixbuf-3.0.pc gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail.pc
if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-2.0.pc
+pkgconfig_DATA += gtk+-unix-print-3.0.pc
endif
DISTCLEANFILES = \
- gtk+-unix-print-2.0.pc \
- gtk+-$(GDKTARGET)-2.0.pc \
- gdk-$(GDKTARGET)-2.0.pc \
+ gtk+-unix-print-3.0.pc \
+ gtk+-$(GDKTARGET)-3.0.pc \
+ gdk-$(GDKTARGET)-3.0.pc \
gail.pc \
- gtk+-$(GDKTARGET)-2.0-uninstalled.pc \
- gdk-$(GDKTARGET)-2.0-uninstalled.pc \
+ gtk+-$(GDKTARGET)-3.0-uninstalled.pc \
+ gdk-$(GDKTARGET)-3.0-uninstalled.pc \
gail-uninstalled.pc \
config.lt
@@ -184,21 +183,21 @@ ChangeLog:
echo A git checkout and git-log is required to generate this file >> $@); \
fi
-## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
+## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
DEFAULT_GDKTARGET=x11
install-data-hook:
(cd $(DESTDIR)$(pkgconfigdir) && \
- test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
- test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
- rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
- rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
+ test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
+ test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
+ rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
+ rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
(cd $(DESTDIR)$(pkgconfigdir) && \
- rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
- rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
+ rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
+ rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
uninstall-local:
- rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
- rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
+ rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
+ rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
dist-hook:
if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
diff --git a/configure.ac b/configure.ac
index 82361b3..47d1309 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PREREQ(2.62)
# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [21])
+m4_define([gtk_minor_version], [90])
m4_define([gtk_micro_version], [0])
m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age],
@@ -19,7 +19,7 @@ m4_define([gtk_binary_age],
m4_define([gtk_version],
[gtk_major_version.gtk_minor_version.gtk_micro_version])
# This is the X.Y used in -lgtk-FOO-X.Y
-m4_define([gtk_api_version], [2.0])
+m4_define([gtk_api_version], [3.0])
# Define a string for the earliest version that this release has
# backwards binary compatibility with for all interfaces a module
@@ -28,7 +28,7 @@ m4_define([gtk_api_version], [2.0])
# for GTK+.
#
#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [2.10.0])
+m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages
m4_define([glib_required_version], [2.23.6])
@@ -2108,14 +2108,14 @@ AC_CONFIG_FILES([
config.h.win32
gtk-zip.sh
Makefile
-gdk-pixbuf-2.0.pc
-gdk-2.0.pc
-gtk+-2.0.pc
-gtk+-unix-print-2.0.pc
+gdk-pixbuf-3.0.pc
+gdk-3.0.pc
+gtk+-3.0.pc
+gtk+-unix-print-3.0.pc
gail.pc
-gdk-pixbuf-2.0-uninstalled.pc
-gdk-2.0-uninstalled.pc
-gtk+-2.0-uninstalled.pc
+gdk-pixbuf-3.0-uninstalled.pc
+gdk-3.0-uninstalled.pc
+gtk+-3.0-uninstalled.pc
gail-uninstalled.pc
m4macros/Makefile
po/Makefile.in
@@ -2166,7 +2166,7 @@ modules/engines/Makefile
modules/engines/pixbuf/Makefile
modules/engines/ms-windows/Makefile
modules/engines/ms-windows/Theme/Makefile
-modules/engines/ms-windows/Theme/gtk-2.0/Makefile
+modules/engines/ms-windows/Theme/gtk-3.0/Makefile
modules/input/Makefile
modules/printbackends/Makefile
modules/printbackends/cups/Makefile
diff --git a/demos/Makefile.am b/demos/Makefile.am
index f87b3cd..994166a 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -41,8 +41,8 @@ if CROSS_COMPILING
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
pixbuf_csource_deps=
else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0 $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
endif
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 698c242..ffb11ac 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am for gtk+/demos
include $(top_srcdir)/Makefile.decl
-democodedir=$(datadir)/gtk-2.0/demo
+democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
## These should be in the order you want them to appear in the
## demo app, which means alphabetized by demo title, not filename
@@ -99,7 +99,7 @@ IMAGEFILES= alphatest.png \
gnome-gmush.png \
gnome-gsame.png \
gnu-keys.png \
- gtk-logo-rgb.gif
+ gtk-logo-rgb.gif
democode_DATA = $(demos) $(IMAGEFILES) demo.ui
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 7734e72..f56aead 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -56,8 +56,8 @@ content_files = \
gdk-pixbuf-rendering.sgml \
gdk-pixbuf.sgml \
porting-from-imlib.sgml \
- gdk-pixbuf-csource.xml \
- gdk-pixbuf-query-loaders.xml
+ gdk-pixbuf-csource-3.0.xml \
+ gdk-pixbuf-query-loaders-3.0.xml
# Images to copy into HTML directory
HTML_IMAGES = composite.png
@@ -81,7 +81,9 @@ EXTRA_DIST += version.xml.in \
if ENABLE_MAN
-man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
+man_MANS = \
+ gdk-pixbuf-csource-3.0.1 \
+ gdk-pixbuf-query-loaders-3.0.1
%.1 : %.xml
@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml
similarity index 85%
rename from docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
rename to docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml
index 36a0423..e353f3a 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml
@@ -5,23 +5,23 @@
<refentry id="gdk-pixbuf-csource">
<refmeta>
-<refentrytitle>gdk-pixbuf-csource</refentrytitle>
+<refentrytitle>gdk-pixbuf-csource-3.0</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
-<refname>gdk-pixbuf-csource</refname>
+<refname>gdk-pixbuf-csource-3.0</refname>
<refpurpose>C code generation utility for GdkPixbuf images</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
-<command>gdk-pixbuf-csource</command>
+<command>gdk-pixbuf-csource-3.0</command>
<arg choice="opt">options</arg>
<arg choice="opt">image</arg>
</cmdsynopsis>
<cmdsynopsis>
-<command>gdk-pixbuf-csource</command>
+<command>gdk-pixbuf-csource-3.0</command>
<arg choice="opt">options</arg>
<arg choice="plain">--build-list</arg>
<arg rep="repeat">
@@ -33,16 +33,16 @@
<refsect1><title>Description</title>
<para>
-<command>gdk-pixbuf-csource</command> is a small utility that generates C code
-containing images, useful for compiling images directly into programs.
+<command>gdk-pixbuf-csource-3.0</command> is a small utility that generates
+C code containing images, useful for compiling images directly into programs.
</para>
</refsect1>
<refsect1><title>Invocation</title>
<para>
-<command>gdk-pixbuf-csource</command> either takes as input one image file name
-to generate code for, or, using the <option>--build-list</option> option, a
-list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
+<command>gdk-pixbuf-csource-3.0</command> either takes as input one image file
+name to generate code for, or, using the <option>--build-list</option> option,
+a list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
pairs to generate code for a list of images into named variables.
</para>
<refsect2><title>Options</title>
@@ -151,7 +151,7 @@ Make warnings fatal (causes the program to abort).
<refsect1><title>See also</title>
<para>
-The <structname>GdkPixbuf</structname> documentation, shipped with the
+The <structname>GdkPixbuf</structname> documentation, shipped with the
Gtk+ distribution, available from <ulink url="http://www.gtk.org";>www.gtk.org</ulink>.
</para>
</refsect1>
@@ -166,11 +166,11 @@ generates pixbufs with suboptimal rowstride in some cases.
<refsect1><title>Author</title>
<para>
-<command>gdk-pixbuf-csource</command> was written by Tim Janik
-<email>timj gtk org</email>.
+<command>gdk-pixbuf-csource-3.0</command> was written by Tim Janik
+<email>timj gtk org</email>.
</para>
<para>
-This manual page was provided by Tim Janik <email>timj gtk org</email>.
+This manual page was provided by Tim Janik <email>timj gtk org</email>.
</para>
</refsect1>
</refentry>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml
similarity index 64%
rename from docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
rename to docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml
index 86fc866..7ff936b 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml
@@ -5,30 +5,31 @@
<refentry id="gdk-pixbuf-query-loaders">
<refmeta>
-<refentrytitle>gdk-pixbuf-query-loaders</refentrytitle>
+<refentrytitle>gdk-pixbuf-query-loaders-3.0</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
-<refname>gdk-pixbuf-query-loaders</refname>
+<refname>gdk-pixbuf-query-loaders-3.0</refname>
<refpurpose>GdkPixbuf loader registration utility</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
-<command>gdk-pixbuf-query-loaders</command>
+<command>gdk-pixbuf-query-loaders-3.0</command>
<arg choice="opt" rep="repeat">module</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1><title>Description</title>
<para>
-<command>gdk-pixbuf-query-loaders</command> collects information about loadable
-modules for <application>gdk-pixbuf</application> and writes it to <filename>stdout</filename>.
+<command>gdk-pixbuf-query-loaders-3.0</command> collects information about
+loadable modules for <application>gdk-pixbuf</application> and writes it to
+<filename>stdout</filename>.
</para>
<para>
If called without arguments, it looks for modules in the
-<application>gdk-pixbuf</application> loader directory.
+<application>gdk-pixbuf</application> loader directory.
</para>
<para>
If called with arguments, it looks for the specified modules. The arguments
@@ -39,8 +40,9 @@ may be absolute or relative paths.
<refsect1><title>Environment</title>
<para>
The environment variable <envar>GDK_PIXBUF_MODULEDIR</envar> can be used
-to specify a different loader directory. The default <application>gdk-pixbuf</application> loader
-directory is <filename><replaceable>libdir</replaceable>/gtk-2.0/<replaceable>version</replaceable>/loaders</filename>.
+to specify a different loader directory. The default
+<application>gdk-pixbuf</application> loader
+directory is <filename><replaceable>libdir</replaceable>/gtk-3.0/<replaceable>version</replaceable>/loaders</filename>.
</para>
</refsect1>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
index 675ad09..4b8fc9e 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -104,12 +104,12 @@
<partintro>
<para>
This part presents the tools which are shipped with the
- &gdk-pixbuf; library.
+ &gdk-pixbuf; library.
</para>
</partintro>
- <xi:include href="gdk-pixbuf-csource.xml" />
- <xi:include href="gdk-pixbuf-query-loaders.xml" />
+ <xi:include href="gdk-pixbuf-csource-3.0.xml" />
+ <xi:include href="gdk-pixbuf-query-loaders-3.0.xml" />
</reference>
<index id="api-index-full">
diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
index 776586d..d569f8a 100644
--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
@@ -23,6 +23,9 @@ Animated images.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkPixbufAnimation ##### -->
<para>
An opaque struct representing an animation.
@@ -46,23 +49,6 @@ certain position in an animation.
@Returns:
-<!-- ##### FUNCTION gdk_pixbuf_animation_ref ##### -->
-<para>
-
-</para>
-
- animation:
- Returns:
-
-
-<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->
-<para>
-
-</para>
-
- animation:
-
-
<!-- ##### FUNCTION gdk_pixbuf_animation_get_width ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
index c4f38b1..ffd7bd1 100644
--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
@@ -46,6 +46,9 @@ Creating a pixbuf from image data that is already in memory.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_new ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
index 8e51ce9..84a461c 100644
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -28,6 +28,9 @@ Loading a pixbuf from a file.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
index 13c5948..d81557a 100644
--- a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
@@ -21,6 +21,9 @@ to a socket or store it in a database.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
index 129be6b..3892e84 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
@@ -72,6 +72,9 @@ Application-driven progressive image loading.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkPixbufLoader ##### -->
<para>
The <structname>GdkPixbufLoader</structname> struct contains only private
@@ -114,6 +117,7 @@ fields.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index a9891e0..89af148 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -553,3 +553,33 @@ End:
</para>
+<!-- ##### FUNCTION gdk_pixbuf_animation_ref ##### -->
+<para>
+
+</para>
+
+ animation:
+ Returns:
+
+<!-- ##### FUNCTION gdk_pixbuf_animation_unref ##### -->
+<para>
+
+</para>
+
+ animation:
+
+<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
+ <para>
+
+ </para>
+
+ pixbuf:
+ Returns:
+
+<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->
+<para>
+
+</para>
+
+ pixbuf:
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
index e89a3ad..aaedfec 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
@@ -26,6 +26,9 @@ Getting parts of an X drawable's image data into a pixbuf.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
index 5fec563..d960780 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
@@ -23,6 +23,9 @@ Initializing the &gdk-pixbuf; Xlib library.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
index a5558c2..f16665c 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
@@ -24,6 +24,9 @@ Rendering a pixbuf to an X drawable.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
index 1e22040..5763f89 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
@@ -20,6 +20,9 @@ Rendering RGB buffers to X drawables.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT XlibRgbCmap ##### -->
<para>
FIXME: Describe this.
@@ -198,6 +201,7 @@ displays.
</para>
+ void:
@Returns:
@@ -230,6 +234,7 @@ displays.
</para>
+ void:
@Returns:
@@ -238,6 +243,7 @@ displays.
</para>
+ void:
@Returns:
@@ -246,6 +252,7 @@ displays.
</para>
+ void:
@Returns:
@@ -254,6 +261,7 @@ displays.
</para>
+ void:
@Returns:
@@ -262,6 +270,7 @@ displays.
</para>
+ void:
@Returns:
@@ -270,6 +279,7 @@ displays.
</para>
+ void:
@Returns: <!--
Local variables:
mode: sgml
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
index 3ed25ee..10eeb61 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
@@ -93,6 +93,9 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GdkPixbufError ##### -->
<para>
An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;
diff --git a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
index 7e7364b..b3cce41 100644
--- a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
@@ -19,6 +19,9 @@ you're linking against.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### VARIABLE gdk_pixbuf_version ##### -->
<para>
Contains the full version of the &gdk-pixbuf; library as a string.
diff --git a/docs/reference/gdk-pixbuf/tmpl/inline.sgml b/docs/reference/gdk-pixbuf/tmpl/inline.sgml
index f9dfe8d..0b8da2c 100644
--- a/docs/reference/gdk-pixbuf/tmpl/inline.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/inline.sgml
@@ -22,6 +22,9 @@ into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkPixdata ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
index 441f123..49abfe4 100644
--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -68,6 +68,9 @@ They are not covered by the same stability guarantees as the regular
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
<para>
@@ -84,6 +87,7 @@ They are not covered by the same stability guarantees as the regular
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
index b894022..d436715 100644
--- a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
@@ -48,21 +48,7 @@ Functions for reference counting and memory management on pixbufs.
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
- <para>
-
- </para>
-
- pixbuf:
- Returns:
-
-
-<!-- ##### FUNCTION gdk_pixbuf_unref ##### -->
-<para>
-
-</para>
-
- pixbuf:
+<!-- ##### SECTION Image ##### -->
<!-- ##### USER_FUNCTION GdkPixbufDestroyNotify ##### -->
diff --git a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
index 5c26be2..6550cd5 100644
--- a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
@@ -81,6 +81,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GdkInterpType ##### -->
<para>
This enumeration describes the different interpolation modes that
diff --git a/docs/reference/gdk-pixbuf/tmpl/util.sgml b/docs/reference/gdk-pixbuf/tmpl/util.sgml
index 7770b77..fd54648 100644
--- a/docs/reference/gdk-pixbuf/tmpl/util.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/util.sgml
@@ -20,6 +20,9 @@ Utility and miscellaneous convenience functions.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
<para>
diff --git a/docs/reference/gdk/tmpl/cairo_interaction.sgml b/docs/reference/gdk/tmpl/cairo_interaction.sgml
index 7ada736..fc7fbf5 100644
--- a/docs/reference/gdk/tmpl/cairo_interaction.sgml
+++ b/docs/reference/gdk/tmpl/cairo_interaction.sgml
@@ -27,6 +27,9 @@ Cairo paths and to use pixbufs as sources for drawing operations.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_cairo_create ##### -->
<para>
diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index 31a09f7..3d1a874 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkColor ##### -->
<para>
The #GdkColor structure is used to describe an
@@ -102,6 +105,7 @@ The colormap structure contains the following public fields.
<para>
</para>
+ void:
@Returns:
@@ -109,6 +113,7 @@ The colormap structure contains the following public fields.
<para>
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml
index 8d45cfa..89abff6 100644
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/docs/reference/gdk/tmpl/cursors.sgml
@@ -31,6 +31,9 @@ gdk_window_set_cursor() or by setting the cursor member of the
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkCursor ##### -->
<para>
A <type>GdkCursor</type> structure represents a cursor.
@@ -212,3 +215,5 @@ The standard cursors available.
</para>
@cursor:
+
+
diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml
index 3d1b521..dd9c18b 100644
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -25,6 +25,9 @@ the GTK+ documentation for more information.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_drag_get_selection ##### -->
<para>
</para>
@@ -54,6 +57,7 @@ the GTK+ documentation for more information.
<para>
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index 7307140..9cd73f8 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -34,6 +34,9 @@ gtk_widget_create_pango_layout().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkDrawable ##### -->
<para>
An opaque structure representing an object that can be
diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml
index cd94fde..42c54b0 100644
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -23,6 +23,9 @@ required events are received. See gtk_widget_set_events().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### UNION GdkEvent ##### -->
<para>
The #GdkEvent struct contains a union of all of the event structs,
diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml
index efb9e3e..392cd07 100644
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -30,6 +30,9 @@ The structs used for each type of event.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GdkEventType ##### -->
<para>
Specifies the type of the event.
@@ -165,6 +168,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
<para>
</para>
+ void:
@Returns:
@@ -172,6 +176,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
<para>
</para>
+ void:
@Returns:
@@ -179,6 +184,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
<para>
</para>
+ void:
@Returns:
@@ -332,6 +338,7 @@ gdk_event_handler_set().
<para>
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml
index 25efd2d..1f68fb7 100644
--- a/docs/reference/gdk/tmpl/fonts.sgml
+++ b/docs/reference/gdk/tmpl/fonts.sgml
@@ -264,6 +264,9 @@ here).
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkFont ##### -->
<para>
The <structname>GdkFont</structname> structure represents a font or fontset. It
diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index 7d445ed..2897bcb 100644
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -33,6 +33,9 @@ be set by the latter method.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkGC ##### -->
<para>
The #GdkGC structure represents a graphics context.
diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml
index adb7170..13b0c19 100644
--- a/docs/reference/gdk/tmpl/gdk-unused.sgml
+++ b/docs/reference/gdk/tmpl/gdk-unused.sgml
@@ -923,6 +923,14 @@ they will be ignored.
</para>
+<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
+<para>
+Gets the colormap set by GdkRGB. This colormap and the corresponding
+visual should be used when creating windows that will be drawn in by GdkRGB.
+</para>
+
+ Returns: The #GdkColormap set by GdkRGB.
+
<!-- ##### VARIABLE gdk_screen ##### -->
<para>
diff --git a/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml b/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
index 2d1f8ff..78928a4 100644
--- a/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
+++ b/docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
@@ -36,6 +36,9 @@ g_object_unref (context);
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### TYPEDEF GdkAppLaunchContext ##### -->
<para>
An opaque structure representing an application launch context.
@@ -47,6 +50,7 @@ An opaque structure representing an application launch context.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml
index 36e3296..19a7798 100644
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml
@@ -31,6 +31,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkDisplay ##### -->
<para>
The <structname>GdkDisplay</structname> struct is the GDK representation
@@ -61,6 +64,7 @@ of an X display. All its fields are private and should not be accessed directly.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
index a2b65dc..253c5ed 100644
--- a/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
@@ -19,6 +19,9 @@ changes.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkDisplayManager ##### -->
<para>
The <structname>GdkDisplayManager</structname> struct has no interesting
@@ -45,6 +48,7 @@ fields.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml
index 64784c5..eeeed17 100644
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -25,6 +25,9 @@ form a large screen area.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkScreen ##### -->
<para>
This is a currently just a placeholder typedef for the first argument of
@@ -70,6 +73,7 @@ when GDK gets multihead support.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/gdktesting.sgml b/docs/reference/gdk/tmpl/gdktesting.sgml
index c1ce047..f8e787a 100644
--- a/docs/reference/gdk/tmpl/gdktesting.sgml
+++ b/docs/reference/gdk/tmpl/gdktesting.sgml
@@ -18,6 +18,9 @@ They allow to simulate some user input.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_test_render_sync ##### -->
<para>
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 41f0c72..3278731 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -18,6 +18,9 @@ utility functions.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_init ##### -->
<para>
Initializes the GDK library and connects to the X server.
@@ -70,6 +73,7 @@ by GTK+ applications.
</para>
+ void:
@Returns:
@@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C"
locale.
</para>
+ void:
@Returns: the resulting locale.
@@ -123,6 +128,7 @@ of g_atexit()).
</para>
+ void:
<!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
@@ -141,6 +147,7 @@ commandline option, the default value is the program name (determined
with g_get_prgname()) with the first character converted to uppercase.
</para>
+ void:
@Returns: the program class.
@@ -160,6 +167,7 @@ Gets the name of the display, which usually comes from the <envar>DISPLAY</envar
environment variable or the <option>--display</option> command line option.
</para>
+ void:
@Returns: the name of the display.
@@ -170,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for
trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
</para>
+ void:
<!-- ##### FUNCTION gdk_screen_width ##### -->
<para>
</para>
+ void:
@Returns:
@@ -183,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
<para>
</para>
+ void:
@Returns:
@@ -190,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
<para>
</para>
+ void:
@Returns:
@@ -197,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
<para>
</para>
+ void:
@Returns:
@@ -279,6 +292,7 @@ success or the reason for the failure of the grab attempt.
<para>
</para>
+ void:
@Returns:
@@ -324,6 +338,7 @@ available.
<para>
</para>
+ void:
<!-- ##### FUNCTION gdk_get_use_xshm ##### -->
@@ -338,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and
server are on the same machine and the server supports it.
</para>
+ void:
@Returns: %TRUE if use of the MIT shared memory extension will be attempted.
@@ -375,6 +391,7 @@ avoid the X error in any other way.
</programlisting>
</example>
+ void:
<!-- ##### FUNCTION gdk_error_trap_pop ##### -->
@@ -382,6 +399,7 @@ avoid the X error in any other way.
Removes the X error trap installed with gdk_error_trap_push().
</para>
+ void:
@Returns: the X error code, or 0 if no error occurred.
diff --git a/docs/reference/gdk/tmpl/images.sgml b/docs/reference/gdk/tmpl/images.sgml
index a9a6cd7..0973635 100644
--- a/docs/reference/gdk/tmpl/images.sgml
+++ b/docs/reference/gdk/tmpl/images.sgml
@@ -57,6 +57,9 @@ displays.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkImage ##### -->
<para>
The #GdkImage struct contains information on the image and the pixel data.
diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml
index 0ffe255..41377ca 100644
--- a/docs/reference/gdk/tmpl/input.sgml
+++ b/docs/reference/gdk/tmpl/input.sgml
@@ -34,6 +34,9 @@ callbacks.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_input_add_full ##### -->
diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml
index 4a163fe..e31cd9e 100644
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/docs/reference/gdk/tmpl/input_devices.sgml
@@ -87,6 +87,9 @@ and <structfield>ytilt</structfield>.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkDevice ##### -->
<para>
A <structname>GdkDevice</structname> structure contains
@@ -174,6 +177,7 @@ types that GTK+ understands.
<para>
</para>
+ void:
@Returns:
@@ -224,6 +228,7 @@ Specifies how an axis of a device is used.
<para>
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index 9c67e09..dc00834 100644
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -88,6 +88,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkKeymap ##### -->
<para>
A <structname>GdkKeymap</structname> defines the translation from keyboard state
@@ -143,6 +146,7 @@ be mapped to a keyval.
</para>
+ void:
@Returns:
@@ -234,6 +238,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
@Returns:
+<!-- ##### FUNCTION gdk_keymap_add_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+ keymap:
+ state:
+
+
<!-- ##### FUNCTION gdk_keymap_map_virtual_modifiers ##### -->
<para>
diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml
index b03c4b1..b9556a9 100644
--- a/docs/reference/gdk/tmpl/pango_interaction.sgml
+++ b/docs/reference/gdk/tmpl/pango_interaction.sgml
@@ -132,6 +132,9 @@ g_object_unref (gc);
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkPangoRenderer ##### -->
<para>
@@ -210,6 +213,7 @@ g_object_unref (gc);
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/pixbufs.sgml b/docs/reference/gdk/tmpl/pixbufs.sgml
index 53de271..9b1aacf 100644
--- a/docs/reference/gdk/tmpl/pixbufs.sgml
+++ b/docs/reference/gdk/tmpl/pixbufs.sgml
@@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
<para>
@@ -39,6 +42,12 @@ pixbufs, see the #GdkPixbuf API documentation.
</para>
+
+<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
+<para>
+
+</para>
+
@pixbuf:
@pixmap_return:
@mask_return:
diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index d64418f..333a2b3 100644
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -21,6 +21,9 @@ pixel can be either on or off).
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkPixmap ##### -->
<para>
An opaque structure representing an offscreen drawable.
@@ -125,3 +128,5 @@ An opaque structure representing an offscreen drawable of depth
#GdkWindow, can often be used interchangeably. The type #GdkDrawable
refers generically to any of these types.
</para>
+
+
diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml
index 5dc62e6..64a1b2d 100644
--- a/docs/reference/gdk/tmpl/properties.sgml
+++ b/docs/reference/gdk/tmpl/properties.sgml
@@ -45,6 +45,9 @@ data commonly stored in X window properties.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkAtom ##### -->
<para>
An opaque type representing a string as an index into a table
diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index c05c264..dfb43a6 100644
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -36,6 +36,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkPoint ##### -->
<para>
Defines the x and y coordinates of a point.
@@ -86,6 +89,7 @@ A GdkRegion represents a set of pixels on the screen.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index 857558d..a60e739 100644
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -125,6 +125,9 @@ colors.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
<para>
Draws an RGB image in the drawable. This is the core GdkRGB
@@ -360,6 +363,7 @@ private colormap.
<para>
</para>
+ void:
@Returns:
@@ -368,18 +372,10 @@ private colormap.
</para>
+ void:
@Returns:
-<!-- ##### MACRO gdk_rgb_get_cmap ##### -->
-<para>
-Gets the colormap set by GdkRGB. This colormap and the corresponding
-visual should be used when creating windows that will be drawn in by GdkRGB.
-</para>
-
- Returns: The #GdkColormap set by GdkRGB.
-
-
<!-- ##### FUNCTION gdk_rgb_ditherable ##### -->
<para>
Determines whether the preferred visual is ditherable. This function may be
@@ -388,6 +384,7 @@ dither mode is desired; if the display is not ditherable, it may make
sense to gray out or hide the corresponding UI widget.
</para>
+ void:
@Returns: %TRUE if the preferred visual is ditherable.
diff --git a/docs/reference/gdk/tmpl/selections.sgml b/docs/reference/gdk/tmpl/selections.sgml
index 413bcf3..1ce9b89 100644
--- a/docs/reference/gdk/tmpl/selections.sgml
+++ b/docs/reference/gdk/tmpl/selections.sgml
@@ -50,6 +50,9 @@ to the X Inter-client Communication Conventions Manual
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### MACRO GDK_SELECTION_PRIMARY ##### -->
<para>
A #GdkAtom representing the <literal>PRIMARY</literal> selection.
diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml
index 489b41f..75a61ee 100644
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -250,6 +250,9 @@ int main (int argc, char *argv[])
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### MACRO GDK_THREADS_ENTER ##### -->
<para>
This macro marks the beginning of a critical section in which GDK and
@@ -275,6 +278,7 @@ begun with #GDK_THREADS_ENTER.
</para>
+ void:
<!-- ##### FUNCTION gdk_threads_enter ##### -->
@@ -285,6 +289,7 @@ conditions. Only one thread at a time can be in such a critial
section.
</para>
+ void:
<!-- ##### FUNCTION gdk_threads_leave ##### -->
@@ -292,6 +297,7 @@ section.
Leaves a critical region begun with gdk_threads_enter().
</para>
+ void:
<!-- ##### VARIABLE gdk_threads_mutex ##### -->
diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml
index 6738fc3..5531d49 100644
--- a/docs/reference/gdk/tmpl/visuals.sgml
+++ b/docs/reference/gdk/tmpl/visuals.sgml
@@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkVisual ##### -->
<para>
The <type>GdkVisual</type> structure contains information about
@@ -171,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
</para>
+ void:
@Returns:
@@ -179,6 +183,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
</para>
+ void:
@Returns:
@@ -187,6 +192,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
</para>
+ void:
@Returns:
@@ -195,6 +201,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
</para>
+ void:
@Returns:
@@ -203,6 +210,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index f9c94e0..9f62167 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -209,6 +209,9 @@ gdk_offscreen_window_get_pixmap().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GdkWindow ##### -->
<para>
An opaque structure representing an onscreen drawable.
@@ -984,7 +987,7 @@ Registers a window as a potential drop destination.
@window:
@region:
- child_func:
+ GdkWindow *, gpointer:
@user_data:
@@ -1018,6 +1021,7 @@ Registers a window as a potential drop destination.
</para>
+ void:
<!-- ##### FUNCTION gdk_window_process_updates ##### -->
@@ -1745,6 +1749,7 @@ The hint must be set before mapping the window.
</para>
+ void:
@Returns:
@@ -1753,6 +1758,7 @@ The hint must be set before mapping the window.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 2af1f68..66a5a07 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -17,6 +17,9 @@ X backend-specific functions
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### MACRO GDK_ROOT_WINDOW ##### -->
<para>
Obtains the Xlib window id of the root window of the current screen.
@@ -657,6 +660,7 @@ Since: 2.2
</para>
+ void:
@Returns:
@@ -665,6 +669,7 @@ Since: 2.2
</para>
+ void:
@Returns:
@@ -673,6 +678,7 @@ Since: 2.2
</para>
+ void:
@Returns:
@@ -681,6 +687,7 @@ Since: 2.2
</para>
+ void:
<!-- ##### FUNCTION gdk_x11_image_get_xdisplay ##### -->
@@ -724,6 +731,7 @@ Since: 2.2
</para>
+ void:
<!-- ##### FUNCTION gdk_x11_visual_get_xvisual ##### -->
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 9495989..93b66fc 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -10,7 +10,7 @@ DOC_MODULE=gtk
DOC_MAIN_SGML_FILE=gtk-docs.sgml
# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../gtk
@@ -149,9 +149,9 @@ content_files = \
tree_widget.sgml \
windows.sgml \
x11.sgml \
- gtk-query-immodules-2.0.xml \
- gtk-update-icon-cache.xml \
- gtk-builder-convert.xml \
+ gtk-query-immodules-3.0.xml \
+ gtk-update-icon-cache-3.0.xml \
+ gtk-builder-convert-3.0.xml \
visual_index.xml
expand_content_files = \
@@ -367,9 +367,12 @@ EXTRA_DIST += version.xml.in
if ENABLE_MAN
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+man_MANS = \
+ gtk-query-immodules-3.0.1 \
+ gtk-update-icon-cache-3.0.1 \
+ gtk-builder-convert-3.0.1
-%.1 : %.xml
+%.1 : %.xml
@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
BUILT_EXTRA_DIST = $(man_MANS)
diff --git a/docs/reference/gtk/gtk-builder-convert.xml b/docs/reference/gtk/gtk-builder-convert-3.0.xml
similarity index 86%
rename from docs/reference/gtk/gtk-builder-convert.xml
rename to docs/reference/gtk/gtk-builder-convert-3.0.xml
index e0b6e1c..eccfe33 100644
--- a/docs/reference/gtk/gtk-builder-convert.xml
+++ b/docs/reference/gtk/gtk-builder-convert-3.0.xml
@@ -1,18 +1,18 @@
<refentry id="gtk-builder-convert">
<refmeta>
-<refentrytitle>gtk-builder-convert</refentrytitle>
+<refentrytitle>gtk-builder-convert-3.0</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
-<refname>gtk-builder-convert</refname>
+<refname>gtk-builder-convert-3.0</refname>
<refpurpose>Glade file conversion utility</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
-<command>gtk-builder-convert</command>
+<command>gtk-builder-convert-3.0</command>
<arg choice="opt">--skip-windows</arg>
<arg choice="opt">--root <replaceable>name</replaceable></arg>
<arg choice="req">input</arg>
@@ -21,7 +21,7 @@
</refsynopsisdiv>
<refsect1><title>Description</title>
-<para><command>gtk-builder-convert</command> converts glade files
+<para><command>gtk-builder-convert-3.0</command> converts glade files
into XML files which can be loaded with GtkBuilder.
</para>
<para>
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 251332c..7fc18df 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -425,9 +425,9 @@ that is, GUI components such as #GtkButton or #GtkTextView.
<part>
<title>GTK+ Tools</title>
- <xi:include href="gtk-query-immodules-2.0.xml" />
- <xi:include href="gtk-update-icon-cache.xml" />
- <xi:include href="gtk-builder-convert.xml" />
+ <xi:include href="gtk-query-immodules-3.0.xml" />
+ <xi:include href="gtk-update-icon-cache-3.0.xml" />
+ <xi:include href="gtk-builder-convert-3.0.xml" />
</part>
<xi:include href="glossary.xml" />
diff --git a/docs/reference/gtk/gtk-query-immodules-2.0.xml b/docs/reference/gtk/gtk-query-immodules-3.0.xml
similarity index 71%
rename from docs/reference/gtk/gtk-query-immodules-2.0.xml
rename to docs/reference/gtk/gtk-query-immodules-3.0.xml
index 1db0d70..03510d2 100644
--- a/docs/reference/gtk/gtk-query-immodules-2.0.xml
+++ b/docs/reference/gtk/gtk-query-immodules-3.0.xml
@@ -2,33 +2,33 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
]>
-<refentry id="gtk-query-immodules-2.0">
+<refentry id="gtk-query-immodules">
<refmeta>
-<refentrytitle>gtk-query-immodules-2.0</refentrytitle>
+<refentrytitle>gtk-query-immodules-3.0</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
-<refname>gtk-query-immodules-2.0</refname>
+<refname>gtk-query-immodules-3.0</refname>
<refpurpose>Input method module registration utility</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
-<command>gtk-query-immodules-2.0</command>
+<command>gtk-query-immodules-3.0</command>
<arg choice="opt" rep="repeat">module</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1><title>Description</title>
<para>
-<command>gtk-query-immodules-2.0</command> collects information about loadable
-input method modules for GTK+ and writes it to <filename>stdout</filename>.
+<command>gtk-query-immodules-3.0</command> collects information about loadable
+input method modules for GTK+ and writes it to <filename>stdout</filename>.
</para>
<para>
-If called without arguments, it looks for modules in the GTK+ input method
-module path.
+If called without arguments, it looks for modules in the GTK+ input method
+module path.
</para>
<para>
If called with arguments, it looks for the specified modules. The arguments
@@ -38,8 +38,8 @@ may be absolute or relative paths.
<refsect1><title>Environment</title>
<para>
-The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link> can
-be used to prepend directories to the input method module path.
+The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link>
+can be used to prepend directories to the input method module path.
</para>
</refsect1>
diff --git a/docs/reference/gtk/gtk-update-icon-cache.xml b/docs/reference/gtk/gtk-update-icon-cache-3.0.xml
similarity index 60%
rename from docs/reference/gtk/gtk-update-icon-cache.xml
rename to docs/reference/gtk/gtk-update-icon-cache-3.0.xml
index 4d3f4a8..477f37c 100644
--- a/docs/reference/gtk/gtk-update-icon-cache.xml
+++ b/docs/reference/gtk/gtk-update-icon-cache-3.0.xml
@@ -5,18 +5,18 @@
<refentry id="gtk-update-icon-cache">
<refmeta>
-<refentrytitle>gtk-update-icon-cache</refentrytitle>
+<refentrytitle>gtk-update-icon-cache-3.0</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
-<refname>gtk-update-icon-cache</refname>
+<refname>gtk-update-icon-cache-3.0</refname>
<refpurpose>Icon theme caching utility</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
-<command>gtk-update-icon-cache</command>
+<command>gtk-update-icon-cache-3.0</command>
<arg choice="opt">--force</arg>
<arg choice="opt">--ignore-theme-index</arg>
<arg choice="opt">--index-only</arg>
@@ -28,20 +28,22 @@
</refsynopsisdiv>
<refsect1><title>Description</title>
-<para><command>gtk-update-icon-cache</command> creates mmap()able cache files for
-icon themes.
+<para>
+ <command>gtk-update-icon-cache-3.0</command> creates mmap()able cache
+ files for icon themes.
</para>
<para>
-It expects to be given the path to a icon theme directory containing an
-<filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>,
-and writes a <filename>icon-theme.cache</filename> containing cached information
-about the icons in the directory tree below the given directory.
+ It expects to be given the path to a icon theme directory containing an
+ <filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>,
+ and writes a <filename>icon-theme.cache</filename> containing cached
+ information about the icons in the directory tree below the given directory.
</para>
<para>
-GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
-to avoid a lot of system call and disk seek overhead when the application starts.
-Since the format of the cache files allows them to be mmap()ed shared between
-multiple applications, the overall memory consumption is reduced as well.
+ GTK+ can use the cache files created by <command>gtk-update-icon-cache-3.0</command>
+ to avoid a lot of system call and disk seek overhead when the application
+ starts. Since the format of the cache files allows them to be mmap()ed
+ shared between multiple applications, the overall memory consumption is
+ reduced as well.
</para>
</refsect1>
@@ -50,17 +52,17 @@ multiple applications, the overall memory consumption is reduced as well.
<varlistentry>
<term>--force</term>
<term>-f</term>
- <listitem><para>Overwrite an existing cache file even if it appears to be
+ <listitem><para>Overwrite an existing cache file even if it appears to be
uptodate.</para></listitem>
</varlistentry>
<varlistentry>
<term>--ignore-theme-index</term>
<term>-t</term>
- <listitem><para>Don't check for the existence of 'index.theme' in the icon theme
- directory. Without this option, <command>gtk-update-icon-cache</command> refuses
- to create an icon cache in a directory which does not appear to be the toplevel
- directory of an icon theme.
+ <listitem><para>Don't check for the existence of 'index.theme' in the icon
+ theme directory. Without this option, <command>gtk-update-icon-cache-3.0</command>
+ refuses to create an icon cache in a directory which does not appear to
+ be the toplevel directory of an icon theme.
</para></listitem>
</varlistentry>
@@ -74,15 +76,15 @@ multiple applications, the overall memory consumption is reduced as well.
<varlistentry>
<term>--source</term>
<term>-c</term>
- <listitem><para>Output a C header file declaring a constant
- <replaceable>name</replaceable> with the contents of the icon
+ <listitem><para>Output a C header file declaring a constant
+ <replaceable>name</replaceable> with the contents of the icon
cache.</para></listitem>
</varlistentry>
<varlistentry>
<term>--quiet</term>
<term>-q</term>
- <listitem><para>Turn off verbose output.
+ <listitem><para>Turn off verbose output.
</para></listitem>
</varlistentry>
diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml
index 771e7c9..225d564 100644
--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -2,7 +2,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
]>
-<refentry id="gtk-question-index" revision="1 Jan 2002">
+<refentry id="gtk-question-index">
<refmeta>
<refentrytitle>Common Questions</refentrytitle>
<manvolnum>3</manvolnum>
diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index add364f..ee7c0e1 100644
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -2,7 +2,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
]>
-<refentry id="gtk-running" revision="10 Jan 2002">
+<refentry id="gtk-running">
<refmeta>
<refentrytitle>Running GTK+ Applications</refentrytitle>
<manvolnum>3</manvolnum>
@@ -24,8 +24,8 @@ How to run and debug your GTK+ application
<para>
All GTK+ applications support a number of standard commandline
-options. These are removed from <literal>argv</literal> by gtk_init().
-Modules may parse and remove further options. The
+options. These are removed from <literal>argv</literal> by gtk_init().
+Modules may parse and remove further options. The
<link linkend="x11-cmdline">X11</link> and
<link linkend="win32-cmdline">Windows</link> GDK backends parse
some additional commandline options.
@@ -35,8 +35,8 @@ some additional commandline options.
<title><systemitem>--gtk-module <replaceable>module</replaceable></systemitem></title>
<para>
-A list of modules to load in addition to those specified in the
-<envar>GTK_MODULES</envar> environment variable and the
+A list of modules to load in addition to those specified in the
+<envar>GTK_MODULES</envar> environment variable and the
<literal>gtk-modules</literal> setting.
</para>
</formalpara>
@@ -56,11 +56,10 @@ warning that occurs.
<title><systemitem>--gtk-debug <replaceable>options</replaceable></systemitem></title>
<para>
-A list of <link linkend="GTK-Debug-Options">debug options</link>
-to turn on in addition to those specified in the <envar>GTK_DEBUG</envar>
-environment variable.
-This option is only available if GTK+ has been configured with
-<option>--enable-debug=yes</option>.
+A list of <link linkend="GTK-Debug-Options">debug options</link>
+to turn on in addition to those specified in the <envar>GTK_DEBUG</envar>
+environment variable. This option is only available if GTK+ has been
+configured with <option>--enable-debug=yes</option>.
</para>
</formalpara>
@@ -68,9 +67,8 @@ This option is only available if GTK+ has been configured with
<title><systemitem>--gtk-no-debug <replaceable>options</replaceable></systemitem></title>
<para>
-A list of <link linkend="GTK-Debug-Options">debug options</link>
-to turn off.
-This option is only available if GTK+ has been configured with
+A list of <link linkend="GTK-Debug-Options">debug options</link>
+to turn off. This option is only available if GTK+ has been configured with
<option>--enable-debug=yes</option>.
</para>
</formalpara>
@@ -84,7 +82,7 @@ list them here for completeness nevertheless.
<title><systemitem>--class <replaceable>class</replaceable></systemitem></title>
<para>
-Sets the program class; see gdk_set_program_class().
+Sets the program class; see gdk_set_program_class().
</para>
</formalpara>
@@ -100,9 +98,9 @@ Sets the program name.
<title><systemitem>--gdk-debug <replaceable>options</replaceable></systemitem></title>
<para>
-A list of <link linkend="GDK-Debug-Options">debug options</link>
-to turn on in addition to those specified in the <envar>GDK_DEBUG</envar>
-environment variable. This option is only available if GTK+ has been
+A list of <link linkend="GDK-Debug-Options">debug options</link>
+to turn on in addition to those specified in the <envar>GDK_DEBUG</envar>
+environment variable. This option is only available if GTK+ has been
configured with <option>--enable-debug=yes</option>.
</para>
</formalpara>
@@ -111,7 +109,7 @@ configured with <option>--enable-debug=yes</option>.
<title><systemitem>--gdk-no-debug <replaceable>options</replaceable></systemitem></title>
<para>
-A list of <link linkend="GDK-Debug-Options">debug options</link>
+A list of <link linkend="GDK-Debug-Options">debug options</link>
to turn off. This option is only available if GTK+ has been configured with
<option>--enable-debug=yes</option>.
</para>
@@ -122,12 +120,12 @@ to turn off. This option is only available if GTK+ has been configured with
<refsect2>
<title>Environment variables</title>
-<para>
+<para>
GTK+ inspects a number of environment variables in addition to standard
-variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar>
-or <envar>DISPLAY</envar>; mostly to determine paths to look for certain
-files. The <link linkend="x11-envar">X11</link>,
-<link linkend="win32-envar">Windows</link> and
+variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar>
+or <envar>DISPLAY</envar>; mostly to determine paths to look for certain
+files. The <link linkend="x11-envar">X11</link>,
+<link linkend="win32-envar">Windows</link> and
<link linkend="fb-envar">Framebuffer</link> GDK backends use some
additional environment variables.
</para>
@@ -190,7 +188,7 @@ additional environment variables.
</varlistentry>
</variablelist>
- The special value <literal>all</literal> can be used to turn on all
+ The special value <literal>all</literal> can be used to turn on all
debug options.
</para>
</formalpara>
@@ -210,14 +208,14 @@ additional environment variables.
Specifies a list of directories to search when GTK+ is looking for
dynamically loaded objects such as the modules specified by
<envar>GTK_MODULES</envar>, theme engines, input method
- modules, file system backends and print backends. If the path to
- the dynamically loaded object is given as an absolute path name,
- then GTK+ loads it directly.
- Otherwise, GTK+ goes in turn through the directories in GTK_PATH,
- followed by the directory <filename>.gtk-2.0</filename> in the user's
- home directory, followed by the system default directory,
- which is <filename><replaceable>libdir</replaceable>/gtk-2.0/modules</filename>.
- (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is
+ modules, file system backends and print backends. If the path to
+ the dynamically loaded object is given as an absolute path name,
+ then GTK+ loads it directly.
+ Otherwise, GTK+ goes in turn through the directories in GTK_PATH,
+ followed by the directory <filename>.gtk-3.0</filename> in the user's
+ home directory, followed by the system default directory,
+ which is <filename><replaceable>libdir</replaceable>/gtk-3.0/modules</filename>.
+ (If <envar>GTK_EXE_PREFIX</envar> is defined, <replaceable>libdir</replaceable> is
<filename>$GTK_EXE_PREFIX/lib</filename>. Otherwise it is the libdir
specified when GTK+ was configured, usually
<filename>/usr/lib</filename>, or
@@ -227,14 +225,14 @@ additional environment variables.
<filename><replaceable>directory</replaceable>/<replaceable>version</replaceable>/<replaceable>host</replaceable>/<replaceable>type</replaceable></filename>
Where <replaceable>version</replaceable> is derived from the
version of GTK+ (use <literal>pkg-config
- --variable=gtk_binary_version gtk+-2.0</literal> to determine this from a
+ --variable=gtk_binary_version gtk+-3.0</literal> to determine this from a
script), <replaceable>host</replaceable> is the architecture on
which GTK+ was built. (use <literal>pkg-config
- --variable=gtk_host gtk+-2.0</literal> to determine this from a
+ --variable=gtk_host gtk+-3.0</literal> to determine this from a
script), and <replaceable>type</replaceable> is a directory
specific to the type of modules; currently it can be
- <literal>modules</literal>, <literal>engines</literal>,
- <literal>immodules</literal>, <literal>filesystems</literal> or
+ <literal>modules</literal>, <literal>engines</literal>,
+ <literal>immodules</literal>, <literal>filesystems</literal> or
<literal>printbackends</literal>, corresponding to the types of
modules mentioned above. Either <replaceable>version</replaceable>,
<replaceable>host</replaceable>, or both may be omitted. GTK+ looks
@@ -262,17 +260,17 @@ additional environment variables.
<para>
Specifies the file listing the IM modules to load. This environment
- variable overrides the <literal>im_module_file</literal> specified in
- the RC files, which in turn overrides the default value
- <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gtk.immodules</filename>
- (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when GTK+ was configured,
+ variable overrides the <literal>im_module_file</literal> specified in
+ the RC files, which in turn overrides the default value
+ <filename><replaceable>sysconfdir</replaceable>/gtk-3.0/gtk.immodules</filename>
+ (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when GTK+ was configured,
usually <filename>/usr/local/etc</filename>.)
</para>
</formalpara>
<formalpara>
<title><envar>GTK2_RC_FILES</envar></title>
-
+
<para>
Specifies a list of RC files to parse instead of the default ones;
see <link linkend="gtk-Resource-Files">Resource Files</link>.
@@ -283,7 +281,7 @@ additional environment variables.
<title><envar>GTK_EXE_PREFIX</envar></title>
<para>
- If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of
+ If set, GTK+ uses <filename>$GTK_EXE_PREFIX/lib</filename> instead of
the libdir configured when GTK+ was compiled.
</para>
</formalpara>
@@ -307,9 +305,9 @@ nevertheless.
<title><envar>GDK_PIXBUF_MODULE_FILE</envar></title>
<para>
- Specifies the file listing the GdkPixbuf loader modules to load.
- This environment variable overrides the default value
- <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gdk-pixbuf.loaders</filename>
+ Specifies the file listing the GdkPixbuf loader modules to load.
+ This environment variable overrides the default value
+ <filename><replaceable>sysconfdir</replaceable>/gtk-3.0/gdk-pixbuf.loaders</filename>
(<replaceable>sysconfdir</replaceable> is the sysconfdir specified when
GTK+ was configured, usually <filename>/usr/local/etc</filename>.)
</para>
@@ -385,9 +383,9 @@ nevertheless.
<para>
GTK+ uses these environment variables to locate icon themes
- and MIME information. For more information, see
+ and MIME information. For more information, see
<ulink url="http://freedesktop.org/Standards/icon-theme-spec";>Icon Theme Specification</ulink>,
- the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec";>Shared MIME-info Database</ulink>
+ the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec";>Shared MIME-info Database</ulink>
and the <ulink url="http://freedesktop.org/Standards/basedir-spec";>Base Directory Specification</ulink>.
</para>
</formalpara>
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 70f0e6b..21b713a 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -65,6 +65,129 @@ Implementation of Object Properties
GtkCellRendererTextPixbuf
+<!-- ##### SECTION ./tmpl/gtkclist.sgml:Long_Description ##### -->
+<para>
+The #GtkCList widget is a very useful multi-columned scrolling list.
+It can display data in nicely aligned vertical columns, with titles
+at the top of the list.
+</para>
+<para>
+GtkCList has been deprecated since GTK+ 2.0 and should not be used
+in newly written code. Use #GtkTreeView instead.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkclist.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkclist.sgml:Short_Description ##### -->
+A multi-columned scrolling list widget
+
+
+<!-- ##### SECTION ./tmpl/gtkclist.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkclist.sgml:Title ##### -->
+GtkCList
+
+
+<!-- ##### SECTION ./tmpl/gtkcombo.sgml:Long_Description ##### -->
+<para>
+The #GtkCombo widget consists of a single-line text entry field and a drop-down
+list. The drop-down list is displayed when the user clicks on a small arrow
+button to the right of the entry field.
+</para>
+<para>
+The drop-down list is a #GtkList widget and can be accessed using the
+<structfield>list</structfield> member of the #GtkCombo-struct.
+List elements can contain arbitrary widgets, but if an element is not a
+plain label, then you must use the gtk_list_set_item_string() function.
+This sets the string which will be placed in the text entry field when the
+item is selected.
+</para>
+<para>
+By default, the user can step through the items in the list using the
+arrow (cursor) keys, though this behaviour can be turned off with
+gtk_combo_set_use_arrows().
+</para>
+<para>
+As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBoxEntry.
+</para>
+
+<example id="gtkcombo-simple-example">
+<title>Creating a <structname>GtkCombo</structname> widget with simple text
+items.</title>
+<programlisting>
+ GtkWidget *combo;
+ GList *items = NULL;
+
+ items = g_list_append (items, "First Item");
+ items = g_list_append (items, "Second Item");
+ items = g_list_append (items, "Third Item");
+ items = g_list_append (items, "Fourth Item");
+ items = g_list_append (items, "Fifth Item");
+
+ combo = gtk_combo_new (<!-- -->);
+ gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
+</programlisting>
+</example>
+
+<example>
+<title>Creating a <structname>GtkCombo</structname> widget with a complex item.</title>
+<programlisting>
+ GtkWidget *combo, *item, *hbox, *arrow, *label;
+
+ combo = gtk_combo_new (<!-- -->);
+
+ item = gtk_list_item_new (<!-- -->);
+ gtk_widget_show (item);
+
+ /* You can put almost anything into the GtkListItem widget. Here we will use
+ a horizontal box with an arrow and a label in it. */
+ hbox = gtk_hbox_new (FALSE, 3);
+ gtk_container_add (GTK_CONTAINER (item), hbox);
+ gtk_widget_show (hbox);
+
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
+ gtk_widget_show (arrow);
+ gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
+
+ label = gtk_label_new ("First Item");
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+ /* You must set the string to display in the entry field when the item is
+ selected. */
+ gtk_combo_set_item_string (GTK_COMBO (combo), GTK_ITEM (item), "1st Item");
+
+ /* Now we simply add the item to the combo's list. */
+ gtk_container_add (GTK_CONTAINER (GTK_COMBO (combo)->list), item);
+</programlisting>
+</example>
+
+
+<!-- ##### SECTION ./tmpl/gtkcombo.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkcombo.sgml:Short_Description ##### -->
+A text entry field with a dropdown list
+
+
+<!-- ##### SECTION ./tmpl/gtkcombo.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkcombo.sgml:Title ##### -->
+GtkCombo
+
+
<!-- ##### SECTION ./tmpl/gtkdata.sgml:Long_Description ##### -->
<para>
The #GtkData object is a very simple object intended to be used as a base
@@ -101,6 +224,210 @@ Debugging
gtkenums.sgml
+<!-- ##### SECTION ./tmpl/gtkfilesel.sgml:Long_Description ##### -->
+<para>
+#GtkFileSelection has been superseded by the newer #GtkFileChooser family
+of widgets.
+</para>
+<para>
+#GtkFileSelection should be used to retrieve file or directory names from
+the user. It will create a new dialog window containing a directory list,
+and a file list corresponding to the current working directory. The filesystem
+can be navigated using the directory list or the drop-down history menu.
+Alternatively, the TAB key can be used to navigate using filename
+completion - common in text based editors such as emacs and jed.
+</para>
+<para>
+File selection dialogs are created with a call to gtk_file_selection_new().
+</para>
+<para>
+The default filename can be set using gtk_file_selection_set_filename() and the selected filename retrieved using gtk_file_selection_get_filename().
+</para>
+<para>
+Use gtk_file_selection_complete() to display files and directories
+that match a given pattern. This can be used for example, to show only
+*.txt files, or only files beginning with gtk*.
+</para>
+<para>
+Simple file operations; create directory, delete file, and rename file, are available from buttons at the top of the dialog. These can be hidden using gtk_file_selection_hide_fileop_buttons() and shown again using gtk_file_selection_show_fileop_buttons().
+</para>
+<para>
+<example>
+<title>Getting a filename from the user.</title>
+<programlisting>
+
+/* The file selection widget and the string to store the chosen filename */
+
+void store_filename (GtkWidget *widget, gpointer user_data) {
+ GtkWidget *file_selector = GTK_WIDGET (user_data);
+ const gchar *selected_filename;
+
+ selected_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_selector));
+ g_print ("Selected filename: %s\n", selected_filename);
+}
+
+void create_file_selection (void) {
+
+ GtkWidget *file_selector;
+
+ /* Create the selector */
+
+ file_selector = gtk_file_selection_new ("Please select a file for editing.");
+
+ g_signal_connect (GTK_FILE_SELECTION (file_selector)->ok_button,
+ "clicked",
+ G_CALLBACK (store_filename),
+ file_selector);
+
+ /* Ensure that the dialog box is destroyed when the user clicks a button. */
+
+ g_signal_connect_swapped (GTK_FILE_SELECTION (file_selector)->ok_button,
+ "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ file_selector);
+
+ g_signal_connect_swapped (GTK_FILE_SELECTION (file_selector)->cancel_button,
+ "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ file_selector);
+
+ /* Display that dialog */
+
+ gtk_widget_show (file_selector);
+}
+
+</programlisting>
+</example>
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkfilesel.sgml:See_Also ##### -->
+
+<para>
+<variablelist>
+<varlistentry>
+<term>#GtkDialog</term>
+<listitem><para>Add your own widgets into the #GtkFileSelection.</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkfilesel.sgml:Short_Description ##### -->
+Prompt the user for a file or directory name
+
+
+<!-- ##### SECTION ./tmpl/gtkfilesel.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkfilesel.sgml:Title ##### -->
+GtkFileSelection
+
+
+<!-- ##### SECTION ./tmpl/gtkitemfactory.sgml:Long_Description ##### -->
+<para>
+As of GTK+ 2.4, #GtkItemFactory has been deprecated in favour of #GtkUIManager.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkitemfactory.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkitemfactory.sgml:Short_Description ##### -->
+A factory for menus
+
+
+<!-- ##### SECTION ./tmpl/gtkitemfactory.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkitemfactory.sgml:Title ##### -->
+GtkItemFactory
+
+
+<!-- ##### SECTION ./tmpl/gtklist.sgml:Long_Description ##### -->
+<para>
+The #GtkList widget is a container whose children are displayed
+vertically in order, and can be selected.
+
+The list has many selection modes, which are programmer selective and
+depend on how many elements are able to be selected at the same time.
+</para>
+<para>
+GtkList has been deprecated since GTK+ 2.0 and should not be used
+in newly written code. Use #GtkTreeView instead.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtklist.sgml:See_Also ##### -->
+<para>
+<variablelist>
+<varlistentry>
+<term>#GtkContainer</term>
+<listitem><para>For functions that apply to every #GtkContainer
+(like #GtkList).</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>#GtkListitem</term>
+<listitem><para>Children of a #GtkList widget must be of this
+type.</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtklist.sgml:Short_Description ##### -->
+Widget for packing a list of selectable items
+
+
+<!-- ##### SECTION ./tmpl/gtklist.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtklist.sgml:Title ##### -->
+GtkList
+
+
+<!-- ##### SECTION ./tmpl/gtklistitem.sgml:Long_Description ##### -->
+<para>
+The #GtkListItem widget is used for each item in a #GtkList.
+</para>
+<para>
+GtkList has has been deprecated since GTK+ 2.0 and should not be used
+in newly written code. Use #GtkTreeView instead.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtklistitem.sgml:See_Also ##### -->
+<para>
+<variablelist>
+
+<varlistentry>
+<term>#GtkList</term>
+<listitem><para>the parent list widget.</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtklistitem.sgml:Short_Description ##### -->
+An item in a GtkList
+
+
+<!-- ##### SECTION ./tmpl/gtklistitem.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtklistitem.sgml:Title ##### -->
+GtkListItem
+
+
<!-- ##### SECTION ./tmpl/gtkmarshal.sgml:Long_Description ##### -->
<refsect2>
<title>What are Signal Marshallers?</title>
@@ -209,6 +536,41 @@ Signal Marshallers
GtkPacker
+<!-- ##### SECTION ./tmpl/gtkpreview.sgml:Long_Description ##### -->
+<para>
+The #GtkPreview widget provides a simple interface
+used to display images as RGB or grayscale data.
+It's deprecated; just use a #GdkPixbuf displayed by a #GtkImage, or
+perhaps a #GtkDrawingArea. #GtkPreview has no advantage over those
+approaches.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkpreview.sgml:See_Also ##### -->
+<para>
+<variablelist>
+
+<varlistentry>
+<term>#GdkRGB</term>
+<listitem><para>the backend used by #GtkPreview.</para></listitem>
+</varlistentry>
+
+</variablelist>
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkpreview.sgml:Short_Description ##### -->
+A widget to display RGB or grayscale data
+
+
+<!-- ##### SECTION ./tmpl/gtkpreview.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtkpreview.sgml:Title ##### -->
+GtkPreview
+
+
<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Title ##### -->
Private Information
@@ -237,6 +599,56 @@ Private Information
Themes
+<!-- ##### SECTION ./tmpl/gtktipsquery.sgml:Long_Description ##### -->
+<para>
+The #GtkTipsQuery widget is a subclass of #GtkLabel which is used to display
+help about widgets in a user interface.
+</para>
+<para>
+A query is started with a call to gtk_tips_query_start_query(), usually
+when some kind of 'Help' button is pressed. The #GtkTipsQuery then grabs all
+events, stopping the user interface from functioning normally.
+Then as the user moves the mouse over the widgets, the #GtkTipsQuery displays
+each widget's tooltip text.
+</para>
+<para>
+By connecting to the "widget-entered" or "widget-selected" signals, it is
+possible to customize the #GtkTipsQuery to perform other actions when widgets
+are entered or selected. For example, a help browser could be opened with
+documentation on the widget selected.
+</para>
+<para>
+At some point a call to gtk_tips_query_stop_query() must be made in order to
+stop the query and return the interface to its normal state.
+The gtk_tips_query_set_caller() function can be used to specify a widget
+which the user can select to stop the query (often the same button used to
+start the query).
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtktipsquery.sgml:See_Also ##### -->
+<para>
+<variablelist>
+<varlistentry>
+<term>#GtkTooltips</term>
+<listitem><para>the object which handles tooltips.</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtktipsquery.sgml:Short_Description ##### -->
+Displays help about widgets in the user interface
+
+
+<!-- ##### SECTION ./tmpl/gtktipsquery.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gtktipsquery.sgml:Title ##### -->
+GtkTipsQuery
+
+
<!-- ##### SECTION ./tmpl/gtktreemodelsimple.sgml:Long_Description ##### -->
<para>
@@ -257,6 +669,112 @@ Themes
GtkModelSimple
+<!-- ##### MACRO GTK_CELL_PIXMAP ##### -->
+<para>
+A macro to cast a generic #GtkCList cell item to a GtkCellPixmap pointer.
+</para>
+
+ cell: The #GtkCList cell item to convert.
+
+<!-- ##### MACRO GTK_CELL_PIXTEXT ##### -->
+<para>
+A macro to cast a generic #GtkCList cell item to a GtkCellPixText pointer.
+</para>
+
+ cell: The #GtkCList cell item to convert.
+
+<!-- ##### MACRO GTK_CELL_TEXT ##### -->
+<para>
+A macro to cast a generic #GtkCList cell item to a GtkCellText pointer.
+</para>
+
+ cell: The #GtkCList cell item to convert.
+
+<!-- ##### MACRO GTK_CELL_WIDGET ##### -->
+<para>
+A macro to cast a generic #GtkCList cell item to a GtkCellWidget pointer.
+</para>
+
+ cell: The #GtkCList cell item to convert.
+
+<!-- ##### MACRO GTK_CHECK_CAST ##### -->
+<para>
+Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is
+defined, just cast it. Otherwise, check to see if we can cast @tobj
+into a @cast.
+</para>
+
+
+<!-- ##### MACRO GTK_CHECK_CLASS_CAST ##### -->
+<para>
+Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is
+defined, just cast it. Otherwise, check to see if we can cast @tobj
+into a @cast.
+</para>
+
+ tclass: a #GtkClassInitFunc
+ cast_type: a GTK+ type.
+ cast: a C type
+
+<!-- ##### MACRO GTK_CHECK_CLASS_TYPE ##### -->
+<para>
+Determines whether @type_class is a type of @otype.
+</para>
+
+ type_class: a #GtkTypeClass class.
+
+<!-- ##### MACRO GTK_CHECK_GET_CLASS ##### -->
+<para>
+Gets the class of @tobj.
+</para>
+
+ tobj: a #GtkObject.
+
+<!-- ##### MACRO GTK_CHECK_TYPE ##### -->
+<para>
+Determines whether @type_object is a type of @otype.
+</para>
+
+ type_object: a #GtkTypeObject object
+
+<!-- ##### MACRO GTK_CLASS_NAME ##### -->
+<para>
+Returns the type name of @class.
+</para>
+
+ class: a #GtkTypeClass.
+ Deprecated: Use g_type_name() and G_TYPE_FROM_CLASS() instead.
+
+<!-- ##### MACRO GTK_CLASS_TYPE ##### -->
+<para>
+Returns the type of @class.
+</para>
+
+ class: a #GtkTypeClass.
+ Deprecated: Use G_TYPE_FROM_CLASS() instead.
+
+<!-- ##### MACRO GTK_CLIST_ADD_MODE ##### -->
+<para>
+A macro to test whether the CList is in "add mode."
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_CLIST_AUTO_RESIZE_BLOCKED ##### -->
+<para>
+A macro to check if automatic resizing of columns is blocked.
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_CLIST_AUTO_SORT ##### -->
+<para>
+A macro to test whether the CList has automatic sorting
+switched on.
+</para>
+
+ clist: The #GtkCList widget to check.
+
<!-- ##### MACRO GTK_CLIST_CHILD_HAS_FOCUS ##### -->
<para>
A macro to check whether a child widget of the CList
@@ -265,6 +783,92 @@ has the focus.
@clist: The #GtkCList widget to check.
+<!-- ##### MACRO GTK_CLIST_DRAW_DRAG_LINE ##### -->
+<para>
+A macro to check if the DRAW_DRAG_LINE property is enabled.
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_CLIST_DRAW_DRAG_RECT ##### -->
+<para>
+A macro to check if the DRAW_DRAG_RECT property is enabled.
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_CLIST_FLAGS ##### -->
+<para>
+Reads the current flags of the specified CList.
+</para>
+
+ clist: The #GtkCList widget from which to get the flags
+
+<!-- ##### MACRO GTK_CLIST_IN_DRAG ##### -->
+<para>
+A macro to check whether the #GtkCList is in "drag mode."
+</para>
+
+ clist: The #GtkCList to check.
+
+<!-- ##### MACRO GTK_CLIST_REORDERABLE ##### -->
+<para>
+A macro to test if the CList's columns are re-orderable
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_CLIST_ROW ##### -->
+<para>
+A macro to cast a GList element to a CListRow pointer.
+</para>
+
+ _glist_: The GList element to convert.
+
+<!-- ##### MACRO GTK_CLIST_ROW_HEIGHT_SET ##### -->
+<para>
+A macro to check whether the #GtkCList's row height is set.
+</para>
+
+ clist: The #GtkCList to check.
+
+<!-- ##### MACRO GTK_CLIST_SET_FLAG ##### -->
+<para>
+A macro to set a particular flag for the specified CList.
+</para>
+
+ clist: The #GtkCList widget to affect.
+ flag: A single #GtkCList flag to set. NOTE: Do not add the GTK_ prefix.
+
+<!-- ##### MACRO GTK_CLIST_SHOW_TITLES ##### -->
+<para>
+A macro to check whether the flag for showing the
+widget's column titles is set.
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_CLIST_UNSET_FLAG ##### -->
+<para>
+A macro to clear a particular flag for the specified CList.
+</para>
+
+ clist: The #GtkCList widget to affect.
+ flag: A single #GtkCList flag to clear. NOTE: Do not add the GTK_ prefix.
+
+<!-- ##### MACRO GTK_CLIST_USE_DRAG_ICONS ##### -->
+<para>
+A macro to check if the USE_DRAG_ICONS property is enabled.
+</para>
+
+ clist: The #GtkCList widget to check.
+
+<!-- ##### MACRO GTK_FUNDAMENTAL_TYPE ##### -->
+<para>
+Converts a GTK+ type into a fundamental type.
+</para>
+
+
<!-- ##### MACRO GTK_ICON_SIZE_BUTTON ##### -->
<para>
@@ -330,6 +934,14 @@ Test whether a GtkObject has had gtk_object_destroy() invoked on it.
@obj: the object to examine.
+<!-- ##### MACRO GTK_OBJECT_FLOATING ##### -->
+<para>
+Evaluates to %TRUE if the object still has its floating reference count.
+See the overview documentation for #GtkObject.
+</para>
+
+ obj: the object to examine.
+
<!-- ##### MACRO GTK_OBJECT_NSIGNALS ##### -->
<para>
Get the number of signals defined by this object.
@@ -372,6 +984,118 @@ Turns off certain object flags. (Private)
</para>
+<!-- ##### MACRO GTK_RETLOC_BOOL ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOOL.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_BOXED ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOXED.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_CHAR ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_CHAR.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_DOUBLE ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_DOUBLE.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_ENUM ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ENUM.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_FLAGS ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLAGS.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_FLOAT ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLOAT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_INT ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_INT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_LONG ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_LONG.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_OBJECT ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_OBJECT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_POINTER ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_POINTER.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_STRING ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_STRING.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_UCHAR ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UCHAR.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_UINT ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UINT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_RETLOC_ULONG ##### -->
+<para>
+If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ULONG.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_SIGNAL_FUNC ##### -->
+<para>
+Just a macroized cast into a #GtkSignalFunc.
+</para>
+
+ f:
+
<!-- ##### MACRO GTK_STOCK_BUTTON_APPLY ##### -->
<para>
@@ -408,6 +1132,13 @@ Turns off certain object flags. (Private)
</para>
+<!-- ##### MACRO GTK_STRUCT_OFFSET ##### -->
+<para>
+Use in place of <function>offsetof()</function>, which is used if it exists.
+</para>
+
+ Deprecated: Use G_STRUCT_OFFSET() instead.
+
<!-- ##### MACRO GTK_TIPS_QUERY ##### -->
<para>
@@ -455,12 +1186,34 @@ The last "flat" (no struct) enumerated type value.
</para>
+<!-- ##### MACRO GTK_TYPE_FUNDAMENTAL_LAST ##### -->
+<para>
+The highest-numbered structured or flat enumerated type value.
+</para>
+
+ Deprecated: Use #G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1 instead.
+
+<!-- ##### MACRO GTK_TYPE_FUNDAMENTAL_MAX ##### -->
+<para>
+The maximum fundamental enumerated type value.
+</para>
+
+ Deprecated: Use #G_TYPE_FUNDAMENTAL_MAX instead.
+
<!-- ##### MACRO GTK_TYPE_IDENTIFIER ##### -->
<para>
Hide the name of gtk_identifier_get_type
</para>
+<!-- ##### MACRO GTK_TYPE_IS_OBJECT ##### -->
+<para>
+Returns %TRUE if @type is a %GTK_TYPE_OBJECT.
+</para>
+
+ type: a #GtkType.
+ Deprecated: Use G_TYPE_IS_OBJECT() instead.
+
<!-- ##### MACRO GTK_TYPE_MAKE ##### -->
<para>
Combine a fundemantal type and a sequence number to create a gtk type.
@@ -519,6 +1272,20 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS
@a:
+<!-- ##### MACRO GTK_VALUE_BOOL ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOOL.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_BOXED ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOXED.
+</para>
+
+ a: a #GtkArg.
+
<!-- ##### MACRO GTK_VALUE_CALLBACK ##### -->
<para>
Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK
@@ -526,6 +1293,13 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK
@a:
+<!-- ##### MACRO GTK_VALUE_CHAR ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_CHAR.
+</para>
+
+ a: a #GtkArg.
+
<!-- ##### MACRO GTK_VALUE_C_CALLBACK ##### -->
<para>
Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
@@ -533,6 +1307,34 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
@a:
+<!-- ##### MACRO GTK_VALUE_DOUBLE ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_DOUBLE.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_ENUM ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ENUM.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_FLAGS ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLAGS.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_FLOAT ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLOAT.
+</para>
+
+ a: a #GtkArg.
+
<!-- ##### MACRO GTK_VALUE_FOREIGN ##### -->
<para>
Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
@@ -540,6 +1342,69 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
@a:
+<!-- ##### MACRO GTK_VALUE_INT ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_INT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_LONG ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_LONG.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_OBJECT ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_OBJECT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_POINTER ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_POINTER.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_SIGNAL ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_SIGNAL.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_STRING ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_STRING.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_UCHAR ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UCHAR.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_UINT ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UINT.
+</para>
+
+ a: a #GtkArg.
+
+<!-- ##### MACRO GTK_VALUE_ULONG ##### -->
+<para>
+Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ULONG.
+</para>
+
+ a: a #GtkArg.
+
<!-- ##### USER_FUNCTION GValueCompareFunc ##### -->
<para>
@@ -614,6 +1479,22 @@ This is a private struct used by GTK+ internally, don't worry about it.
@action: the object which received the signal.
@widget:
+<!-- ##### ENUM GtkArgFlags ##### -->
+<para>
+Possible flags indicating how an argument should be treated.
+</para>
+
+ GTK_ARG_READABLE: the argument is readable. (i.e. can be queried)
+ GTK_ARG_WRITABLE: the argument is writable. (i.e. settable)
+ GTK_ARG_CONSTRUCT: the argument needs construction.
+ GTK_ARG_CONSTRUCT_ONLY: the argument needs construction (and will
+be set once during object creation), but is otherwise cannot be
+set. Hence this flag is not allowed with #GTK_ARG_WRITABLE,
+and is redundant with #GTK_ARG_CONSTRUCT.
+ GTK_ARG_CHILD_ARG: an argument type that applies to (and may be different for)
+each child. Used by #GtkContainer.
+ Deprecated: Use corresponding #GParamSpec features instead
+
<!-- ##### USER_FUNCTION GtkArgGetFunc ##### -->
<para>
Define a function pointer. Deprecated.
@@ -661,6 +1542,340 @@ Define a function pointer. Deprecated.
is provided to allow language bindings to intercept the
type resolution process.
+<!-- ##### ENUM GtkButtonAction ##### -->
+<para>
+Values for specifying what mouse button events a CList will
+react to.
+</para>
+
+ GTK_BUTTON_IGNORED:
+ GTK_BUTTON_SELECTS:
+ GTK_BUTTON_DRAGS:
+ GTK_BUTTON_EXPANDS:
+
+<!-- ##### STRUCT GtkCList ##### -->
+<para>
+This is the embodiment of the #GtkCList widget. This structure contains
+only private data, and should be accessed only via the CList API.
+</para>
+
+
+<!-- ##### SIGNAL GtkCList::abort-column-resize ##### -->
+<para>
+This signal is emitted when a column resize is aborted.
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::click-column ##### -->
+<para>
+This signal is emitted when a column title is clicked.
+</para>
+
+ clist: The object which received the signal.
+ column: The number of the column.
+
+<!-- ##### SIGNAL GtkCList::end-selection ##### -->
+<para>
+This signal is emitted when a selection ends in a
+multiple selection CList.
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::extend-selection ##### -->
+<para>
+This signal is emitted when the selection is extended.
+</para>
+
+ clist: the object which received the signal.
+ scroll_type: A #GtkScrollType value of any scrolling operation the
+occured during the selection.
+ position: A value between 0.0 and 1.0.
+ auto_start_selection: %TRUE or %FALSE.
+
+<!-- ##### SIGNAL GtkCList::resize-column ##### -->
+<para>
+This signal is emitted when a column is resized.
+</para>
+
+ clist: The object which received the signal.
+ column: The number of the column
+ width: The new width of the column.
+
+<!-- ##### SIGNAL GtkCList::row-move ##### -->
+<para>
+This signal is emitted when a row is moved.
+</para>
+
+ clist: The object which received the signal.
+ arg1: The source position of the row.
+ arg2: The destination position of the row.
+
+<!-- ##### SIGNAL GtkCList::scroll-horizontal ##### -->
+<para>
+This signal is emitted when the CList is scrolled horizontally.
+</para>
+
+ clist: the object which received the signal.
+ scroll_type: A #GtkScrollType value of how the scroll operation occured.
+ position: a value between 0.0 and 1.0.
+
+<!-- ##### SIGNAL GtkCList::scroll-vertical ##### -->
+<para>
+This signal is emitted when the CList is scrolled vertically.
+</para>
+
+ clist: the object which received the signal.
+ scroll_type: A #GtkScrollType value of how the scroll operation occured.
+ position: A value between 0.0 and 1.0.
+
+<!-- ##### SIGNAL GtkCList::select-all ##### -->
+<para>
+This signal is emitted when all the rows are selected in a CList.
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::select-row ##### -->
+<para>
+This signal is emitted when the user selects a row in the list.
+It is emitted for every row that is selected in a multi-selection or
+by calling gtk_clist_select_all().
+</para>
+
+ clist: The object which received the signal.
+ row: The row selected.
+ column: The column where the selection occured.
+ event: A #GdkEvent structure for the selection.
+
+<!-- ##### SIGNAL GtkCList::set-scroll-adjustments ##### -->
+<para>
+
+</para>
+
+ clist: the object which received the signal.
+ arg1:
+ arg2:
+
+<!-- ##### SIGNAL GtkCList::start-selection ##### -->
+<para>
+This signal is emitted when a drag-selection is started in
+a multiple-selection CList.
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::toggle-add-mode ##### -->
+<para>
+This signal is emitted when "add mode" is toggled.
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::toggle-focus-row ##### -->
+<para>
+
+</para>
+
+ clist: The object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::undo-selection ##### -->
+<para>
+This signal is emitted when an undo selection occurs in the CList,
+probably via calling gtk_clist_undo_selection().
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::unselect-all ##### -->
+<para>
+This signal is emitted when all rows are unselected in a CList.
+</para>
+
+ clist: the object which received the signal.
+
+<!-- ##### SIGNAL GtkCList::unselect-row ##### -->
+<para>
+This signal is emitted when the user unselects a row in the list.
+It is emitted for every row that is unselected in a multi-selection or
+by calling gtk_clist_unselect_all(). It is also emitted for the
+previously selected row in a "single" or "browse" mode CList.
+</para>
+
+ clist: The object which received the signal.
+ row: The selected row
+ column: The column where the selection occured.
+ event:
+
+<!-- ##### ARG GtkCList:n-columns ##### -->
+<para>
+An integer value for a column.
+</para>
+
+
+<!-- ##### ARG GtkCList:reorderable ##### -->
+<para>
+A boolean value for determining if the user can re-order the CList's
+columns.
+</para>
+
+
+<!-- ##### ARG GtkCList:row-height ##### -->
+<para>
+An integer value representing the height of a row in pixels.
+</para>
+
+
+<!-- ##### ARG GtkCList:selection-mode ##### -->
+<para>
+Sets the type of selection mode for the CList.
+</para>
+
+
+<!-- ##### ARG GtkCList:shadow-type ##### -->
+<para>
+Sets the shadowing for the CList.
+</para>
+
+
+<!-- ##### ARG GtkCList:sort-type ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkCList:titles-active ##### -->
+<para>
+A boolean value for setting whether the column titles can be
+clicked.
+</para>
+
+
+<!-- ##### ARG GtkCList:use-drag-icons ##### -->
+<para>
+A boolean value for setting whether to use icons during drag
+operations.
+</para>
+
+
+<!-- ##### STRUCT GtkCListCellInfo ##### -->
+<para>
+A simple structure that the #GtkCList widget uses to keep track
+of the location of a cell.
+</para>
+
+ row:
+ column:
+
+<!-- ##### STRUCT GtkCListColumn ##### -->
+<para>
+A structure that the #GtkCList widget uses to keep track of information
+about its columns.
+</para>
+
+ title:
+ area:
+ button:
+ window:
+ width:
+ min_width:
+ max_width:
+ justification:
+ visible:
+ width_set:
+ resizeable:
+ auto_resize:
+ button_passive:
+
+<!-- ##### USER_FUNCTION GtkCListCompareFunc ##### -->
+<para>
+Function prototype for the compare function callback.
+</para>
+
+ clist: The #GtkCList that is affected.
+ ptr1: A #gconstpointer to the first node to compare.
+ ptr2: A #gconstpointer to the second node to compare.
+ Returns: 0 if the nodes are equal, less than 0 if the first node should
+come before the second, and greater than 1 if the second come before the
+first.
+
+<!-- ##### STRUCT GtkCListDestInfo ##### -->
+<para>
+A simple structure that the #GtkCList widget uses to track
+a cell for a drag operation.
+</para>
+
+ cell:
+ insert_pos:
+
+<!-- ##### ENUM GtkCListDragPos ##### -->
+<para>
+An enumeration for drag operations.
+</para>
+
+ GTK_CLIST_DRAG_NONE:
+ GTK_CLIST_DRAG_BEFORE:
+ GTK_CLIST_DRAG_INTO:
+ GTK_CLIST_DRAG_AFTER:
+
+<!-- ##### STRUCT GtkCListRow ##### -->
+<para>
+A structure that the #GtkCList widget uses to keep track of information
+about its rows.
+</para>
+
+ cell:
+ state:
+ foreground:
+ background:
+ style:
+ data:
+ destroy:
+ fg_set:
+ bg_set:
+ selectable:
+
+<!-- ##### STRUCT GtkCell ##### -->
+<para>
+A generic structure that the #GtkCList widget uses to keep track of the
+contents of each of its cells.
+</para>
+
+ type:
+ vertical:
+ horizontal:
+ style:
+ widget:
+
+<!-- ##### STRUCT GtkCellPixText ##### -->
+<para>
+A structure that the #GtkCList widget uses to keep track of #GtkCList cells
+that contain a combination of text and a GdkPixmap.
+</para>
+
+ type:
+ vertical:
+ horizontal:
+ style:
+ text:
+ spacing:
+ pixmap:
+ mask:
+
+<!-- ##### STRUCT GtkCellPixmap ##### -->
+<para>
+A structure that the #GtkCList widget uses to keep track of #GtkCList cells
+that contain a GdkPixmap.
+</para>
+
+ type:
+ vertical:
+ horizontal:
+ style:
+ pixmap:
+ mask:
+
<!-- ##### STRUCT GtkCellRendererTextPixbuf ##### -->
<para>
@@ -668,12 +1883,55 @@ Define a function pointer. Deprecated.
@parent:
+<!-- ##### STRUCT GtkCellText ##### -->
+<para>
+A structure that the #GtkCList widget uses to keep track of #GtkCList cells
+that contain text.
+</para>
+
+ type:
+ vertical:
+ horizontal:
+ style:
+ text:
+
+<!-- ##### ENUM GtkCellType ##### -->
+<para>
+Identifies the type of element in the current cell of the CList. Cells can
+contain text, pixmaps, or both. Unfortunately support for %GTK_CELL_WIDGET
+was never completed.
+</para>
+
+ GTK_CELL_EMPTY:
+ GTK_CELL_TEXT:
+ GTK_CELL_PIXMAP:
+ GTK_CELL_PIXTEXT:
+ GTK_CELL_WIDGET:
+
<!-- ##### ARG GtkCellView:use-fg ##### -->
<para>
</para>
+<!-- ##### STRUCT GtkCellWidget ##### -->
+<para>
+A structure that the #GtkCList widget uses to keep track of #GtkCList cells
+that contain another widget.
+</para>
+
+ type:
+ vertical:
+ horizontal:
+ style:
+ widget:
+
+<!-- ##### TYPEDEF GtkClassInitFunc ##### -->
+<para>
+Defines a function pointer.
+</para>
+
+
<!-- ##### ARG GtkColorSelection:previous-alpha ##### -->
<para>
@@ -686,6 +1944,47 @@ Define a function pointer. Deprecated.
</para>
+<!-- ##### STRUCT GtkCombo ##### -->
+<para>
+The #GtkCombo-struct struct contains the following fields.
+(These fields should be considered read-only. They should never be set by
+an application.)
+</para>
+
+ entry: the text entry field.
+ list: the list shown in the drop-down window.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### ARG GtkCombo:allow-empty ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkCombo:case-sensitive ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkCombo:enable-arrow-keys ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkCombo:enable-arrows-always ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkCombo:value-in-list ##### -->
+<para>
+
+</para>
+
+
<!-- ##### SIGNAL GtkComboBox::popup-hide ##### -->
<para>
@@ -741,6 +2040,19 @@ possibly because the #GtkData object is about to be destroyed.
@data: the object which received the signal.
+<!-- ##### USER_FUNCTION GtkDestroyNotify ##### -->
+<para>
+Defines a function pointer.
+</para>
+
+ data: #gpointer
+
+<!-- ##### UNION GtkDitherInfo ##### -->
+<para>
+This union not used in GTK+.
+</para>
+
+
<!-- ##### SIGNAL GtkEditable::activate ##### -->
<para>
Indicates that the user has activated the widget
@@ -1052,12 +2364,71 @@ You may not attach these to signals created with the
@_gtk_reserved4:
@_gtk_reserved5:
+<!-- ##### TYPEDEF GtkEnumValue ##### -->
+<para>
+A structure which contains a single enum value, and its name, and its
+nickname.
+</para>
+
+
<!-- ##### ARG GtkFileChooser:file-system ##### -->
<para>
</para>
+<!-- ##### STRUCT GtkFileSelection ##### -->
+<para>
+The #GtkFileSelection struct contains the following #GtkWidget fields:
+</para>
+
+ dir_list:
+ file_list:
+ selection_entry:
+ selection_text:
+ main_vbox:
+ ok_button:
+ cancel_button: the two main buttons that signals should be connected
+ to in order to perform an action when the user hits either OK or
+ Cancel.
+ help_button:
+ history_pulldown: the #GtkOptionMenu used to create the drop-down
+ directory history.
+ history_menu:
+ history_list:
+ fileop_dialog: the dialog box used to display the #GtkFileSelection.
+ It can be customized by adding/removing widgets from it using the
+ standard #GtkDialog functions.
+ fileop_entry:
+ fileop_file:
+ cmpl_state:
+ fileop_c_dir:
+ fileop_del_file:
+ fileop_ren_file: the buttons that appear at the top of the file
+ selection dialog. These "operation buttons" can be hidden and
+ redisplayed with gtk_file_selection_hide_fileop_buttons() and
+ gtk_file_selection_show_fileop_buttons() respectively.
+ button_area:
+ action_area:
+
+<!-- ##### ARG GtkFileSelection:filename ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileSelection:select-multiple ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileSelection:show-fileops ##### -->
+<para>
+
+</para>
+
+
<!-- ##### STRUCT GtkFixedChild ##### -->
<para>
The #GtkFixedChild-struct struct contains the following fields.
@@ -1092,6 +2463,12 @@ container.</entry>
@x:
@y:
+<!-- ##### TYPEDEF GtkFlagValue ##### -->
+<para>
+
+</para>
+
+
<!-- ##### ENUM GtkFontFilterType ##### -->
<para>
A set of bit flags used to specify the filter being set
@@ -1115,6 +2492,14 @@ gtk_font_selection_set_filter().
@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
@GTK_FONT_ALL: a bitwise combination of all of the above.
+<!-- ##### TYPEDEF GtkFundamentalType ##### -->
+<para>
+#GtkFundamentalType is an enumerated type which lists all the possible
+fundamental types (e.g. <type>char</type>, <type>uchar</type>, <type>int</type>,
+<type>long</type>, <type>float</type>, etc).
+</para>
+
+
<!-- ##### ARG GtkHScale:adjustment ##### -->
<para>
the #GtkAdjustment which sets the range of the scale.
@@ -1152,12 +2537,193 @@ a RC file.
</para>
+<!-- ##### STRUCT GtkItemFactory ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION GtkItemFactoryCallback ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION GtkItemFactoryCallback1 ##### -->
+<para>
+
+</para>
+
+ callback_data:
+ callback_action:
+ widget:
+
+<!-- ##### USER_FUNCTION GtkItemFactoryCallback2 ##### -->
+<para>
+
+</para>
+
+ widget:
+ callback_data:
+ callback_action:
+
+<!-- ##### STRUCT GtkItemFactoryEntry ##### -->
+<para>
+
+</para>
+
+ path:
+ accelerator:
+ callback:
+ callback_action:
+ item_type:
+ extra_data:
+
+<!-- ##### STRUCT GtkItemFactoryItem ##### -->
+<para>
+
+</para>
+
+ path:
+ widgets:
+
<!-- ##### ARG GtkLabel:accel-keyval ##### -->
<para>
</para>
+<!-- ##### STRUCT GtkList ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL GtkList::select-child ##### -->
+<para>
+The child @widget has just been selected.
+</para>
+
+ list: the object which received the signal.
+ widget: the newly selected child.
+
+<!-- ##### SIGNAL GtkList::selection-changed ##### -->
+<para>
+The selection of the widget has just changed.
+</para>
+
+ list: the object which received the signal.
+
+<!-- ##### SIGNAL GtkList::unselect-child ##### -->
+<para>
+The child @widget has just been unselected.
+</para>
+
+ list: the object which received the signal.
+ widget: the newly unselected child.
+
+<!-- ##### ARG GtkList:selection-mode ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkListItem ##### -->
+<para>
+The #GtkListItem struct contains private data only, and should
+only be accessed using the functions below.
+</para>
+
+
+<!-- ##### SIGNAL GtkListItem::end-selection ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkListItem::extend-selection ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+ scroll_type:
+ position:
+ auto_start_selection:
+
+<!-- ##### SIGNAL GtkListItem::scroll-horizontal ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+ scroll_type:
+ position:
+
+<!-- ##### SIGNAL GtkListItem::scroll-vertical ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+ scroll_type:
+ position:
+
+<!-- ##### SIGNAL GtkListItem::select-all ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkListItem::start-selection ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkListItem::toggle-add-mode ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkListItem::toggle-focus-row ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkListItem::undo-selection ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### SIGNAL GtkListItem::unselect-all ##### -->
+<para>
+
+</para>
+
+ listitem: the object which received the signal.
+
+<!-- ##### ENUM GtkMatchType ##### -->
+<para>
+
+</para>
+
+ GTK_MATCH_ALL:
+ GTK_MATCH_ALL_TAIL:
+ GTK_MATCH_HEAD:
+ GTK_MATCH_TAIL:
+ GTK_MATCH_EXACT:
+ GTK_MATCH_LAST:
+
<!-- ##### SIGNAL GtkMenuBar::cycle-focus ##### -->
<para>
@@ -1193,6 +2759,36 @@ a RC file.
@arg1:
@arg2:
+<!-- ##### ARG GtkNotebook:group-id ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkNotebook:homogeneous ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkNotebook:tab-border ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkNotebook:tab-hborder ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkNotebook:tab-vborder ##### -->
+<para>
+
+</para>
+
+
<!-- ##### ARG GtkObject:object-signal ##### -->
<para>
Setting this with a GtkType of GTK_TYPE_SIGNAL connects
@@ -1234,6 +2830,18 @@ after other user handlers and the default handler.
</para>
+<!-- ##### ARG GtkObject:user-data ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF GtkObjectInitFunc ##### -->
+<para>
+Defines a function pointer.
+</para>
+
+
<!-- ##### SIGNAL GtkOldEditable::changed ##### -->
<para>
@@ -1347,6 +2955,73 @@ after other user handlers and the default handler.
@user_data:
@seq_id:
+<!-- ##### STRUCT GtkPreview ##### -->
+<para>
+The #GtkPreview-struct struct contains private data only, and
+should be accessed using the functions below.
+</para>
+
+
+<!-- ##### ARG GtkPreview:expand ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkPreviewInfo ##### -->
+<para>
+Contains information about global properties
+of preview widgets.
+
+The #GtkPreviewInfo struct contains the following fields.
+(These fields should be considered read-only. They should never be set by
+an application.)
+
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
+<tbody>
+
+<row>
+<entry>#GdkVisual *visual;</entry>
+<entry>the visual used by all previews.</entry>
+</row>
+
+<row>
+<entry>#GdkColormap *cmap;</entry>
+<entry>the colormap used by all previews.</entry>
+</row>
+
+<row>
+<entry>gdouble gamma;</entry>
+<entry>the gamma correction value used by all previews (See gtk_preview_set_gamma()).</entry>
+</row>
+
+</tbody>
+</tgroup>
+</informaltable>
+
+</para>
+
+ lookup:
+ gamma:
+
+<!-- ##### ENUM GtkPreviewType ##### -->
+<para>
+An enumeration which describes whether a preview
+contains grayscale or red-green-blue data.
+</para>
+
+ GTK_PREVIEW_COLOR: the preview contains red-green-blue data.
+ GTK_PREVIEW_GRAYSCALE: The preview contains grayscale data.
+
+<!-- ##### USER_FUNCTION GtkPrintFunc ##### -->
+<para>
+
+</para>
+
+ func_data:
+ str:
+
<!-- ##### ARG GtkPrintOperation:number-of-pages ##### -->
<para>
@@ -1367,6 +3042,36 @@ after other user handlers and the default handler.
@PRIVATE_GTK_DIRECTION_SET:
@PRIVATE_GTK_DIRECTION_LTR:
+<!-- ##### ARG GtkProgressBar:activity-blocks ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkProgressBar:activity-step ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkProgressBar:adjustment ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkProgressBar:bar-style ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkProgressBar:discrete-blocks ##### -->
+<para>
+
+</para>
+
+
<!-- ##### STRUCT GtkRcStyleClass ##### -->
<para>
@@ -1409,6 +3114,16 @@ after other user handlers and the default handler.
</para>
+<!-- ##### ENUM GtkSideType ##### -->
+<para>
+
+</para>
+
+ GTK_SIDE_TOP:
+ GTK_SIDE_BOTTOM:
+ GTK_SIDE_LEFT:
+ GTK_SIDE_RIGHT:
+
<!-- ##### USER_FUNCTION GtkSignalDestroy ##### -->
<para>
A function which you can use to clean up when the
@@ -1427,6 +3142,12 @@ function).
@data: The user data associated with the hook that is being
destroyed.
+<!-- ##### USER_FUNCTION GtkSignalFunc ##### -->
+<para>
+Defines a function pointer.
+</para>
+
+
<!-- ##### USER_FUNCTION GtkSignalMarshal ##### -->
<para>
This is currently a hack left in for a scheme wrapper library.
@@ -1444,6 +3165,12 @@ Don't use it.
@return_type: The type of the return value from the function
or #GTK_TYPE_NONE for no return value.
+<!-- ##### TYPEDEF GtkSignalMarshaller ##### -->
+<para>
+Defines a function pointer.
+</para>
+
+
<!-- ##### STRUCT GtkSignalQuery ##### -->
<para>
This structure contains all the information about a particular
@@ -1624,12 +3351,95 @@ produce superscript and subscript.
</para>
+<!-- ##### STRUCT GtkTipsQuery ##### -->
+<para>
+The #GtkTipsQuery-struct struct contains private data only, and
+should be accessed using the functions below.
+</para>
+
+
+<!-- ##### SIGNAL GtkTipsQuery::start-query ##### -->
+<para>
+Emitted when the query is started.
+</para>
+
+ tipsquery: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTipsQuery::stop-query ##### -->
+<para>
+Emitted when the query is stopped.
+</para>
+
+ tipsquery: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTipsQuery::widget-entered ##### -->
+<para>
+Emitted when a widget is entered by the pointer while the query is in effect.
+</para>
+
+ tipsquery: the object which received the signal.
+ widget: the widget that was entered by the pointer.
+ tip_text: the widget's tooltip.
+ tip_private: the widget's private tooltip (see gtk_tooltips_set_tip()).
+
+<!-- ##### SIGNAL GtkTipsQuery::widget-selected ##### -->
+<para>
+Emitted when a widget is selected during a query.
+</para>
+
+ tipsquery: the object which received the signal.
+ widget: the widget that was selected.
+ tip_text: the widget's tooltip.
+ tip_private: the widget's private tooltip (see gtk_tooltips_set_tip()).
+ event: the button press or button release event.
+ Returns: %TRUE if the query should be stopped.
+
+<!-- ##### ARG GtkTipsQuery:caller ##### -->
+<para>
+The widget that starts the tips query, usually a button.
+If it is selected while the query is in effect the query is automatically
+stopped.
+</para>
+
+
+<!-- ##### ARG GtkTipsQuery:emit-always ##### -->
+<para>
+%TRUE if the widget-entered and widget-selected signals are emitted even when
+the widget has no tooltip set.
+</para>
+
+
+<!-- ##### ARG GtkTipsQuery:label-inactive ##### -->
+<para>
+The text to display in the #GtkTipsQuery widget when the query is not in
+effect.
+</para>
+
+
+<!-- ##### ARG GtkTipsQuery:label-no-tip ##### -->
+<para>
+The text to display in the #GtkTipsQuery widget when the query is running
+and the widget that the pointer is over has no tooltip.
+</para>
+
+
<!-- ##### ARG GtkToolButton:show-label-horizontally ##### -->
<para>
</para>
+<!-- ##### SIGNAL GtkToolItem::set-tooltip ##### -->
+<para>
+
+</para>
+
+ toolitem: the object which received the signal.
+ arg1:
+ arg2:
+ arg3:
+ Returns:
+
<!-- ##### SIGNAL GtkToolbar::move-focus ##### -->
<para>
@@ -1651,6 +3461,24 @@ produce superscript and subscript.
</para>
+<!-- ##### ARG GtkToolbar:tooltips ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION GtkTranslateFunc ##### -->
+<para>
+The function used to translate messages in e.g. #GtkIconFactory
+and #GtkActionGroup.
+</para>
+
+ path: The id of the message. In #GtkItemFactory this will be a path
+ from a #GtkItemFactoryEntry, in #GtkActionGroup, it will be a label
+ or tooltip from a #GtkActionEntry.
+ func_data: user data passed in when registering the function
+ Returns: the translated message
+
<!-- ##### STRUCT GtkTreeSelectionClass ##### -->
<para>
@@ -1695,6 +3523,48 @@ produce superscript and subscript.
@user_data:
@Returns:
+<!-- ##### TYPEDEF GtkType ##### -->
+<para>
+#GtkType is unique integer identifying the type. The guts of the
+information about the type is held in a private struct named
+#GtkTypeNode.
+</para>
+
+
+<!-- ##### TYPEDEF GtkTypeClass ##### -->
+<para>
+The base structure for a GTK+ type. Every type inherits this as a base structure.
+</para>
+
+
+<!-- ##### STRUCT GtkTypeInfo ##### -->
+<para>
+Holds information about the type. gtk_type_name() returns the name.
+ object_size is somehow set to the number of bytes that an instance of
+the object will occupy. @class_init_func holds the type's
+initialization function. @object_init_func holds the initialization
+function for an instance of the object. @reserved_1 is used for
+#GtkEnumValue to hold the enumerated values.
+</para>
+
+ type_name:
+ object_size:
+ class_size:
+ class_init_func:
+ object_init_func:
+ reserved_1:
+ reserved_2:
+ base_class_init_func:
+
+<!-- ##### TYPEDEF GtkTypeObject ##### -->
+<para>
+A #GtkTypeObject defines the minimum structure requirements
+for type instances. Type instances returned from gtk_type_new ()
+and initialized through a #GtkObjectInitFunc need to directly inherit
+from this structure or at least copy its fields one by one.
+</para>
+
+
<!-- ##### SIGNAL GtkUIManager::changed ##### -->
<para>
@@ -2147,6 +4017,29 @@ get an array of #GtkArgs that this object accepts.
@n_args_p: the number of arguments this object accepts.
@Returns: the array of arguments (or NULL on error).
+<!-- ##### MACRO gtk_binding_entry_add ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_binding_entry_clear ##### -->
+<para>
+
+</para>
+
+ binding_set:
+ keyval:
+ modifiers:
+
+<!-- ##### FUNCTION gtk_binding_parse_binding ##### -->
+<para>
+
+</para>
+
+ scanner:
+ Returns:
+
<!-- ##### FUNCTION gtk_button_box_child_requisition ##### -->
<para>
This is an internally used function and should never be called from an
@@ -2212,6 +4105,25 @@ Sets the default size of child buttons.
@accel_group:
@Returns:
+<!-- ##### FUNCTION gtk_calendar_display_options ##### -->
+<para>
+</para>
+
+ calendar:
+ flags:
+
+<!-- ##### FUNCTION gtk_calendar_freeze ##### -->
+<para>
+</para>
+
+ calendar:
+
+<!-- ##### FUNCTION gtk_calendar_thaw ##### -->
+<para>
+</para>
+
+ calendar:
+
<!-- ##### FUNCTION gtk_cell_renderer_event ##### -->
<para>
@@ -2233,6 +4145,14 @@ Sets the default size of child buttons.
@Returns:
+<!-- ##### FUNCTION gtk_cell_view_get_cell_renderers ##### -->
+<para>
+
+</para>
+
+ cell_view:
+ Returns:
+
<!-- ##### FUNCTION gtk_cell_view_get_use_fg ##### -->
<para>
@@ -2257,6 +4177,81 @@ Sets the default size of child buttons.
@cell_view:
@use_fg:
+<!-- ##### FUNCTION gtk_clist_append ##### -->
+<para>
+Adds a row to the CList at the bottom.
+</para>
+
+ clist: The #GtkCList to affect.
+ text: An array of strings to add.
+ Returns: The number of the row added.
+
+<!-- ##### FUNCTION gtk_clist_clear ##### -->
+<para>
+Removes all the CList's rows.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_column_title_active ##### -->
+<para>
+Sets the specified column in the #GtkCList to become selectable. You can
+then respond to events from the user clicking on a title button, and take
+appropriate action.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to make active, counting from 0.
+
+<!-- ##### FUNCTION gtk_clist_column_title_passive ##### -->
+<para>
+Causes the specified column title button to become passive, i.e., does
+not respond to events, such as the user clicking on it.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to make passive, counting from 0.
+
+<!-- ##### FUNCTION gtk_clist_column_titles_active ##### -->
+<para>
+Causes all column title buttons to become active. This is the same
+as calling gtk_clist_column_title_active() for each column.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_column_titles_hide ##### -->
+<para>
+Causes the #GtkCList to hide its column titles, if they are currently
+showing.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_column_titles_passive ##### -->
+<para>
+Causes all column title buttons to become passive. This is the same
+as calling gtk_clist_column_title_passive() for each column.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_column_titles_show ##### -->
+<para>
+This function causes the #GtkCList to show its column titles, if
+they are not already showing.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_columns_autosize ##### -->
+<para>
+Auto-sizes all columns in the CList and returns the total width of the CList.
+</para>
+
+ clist: The #GtkCList to affect.
+ Returns: The total width of the CList.
+
<!-- ##### FUNCTION gtk_clist_construct ##### -->
<para>
Initializes a previously allocated #GtkCList widget for use. This should not
@@ -2269,6 +4264,641 @@ normally be used to create a #GtkCList widget. Use gtk_clist_new() instead.
of the columns. There should be enough strings in the array for
the number of columns specified.
+<!-- ##### FUNCTION gtk_clist_find_row_from_data ##### -->
+<para>
+Searches the CList for the row with the specified data.
+</para>
+
+ clist: The #GtkCList to search.
+ data: The data to search for a match.
+ Returns: The number of the matching row, or -1 if no match could be found.
+
+<!-- ##### FUNCTION gtk_clist_freeze ##### -->
+<para>
+Causes the #GtkCList to stop updating its visuals until a matching call to
+gtk_clist_thaw() is made. This function is useful if a lot of changes
+will be made to the widget that may cause a lot of visual updating to
+occur. Note that calls to gtk_clist_freeze() can be nested.
+</para>
+
+ clist: The #GtkCList to freeze.
+
+<!-- ##### FUNCTION gtk_clist_get_cell_style ##### -->
+<para>
+Gets the current style of the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ Returns: A #GtkStyle object.
+
+<!-- ##### FUNCTION gtk_clist_get_cell_type ##### -->
+<para>
+Checks the type of cell at the location specified.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ Returns: A #GtkCellType value describing the cell.
+
+<!-- ##### FUNCTION gtk_clist_get_column_title ##### -->
+<para>
+Gets the current title of the specified column
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to query.
+ Returns: The title of the column.
+
+<!-- ##### FUNCTION gtk_clist_get_column_widget ##### -->
+<para>
+Gets the widget in the column header for the specified column.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to query.
+ Returns: Pointer to a #GtkWidget for the column header.
+
+<!-- ##### FUNCTION gtk_clist_get_hadjustment ##### -->
+<para>
+Gets the #GtkAdjustment currently being used for the horizontal
+aspect.
+</para>
+
+ clist: The #GtkCList to check.
+ Returns: A #GtkAdjustment object, or NULL if none is currently
+being used.
+
+<!-- ##### FUNCTION gtk_clist_get_pixmap ##### -->
+<para>
+Gets the pixmap and bitmap mask of the specified cell. The returned mask value can be NULL.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ pixmap: A pointer to a pointer to store the cell's #GdkPixmap.
+ mask: A pointer to a pointer to store the cell's #GdkBitmap mask.
+ Returns: 1 if the cell's pixmap could be retrieved, 0 otherwise.
+
+<!-- ##### FUNCTION gtk_clist_get_pixtext ##### -->
+<para>
+Gets the text, pixmap and bitmap mask for the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to query.
+ column: The column to query.
+ text: A pointer to a pointer to store the text.
+ spacing: A pointer to a #guint8 to store the spacing.
+ pixmap: A pointer to a #GdkPixmap pointer to store the cell's pixmap.
+ mask: A pointer to a #GdkBitmap pointer to store the cell's bitmap mask.
+ Returns: 1 if the retrieval was successful, 0 otherwise.
+
+<!-- ##### FUNCTION gtk_clist_get_row_data ##### -->
+<para>
+Gets the currently set data for the specified row.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to query.
+ Returns: The data set for the row.
+
+<!-- ##### FUNCTION gtk_clist_get_row_style ##### -->
+<para>
+Gets the style set for the specified row.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to query.
+ Returns: The #GtkStyle of the row.
+
+<!-- ##### FUNCTION gtk_clist_get_selectable ##### -->
+<para>
+Gets whether the specified row is selectable or not.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to query.
+ Returns: A #gboolean value.
+
+<!-- ##### FUNCTION gtk_clist_get_selection_info ##### -->
+<para>
+Gets the row and column at the specified pixel position in the CList.
+</para>
+
+ clist: The #GtkCList to affect.
+ x: The horizontal pixel position to check.
+ y: The vertical pixel position to check..
+ row: Pointer to a #gint to store the row value.
+ column: Pointer to a #gint to store the column value.
+ Returns: 1 if row/column is returned and in range, 0 otherwise.
+
+<!-- ##### FUNCTION gtk_clist_get_text ##### -->
+<para>
+Gets the text for the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to query.
+ column: The column to query.
+ text: A pointer to a pointer to store the text.
+ Returns: 1 if the cell's text could be retrieved, 0 otherwise.
+
+<!-- ##### FUNCTION gtk_clist_get_vadjustment ##### -->
+<para>
+Gets the #GtkAdjustment currently being used for the vertical
+aspect.
+</para>
+
+ clist: The #GtkCList to check.
+ Returns: A #GtkAdjustment object, or NULL if none is currently
+being used.
+
+<!-- ##### FUNCTION gtk_clist_insert ##### -->
+<para>
+Adds a row of text to the CList at the specified position.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row where the text should be inserted.
+ text: An array of string to add.
+ Returns: The number of the row added.
+
+<!-- ##### FUNCTION gtk_clist_moveto ##### -->
+<para>
+Tells the CList widget to visually move to the specified
+row and column.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to which to move.
+ column: The column to which to move.
+ row_align: A value between 0 and 1 that describes the positioning of
+the row in relation to the viewable area of the CList's contents.
+ col_align: A value between 0 and 1 that describes the positioning of
+the column in relation to the viewable area of the CList's contents.
+
+<!-- ##### FUNCTION gtk_clist_new ##### -->
+<para>
+Creates a new #GtkCList widget for use.
+</para>
+
+ columns: The number of columns the #GtkCList should have.
+ Returns: A pointer to a new GtkCList object.
+
+<!-- ##### FUNCTION gtk_clist_new_with_titles ##### -->
+<para>
+Creates a new #GtkCList widget with column titles for use.
+</para>
+
+ columns: The number of columns the #GtkCList should have.
+ titles: A string array of titles for the widget. There should be
+enough strings in the array for the specified number of columns.
+ Returns: A pointer to a new GtkCList object.
+
+<!-- ##### FUNCTION gtk_clist_optimal_column_width ##### -->
+<para>
+Gets the required width in pixels that is needed to show
+everything in the specified column.
+</para>
+
+ clist: The #GtkCList to check.
+ column: The column to check.
+ Returns: The required width in pixels for the column.
+
+<!-- ##### FUNCTION gtk_clist_prepend ##### -->
+<para>
+Adds a row to the CList at the top.
+</para>
+
+ clist: The #GtkCList to affect.
+ text: An array of strings to add.
+ Returns: The number of the row added.
+
+<!-- ##### FUNCTION gtk_clist_remove ##### -->
+<para>
+Removes the specified row from the CList.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to remove.
+
+<!-- ##### FUNCTION gtk_clist_row_is_visible ##### -->
+<para>
+Checks how the specified row is visible.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to query.
+ Returns: A #GtkVisibility value that tells you how the row is visible.
+
+<!-- ##### FUNCTION gtk_clist_row_move ##### -->
+<para>
+Allows you to move a row from one position to another in the
+list.
+</para>
+
+ clist: The #GtkCList to affect.
+ source_row: The original position of the row to move.
+ dest_row: The position to which the row should be moved.
+
+<!-- ##### FUNCTION gtk_clist_select_all ##### -->
+<para>
+Selects all rows in the CList. This function has no affect for a
+CList in "single" or "browse" selection mode.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_select_row ##### -->
+<para>
+Selects the specified row. Causes the "select-row" signal to be emitted for the specified row and column.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to select.
+ column: The column to select.
+
+<!-- ##### FUNCTION gtk_clist_set_auto_sort ##### -->
+<para>
+Turns on or off auto sort of the #GtkCList. If auto sort is on, then the CList will be resorted when a row is inserted into the CList.
+</para>
+
+ clist: The #GtkCList to affect.
+ auto_sort: whether auto sort should be on or off
+
+<!-- ##### FUNCTION gtk_clist_set_background ##### -->
+<para>
+Sets the background color for the specified row.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to affect.
+ color: A pointer to a #GdkColor structure.
+
+<!-- ##### FUNCTION gtk_clist_set_button_actions ##### -->
+<para>
+Sets the action(s) that the specified mouse button will have
+on the CList.
+</para>
+
+ clist: The #GtkCList to affect.
+ button: The mouse button to set. The values here, unlike in the
+ rest of GTK+ start from 0. For instance, the right mouse
+ button, which is 3 elsewhere, should be given as 2 here.
+ button_actions: A logically OR'd value of #GtkButtonAction values
+for the button.
+
+<!-- ##### FUNCTION gtk_clist_set_cell_style ##### -->
+<para>
+Sets the style for the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ style: A pointer to a #GtkStyle structure.
+
+<!-- ##### FUNCTION gtk_clist_set_column_auto_resize ##### -->
+<para>
+Lets you specify whether a column should be automatically resized
+by the widget when data is added or removed. Enabling auto-resize
+on a column explicity disallows user-resizing of the column.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column on which to set auto-resizing.
+ auto_resize: %TRUE or %FALSE.
+
+<!-- ##### FUNCTION gtk_clist_set_column_justification ##### -->
+<para>
+Sets the justification to be used for all text in the specified
+column.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column which should be affected.
+ justification: A GtkJustification value for the column.
+
+<!-- ##### FUNCTION gtk_clist_set_column_max_width ##### -->
+<para>
+Causes the column specified to have a maximum width, preventing
+the user from resizing it larger than that specified.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to set the maximum width.
+ max_width: The width, in pixels.
+
+<!-- ##### FUNCTION gtk_clist_set_column_min_width ##### -->
+<para>
+Causes the column specified to have a minimum width, preventing
+the user from resizing it smaller than that specified.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to set the minimum width.
+ min_width: The width, in pixels.
+
+<!-- ##### FUNCTION gtk_clist_set_column_resizeable ##### -->
+<para>
+Lets you specify whether a specified column should be resizeable
+by the user. Note that turning on resizeability for the column will
+automatically shut off auto-resizing, but turning off resizeability
+will NOT turn on auto-resizing. This must be done manually via a
+call to gtk_clist_set_column_auto_resize().
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column on which to set resizeability.
+ resizeable: %TRUE or %FALSE.
+
+<!-- ##### FUNCTION gtk_clist_set_column_title ##### -->
+<para>
+Sets the title for the specified column.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column whose title should be changed.
+ title: A string to be the column's title.
+
+<!-- ##### FUNCTION gtk_clist_set_column_visibility ##### -->
+<para>
+Allows you to set whether a specified column in the #GtkCList should
+be hidden or shown. Note that at least one column must always be
+showing, so attempting to hide the last visible column will be
+ignored.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to set visibility.
+ visible: %TRUE or %FALSE.
+
+<!-- ##### FUNCTION gtk_clist_set_column_widget ##### -->
+<para>
+Sets a widget to be used as the specified column's title. This
+can be used to place a pixmap or something else as the column
+title, instead of the standard text.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column whose title should be a widget.
+ widget: A pointer to a previously create widget.
+
+<!-- ##### FUNCTION gtk_clist_set_column_width ##### -->
+<para>
+Causes the column specified for the #GtkCList to be set to
+a specified width.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to set the width.
+ width: The width, in pixels.
+
+<!-- ##### FUNCTION gtk_clist_set_compare_func ##### -->
+<para>
+Sets the compare function of the #GtkClist to @cmp_func. If @cmp_func is NULL,
+then the default compare function is used. The default compare function sorts
+ascending or with the type set by gtk_clist_set_sort_type() by the column set
+by gtk_clist_set_sort_column().
+</para>
+
+ clist: The #GtkCList to affect.
+ cmp_func: The #GtkCompareFunction to use.
+
+<!-- ##### FUNCTION gtk_clist_set_foreground ##### -->
+<para>
+Sets the foreground color for the specified row.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to affect.
+ color: A pointer to a #GdkColor structure.
+
+<!-- ##### FUNCTION gtk_clist_set_hadjustment ##### -->
+<para>
+Allows you to set the #GtkAdjustment to be used for the horizontal
+aspect of the #GtkCList widget.
+</para>
+
+ clist: The #GtkCList to affect.
+ adjustment: A pointer to a #GtkAdjustment widget, or NULL.
+
+<!-- ##### FUNCTION gtk_clist_set_pixmap ##### -->
+<para>
+Sets a pixmap for the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ pixmap: A pointer to a #GdkPixmap to place in the cell.
+ mask: A pointer to a #GdkBitmap mask for the cell.
+
+<!-- ##### FUNCTION gtk_clist_set_pixtext ##### -->
+<para>
+Sets text and a pixmap/bitmap on the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ text: The text to set in the cell.
+ spacing: The spacing between the cell's text and pixmap.
+ pixmap: A pointer to a #GdkPixmap for the cell.
+ mask: A pointer to a #GdkBitmap mask for the cell.
+
+<!-- ##### FUNCTION gtk_clist_set_reorderable ##### -->
+<para>
+Sets whether the CList's rows are re-orderable using drag-and-drop.
+</para>
+
+ clist: The #GtkCList to affect.
+ reorderable: %TRUE or %FALSE.
+
+<!-- ##### FUNCTION gtk_clist_set_row_data ##### -->
+<para>
+Sets data for the specified row. This is the same as calling gtk_clist_set_row_data_full(clist, row, data, NULL).
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to affect.
+ data: The data to set for the row.
+
+<!-- ##### FUNCTION gtk_clist_set_row_data_full ##### -->
+<para>
+Sets the data for specified row, with a callback when the row is destroyed.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to affect.
+ data: The data to set for the row.
+ destroy: A #GtkDestroyNotify function to be called when the row is destroyed.
+
+<!-- ##### FUNCTION gtk_clist_set_row_height ##### -->
+<para>
+Causes the #GtkCList to have a specified height for its
+rows. Setting the row height to 0 allows the #GtkCList to adjust
+automatically to data in the row.
+</para>
+
+ clist: The #GtkCList to affect.
+ height: The height, in pixels.
+
+<!-- ##### FUNCTION gtk_clist_set_row_style ##### -->
+<para>
+Sets the style for all cells in the specified row.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to affect.
+ style: A pointer to a #GtkStyle to set.
+
+<!-- ##### FUNCTION gtk_clist_set_selectable ##### -->
+<para>
+Sets whether the specified row is selectable or not.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to affect.
+ selectable: %TRUE or %FALSE.
+
+<!-- ##### FUNCTION gtk_clist_set_selection_mode ##### -->
+<para>
+Sets the selection mode for the specified CList. This allows you to
+set whether only one or more than one item can be selected at a time
+in the widget. Note that setting the widget's selection mode to one
+of GTK_SELECTION_BROWSE or GTK_SELECTION_SINGLE will cause all the
+items in the #GtkCList to become deselected.
+</para>
+
+ clist: The #GtkCList to affect.
+ mode: The GtkSelectionMode type to set for this CList.
+
+<!-- ##### FUNCTION gtk_clist_set_shadow_type ##### -->
+<para>
+Sets the shadow type for the specified CList. Changing this value
+will cause the #GtkCList to update its visuals.
+</para>
+
+ clist: The #GtkCList to affect.
+ type: The GtkShadowType desired.
+
+<!-- ##### FUNCTION gtk_clist_set_shift ##### -->
+<para>
+Sets the vertical and horizontal shift of the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ vertical: The value to set for the vertical shift.
+ horizontal: The value to set for the vertical shift.
+
+<!-- ##### FUNCTION gtk_clist_set_sort_column ##### -->
+<para>
+Sets the sort column of the clist. The sort column is used by the
+default compare function to determine which column to sort by.
+</para>
+
+ clist: The #GtkCList to affect.
+ column: The column to sort by
+
+<!-- ##### FUNCTION gtk_clist_set_sort_type ##### -->
+<para>
+Sets the sort type of the #GtkClist. This is either GTK_SORT_ASCENDING for
+ascening sort or GTK_SORT_DESCENDING for descending sort.
+</para>
+
+ clist: The #GtkCList to affect.
+ sort_type: the #GtkSortType to use
+
+<!-- ##### FUNCTION gtk_clist_set_text ##### -->
+<para>
+Sets the displayed text in the specified cell.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row of the cell.
+ column: The column of the cell.
+ text: The text to set in the cell.
+
+<!-- ##### FUNCTION gtk_clist_set_use_drag_icons ##### -->
+<para>
+Determines whether the #GtkClist should use icons when
+doing drag-and-drop operations.
+</para>
+
+ clist: The #GtkCList to affect.
+ use_icons: %TRUE or %FALSE.
+
+<!-- ##### FUNCTION gtk_clist_set_vadjustment ##### -->
+<para>
+Allows you to set the #GtkAdjustment to be used for the vertical
+aspect of the #GtkCList widget.
+</para>
+
+ clist: The #GtkCList to affect.
+ adjustment: A pointer to a #GtkAdjustment widget, or NULL.
+
+<!-- ##### FUNCTION gtk_clist_sort ##### -->
+<para>
+Sorts the #GtkClist according to the current compare function, which
+can be set with the gtk_clist_set_compare_func() function.
+</para>
+
+ clist: The #GtkCList to sort.
+
+<!-- ##### FUNCTION gtk_clist_swap_rows ##### -->
+<para>
+Swaps the two specified rows with each other.
+</para>
+
+ clist: The #GtkCList to affect.
+ row1: Number of the first row.
+ row2: Number of the second row.
+
+<!-- ##### FUNCTION gtk_clist_thaw ##### -->
+<para>
+Causes the specified #GtkCList to allow visual updates.
+</para>
+
+ clist: The #GtkCList to thaw.
+
+<!-- ##### FUNCTION gtk_clist_undo_selection ##### -->
+<para>
+Undoes the last selection for an "extended selection mode" CList.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_unselect_all ##### -->
+<para>
+Unselects all rows in the CList.
+</para>
+
+ clist: The #GtkCList to affect.
+
+<!-- ##### FUNCTION gtk_clist_unselect_row ##### -->
+<para>
+Unselects the specified row. Causes the "unselect-row" signal to be emitted for the specified row and column.
+</para>
+
+ clist: The #GtkCList to affect.
+ row: The row to select.
+ column: The column to select.
+
+<!-- ##### FUNCTION gtk_color_selection_get_color ##### -->
+<para>
+
+</para>
+
+ colorsel:
+ color:
+
<!-- ##### FUNCTION gtk_color_selection_get_old_color ##### -->
<para>
@@ -2293,6 +4923,22 @@ the number of columns specified.
@colorsel:
@Returns:
+<!-- ##### FUNCTION gtk_color_selection_set_change_palette_hook ##### -->
+<para>
+
+</para>
+
+ func:
+ Returns:
+
+<!-- ##### FUNCTION gtk_color_selection_set_color ##### -->
+<para>
+
+</para>
+
+ colorsel:
+ color:
+
<!-- ##### FUNCTION gtk_color_selection_set_old_color ##### -->
<para>
@@ -2346,6 +4992,96 @@ is enabled.
@combo_box:
@column:
+<!-- ##### FUNCTION gtk_combo_disable_activate ##### -->
+<para>
+Stops the #GtkCombo widget from showing the popup list when the #GtkEntry
+emits the "activate" signal, i.e. when the Return key is pressed.
+This may be useful if, for example, you want the Return key to close a dialog
+instead.
+</para>
+
+ combo: a #GtkCombo.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_new ##### -->
+<para>
+Creates a new #GtkCombo.
+</para>
+
+ Returns: a new #GtkCombo.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_set_case_sensitive ##### -->
+<para>
+Specifies whether the text entered into the #GtkEntry field and the text in
+the list items is case sensitive.
+</para>
+<para>
+This may be useful, for example, when you have called
+gtk_combo_set_value_in_list() to limit the values entered, but you are not
+worried about differences in case.
+</para>
+
+ combo: a #GtkCombo.
+ val: %TRUE if the text in the list items is case sensitive.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_set_item_string ##### -->
+<para>
+Sets the string to place in the #GtkEntry field when a particular list item is
+selected. This is needed if the list item is not a simple label.
+</para>
+
+ combo: a #GtkCombo.
+ item: a #GtkItem.
+ item_value: the string to place in the #GtkEntry when @item is selected.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_set_popdown_strings ##### -->
+<para>
+Convenience function to set all of the items in the popup list.
+(See the <link linkend="gtkcombo-simple-example">example</link> above.)
+</para>
+
+ combo: a #GtkCombo.
+ strings: a list of strings, or %NULL to clear the popup list
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_set_use_arrows ##### -->
+<para>
+Specifies if the arrow (cursor) keys can be used to step through the items in
+the list. This is on by default.
+</para>
+
+ combo: a #GtkCombo.
+ val: %TRUE if the arrow keys can be used to step through the items in
+ the list.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_set_use_arrows_always ##### -->
+<para>
+Obsolete function, does nothing.
+</para>
+
+ combo: a #GtkCombo.
+ val: unused
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
+<!-- ##### FUNCTION gtk_combo_set_value_in_list ##### -->
+<para>
+Specifies whether the value entered in the text entry field must match one of
+the values in the list. If this is set then the user will not be able to
+perform any other action until a valid value has been entered.
+</para>
+<para>
+If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE.
+</para>
+
+ combo: a #GtkCombo.
+ val: %TRUE if the value entered must match one of the values in the list.
+ ok_if_empty: %TRUE if an empty value is considered valid.
+ Deprecated: 2.4: Use #GtkComboBox instead.
+
<!-- ##### FUNCTION gtk_container_add_child_arg_type ##### -->
<para>
@@ -2505,6 +5241,17 @@ Internal function.
@toplevel:
@event:
+<!-- ##### FUNCTION gtk_drag_set_default_icon ##### -->
+<para>
+
+</para>
+
+ colormap:
+ pixmap:
+ mask:
+ hot_x:
+ hot_y:
+
<!-- ##### FUNCTION gtk_drag_source_handle_event ##### -->
<para>
Internal function.
@@ -2513,6 +5260,20 @@ Internal function.
@widget:
@event:
+<!-- ##### FUNCTION gtk_drawing_area_size ##### -->
+<para>
+Sets the size that the drawing area will request
+in response to a "size_request" signal. The
+drawing area may actually be allocated a size
+larger than this depending on how it is packed
+within the enclosing containers.
+</para>
+
+ darea: a #GtkDrawingArea
+ width: the width to request
+ height: the height to request
+ Deprecated: Use gtk_widget_set_size_request() instead.
+
<!-- ##### FUNCTION gtk_editable_changed ##### -->
<para>
Causes the "changed" signal to be emitted.
@@ -2565,6 +5326,27 @@ Claim or disclaim ownership of the PRIMARY X selection.
@icon_pos:
@Returns:
+<!-- ##### FUNCTION gtk_file_chooser_dialog_new_with_backend ##### -->
+<para>
+
+</para>
+
+ title:
+ parent:
+ action:
+ backend:
+ first_button_text:
+ Varargs:
+ Returns:
+
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gtk-docs.sgml" "book" "refsect1")
+End:
+-->
+
<!-- ##### FUNCTION gtk_file_chooser_error_quark ##### -->
<para>
@@ -2588,6 +5370,103 @@ Claim or disclaim ownership of the PRIMARY X selection.
@chooser:
@folder_mode:
+<!-- ##### FUNCTION gtk_file_chooser_widget_new_with_backend ##### -->
+<para>
+
+</para>
+
+ action:
+ backend:
+ Returns:
+
+<!-- ##### FUNCTION gtk_file_selection_complete ##### -->
+<para>
+Will attempt to match @pattern to a valid filenames or subdirectories in the current directory. If a match can be made, the matched filename will appear in the text entry field of the file selection dialog.
+If a partial match can be made, the "Files" list will contain those
+file names which have been partially matched, and the "Folders"
+list those directories which have been partially matched.
+</para>
+
+ filesel: a #GtkFileSelection.
+ pattern: a string of characters which may or may not match any filenames in the current directory.
+
+<!-- ##### FUNCTION gtk_file_selection_get_filename ##### -->
+<para>
+</para>
+
+ filesel:
+ Returns:
+
+<!-- ##### FUNCTION gtk_file_selection_get_select_multiple ##### -->
+<para>
+
+</para>
+
+ filesel:
+ Returns:
+
+<!-- ##### FUNCTION gtk_file_selection_get_selections ##### -->
+<para>
+
+</para>
+
+ filesel:
+ Returns:
+
+<!-- ##### FUNCTION gtk_file_selection_hide_fileop_buttons ##### -->
+<para>
+Hides the file operation buttons that normally appear at the top of the dialog. Useful if you wish to create a custom file selector, based on #GtkFileSelection.
+</para>
+
+ filesel: a #GtkFileSelection.
+
+<!-- ##### FUNCTION gtk_file_selection_new ##### -->
+<para>
+Creates a new file selection dialog box. By default it will contain a #GtkTreeView of the application's current working directory, and a file listing. Operation buttons that allow the user to create a directory, delete files and rename files, are also present.
+</para>
+
+ title: a message that will be placed in the file requestor's titlebar.
+ Returns: the new file selection.
+ Deprecated: Use gtk_file_chooser_dialog_new() instead
+
+<!-- ##### FUNCTION gtk_file_selection_set_filename ##### -->
+<para>
+</para>
+
+ filesel:
+ filename:
+
+<!-- ##### FUNCTION gtk_file_selection_set_select_multiple ##### -->
+<para>
+
+</para>
+
+ filesel:
+ select_multiple:
+
+<!-- ##### FUNCTION gtk_file_selection_show_fileop_buttons ##### -->
+<para>
+Shows the file operation buttons, if they have previously been hidden. The rest of the widgets in the dialog will be resized accordingly.
+</para>
+
+ filesel: a #GtkFileSelection.
+
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_apply_button ##### -->
+<para>
+
+</para>
+
+ fsd:
+ Returns:
+
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_font ##### -->
+<para>
+
+</para>
+
+ fsd:
+ Returns:
+
<!-- ##### FUNCTION gtk_font_selection_dialog_set_filter ##### -->
<para>
Sets one of the two font filters, to limit the fonts shown.
@@ -2629,6 +5508,14 @@ will be shown, or NULL to show all charsets.
@fontsel:
@Returns:
+<!-- ##### FUNCTION gtk_font_selection_get_font ##### -->
+<para>
+
+</para>
+
+ fontsel:
+ Returns:
+
<!-- ##### FUNCTION gtk_font_selection_set_filter ##### -->
<para>
Sets one of the two font filters, to limit the fonts shown.
@@ -2683,6 +5570,99 @@ Get the type of GtkIdentifier.
@Returns:
+<!-- ##### FUNCTION gtk_item_factories_path_delete ##### -->
+<para>
+
+</para>
+
+ ifactory_path:
+ path:
+
+<!-- ##### FUNCTION gtk_item_factory_add_foreign ##### -->
+<para>
+
+</para>
+
+ accel_widget:
+ full_path:
+ accel_group:
+ keyval:
+ modifiers:
+
+<!-- ##### FUNCTION gtk_item_factory_construct ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ container_type:
+ path:
+ accel_group:
+
+<!-- ##### FUNCTION gtk_item_factory_create_item ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ entry:
+ callback_data:
+ callback_type:
+
+<!-- ##### FUNCTION gtk_item_factory_create_items ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ n_entries:
+ entries:
+ callback_data:
+
+<!-- ##### FUNCTION gtk_item_factory_create_items_ac ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ n_entries:
+ entries:
+ callback_data:
+ callback_type:
+
+<!-- ##### FUNCTION gtk_item_factory_create_menu_entries ##### -->
+<para>
+
+</para>
+
+ n_entries:
+ entries:
+
+<!-- ##### FUNCTION gtk_item_factory_delete_entries ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ n_entries:
+ entries:
+
+<!-- ##### FUNCTION gtk_item_factory_delete_entry ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ entry:
+
+<!-- ##### FUNCTION gtk_item_factory_delete_item ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ path:
+
<!-- ##### FUNCTION gtk_item_factory_dump_items ##### -->
<para>
@@ -2702,6 +5682,68 @@ Get the type of GtkIdentifier.
@path_pspec:
@modified_only:
+<!-- ##### FUNCTION gtk_item_factory_from_path ##### -->
+<para>
+
+</para>
+
+ path:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_from_widget ##### -->
+<para>
+
+</para>
+
+ widget:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_get_item ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ path:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_get_item_by_action ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ action:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_get_widget ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ path:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_get_widget_by_action ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ action:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_new ##### -->
+<para>
+
+</para>
+
+ container_type:
+ path:
+ accel_group:
+ Returns:
+
<!-- ##### FUNCTION gtk_item_factory_parse_rc ##### -->
<para>
@@ -2723,6 +5765,54 @@ Get the type of GtkIdentifier.
@rc_string:
+<!-- ##### FUNCTION gtk_item_factory_path_from_widget ##### -->
+<para>
+
+</para>
+
+ widget:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_popup ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ x:
+ y:
+ mouse_button:
+ time_:
+
+<!-- ##### FUNCTION gtk_item_factory_popup_data ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_popup_data_from_widget ##### -->
+<para>
+
+</para>
+
+ widget:
+ Returns:
+
+<!-- ##### FUNCTION gtk_item_factory_popup_with_data ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ popup_data:
+ destroy:
+ x:
+ y:
+ mouse_button:
+ time_:
+
<!-- ##### FUNCTION gtk_item_factory_print_func ##### -->
<para>
@@ -2731,6 +5821,34 @@ Get the type of GtkIdentifier.
@FILE_pointer:
@string:
+<!-- ##### FUNCTION gtk_item_factory_set_translate_func ##### -->
+<para>
+
+</para>
+
+ ifactory:
+ func:
+ data:
+ notify:
+
+<!-- ##### FUNCTION gtk_label_get ##### -->
+<para>
+Gets the current string of text within the #GtkLabel and writes it to
+the given @str argument. It does not make a copy of this string so you
+must not write to it.
+</para>
+
+ label: The #GtkLabel widget you want to get the text from.
+ str: The reference to the pointer you want to point to the text.
+ Deprecated: Use gtk_label_get_text() instead.
+
+<!-- ##### MACRO gtk_label_set ##### -->
+<para>
+Sets the text within the GtkLabel widget.
+</para>
+
+ Deprecated: Use gtk_label_set_text() instead.
+
<!-- ##### FUNCTION gtk_label_set_markup_with_accel ##### -->
<para>
@@ -2740,6 +5858,260 @@ Get the type of GtkIdentifier.
@str:
@Returns:
+<!-- ##### FUNCTION gtk_layout_freeze ##### -->
+<para>
+
+</para>
+
+ layout:
+
+<!-- ##### FUNCTION gtk_layout_thaw ##### -->
+<para>
+
+</para>
+
+ layout:
+
+<!-- ##### FUNCTION gtk_list_append_items ##### -->
+<para>
+Adds @items to the end of the @list.
+</para>
+
+ list: the list widget.
+ items: the items.
+
+<!-- ##### FUNCTION gtk_list_child_position ##### -->
+<para>
+Searches the children of @list for the index of @child.
+</para>
+
+ list: the list widget.
+ child: the child to look for.
+ Returns: the index of the child, -1 if not found.
+
+<!-- ##### FUNCTION gtk_list_clear_items ##### -->
+<para>
+Removes the items between index @start (included) and @end (excluded)
+from the @list. If @end is negative, or greater than the number of
+children of @list, it's assumed to be exactly the number of
+elements. If @start is greater than or equal to @end, nothing is
+done.
+</para>
+
+ list: the list widget.
+ start: the index of the first item to remove.
+ end: the index of the lest item to remove plus one.
+
+<!-- ##### FUNCTION gtk_list_end_drag_selection ##### -->
+<para>
+Stops the drag selection mode and ungrabs the pointer. This has no
+effect if a drag selection is not active.
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_end_selection ##### -->
+<para>
+Ends the selection. Used with gtk_list_extend_selection() and
+gtk_list_start_selection(). Only in #GTK_SELECTION_EXTENDED mode.
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_extend_selection ##### -->
+<para>
+Extends the selection by moving the anchor according to @scroll_type. Only
+in #GTK_SELECTION_EXTENDED.
+</para>
+
+ list: the list widget.
+ scroll_type: the direction and length.
+ position: the position if @scroll_type is #GTK_SCROLL_JUMP.
+ auto_start_selection: if %TRUE, gtk_list_start_selection() is automatically
+carried out before extending the selection.
+
+<!-- ##### FUNCTION gtk_list_insert_items ##### -->
+<para>
+Inserts @items into the @list at the position @position. The #GList items
+must not be freed after.
+</para>
+
+ list: the list widget.
+ items: the items.
+ position: the position to insert @items, starting at 0.
+
+<!-- ##### FUNCTION gtk_list_item_deselect ##### -->
+<para>
+Deselects the item, by emitting the item's "deselect" signal.
+</para>
+
+ list_item: a #GtkListItem.
+
+<!-- ##### FUNCTION gtk_list_item_new ##### -->
+<para>
+Creates a new #GtkListitem.
+</para>
+
+ Returns: a new #GtkListItem.
+
+<!-- ##### FUNCTION gtk_list_item_new_with_label ##### -->
+<para>
+Creates a new #GtkListItem with a child label containing the given string.
+</para>
+
+ label: the string to use for the child label.
+ Returns: a new #GtkListItem with a child #GtkLabel with the text set to
+ label
+
+<!-- ##### FUNCTION gtk_list_item_select ##### -->
+<para>
+Selects the item, by emitting the item's "select" signal.
+Depending on the selection mode of the list, this may cause other items to
+be deselected.
+</para>
+
+ list_item: a #GtkListItem.
+
+<!-- ##### FUNCTION gtk_list_new ##### -->
+<para>
+Creates a new #GtkList.
+</para>
+
+ Returns: the newly-created #GtkList
+
+<!-- ##### FUNCTION gtk_list_prepend_items ##### -->
+<para>
+Inserts @items at the beginning of the @list.
+</para>
+
+ list: the list widget.
+ items: the items.
+
+<!-- ##### FUNCTION gtk_list_remove_items ##### -->
+<para>
+Removes the @items from the @list.
+</para>
+
+ list: the list widget.
+ items: the items to remove.
+
+<!-- ##### FUNCTION gtk_list_remove_items_no_unref ##### -->
+<para>
+Removes the @items from the @list, without unreferencing them. It
+may be useful if you want to move the items from one list to another.
+</para>
+
+ list: the list widget.
+ items: the items.
+
+<!-- ##### FUNCTION gtk_list_scroll_horizontal ##### -->
+<para>
+Scrolls @list horizontaly. This supposes that the list is packed into a
+scrolled window or something similar, and adjustments are well
+set. Step and page increment are those from the horizontal adjustment
+of @list. Backward means to the left, and forward to the
+right. Out of bounds values are truncated.
+ scroll_type may be any valid #GtkScrollType. If @scroll_type is
+#GTK_SCROLL_NONE, nothing is done. If it's #GTK_SCROLL_JUMP, the list
+scrolls to the ratio @position: 0 is full left, 1 is full right.
+</para>
+
+ list: the list widget.
+ scroll_type: the scrolling type.
+ position: the position if @scroll_type is #GTK_SCROLL_JUMP
+
+<!-- ##### FUNCTION gtk_list_scroll_vertical ##### -->
+<para>
+Scrolls @list vertically. This supposes that the list is packed into a
+scrolled window or something similar, and adjustments are well
+set. Step and page increment are those from the vertical adjustment
+of @list. Backward means up, and forward down. Out of bounds values are
+truncated.
+ scroll_type may be any valid #GtkScrollType. If @scroll_type is
+#GTK_SCROLL_NONE, nothing is done. If it's #GTK_SCROLL_JUMP, the list
+scrolls to the ratio @position: 0 is top, 1 is bottom.
+</para>
+
+ list: the list widget.
+ scroll_type: the scrolling type.
+ position: the position if @scroll_type is #GTK_SCROLL_JUMP
+
+<!-- ##### FUNCTION gtk_list_select_all ##### -->
+<para>
+Selects all children of @list. A signal will be emitted for each
+newly selected child.
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_select_child ##### -->
+<para>
+Selects the given @child. The signal GtkList::select-child will be
+emitted.
+</para>
+
+ list: the list widget
+ child: the child to select.
+
+<!-- ##### FUNCTION gtk_list_select_item ##### -->
+<para>
+Selects the child number @item of the @list. Nothing happens if @item
+is out of bounds. The signal GtkList::select-child will be emitted.
+</para>
+
+ list: the list widget.
+ item: the index of the child to select.
+
+<!-- ##### FUNCTION gtk_list_set_selection_mode ##### -->
+<para>
+Set the list selection mode. The selection mode can be any value in
+#GtkSelectionMode:
+<variablelist>
+<varlistentry>
+<term>#GTK_SELECTION_SINGLE</term>
+<listitem><para>
+Zero or one element may be selected.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GTK_SELECTION_BROWSE</term>
+<listitem><para>
+Exactly one element is always selected (this can be false after you have
+changed the selection mode).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GTK_SELECTION_MULTIPLE</term>
+<listitem><para>
+Any number of elements may be selected. Clicks toggle the state of an
+item.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>#GTK_SELECTION_EXTENDED</term>
+<listitem><para>
+Any number of elements may be selected. Click-drag selects a range of
+elements; the Ctrl key may be used to enlarge the selection, and
+Shift key to select between the focus and the child pointed to.
+</para></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+ list: the list widget.
+ mode: the new selection mode.
+
+<!-- ##### FUNCTION gtk_list_start_selection ##### -->
+<para>
+Starts a selection (or part of selection) at the focused child. Only in
+#GTK_SELECTION_EXTENDED mode.
+</para>
+
+ list: the list widget.
+
<!-- ##### FUNCTION gtk_list_store_move ##### -->
<para>
@@ -2785,6 +6157,98 @@ Get the type of GtkIdentifier.
@store:
@n_columns:
+<!-- ##### FUNCTION gtk_list_toggle_add_mode ##### -->
+<para>
+Toggles between adding to the selection and beginning a new selection. Only
+in #GTK_SELECTION_EXTENDED. Useful with gtk_list_extend_selection().
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_toggle_focus_row ##### -->
+<para>
+Toggles the focus row. If the focus row is selected, it's
+unselected. If the focus row is unselected, it's selected. If the
+selection mode of @list is #GTK_SELECTION_BROWSE, this has no effect,
+as the selection is always at the focus row.
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_toggle_row ##### -->
+<para>
+Toggles the child @item of list. If the selection mode of @list is
+#GTK_SELECTION_BROWSE, the item is selected, and the others are
+unselected.
+</para>
+
+ list: the list widget.
+ item: the child to toggle.
+
+<!-- ##### FUNCTION gtk_list_undo_selection ##### -->
+<para>
+Restores the selection in the last state, only if selection mode is
+#GTK_SELECTION_EXTENDED. If this function is called twice, the selection is
+cleared. This function sometimes gives stranges "last states".
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_unselect_all ##### -->
+<para>
+Unselects all children of @list. A signal will be emitted for each
+newly unselected child.
+</para>
+
+ list: the list widget.
+
+<!-- ##### FUNCTION gtk_list_unselect_child ##### -->
+<para>
+Unselects the given @child. The signal GtkList::unselect-child will be
+emitted.
+</para>
+
+ list: the list widget.
+ child: the child to unselect.
+
+<!-- ##### FUNCTION gtk_list_unselect_item ##### -->
+<para>
+Unselects the child number @item of the @list. Nothing happens if
+ item is out of bounds. The signal GtkList::unselect-child will be
+emitted.
+</para>
+
+ list: the list widget.
+ item: the index of the child to unselect.
+
+<!-- ##### MACRO gtk_menu_bar_append ##### -->
+<para>
+Adds a new #GtkMenuItem to the end of the GtkMenuBar
+</para>
+
+ menu: a #GtkMenuBar
+ child: the #GtkMenuItem to add
+ Deprecated: Use gtk_menu_shell_append() instead.
+
+<!-- ##### MACRO gtk_menu_bar_insert ##### -->
+<para>
+Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
+</para>
+
+ menu: a #GtkMenuBar
+ child: the #GtkMenuItem to add
+ pos: the position in the item list where the @child is added.
+ Deprecated: Use gtk_menu_shell_insert() instead.
+
+<!-- ##### MACRO gtk_menu_bar_prepend ##### -->
+<para>
+Adds a new #GtkMenuItem to the beginning of the GtkMenuBar
+</para>
+
+ menu: a #GtkMenuBar
+ child: the #GtkMenuItem to add
+ Deprecated: Use gtk_menu_shell_prepend() instead.
+
<!-- ##### FUNCTION gtk_menu_ensure_uline_accel_group ##### -->
<para>
@@ -2811,6 +6275,20 @@ arrow.
@show_toggle_indicator: unused
@show_submenu_indicator: whether to show the arrow or not
+<!-- ##### FUNCTION gtk_menu_item_remove_submenu ##### -->
+<para>
+
+</para>
+
+ menu_item:
+
+<!-- ##### MACRO gtk_menu_item_right_justify ##### -->
+<para>
+Sets the menu item to be right-justified. Only useful for menu bars.
+</para>
+
+ menu_item: the menu item
+
<!-- ##### FUNCTION gtk_menu_item_set_placement ##### -->
<para>
Specifies the placement of the submenu around the menu item. The placement
@@ -2824,6 +6302,88 @@ This function is useless in usual applications.
@menu_item: the menu item
@placement: the submenu placement
+<!-- ##### FUNCTION gtk_menu_tool_button_set_arrow_tooltip ##### -->
+<para>
+
+</para>
+
+ button:
+ tooltips:
+ tip_text:
+ tip_private:
+
+<!-- ##### MACRO gtk_notebook_current_page ##### -->
+<para>
+Deprecated compatibility macro.
+</para>
+
+ Deprecated: Use gtk_notebook_get_current_page() instead.
+
+<!-- ##### FUNCTION gtk_notebook_get_group_id ##### -->
+<para>
+
+</para>
+
+ notebook:
+ Returns:
+
+<!-- ##### FUNCTION gtk_notebook_set_group_id ##### -->
+<para>
+
+</para>
+
+ notebook:
+ group_id:
+
+<!-- ##### FUNCTION gtk_notebook_set_homogeneous_tabs ##### -->
+<para>
+</para>
+
+ notebook:
+ homogeneous:
+
+<!-- ##### MACRO gtk_notebook_set_page ##### -->
+<para>
+Deprecated compatibility macro.
+</para>
+
+ Deprecated: Use gtk_notebook_set_current_page() instead.
+
+<!-- ##### FUNCTION gtk_notebook_set_tab_border ##### -->
+<para>
+</para>
+
+ notebook:
+ border_width:
+
+<!-- ##### FUNCTION gtk_notebook_set_tab_hborder ##### -->
+<para>
+</para>
+
+ notebook:
+ tab_hborder:
+
+<!-- ##### FUNCTION gtk_notebook_set_tab_vborder ##### -->
+<para>
+</para>
+
+ notebook:
+ tab_vborder:
+
+<!-- ##### FUNCTION gtk_object_add_arg_type ##### -->
+<para>
+Deprecated in favor of the #GObject property system including #GParamSpec.
+Add a new type of argument to an object class.
+Usually this is called when registering a new type of object.
+</para>
+
+ arg_name: fully qualify object name, for example GtkObject::user_data.
+ arg_type: type of the argument.
+ arg_flags: bitwise-OR of the #GtkArgFlags enum. (Whether the argument is
+settable or gettable, whether it is set when the object is constructed.)
+ arg_id: an internal number, passed in from here to the "set_arg" and
+"get_arg" handlers of the object.
+
<!-- ##### FUNCTION gtk_object_arg_get ##### -->
<para>
Private function to get an argument and argument info from an object.
@@ -2945,6 +6505,18 @@ gtk_object_default_construct().
@object: object which has been constructed. This is usually
done automatically by gtk_object_new() and gtk_object_newv().
+<!-- ##### MACRO gtk_object_data_force_id ##### -->
+<para>
+Useless deprecated macro. Ignore it.
+</para>
+
+
+<!-- ##### MACRO gtk_object_data_try_key ##### -->
+<para>
+Useless deprecated macro. Ignore it.
+</para>
+
+
<!-- ##### FUNCTION gtk_object_default_construct ##### -->
<para>
This function is called to construct arguments that haven't been initialized
@@ -2961,6 +6533,54 @@ be used to bypass it.
@object: the object to initialize.
+<!-- ##### FUNCTION gtk_object_get ##### -->
+<para>
+Gets properties of an object.
+</para>
+
+ object: a #GtkObject.
+ first_property_name: name of first property to get the value for.
+ Varargs: %NULL-terminated list of name-return location pairs.
+ Deprecated: Use g_object_get() instead.
+
+<!-- ##### FUNCTION gtk_object_get_data ##### -->
+<para>
+Get a named field from the object's table of associations (the object_data).
+</para>
+
+ object: the object maintaining the associations.
+ key: name of the key for that association.
+ Returns: the data if found, or %NULL if no such data exists.
+ Deprecated: Use g_object_get_data() instead.
+
+<!-- ##### FUNCTION gtk_object_get_data_by_id ##### -->
+<para>
+Just like gtk_object_get_data() except that it takes
+a #GQuark instead of a string, so it is slightly faster.
+</para>
+<para>
+Use gtk_object_data_try_key() and gtk_object_data_force_id()
+to get an id from a string.
+</para>
+
+ object: object containing the associations.
+ data_id: quark of the key.
+ Returns: the data if found, or %NULL if no such data exists.
+ Deprecated: Use g_object_get_qdata() instead.
+
+<!-- ##### FUNCTION gtk_object_get_user_data ##### -->
+<para>
+Get the object's user data pointer.
+</para>
+<para>
+This is intended to be a pointer for your convenience in
+writing applications.
+</para>
+
+ object: the object.
+ Returns: the user data field for object.
+ Deprecated: Use g_object_get_data() instead.
+
<!-- ##### FUNCTION gtk_object_getv ##### -->
<para>
Gets an array of argument values from an object.
@@ -2970,6 +6590,22 @@ Gets an array of argument values from an object.
@n_args: the number of arguments to query.
@args: the arguments to fill in.
+<!-- ##### FUNCTION gtk_object_new ##### -->
+<para>
+Constructs an object given its arguments, enumerated in the call to the
+function.
+</para>
+
+ type: the type identifying this object. Returned by gtk_type_unique()
+(although for a properly-written object it should be accessible through
+a #GTK_TYPE_FOO macro.)
+ first_property_name: name of the first property to set when constructing
+ the object.
+ Varargs: the first argument's value, followed by any number of
+name/argument-value pairs, terminated with %NULL.
+ Returns: the new #GtkObject.
+ Deprecated: Use g_object_new() instead.
+
<!-- ##### FUNCTION gtk_object_newv ##### -->
<para>
Construct an object with an array of arguments.
@@ -2998,6 +6634,168 @@ each argument. You must g_free() this if you request it.
@n_args: the number of arguments is returned in this field.
@Returns: an array of arguments, that you must deallocate with g_free().
+<!-- ##### FUNCTION gtk_object_ref ##### -->
+<para>
+Increases the reference count of the object.
+</para>
+
+ object: the object to reference.
+ Returns: @object.
+ Deprecated: Use g_object_ref() instead.
+
+<!-- ##### FUNCTION gtk_object_remove_data ##### -->
+<para>
+Removes a specified datum from the object's data associations (the object_data).
+Subsequent calls to gtk_object_get_data() will return %NULL.
+</para>
+<para>
+If you specified a destroy handler with gtk_object_set_data_full(),
+it will be invoked.
+</para>
+
+ object: the object maintaining the association.
+ key: name of the key for that association.
+ Deprecated: Use g_object_set_data() to set the object data to %NULL instead.
+
+<!-- ##### FUNCTION gtk_object_remove_data_by_id ##### -->
+<para>
+Just like gtk_object_remove_data() except that it takes
+a #GQuark instead of a string, so it is slightly faster.
+</para>
+<para>
+Remove a specified datum from the object's data associations.
+Subsequent calls to gtk_object_get_data() will return %NULL.
+</para>
+<para>
+Use gtk_object_data_try_key() and gtk_object_data_force_id()
+to get an id from a string.
+</para>
+
+ object: object containing the associations.
+ data_id: quark of the key.
+ Deprecated: Use g_object_set_qdata() with data of %NULL instead.
+
+<!-- ##### FUNCTION gtk_object_remove_no_notify ##### -->
+<para>
+Remove a specified datum from the object's data associations (the object_data),
+without invoking the association's destroy handler.
+</para>
+<para>
+Just like gtk_object_remove_data() except that any destroy handler
+will be ignored.
+Therefore this only affects data set using gtk_object_set_data_full().
+</para>
+
+ object: the object maintaining the association.
+ key: name of the key for that association.
+ Deprecated: Use g_object_steal_data() instead.
+
+<!-- ##### FUNCTION gtk_object_remove_no_notify_by_id ##### -->
+<para>
+Just like gtk_object_remove_no_notify() except that it takes
+a #GQuark instead of a string, so it is slightly faster.
+</para>
+<para>
+Use gtk_object_data_try_key() and gtk_object_data_force_id()
+to get an id from a string.
+</para>
+
+ object: object containing the associations.
+ key_id: quark of the key.
+ Deprecated: Use g_object_steal_qdata() instead.
+
+<!-- ##### FUNCTION gtk_object_set ##### -->
+<para>
+Sets properties on an object.
+</para>
+<para>
+<informalexample>
+<programlisting>
+void set_box_properties (GtkBox* box)
+{
+ gtk_object_set (GTK_OBJECT (box), "homogeneous", TRUE,
+ "spacing", 8,
+ NULL);
+}
+</programlisting>
+</informalexample>
+</para>
+
+ object: a #GtkObject.
+ first_property_name: name of the first property to set
+ Varargs: the value of the first argument, followed optionally
+by more name/value pairs, followed by %NULL.
+ Deprecated: Use g_object_set() instead.
+
+<!-- ##### FUNCTION gtk_object_set_data ##### -->
+<para>
+Each object carries around a table of associations from
+strings to pointers. This function lets you set an association.
+</para>
+<para>
+If the object already had an association with that name,
+the old association will be destroyed.
+</para>
+
+ object: object containing the associations.
+ key: name of the key.
+ data: data to associate with that key.
+ Deprecated: Use g_object_set_data() instead.
+
+<!-- ##### FUNCTION gtk_object_set_data_by_id ##### -->
+<para>
+Just like gtk_object_set_data() except that it takes
+a #GQuark instead of a string, so it is slightly faster.
+</para>
+<para>
+Use gtk_object_data_try_key() and gtk_object_data_force_id()
+to get an id from a string.
+</para>
+
+ object: object containing the associations.
+ data_id: quark of the key.
+ data: data to associate with that key.
+ Deprecated: Use g_object_set_qdata() instead.
+
+<!-- ##### FUNCTION gtk_object_set_data_by_id_full ##### -->
+<para>
+Just like gtk_object_set_data_full() except that it takes
+a #GQuark instead of a string, so it is slightly faster.
+</para>
+<para>
+Use gtk_object_data_try_key() and gtk_object_data_force_id()
+to get an id from a string.
+</para>
+
+ object: object containing the associations.
+ data_id: quark of the key.
+ data: data to associate with that key.
+ destroy: function to call when the association is destroyed.
+ Deprecated: Use g_object_set_qdata_full() instead.
+
+<!-- ##### FUNCTION gtk_object_set_data_full ##### -->
+<para>
+Like gtk_object_set_data() except it adds notification
+for when the association is destroyed, either by
+gtk_object_remove_data() or when the object is destroyed.
+</para>
+
+ object: object containing the associations.
+ key: name of the key.
+ data: data to associate with that key.
+ destroy: function to call when the association is destroyed.
+ Deprecated: Use g_object_set_data_full() instead.
+
+<!-- ##### FUNCTION gtk_object_set_user_data ##### -->
+<para>
+For convenience, every object offers a generic user data
+pointer. This function sets it.
+</para>
+
+ object: the object whose user data should be set.
+ data: the new value for the user data.
+ Deprecated: Use g_object_set_data() instead.
+
<!-- ##### FUNCTION gtk_object_setv ##### -->
<para>
Set an array of arguments.
@@ -3008,6 +6806,48 @@ Set an array of arguments.
@args: the desired values, as an array of #GtkArgs (which contain
the names, types, and values of the arguments).
+<!-- ##### FUNCTION gtk_object_sink ##### -->
+<para>
+Removes the floating reference from a #GtkObject, if it exists;
+otherwise does nothing. See the #GtkObject overview documentation at
+the top of the page.
+</para>
+
+ object: the object to sink.
+ Deprecated: 2.10: Use g_object_ref_sink() instead
+
+<!-- ##### FUNCTION gtk_object_unref ##### -->
+<para>
+Decreases the reference count of an object. When its reference count drops
+to 0, the object is finalized (i.e. its memory is freed).
+</para>
+
+ object: the object to dereference.
+ Deprecated: Use g_object_unref() instead.
+
+<!-- ##### FUNCTION gtk_object_weakref ##### -->
+<para>
+Adds a weak reference callback to an object. Weak references are used for notification when an object is
+finalized. They are called "weak references" because they allow you to safely
+hold a pointer to an object without calling g_object_ref() (g_object_ref() adds
+a strong reference, that is, forces the object to stay alive).
+</para>
+
+ object: object to weakly reference.
+ notify: callback to invoke before the object is freed.
+ data: extra data to pass to #notify.
+ Deprecated: Use g_object_weak_ref() instead.
+
+<!-- ##### FUNCTION gtk_object_weakunref ##### -->
+<para>
+Removes a weak reference callback to an object.
+</para>
+
+ object: object stop weakly referencing.
+ notify: callback to search for.
+ data: data to search for.
+ Deprecated: Use g_object_weak_unref() instead.
+
<!-- ##### FUNCTION gtk_packer_add ##### -->
<para>
@@ -3107,6 +6947,21 @@ the names, types, and values of the arguments).
@packer:
@spacing:
+<!-- ##### FUNCTION gtk_paint_string ##### -->
+<para>
+
+</para>
+
+ style:
+ window:
+ state_type:
+ area:
+ widget:
+ detail:
+ x:
+ y:
+ string:
+
<!-- ##### MACRO gtk_paned_handle_size ##### -->
<para>
Old name for gtk_paned_set_handle_size().
@@ -3165,6 +7020,171 @@ Set the the handle size to @size x @size pixels.
@pspec:
@pattern:
+<!-- ##### FUNCTION gtk_preview_draw_row ##### -->
+<para>
+Sets the data for a portion of a row.
+</para>
+
+ preview: a #GtkPreview.
+ data: the new data for the portion. It should contain
+ @w bytes of data if the preview is of type
+ GTK_TYPE_GRAYSCALE, and 3* w bytes of data
+ if the preview is of type GTK_TYPE_COLOR.
+ x: the starting value on the row to set.
+ y: the row to change.
+ w: the number of pixels in the row to change.
+
+<!-- ##### FUNCTION gtk_preview_get_cmap ##### -->
+<para>
+Returns the colormap used by preview widgets. This
+function is deprecated, and you should use
+gdk_rgb_get_cmap() instead.
+</para>
+
+ Returns: the colormap for previews.
+
+<!-- ##### FUNCTION gtk_preview_get_info ##### -->
+<para>
+Return a #GtkPreviewInfo structure containing
+global information about preview widgets.
+</para>
+
+ Returns: a #GtkPreviewInfo structure. The return
+ value belongs to GTK+ and must not be modified
+ or freed.
+
+<!-- ##### FUNCTION gtk_preview_get_visual ##### -->
+<para>
+Returns the visual used by preview widgets. This
+function is deprecated, and you should use
+gdk_rgb_get_visual() instead.
+</para>
+
+ Returns: the visual for previews.
+
+<!-- ##### FUNCTION gtk_preview_new ##### -->
+<para>
+Create a new preview widget.
+</para>
+
+ type: the type data contained by the widget.
+(Grayscale or RGB)
+ Returns: a new #GtkPreview
+
+<!-- ##### FUNCTION gtk_preview_put ##### -->
+<para>
+Takes a portion of the contents of a preview widget
+and draws it onto the given drawable, @window.
+</para>
+
+ preview: a #GtkPreview.
+ window: a window or pixmap.
+ gc: The graphics context for the operation. Only the
+ clip mask for this GC matters.
+ srcx: the x coordinate of the upper left corner in the source image.
+ srcy: the y coordinate of the upper left corner in the source image.
+ destx: the x coordinate of the upper left corner in the destination image.
+ desty: the y coordinate of the upper left corner in the destination image.
+ width: the width of the rectangular portion to draw.
+ height: the height of the rectangular portion to draw.
+
+<!-- ##### FUNCTION gtk_preview_reset ##### -->
+<para>
+This function is deprecated and does nothing. It was
+once used for changing the colormap and visual on the fly.
+</para>
+
+
+<!-- ##### FUNCTION gtk_preview_set_color_cube ##### -->
+<para>
+This function is deprecated and does nothing. GdkRGB
+automatically picks an optimium color cube for the
+display.
+</para>
+
+ nred_shades: ignored
+ ngreen_shades: ignored
+ nblue_shades: ignored
+ ngray_shades: ignored
+
+<!-- ##### FUNCTION gtk_preview_set_dither ##### -->
+<para>
+Set the dithering mode for the display.
+</para>
+
+ preview: a #GtkPreview.
+ dither: the dithering mode.
+
+<!-- ##### FUNCTION gtk_preview_set_expand ##### -->
+<para>
+Determines the way that the the preview widget behaves
+when the size it is allocated is larger than the requested
+size. If @expand is %FALSE, then the preview's window
+and buffer will be no larger than the size set with
+gtk_preview_size(), and the data set will be centered
+in the allocation if it is larger. If @expand is %TRUE
+then the window and buffer will expand with the allocation;
+the application is responsible for catching
+the "size_allocate" signal and providing the data
+appropriate for this size.
+</para>
+
+ preview: a #GtkPreview.
+ expand: whether the preview's window should expand or not.
+
+<!-- ##### FUNCTION gtk_preview_set_gamma ##### -->
+<para>
+Set the gamma-correction value for all preview widgets.
+(This function will eventually be replaced with a
+function that sets a per-preview-widget gamma value).
+The resulting intensity is given by:
+<literal>destination_value * pow (source_value/255, 1/gamma)</literal>.
+The gamma value is applied when the data is
+set with gtk_preview_draw_row() so changing this
+value will not affect existing data in preview
+widgets.
+</para>
+
+ gamma_: the new gamma value.
+
+<!-- ##### FUNCTION gtk_preview_set_install_cmap ##### -->
+<para>
+This function is deprecated
+and does nothing. GdkRGB will automatically pick
+a private colormap if it cannot allocate sufficient
+colors.
+</para>
+
+ install_cmap: ignored.
+
+<!-- ##### FUNCTION gtk_preview_set_reserved ##### -->
+<para>
+This function is deprecated and does nothing.
+</para>
+
+ nreserved: ignored.
+
+<!-- ##### FUNCTION gtk_preview_size ##### -->
+<para>
+Set the size that the preview widget will request
+in response to a "size_request" signal. The
+drawing area may actually be allocated a size
+larger than this depending on how it is packed
+within the enclosing containers. The effect
+of this is determined by whether the preview
+is set to expand or not (see gtk_preview_expand())
+</para>
+
+ preview: a #GtkPreview.
+ width: the new width.
+ height: the new height.
+
+<!-- ##### FUNCTION gtk_preview_uninit ##### -->
+<para>
+This function is deprecated and does nothing.
+</para>
+
+
<!-- ##### FUNCTION gtk_print_context_create_context ##### -->
<para>
@@ -3237,6 +7257,101 @@ Set the the handle size to @size x @size pixels.
@settings:
@print_to_file:
+<!-- ##### FUNCTION gtk_progress_bar_new_with_adjustment ##### -->
+
+
+ adjustment:
+ Returns:
+
+<!-- ##### FUNCTION gtk_progress_bar_set_activity_blocks ##### -->
+<para>
+Sets the number of blocks used when the progress bar is in activity
+mode. Larger numbers make the visible block smaller.
+</para>
+
+ pbar: a #GtkProgressBar.
+ blocks: number of blocks which can fit within the progress bar area.
+
+<!-- ##### FUNCTION gtk_progress_bar_set_activity_step ##### -->
+<para>
+Sets the step value used when the progress bar is in activity
+mode. The step is the amount by which the progress is incremented
+each iteration.
+</para>
+
+ pbar: a #GtkProgressBar.
+ step: the amount which the progress is incremented in activity
+mode.
+
+<!-- ##### FUNCTION gtk_progress_bar_set_bar_style ##### -->
+<para>
+Sets the style of the #GtkProgressBar. The default style is
+%GTK_PROGRESS_CONTINUOUS.
+</para>
+
+ pbar: a #GtkProgressBar.
+ style: a #GtkProgressBarStyle value indicating the desired style.
+
+<!-- ##### FUNCTION gtk_progress_bar_set_discrete_blocks ##### -->
+<para>
+Sets the number of blocks that the progress bar is divided into
+when the style is %GTK_PROGRESS_DISCRETE.
+</para>
+
+ pbar: a #GtkProgressBar.
+ blocks: number of individual blocks making up the bar.
+
+<!-- ##### FUNCTION gtk_progress_bar_update ##### -->
+<para>
+This function is deprecated. Please use gtk_progress_set_value() or
+gtk_progress_set_percentage() instead.
+</para>
+
+ pbar: a #GtkProgressBar.
+ percentage: the new percent complete value.
+
+<!-- ##### MACRO gtk_radio_menu_item_group ##### -->
+<para>
+Deprecated compatibility macro. Use gtk_radio_menu_item_get_group() instead.
+</para>
+
+
+<!-- ##### FUNCTION gtk_rc_add_class_style ##### -->
+<para>
+Adds a #GtkRcStyle that will be looked up by a matching against
+the class hierarchy of the widget. This is equivalent to a:
+<literal>class PATTERN style STYLE</literal>
+statement in a RC file.
+</para>
+
+ rc_style: the #GtkRcStyle to use for widgets deriving from @pattern
+ pattern: the pattern
+ Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
+
+<!-- ##### FUNCTION gtk_rc_add_widget_class_style ##### -->
+<para>
+Adds a #GtkRcStyle that will be looked up by a match against
+the widget's class pathname. This is equivalent to a:
+<literal>widget_class PATTERN style STYLE</literal>
+statement in a RC file.
+</para>
+
+ rc_style: the #GtkRcStyle to use for widgets matching @pattern
+ pattern: the pattern
+ Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
+
+<!-- ##### FUNCTION gtk_rc_add_widget_name_style ##### -->
+<para>
+Adds a #GtkRcStyle that will be looked up by a match against
+the widget's pathname. This is equivalent to a:
+ <literal>widget PATTERN style STYLE</literal>
+statement in a RC file.
+</para>
+
+ rc_style: the #GtkRcStyle to use for widgets matching @pattern
+ pattern: the pattern
+ Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
+
<!-- ##### FUNCTION gtk_rc_init ##### -->
<para>
Internal function.
@@ -3261,6 +7376,55 @@ Sets the function that GTK+ will use to load images
@loader: the #GtkImageLoader to use
+<!-- ##### FUNCTION gtk_rc_style_ref ##### -->
+<para>
+Increments the reference count of a #GtkRcStyle.
+</para>
+
+ rc_style: a #GtkRcStyle
+ Deprecated: Use g_object_ref() instead
+
+<!-- ##### FUNCTION gtk_rc_style_unref ##### -->
+<para>
+Decrements the reference count of a #GtkRcStyle and
+frees if the result is 0.
+</para>
+
+ rc_style: a #GtkRcStyle
+ Deprecated: Use g_object_unref() instead
+
+<!-- ##### FUNCTION gtk_recent_chooser_get_show_numbers ##### -->
+<para>
+
+</para>
+
+ chooser:
+ Returns:
+
+<!-- ##### FUNCTION gtk_recent_chooser_set_show_numbers ##### -->
+<para>
+
+</para>
+
+ chooser:
+ show_numbers:
+
+<!-- ##### FUNCTION gtk_recent_manager_get_for_screen ##### -->
+<para>
+
+</para>
+
+ screen:
+ Returns:
+
+<!-- ##### FUNCTION gtk_recent_manager_set_screen ##### -->
+<para>
+
+</para>
+
+ manager:
+ screen:
+
<!-- ##### FUNCTION gtk_ruler_draw_pos ##### -->
<para>
@@ -3275,6 +7439,30 @@ Sets the function that GTK+ will use to load images
@ruler: the gtkruler
+<!-- ##### FUNCTION gtk_scale_button_get_orientation ##### -->
+<para>
+
+</para>
+
+ button:
+ Returns:
+
+<!-- ##### FUNCTION gtk_scale_button_set_orientation ##### -->
+<para>
+
+</para>
+
+ button:
+ orientation:
+
+<!-- ##### FUNCTION gtk_selection_clear ##### -->
+<para>
+</para>
+
+ widget:
+ event:
+ Returns:
+
<!-- ##### FUNCTION gtk_selection_incr_event ##### -->
<para>
Internal function.
@@ -3318,6 +7506,15 @@ Internal function.
@Returns:
+<!-- ##### MACRO gtk_spin_button_get_value_as_float ##### -->
+<para>
+Gets the value in the @spin_button.
+</para>
+
+ Returns: the value of @spin_button
+ Deprecated: Use gtk_spin_button_get_value() instead.
+ spin_button: a #GtkSpinButton
+
<!-- ##### FUNCTION gtk_spin_button_set_shadow_type ##### -->
<para>
Creates a border around the arrows of a #GtkSpinButton. The type of border is determined by @shadow_type.
@@ -3326,6 +7523,14 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
@spin_button: a #GtkSpinButton
@shadow_type: the new border type.
+<!-- ##### FUNCTION gtk_status_icon_set_tooltip ##### -->
+<para>
+
+</para>
+
+ status_icon:
+ tooltip_text:
+
<!-- ##### FUNCTION gtk_stock_list_items ##### -->
<para>
@@ -3333,6 +7538,29 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
@Returns:
+<!-- ##### MACRO gtk_style_apply_default_pixmap ##### -->
+<para>
+Does the same as gtk_style_apply_default_background().
+</para>
+
+ s:
+ gw:
+ st:
+ a:
+ x:
+ y:
+ w:
+ h:
+ Deprecated: Use gtk_style_apply_default_background() instead.
+
+<!-- ##### FUNCTION gtk_style_get_font ##### -->
+<para>
+
+</para>
+
+ style:
+ Returns:
+
<!-- ##### FUNCTION gtk_style_get_font_for_display ##### -->
<para>
@@ -3352,6 +7580,38 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
@property_name:
@value:
+<!-- ##### FUNCTION gtk_style_lookup_icon_set ##### -->
+<para>
+
+</para>
+
+ style:
+ stock_id:
+ Returns:
+
+<!-- ##### FUNCTION gtk_style_ref ##### -->
+<para>
+
+</para>
+
+ style:
+ Returns:
+
+<!-- ##### FUNCTION gtk_style_set_font ##### -->
+<para>
+
+</para>
+
+ style:
+ font:
+
+<!-- ##### FUNCTION gtk_style_unref ##### -->
+<para>
+
+</para>
+
+ style:
+
<!-- ##### FUNCTION gtk_text_buffer_paste_primary ##### -->
<para>
@@ -3393,6 +7653,51 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
@Returns:
+<!-- ##### FUNCTION gtk_tips_query_new ##### -->
+<para>
+Creates a new #GtkTipsQuery.
+</para>
+
+ Returns: a new #GtkTipsQuery.
+
+<!-- ##### FUNCTION gtk_tips_query_set_caller ##### -->
+<para>
+Sets the widget which initiates the query, usually a button.
+If the @caller is selected while the query is running, the query is
+automatically stopped.
+</para>
+
+ tips_query: a #GtkTipsQuery.
+ caller: the widget which initiates the query.
+
+<!-- ##### FUNCTION gtk_tips_query_set_labels ##### -->
+<para>
+Sets the text to display when the query is not in effect,
+and the text to display when the query is in effect but the widget beneath
+the pointer has no tooltip.
+</para>
+
+ tips_query: a #GtkTipsQuery.
+ label_inactive: the text to display when the query is not running.
+ label_no_tip: the text to display when the query is running but the widget
+beneath the pointer has no tooltip.
+
+<!-- ##### FUNCTION gtk_tips_query_start_query ##### -->
+<para>
+Starts a query.
+The #GtkTipsQuery widget will take control of the mouse and as the mouse
+moves it will display the tooltip of the widget beneath the mouse.
+</para>
+
+ tips_query: a #GtkTipsQuery.
+
+<!-- ##### FUNCTION gtk_tips_query_stop_query ##### -->
+<para>
+Stops a query.
+</para>
+
+ tips_query: a #GtkTipsQuery.
+
<!-- ##### FUNCTION gtk_tool_item_get_pack_end ##### -->
<para>
@@ -3409,6 +7714,208 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
@tool_item:
@pack_end:
+<!-- ##### FUNCTION gtk_toolbar_append_element ##### -->
+<para>
+
+</para>
+<para>
+
+</para>
+
+ toolbar:
+ type:
+ widget:
+ text:
+ tooltip_text:
+ tooltip_private_text:
+ icon:
+ callback:
+ user_data:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_append_item ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ text:
+ tooltip_text:
+ tooltip_private_text:
+ icon:
+ callback:
+ user_data:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_append_space ##### -->
+<para>
+
+</para>
+
+ toolbar:
+
+<!-- ##### FUNCTION gtk_toolbar_append_widget ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ widget:
+ tooltip_text:
+ tooltip_private_text:
+
+<!-- ##### FUNCTION gtk_toolbar_get_orientation ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_get_tooltips ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_insert_element ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ type:
+ widget:
+ text:
+ tooltip_text:
+ tooltip_private_text:
+ icon:
+ callback:
+ user_data:
+ position:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_insert_item ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ text:
+ tooltip_text:
+ tooltip_private_text:
+ icon:
+ callback:
+ user_data:
+ position:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_insert_space ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ position:
+
+<!-- ##### FUNCTION gtk_toolbar_insert_stock ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ stock_id:
+ tooltip_text:
+ tooltip_private_text:
+ callback:
+ user_data:
+ position:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_insert_widget ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ widget:
+ tooltip_text:
+ tooltip_private_text:
+ position:
+
+<!-- ##### FUNCTION gtk_toolbar_prepend_element ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ type:
+ widget:
+ text:
+ tooltip_text:
+ tooltip_private_text:
+ icon:
+ callback:
+ user_data:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_prepend_item ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ text:
+ tooltip_text:
+ tooltip_private_text:
+ icon:
+ callback:
+ user_data:
+ Returns:
+
+<!-- ##### FUNCTION gtk_toolbar_prepend_space ##### -->
+<para>
+
+</para>
+
+ toolbar:
+
+<!-- ##### FUNCTION gtk_toolbar_prepend_widget ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ widget:
+ tooltip_text:
+ tooltip_private_text:
+
+<!-- ##### FUNCTION gtk_toolbar_remove_space ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ position:
+
+<!-- ##### FUNCTION gtk_toolbar_set_orientation ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ orientation:
+
+<!-- ##### FUNCTION gtk_toolbar_set_tooltips ##### -->
+<para>
+
+</para>
+
+ toolbar:
+ enable:
+
<!-- ##### FUNCTION gtk_trace_referencing ##### -->
<para>
Private: print debugging information while doing a gtk_object_ref() or
@@ -3421,6 +7928,17 @@ a gtk_object_unref().
@line: line number (used within macros).
@do_ref: whether to reference or unreference.
+<!-- ##### MACRO gtk_tree_model_get_iter_root ##### -->
+<para>
+A alternate name for gtk_tree_model_get_iter_first() provided for
+compatibility reasons; this macro will be deprecated in future
+versions of GTK+.
+</para>
+
+ tree_model: A #GtkTreeModel.
+ iter: uninitialized #GtkTreeIter.
+ Returns: %TRUE, if @iter was set.
+
<!-- ##### FUNCTION gtk_tree_model_ref_iter ##### -->
<para>
@@ -3488,6 +8006,15 @@ a gtk_object_unref().
@tree_model:
@iter:
+<!-- ##### MACRO gtk_tree_path_new_root ##### -->
+<para>
+An alternate name for gtk_tree_path_new_first() provided for
+compatibility reasons.
+</para>
+
+ Returns: A new #GtkTreePath.
+ Deprecated: Use gtk_tree_path_new_first() instead.
+
<!-- ##### FUNCTION gtk_tree_store_move ##### -->
<para>
@@ -3598,6 +8125,28 @@ a gtk_object_unref().
@row_draggable_func:
@user_data:
+<!-- ##### FUNCTION gtk_tree_view_tree_to_widget_coords ##### -->
+<para>
+
+</para>
+
+ tree_view:
+ tx:
+ ty:
+ wx:
+ wy:
+
+<!-- ##### FUNCTION gtk_tree_view_widget_to_tree_coords ##### -->
+<para>
+
+</para>
+
+ tree_view:
+ wx:
+ wy:
+ tx:
+ ty:
+
<!-- ##### FUNCTION gtk_type_check_class_cast ##### -->
<para>
Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make
@@ -3626,6 +8175,15 @@ Return the pointer to the type's children's types.
@type: GtkType
@Returns: pointer to a GList
+<!-- ##### FUNCTION gtk_type_class ##### -->
+<para>
+Returns a pointer pointing to the class of @type or %NULL if there was
+any trouble identifying @type. Initializes the class if necessary.
+</para>
+
+ type: a #GtkType.
+ Returns: pointer to the class.
+
<!-- ##### FUNCTION gtk_type_describe_heritage ##### -->
<para>
Print the types @type inherits from.
@@ -3642,6 +8200,41 @@ show the size if @show_size is true.
@type: GtkType
@show_size: gboolean
+<!-- ##### FUNCTION gtk_type_enum_find_value ##### -->
+<para>
+Returns a pointer to one of @enum_type's #GtkEnumValues's whose name (or nickname) matches @value_name.
+</para>
+
+ enum_type: a #GtkType.
+ value_name: the name to look for.
+ Returns: #GtkEnumValue*
+
+<!-- ##### FUNCTION gtk_type_enum_get_values ##### -->
+<para>
+If @enum_type has values, then return a pointer to all of them.
+</para>
+
+ enum_type: a #GtkType.
+ Returns: #GtkEnumValue*
+
+<!-- ##### FUNCTION gtk_type_flags_find_value ##### -->
+<para>
+Returns a pointer to one of @flag_type's #GtkFlagValue's whose name (or nickname) matches @value_name.
+</para>
+
+ flags_type: a #GtkType.
+ value_name: the name to look for.
+ Returns: #GtkFlagValue*
+ flag_type: GtkType
+
+<!-- ##### FUNCTION gtk_type_flags_get_values ##### -->
+<para>
+If @flags_type has values, then return a pointer to all of them.
+</para>
+
+ flags_type: a #GtkType.
+ Returns: #GtkFlagValue*
+
<!-- ##### FUNCTION gtk_type_free ##### -->
<para>
Given the type of an object and a pointer to it, the object is freed.
@@ -3650,6 +8243,14 @@ Given the type of an object and a pointer to it, the object is freed.
@type: GtkType
@mem: gpointer to the object
+<!-- ##### MACRO gtk_type_from_name ##### -->
+<para>
+Gets the internal representation of a type, given its name.
+</para>
+
+ name: the name of a GTK+ type
+ Returns: a #GtkType.
+
<!-- ##### FUNCTION gtk_type_get_varargs_type ##### -->
<para>
Get the varargs type associated with @foreign_type
@@ -3658,6 +8259,50 @@ Get the varargs type associated with @foreign_type
@foreign_type: GtkType
@Returns: GtkType
+<!-- ##### FUNCTION gtk_type_init ##### -->
+<para>
+Initializes the data structures associated with GTK+ types.
+</para>
+
+ debug_flags: debug flags
+
+<!-- ##### MACRO gtk_type_is_a ##### -->
+<para>
+Looks in the type hierarchy to see if @type has @is_a_type among its
+ancestors. Do so with a simple lookup, not a loop.
+</para>
+
+ type: a #GtkType.
+ is_a_type: another #GtkType.
+ Returns: %TRUE if @type is a @is_a_type.
+
+<!-- ##### MACRO gtk_type_name ##### -->
+<para>
+Returns a pointer to the name of a type, or %NULL if it has none.
+</para>
+
+ type: a #GtkType.
+ Returns: a pointer to the name of a type, or %NULL if it has none.
+
+<!-- ##### FUNCTION gtk_type_new ##### -->
+<para>
+Creates a new object of a given type, and return a pointer to it.
+Returns %NULL if you give it an invalid type. It allocates the object
+out of the type's memory chunk if there is a memory chunk. The object
+has all the proper initializers called.
+</para>
+
+ type: a #GtkType.
+ Returns: pointer to a #GtkTypeObject.
+
+<!-- ##### MACRO gtk_type_parent ##### -->
+<para>
+Returns the parent type of a #GtkType.
+</para>
+
+ type: a #GtkType.
+ Returns: the #GtkType of the parent.
+
<!-- ##### FUNCTION gtk_type_parent_class ##### -->
<para>
Return the class of the parent. Initialize the class if necessary.
@@ -3712,6 +8357,15 @@ Set the varargs type for a fundamental type @foreign_type.
fundamental type.
@varargs_type: Must be a GtkType which is either structured or flag, or NONE.
+<!-- ##### FUNCTION gtk_type_unique ##### -->
+<para>
+Creates a new, unique type.
+</para>
+
+ parent_type: if zero, a fundamental type is created
+ gtkinfo: must not be %NULL, and @type_info->type_name must also not be %NULL
+ Returns: the new #GtkType
+
<!-- ##### FUNCTION gtk_widget_accelerator_signal ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkaccelmap.sgml b/docs/reference/gtk/tmpl/gtkaccelmap.sgml
index f83b75b..c7fa69c 100644
--- a/docs/reference/gtk/tmpl/gtkaccelmap.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccelmap.sgml
@@ -17,6 +17,9 @@ Loadable keyboard accelerator specifications
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkAccelMap ##### -->
<para>
@@ -148,6 +151,7 @@ Loadable keyboard accelerator specifications
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkactiongroup.sgml b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
index 516210d..2d6f4a6 100644
--- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
@@ -70,6 +70,9 @@ it doesn't allow you to specify a signal.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkActionGroup ##### -->
<para>
The <structname>GtkActionGroup</structname> struct contains only private
diff --git a/docs/reference/gtk/tmpl/gtkadjustment.sgml b/docs/reference/gtk/tmpl/gtkadjustment.sgml
index ee85e79..d32aedd 100644
--- a/docs/reference/gtk/tmpl/gtkadjustment.sgml
+++ b/docs/reference/gtk/tmpl/gtkadjustment.sgml
@@ -31,6 +31,9 @@ after changing the value and its bounds. This results in the emission of the
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkAdjustment ##### -->
<para>
The #GtkAdjustment-struct struct contains the following fields.
diff --git a/docs/reference/gtk/tmpl/gtkbindings.sgml b/docs/reference/gtk/tmpl/gtkbindings.sgml
index fca01a2..61961ad 100644
--- a/docs/reference/gtk/tmpl/gtkbindings.sgml
+++ b/docs/reference/gtk/tmpl/gtkbindings.sgml
@@ -120,6 +120,9 @@ The "unbind" functionality has been introduced in GTK+ 2.12.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkBindingSet ##### -->
<para>
A binding set maintains a list of activatable key bindings.
@@ -175,13 +178,6 @@ key binding signal emission as stored in #GtkBindingSignal.
@arg_type: implementation detail
-<!-- ##### MACRO gtk_binding_entry_add ##### -->
-<para>
-
-</para>
-
-
-
<!-- ##### FUNCTION gtk_binding_entry_add_signall ##### -->
<para>
@@ -194,25 +190,6 @@ key binding signal emission as stored in #GtkBindingSignal.
@binding_args:
-<!-- ##### FUNCTION gtk_binding_entry_clear ##### -->
-<para>
-
-</para>
-
- binding_set:
- keyval:
- modifiers:
-
-
-<!-- ##### FUNCTION gtk_binding_parse_binding ##### -->
-<para>
-
-</para>
-
- scanner:
- Returns:
-
-
<!-- ##### FUNCTION gtk_binding_set_new ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index e5a26bb..13ca4a6 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -24,6 +24,9 @@ the #GtkLabel.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkButton ##### -->
<para>
This should not be accessed directly. Use the accessor functions below.
@@ -158,6 +161,7 @@ Creates a new #GtkButton widget. To add a child widget to the button,
use gtk_container_add().
</para>
+ void:
@Returns: The newly created #GtkButton widget.
diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml
index 75ab42d..c4dbd96 100644
--- a/docs/reference/gtk/tmpl/gtkcalendar.sgml
+++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml
@@ -36,6 +36,9 @@ gtk_calendar_get_date().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCalendar ##### -->
<para>
<structfield>num_marked_dates</structfield> is an integer containing the
@@ -191,6 +194,7 @@ calendar.
<para>
</para>
+ void:
@Returns:
@@ -312,25 +316,3 @@ calendar.
@rows:
-<!-- ##### FUNCTION gtk_calendar_display_options ##### -->
-<para>
-</para>
-
- calendar:
- flags:
-
-
-<!-- ##### FUNCTION gtk_calendar_freeze ##### -->
-<para>
-</para>
-
- calendar:
-
-
-<!-- ##### FUNCTION gtk_calendar_thaw ##### -->
-<para>
-</para>
-
- calendar:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkcelleditable.sgml b/docs/reference/gtk/tmpl/gtkcelleditable.sgml
index ebcea5f..b06721b 100644
--- a/docs/reference/gtk/tmpl/gtkcelleditable.sgml
+++ b/docs/reference/gtk/tmpl/gtkcelleditable.sgml
@@ -18,6 +18,9 @@ to be usable when editing the contents of a #GtkTreeView cell.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellEditable ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkcelllayout.sgml b/docs/reference/gtk/tmpl/gtkcelllayout.sgml
index e9e8fe2..166d2cb 100644
--- a/docs/reference/gtk/tmpl/gtkcelllayout.sgml
+++ b/docs/reference/gtk/tmpl/gtkcelllayout.sgml
@@ -58,6 +58,9 @@ content of the element is the attribute value.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellLayout ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
index 679338b..4a0e088 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml
@@ -51,6 +51,9 @@ respectively.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GtkCellRendererState ##### -->
<para>
Tells how a cell is to be rendererd.
diff --git a/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml b/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml
index 077dcae..6268e44 100644
--- a/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml
@@ -23,6 +23,9 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererAccel ##### -->
<para>
@@ -81,6 +84,7 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml b/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
index 83d7900..1a989c9 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
@@ -34,6 +34,9 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererCombo ##### -->
<para>
@@ -69,6 +72,7 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
index 51e23f8..cad7a44 100644
--- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
@@ -33,6 +33,9 @@ property is set to a pixbuf, it renders that one.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererPixbuf ##### -->
<para>
@@ -89,6 +92,7 @@ property is set to a pixbuf, it renders that one.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
index ccca765..0d186f2 100644
--- a/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
@@ -22,6 +22,9 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererProgress ##### -->
<para>
@@ -63,6 +66,7 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml b/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml
index fe96170..cd98ee7 100644
--- a/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrendererspin.sgml
@@ -33,6 +33,9 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererSpin ##### -->
<para>
@@ -59,6 +62,7 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
index 42125e4..286929e 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
@@ -25,6 +25,9 @@ the #GtkCellRendererText allows to edit its text using an entry.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererText ##### -->
<para>
@@ -265,6 +268,7 @@ the #GtkCellRendererText allows to edit its text using an entry.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
index faacb51..02e266a 100644
--- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
@@ -20,6 +20,9 @@ property. When activated, it emits the toggled signal.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellRendererToggle ##### -->
<para>
@@ -64,6 +67,7 @@ property. When activated, it emits the toggled signal.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcellview.sgml b/docs/reference/gtk/tmpl/gtkcellview.sgml
index 7143a54..0cc0bc1 100644
--- a/docs/reference/gtk/tmpl/gtkcellview.sgml
+++ b/docs/reference/gtk/tmpl/gtkcellview.sgml
@@ -20,6 +20,9 @@ and drag and drop.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCellView ##### -->
<para>
@@ -51,6 +54,7 @@ and drag and drop.
</para>
+ void:
@Returns:
@@ -137,12 +141,3 @@ and drag and drop.
@color:
-<!-- ##### FUNCTION gtk_cell_view_get_cell_renderers ##### -->
-<para>
-
-</para>
-
- cell_view:
- Returns:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
index 25246b0..0e6313d 100644
--- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
@@ -37,6 +37,9 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCheckButton ##### -->
<para>
<structfield>toggle_button</structfield> is a #GtkToggleButton representing the actual toggle button that composes the check button.
@@ -58,6 +61,7 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
Creates a new #GtkCheckButton.
</para>
+ void:
@Returns: a #GtkWidget.
diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
index 8d83732..51ddf14 100644
--- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
@@ -25,6 +25,9 @@ toggles the value.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkCheckMenuItem ##### -->
<para>
The #GtkCheckMenuItem-struct struct contains the following fields.
@@ -81,6 +84,7 @@ field of the #GtkCheckMenuItem-struct struct to discover the new state.
Creates a new #GtkCheckMenuItem.
</para>
+ void:
@Returns: a new #GtkCheckMenuItem.
diff --git a/docs/reference/gtk/tmpl/gtkclipboard.sgml b/docs/reference/gtk/tmpl/gtkclipboard.sgml
index ddd4195..d39782f 100644
--- a/docs/reference/gtk/tmpl/gtkclipboard.sgml
+++ b/docs/reference/gtk/tmpl/gtkclipboard.sgml
@@ -87,6 +87,9 @@ Storing data on clipboards
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkClipboard ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml
index 61e3690..f51aeca 100644
--- a/docs/reference/gtk/tmpl/gtkcolorbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorbutton.sgml
@@ -19,6 +19,9 @@ widget for selecting a color in a preference dialog.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkColorButton ##### -->
<para>
The GtkColorButton struct has only private fields and
@@ -58,6 +61,7 @@ should not be used directly.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
index e6ed147..368c791 100644
--- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
@@ -21,6 +21,9 @@ color selection dialog box #GtkColorSelectionDialog.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkColorSelection ##### -->
<para>
The #GtkColorSelection-struct struct contains private data only,
@@ -61,6 +64,7 @@ according to its update policy.
</para>
+ void:
@Returns:
@@ -202,15 +206,6 @@ according to its update policy.
@Returns:
-<!-- ##### FUNCTION gtk_color_selection_set_change_palette_hook ##### -->
-<para>
-
-</para>
-
- func:
- Returns:
-
-
<!-- ##### USER_FUNCTION GtkColorSelectionChangePaletteFunc ##### -->
<para>
@@ -240,21 +235,3 @@ according to its update policy.
@Since: 2.2
-<!-- ##### FUNCTION gtk_color_selection_set_color ##### -->
-<para>
-
-</para>
-
- colorsel:
- color:
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_color ##### -->
-<para>
-
-</para>
-
- colorsel:
- color:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
index f5a1fe0..793cacb 100644
--- a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
@@ -29,6 +29,9 @@ name "color_selection". It also exposes the buttons with the names
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkColorSelectionDialog ##### -->
<para>
The #GtkColorSelectionDialog-struct struct contains the following fields.
diff --git a/docs/reference/gtk/tmpl/gtkcombobox.sgml b/docs/reference/gtk/tmpl/gtkcombobox.sgml
index 37ee062..7e080eb 100644
--- a/docs/reference/gtk/tmpl/gtkcombobox.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombobox.sgml
@@ -42,6 +42,9 @@ gtk_combo_box_get_active_text().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkComboBox ##### -->
<para>
@@ -153,6 +156,7 @@ gtk_combo_box_get_active_text().
</para>
+ void:
@Returns:
@@ -279,6 +283,7 @@ gtk_combo_box_get_active_text().
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
index 04d3a63..b8eb489 100644
--- a/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
@@ -61,6 +61,9 @@ child with name "entry".
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkComboBoxEntry ##### -->
<para>
@@ -77,6 +80,7 @@ child with name "entry".
</para>
+ void:
@Returns:
@@ -95,6 +99,7 @@ child with name "entry".
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index c943346..3218186 100644
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -147,6 +147,9 @@ for regular properties.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkContainer ##### -->
<para>
@@ -159,7 +162,7 @@ for regular properties.
</para>
@container: the object which received the signal.
- widget:
+ widget:
<!-- ##### SIGNAL GtkContainer::check-resize ##### -->
<para>
@@ -174,7 +177,7 @@ for regular properties.
</para>
@container: the object which received the signal.
- widget:
+ widget:
<!-- ##### SIGNAL GtkContainer::set-focus-child ##### -->
<para>
@@ -182,7 +185,7 @@ for regular properties.
</para>
@container: the object which received the signal.
- widget:
+ widget:
<!-- ##### ARG GtkContainer:border-width ##### -->
<para>
@@ -204,7 +207,7 @@ for regular properties.
</para>
- widget:
+ widget:
<!-- ##### MACRO GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID ##### -->
@@ -224,8 +227,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- widget:
+ container:
+ widget:
<!-- ##### FUNCTION gtk_container_remove ##### -->
@@ -233,8 +236,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- widget:
+ container:
+ widget:
<!-- ##### FUNCTION gtk_container_add_with_properties ##### -->
@@ -242,10 +245,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- widget:
- first_prop_name:
- Varargs:
+ container:
+ widget:
+ first_prop_name:
+ Varargs:
<!-- ##### FUNCTION gtk_container_get_resize_mode ##### -->
@@ -253,8 +256,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_resize_mode ##### -->
@@ -262,8 +265,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- resize_mode:
+ container:
+ resize_mode:
<!-- ##### FUNCTION gtk_container_check_resize ##### -->
@@ -271,7 +274,7 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
+ container:
<!-- ##### FUNCTION gtk_container_foreach ##### -->
@@ -279,9 +282,9 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- callback:
- callback_data:
+ container:
+ callback:
+ callback_data:
<!-- ##### FUNCTION gtk_container_get_children ##### -->
@@ -289,8 +292,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_reallocate_redraws ##### -->
@@ -298,8 +301,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- needs_redraws:
+ container:
+ needs_redraws:
<!-- ##### FUNCTION gtk_container_get_focus_child ##### -->
@@ -307,8 +310,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_focus_child ##### -->
@@ -316,8 +319,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
+ container:
+ child:
<!-- ##### FUNCTION gtk_container_get_focus_vadjustment ##### -->
@@ -325,8 +328,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
@@ -334,8 +337,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- adjustment:
+ container:
+ adjustment:
<!-- ##### FUNCTION gtk_container_get_focus_hadjustment ##### -->
@@ -343,8 +346,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
@@ -352,8 +355,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- adjustment:
+ container:
+ adjustment:
<!-- ##### FUNCTION gtk_container_resize_children ##### -->
@@ -361,7 +364,7 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
+ container:
<!-- ##### FUNCTION gtk_container_child_type ##### -->
@@ -369,8 +372,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_child_get ##### -->
@@ -378,10 +381,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- first_prop_name:
- Varargs:
+ container:
+ child:
+ first_prop_name:
+ Varargs:
<!-- ##### FUNCTION gtk_container_child_set ##### -->
@@ -389,10 +392,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- first_prop_name:
- Varargs:
+ container:
+ child:
+ first_prop_name:
+ Varargs:
<!-- ##### FUNCTION gtk_container_child_get_property ##### -->
@@ -400,10 +403,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- property_name:
- value:
+ container:
+ child:
+ property_name:
+ value:
<!-- ##### FUNCTION gtk_container_child_set_property ##### -->
@@ -411,10 +414,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- property_name:
- value:
+ container:
+ child:
+ property_name:
+ value:
<!-- ##### FUNCTION gtk_container_child_get_valist ##### -->
@@ -422,10 +425,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- first_property_name:
- var_args:
+ container:
+ child:
+ first_property_name:
+ var_args:
<!-- ##### FUNCTION gtk_container_child_set_valist ##### -->
@@ -433,10 +436,10 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- first_property_name:
- var_args:
+ container:
+ child:
+ first_property_name:
+ var_args:
<!-- ##### FUNCTION gtk_container_forall ##### -->
@@ -444,9 +447,9 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- callback:
- callback_data:
+ container:
+ callback:
+ callback_data:
<!-- ##### FUNCTION gtk_container_get_border_width ##### -->
@@ -454,8 +457,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- Returns:
+ container:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_border_width ##### -->
@@ -463,8 +466,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- border_width:
+ container:
+ border_width:
<!-- ##### FUNCTION gtk_container_propagate_expose ##### -->
@@ -472,9 +475,9 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- child:
- event:
+ container:
+ child:
+ event:
<!-- ##### FUNCTION gtk_container_get_focus_chain ##### -->
@@ -482,9 +485,9 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- focusable_widgets:
- Returns:
+ container:
+ focusable_widgets:
+ Returns:
<!-- ##### FUNCTION gtk_container_set_focus_chain ##### -->
@@ -492,8 +495,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
- focusable_widgets:
+ container:
+ focusable_widgets:
<!-- ##### FUNCTION gtk_container_unset_focus_chain ##### -->
@@ -501,7 +504,7 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- container:
+ container:
<!-- ##### FUNCTION gtk_container_class_find_child_property ##### -->
@@ -509,9 +512,9 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- cclass:
- property_name:
- Returns:
+ cclass:
+ property_name:
+ Returns:
<!-- ##### FUNCTION gtk_container_class_install_child_property ##### -->
@@ -519,9 +522,9 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- cclass:
- property_id:
- pspec:
+ cclass:
+ property_id:
+ pspec:
<!-- ##### FUNCTION gtk_container_class_list_child_properties ##### -->
@@ -529,8 +532,8 @@ properties in set_child_property() and get_child_property() implementations.
</para>
- cclass:
- n_properties:
- Returns:
+ cclass:
+ n_properties:
+ Returns:
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index ecf4d83..32e4878 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -165,6 +165,9 @@ response from the user.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkDialog ##### -->
<para>
<structfield>vbox</structfield> is a #GtkVBox - the main part of the
@@ -256,6 +259,7 @@ Creates a new dialog box. Widgets should not be packed into this #GtkWindow
directly, but into the @vbox and @action_area, as described above.
</para>
+ void:
@Returns: a new #GtkDialog.
diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml
index 7d12740..5477bff 100644
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -27,6 +27,9 @@ in the #GtkWidget class.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GtkDestDefaults ##### -->
<para>
The #GtkDestDefaults enumeration specifies the various
@@ -321,18 +324,6 @@ a widget.
@context:
-<!-- ##### FUNCTION gtk_drag_set_default_icon ##### -->
-<para>
-
-</para>
-
- colormap:
- pixmap:
- mask:
- hot_x:
- hot_y:
-
-
<!-- ##### FUNCTION gtk_drag_check_threshold ##### -->
<para>
@@ -351,11 +342,11 @@ a widget.
</para>
- widget:
- start_button_mask:
- targets:
- n_targets:
- actions:
+ widget:
+ start_button_mask:
+ targets:
+ n_targets:
+ actions:
<!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
index dee937a..1edf19d 100644
--- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
+++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
@@ -107,6 +107,9 @@ refresh to the screen.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkDrawingArea ##### -->
<para>
The #GtkDrawingArea struct contains private data only, and
@@ -119,21 +122,7 @@ should be accessed using the functions below.
Creates a new drawing area.
</para>
+ void:
@Returns: a new #GtkDrawingArea
-<!-- ##### FUNCTION gtk_drawing_area_size ##### -->
-<para>
-Sets the size that the drawing area will request
-in response to a "size_request" signal. The
-drawing area may actually be allocated a size
-larger than this depending on how it is packed
-within the enclosing containers.
-</para>
-
- darea: a #GtkDrawingArea
- width: the width to request
- height: the height to request
- Deprecated: Use gtk_widget_set_size_request() instead.
-
-
diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml
index 6c503aa..18c8490 100644
--- a/docs/reference/gtk/tmpl/gtkeditable.sgml
+++ b/docs/reference/gtk/tmpl/gtkeditable.sgml
@@ -55,6 +55,9 @@ insert_text_handler (GtkEditable *editable,
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkEditable ##### -->
<para>
The #GtkEditable structure is an opaque structure whose members
diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml
index 692c1bf..bac2315 100644
--- a/docs/reference/gtk/tmpl/gtkentry.sgml
+++ b/docs/reference/gtk/tmpl/gtkentry.sgml
@@ -67,6 +67,9 @@ via the context menu of the entry.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkEntry ##### -->
<para>
The #GtkEntry-struct struct contains only private data.
@@ -411,6 +414,7 @@ The #GtkEntry-struct struct contains only private data.
</para>
+ void:
@Returns:
@@ -756,6 +760,24 @@ The #GtkEntry-struct struct contains only private data.
@entry:
+<!-- ##### FUNCTION gtk_entry_im_context_filter_keypress ##### -->
+<para>
+
+</para>
+
+ entry:
+ event:
+ Returns:
+
+
+<!-- ##### FUNCTION gtk_entry_reset_im_context ##### -->
+<para>
+
+</para>
+
+ entry:
+
+
<!-- ##### ENUM GtkEntryIconPosition ##### -->
<para>
Specifies the side of the entry at which an icon is placed.
diff --git a/docs/reference/gtk/tmpl/gtkentrybuffer.sgml b/docs/reference/gtk/tmpl/gtkentrybuffer.sgml
index 712f013..083da46 100644
--- a/docs/reference/gtk/tmpl/gtkentrybuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtkentrybuffer.sgml
@@ -17,6 +17,9 @@ GtkEntryBuffer
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkEntryBuffer ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml
index 611b96f..b0422c1 100644
--- a/docs/reference/gtk/tmpl/gtkentrycompletion.sgml
+++ b/docs/reference/gtk/tmpl/gtkentrycompletion.sgml
@@ -46,6 +46,9 @@ selected, the ::action-activated signal is emitted.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkEntryCompletion ##### -->
<para>
The GtkEntryCompletion struct contains only private data.
@@ -150,6 +153,7 @@ to the unmodified key via <literal>gtk_entry_get_text (GTK_ENTRY (gtk_entry_comp
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml
index 181a5af..579e1c0 100644
--- a/docs/reference/gtk/tmpl/gtkenums.sgml
+++ b/docs/reference/gtk/tmpl/gtkenums.sgml
@@ -17,6 +17,9 @@ Public enumerated types used throughout GTK+
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GtkAccelFlags ##### -->
<para>
@@ -176,18 +179,6 @@ Used for justifying the text inside a #GtkLabel widget. (See also
@GTK_JUSTIFY_CENTER: The text is placed in the center of the label.
@GTK_JUSTIFY_FILL: The text is placed is distributed across the label.
-<!-- ##### ENUM GtkMatchType ##### -->
-<para>
-
-</para>
-
- GTK_MATCH_ALL:
- GTK_MATCH_ALL_TAIL:
- GTK_MATCH_HEAD:
- GTK_MATCH_TAIL:
- GTK_MATCH_EXACT:
- GTK_MATCH_LAST:
-
<!-- ##### ENUM GtkMetricType ##### -->
<para>
Used to indicate which metric is used by a #GtkRuler.
@@ -274,15 +265,6 @@ tabs of a #GtkNotebook, the handle of a #GtkHandleBox or the label of a
@GTK_POS_TOP: The feature is at the top edge.
@GTK_POS_BOTTOM: The feature is at the bottom edge.
-<!-- ##### ENUM GtkPreviewType ##### -->
-<para>
-An enumeration which describes whether a preview
-contains grayscale or red-green-blue data.
-</para>
-
- GTK_PREVIEW_COLOR: the preview contains red-green-blue data.
- GTK_PREVIEW_GRAYSCALE: The preview contains grayscale data.
-
<!-- ##### ENUM GtkReliefStyle ##### -->
<para>
Indicated the relief to be drawn around a #GtkButton.
@@ -365,16 +347,6 @@ Used to change the appearance of an outline typically provided by a #GtkFrame.
@GTK_SHADOW_ETCHED_IN: The outline has a sunken 3d appearance.
@GTK_SHADOW_ETCHED_OUT: The outline has a raised 3d appearance
-<!-- ##### ENUM GtkSideType ##### -->
-<para>
-
-</para>
-
- GTK_SIDE_TOP:
- GTK_SIDE_BOTTOM:
- GTK_SIDE_LEFT:
- GTK_SIDE_RIGHT:
-
<!-- ##### ENUM GtkStateType ##### -->
<para>
This type indicates the current state of a widget; the state determines how
diff --git a/docs/reference/gtk/tmpl/gtkeventbox.sgml b/docs/reference/gtk/tmpl/gtkeventbox.sgml
index fdcec8f..66bbeea 100644
--- a/docs/reference/gtk/tmpl/gtkeventbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkeventbox.sgml
@@ -19,6 +19,9 @@ have their own window.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkEventBox ##### -->
<para>
The #GtkEventBox-struct struct contains private data only, and
@@ -41,6 +44,7 @@ should be accessed using the functions below.
Creates a new #GtkEventBox.
</para>
+ void:
@Returns: a new #GtkEventBox.
diff --git a/docs/reference/gtk/tmpl/gtkexpander.sgml b/docs/reference/gtk/tmpl/gtkexpander.sgml
index 4a62060..402ef58 100644
--- a/docs/reference/gtk/tmpl/gtkexpander.sgml
+++ b/docs/reference/gtk/tmpl/gtkexpander.sgml
@@ -89,6 +89,9 @@ a <child> type attribute.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkExpander ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkfeatures.sgml b/docs/reference/gtk/tmpl/gtkfeatures.sgml
index d40fa25..16e0add 100644
--- a/docs/reference/gtk/tmpl/gtkfeatures.sgml
+++ b/docs/reference/gtk/tmpl/gtkfeatures.sgml
@@ -19,6 +19,9 @@ typically use the features described here.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### VARIABLE gtk_major_version ##### -->
<para>
The major version number of the GTK+ library. (e.g. in GTK+ version
diff --git a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
index 2f13100..6042343 100644
--- a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
@@ -51,6 +51,9 @@ such a way that other interface elements give space to the widget.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFileChooserButton ##### -->
<para>
This should not be accessed directly. Use the accessor functions below.
diff --git a/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml b/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml
index 4ed335f..cc798bc 100644
--- a/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml
@@ -150,26 +150,16 @@ dialog = gtk_file_chooser_dialog_new ("Open File",
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT GtkFileChooserDialog ##### -->
-<para>
-
-</para>
+<!-- ##### SECTION Image ##### -->
-<!-- ##### FUNCTION gtk_file_chooser_dialog_new ##### -->
+<!-- ##### STRUCT GtkFileChooserDialog ##### -->
<para>
</para>
- title:
- parent:
- action:
- first_button_text:
- Varargs:
- Returns:
-
-<!-- ##### FUNCTION gtk_file_chooser_dialog_new_with_backend ##### -->
+<!-- ##### FUNCTION gtk_file_chooser_dialog_new ##### -->
<para>
</para>
@@ -177,17 +167,8 @@ dialog = gtk_file_chooser_dialog_new ("Open File",
@title:
@parent:
@action:
- backend:
@first_button_text:
@Varargs:
@Returns:
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gtk-docs.sgml" "book" "refsect1")
-End:
--->
-
-
diff --git a/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml b/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml
index 082bf46..434d709 100644
--- a/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml
@@ -27,6 +27,9 @@ File chooser widget that can be embedded in other widgets
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFileChooserWidget ##### -->
<para>
@@ -52,13 +55,3 @@ End:
-->
-<!-- ##### FUNCTION gtk_file_chooser_widget_new_with_backend ##### -->
-<para>
-
-</para>
-
- action:
- backend:
- Returns:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkfilefilter.sgml b/docs/reference/gtk/tmpl/gtkfilefilter.sgml
index 6bc5e54..4f22a3c 100644
--- a/docs/reference/gtk/tmpl/gtkfilefilter.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilefilter.sgml
@@ -35,6 +35,9 @@ to manually use a filter on a file with gtk_file_filter_filter().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFileFilter ##### -->
<para>
The <structname>GtkFileFilter</structname> struct contains
@@ -86,6 +89,7 @@ see gtk_file_filter_add_custom().
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml
index db64dcb..b2366aa 100644
--- a/docs/reference/gtk/tmpl/gtkfixed.sgml
+++ b/docs/reference/gtk/tmpl/gtkfixed.sgml
@@ -67,6 +67,9 @@ widget. But you should be aware of the tradeoffs.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFixed ##### -->
<para>
The #GtkFixed-struct struct contains the following fields.
@@ -102,6 +105,7 @@ their positions.</entry>
Creates a new #GtkFixed.
</para>
+ void:
@Returns: a new #GtkFixed.
@@ -125,3 +129,5 @@ Moves a child of a #GtkFixed container to the given position.
@widget: the child widget.
@x: the horizontal position to move the widget to.
@y: the vertical position to move the widget to.
+
+
diff --git a/docs/reference/gtk/tmpl/gtkfontbutton.sgml b/docs/reference/gtk/tmpl/gtkfontbutton.sgml
index 1eda98e..ca8253d 100644
--- a/docs/reference/gtk/tmpl/gtkfontbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontbutton.sgml
@@ -18,6 +18,9 @@ dialog to change the font. It is suitable widget for selecting a font in a prefe
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFontButton ##### -->
<para>
The GtkFontButton struct has only private members and should not be used
@@ -67,6 +70,7 @@ directly.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml
index d182606..ce3ebf3 100644
--- a/docs/reference/gtk/tmpl/gtkfontsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml
@@ -38,6 +38,9 @@ gtk_font_selection_set_preview_text().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFontSelection ##### -->
<para>
The #GtkFontSelection struct contains private data only, and should
@@ -65,15 +68,7 @@ only be accessed using the functions below.
</para>
- Returns:
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_font ##### -->
-<para>
-
-</para>
-
- fontsel:
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
index c8c5ad2..6e98aa7 100644
--- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
@@ -48,6 +48,9 @@ fonts.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFontSelectionDialog ##### -->
@@ -61,15 +64,6 @@ fonts.</para></listitem>
@Returns:
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_font ##### -->
-<para>
-
-</para>
-
- fsd:
- Returns:
-
-
<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
<para>
</para>
@@ -106,15 +100,6 @@ fonts.</para></listitem>
@text:
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_apply_button ##### -->
-<para>
-
-</para>
-
- fsd:
- Returns:
-
-
<!-- ##### FUNCTION gtk_font_selection_dialog_get_cancel_button ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml
index 1f1d9b0..92eab9b 100644
--- a/docs/reference/gtk/tmpl/gtkframe.sgml
+++ b/docs/reference/gtk/tmpl/gtkframe.sgml
@@ -45,6 +45,9 @@ a <child> type attribute.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkFrame ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkgc.sgml b/docs/reference/gtk/tmpl/gtkgc.sgml
index 57d738b..d5f5ee0 100644
--- a/docs/reference/gtk/tmpl/gtkgc.sgml
+++ b/docs/reference/gtk/tmpl/gtkgc.sgml
@@ -21,6 +21,9 @@ When the #GdkGC is no longer needed, gtk_gc_release() should be called.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gtk_gc_get ##### -->
<para>
Gets a #GdkGC with the given depth, colormap and #GdkGCValues.
diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml
index 8b3cae2..dea4867 100644
--- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml
+++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml
@@ -39,6 +39,9 @@ so the snap edge should be set to %GTK_POS_BOTTOM.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHandleBox ##### -->
<para>
The #GtkHandleBox-struct struct contains the following fields.
@@ -137,6 +140,7 @@ handlebox are detached from the main window.
Create a new handle box.
</para>
+ void:
@Returns: a new #GtkHandleBox.
diff --git a/docs/reference/gtk/tmpl/gtkhbbox.sgml b/docs/reference/gtk/tmpl/gtkhbbox.sgml
index e606937..1fd2dcc 100644
--- a/docs/reference/gtk/tmpl/gtkhbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkhbbox.sgml
@@ -48,6 +48,9 @@ gtk_button_box_set_layout().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHButtonBox ##### -->
<para>
GtkHButtonBox does not contain any public fields.
@@ -59,4 +62,7 @@ GtkHButtonBox does not contain any public fields.
Creates a new horizontal button box.
</para>
+ void:
@Returns: a new button box #GtkWidget.
+
+
diff --git a/docs/reference/gtk/tmpl/gtkhpaned.sgml b/docs/reference/gtk/tmpl/gtkhpaned.sgml
index df98d30..25fd033 100644
--- a/docs/reference/gtk/tmpl/gtkhpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkhpaned.sgml
@@ -20,6 +20,9 @@ a handle. See #GtkPaned for details.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHPaned ##### -->
<para>
</para>
@@ -30,6 +33,7 @@ a handle. See #GtkPaned for details.
Create a new #GtkHPaned
</para>
+ void:
@Returns: the new #GtkHPaned
diff --git a/docs/reference/gtk/tmpl/gtkhruler.sgml b/docs/reference/gtk/tmpl/gtkhruler.sgml
index ea2cd50..433dd16 100644
--- a/docs/reference/gtk/tmpl/gtkhruler.sgml
+++ b/docs/reference/gtk/tmpl/gtkhruler.sgml
@@ -33,6 +33,9 @@ rulers.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHRuler ##### -->
<para>
The #GtkHRuler struct contains private data and should be accessed
@@ -45,6 +48,7 @@ with the functions below.
Creates a new horizontal ruler.
</para>
+ void:
@Returns: a new #GtkHRuler.
diff --git a/docs/reference/gtk/tmpl/gtkhscale.sgml b/docs/reference/gtk/tmpl/gtkhscale.sgml
index edd4611..8616ef8 100644
--- a/docs/reference/gtk/tmpl/gtkhscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkhscale.sgml
@@ -22,6 +22,9 @@ shown can be set using the parent #GtkScale class's functions.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHScale ##### -->
<para>
The #GtkHScale-struct struct contains private data only, and
diff --git a/docs/reference/gtk/tmpl/gtkhscrollbar.sgml b/docs/reference/gtk/tmpl/gtkhscrollbar.sgml
index 574e851..6412e07 100644
--- a/docs/reference/gtk/tmpl/gtkhscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkhscrollbar.sgml
@@ -23,6 +23,9 @@ fields in an adjustment represent for a scrollbar.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHScrollbar ##### -->
<para>
The #GtkHScrollbar struct contains private data and should be accessed
diff --git a/docs/reference/gtk/tmpl/gtkhseparator.sgml b/docs/reference/gtk/tmpl/gtkhseparator.sgml
index 9a4ebd8..9e295cb 100644
--- a/docs/reference/gtk/tmpl/gtkhseparator.sgml
+++ b/docs/reference/gtk/tmpl/gtkhseparator.sgml
@@ -32,6 +32,9 @@ gtk_menu_shell_append().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHSeparator ##### -->
<para>
The #GtkHSeparator-struct struct contains private data only, and
@@ -44,6 +47,7 @@ should be accessed using the functions below.
Creates a new #GtkHSeparator.
</para>
+ void:
@Returns: a new #GtkHSeparator.
diff --git a/docs/reference/gtk/tmpl/gtkhsv.sgml b/docs/reference/gtk/tmpl/gtkhsv.sgml
index 999a743..ee952c9 100644
--- a/docs/reference/gtk/tmpl/gtkhsv.sgml
+++ b/docs/reference/gtk/tmpl/gtkhsv.sgml
@@ -30,6 +30,9 @@ saturation.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkHSV ##### -->
<para>
@@ -56,6 +59,7 @@ saturation.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkiconfactory.sgml b/docs/reference/gtk/tmpl/gtkiconfactory.sgml
index 6c716e0..614b50e 100644
--- a/docs/reference/gtk/tmpl/gtkiconfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkiconfactory.sgml
@@ -114,6 +114,9 @@ This attribute is optional.</para>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkIconSource ##### -->
<para>
@@ -204,6 +207,7 @@ This attribute is optional.</para>
</para>
+ void:
@Returns:
@@ -238,6 +242,7 @@ This attribute is optional.</para>
</para>
+ void:
@Returns:
@@ -439,6 +444,7 @@ This attribute is optional.</para>
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkicontheme.sgml b/docs/reference/gtk/tmpl/gtkicontheme.sgml
index 9e2d6bb..9223299 100644
--- a/docs/reference/gtk/tmpl/gtkicontheme.sgml
+++ b/docs/reference/gtk/tmpl/gtkicontheme.sgml
@@ -103,6 +103,9 @@ else
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkIconInfo ##### -->
<para>
Contains information found when looking up an icon in
@@ -160,6 +163,7 @@ The #GQuark used for #GtkIconThemeError errors.
</para>
+ void:
@Returns:
@@ -168,6 +172,7 @@ The #GQuark used for #GtkIconThemeError errors.
</para>
+ void:
@Returns:
@@ -416,6 +421,21 @@ The #GQuark used for #GtkIconThemeError errors.
@Returns:
+<!-- ##### FUNCTION gtk_icon_info_load_symbolic ##### -->
+<para>
+
+</para>
+
+ icon_info:
+ fg:
+ success_color:
+ warning_color:
+ error_color:
+ was_symbolic:
+ error:
+ Returns:
+
+
<!-- ##### FUNCTION gtk_icon_info_set_raw_coordinates ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkiconview.sgml b/docs/reference/gtk/tmpl/gtkiconview.sgml
index 1fc99d1..2dad9da 100644
--- a/docs/reference/gtk/tmpl/gtkiconview.sgml
+++ b/docs/reference/gtk/tmpl/gtkiconview.sgml
@@ -22,6 +22,9 @@ rubberband selection, which is controlled by dragging the pointer.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkIconView ##### -->
<para>
The <structname>GtkIconView</structname> struct contains only
@@ -200,6 +203,7 @@ selected rows. It will be called on every selected row in the view.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml
index b970e49..0ab4133 100644
--- a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml
@@ -21,6 +21,9 @@ fill in the text label.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkImageMenuItem ##### -->
<para>
@@ -70,6 +73,7 @@ fill in the text label.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml
index ecb3ad9..1484fda 100644
--- a/docs/reference/gtk/tmpl/gtkimcontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml
@@ -17,6 +17,9 @@ GtkIMContext
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkIMContext ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml b/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml
index cdbb50b..59d9315 100644
--- a/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml
+++ b/docs/reference/gtk/tmpl/gtkimcontextsimple.sgml
@@ -17,6 +17,9 @@ An input method context supporting table-based input methods
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkIMContextSimple ##### -->
<para>
@@ -28,6 +31,7 @@ An input method context supporting table-based input methods
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
index d216507..f753745 100644
--- a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
@@ -17,6 +17,9 @@ An input method context supporting multiple, loadable input methods
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkIMMulticontext ##### -->
<para>
@@ -28,6 +31,7 @@ An input method context supporting multiple, loadable input methods
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkinvisible.sgml b/docs/reference/gtk/tmpl/gtkinvisible.sgml
index 9315fe8..0f4ead0 100644
--- a/docs/reference/gtk/tmpl/gtkinvisible.sgml
+++ b/docs/reference/gtk/tmpl/gtkinvisible.sgml
@@ -22,6 +22,9 @@ for drag-and-drop.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkInvisible ##### -->
<para>
The #GtkInvisible-struct struct contains no public fields.
@@ -37,6 +40,7 @@ The #GtkInvisible-struct struct contains no public fields.
<para>
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkitem.sgml b/docs/reference/gtk/tmpl/gtkitem.sgml
index effa9a3..626cf5a 100644
--- a/docs/reference/gtk/tmpl/gtkitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkitem.sgml
@@ -18,6 +18,9 @@ and #GtkTreeItem.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkItem ##### -->
<para>
The #GtkItem-struct struct contains private data only, and
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index b3021bd..0740e5f 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -200,6 +200,9 @@ the #GtkLabel::activate-link signal and the gtk_label_get_current_uri() function
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkLabel ##### -->
<para>
This should not be accessed directly. Use the accessor functions as
@@ -436,18 +439,6 @@ The pattern of underlines you want under the existing text within the
@n_chars:
-<!-- ##### FUNCTION gtk_label_get ##### -->
-<para>
-Gets the current string of text within the #GtkLabel and writes it to
-the given @str argument. It does not make a copy of this string so you
-must not write to it.
-</para>
-
- label: The #GtkLabel widget you want to get the text from.
- str: The reference to the pointer you want to point to the text.
- Deprecated: Use gtk_label_get_text() instead.
-
-
<!-- ##### FUNCTION gtk_label_set_line_wrap ##### -->
<para>
@@ -466,14 +457,6 @@ must not write to it.
@wrap_mode:
-<!-- ##### MACRO gtk_label_set ##### -->
-<para>
-Sets the text within the GtkLabel widget.
-</para>
-
- Deprecated: Use gtk_label_set_text() instead.
-
-
<!-- ##### FUNCTION gtk_label_get_layout_offsets ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml
index d3845bb..1b32027 100644
--- a/docs/reference/gtk/tmpl/gtklayout.sgml
+++ b/docs/reference/gtk/tmpl/gtklayout.sgml
@@ -30,6 +30,9 @@ area.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkLayout ##### -->
<para>
@@ -127,22 +130,6 @@ area.
@height:
-<!-- ##### FUNCTION gtk_layout_freeze ##### -->
-<para>
-
-</para>
-
- layout:
-
-
-<!-- ##### FUNCTION gtk_layout_thaw ##### -->
-<para>
-
-</para>
-
- layout:
-
-
<!-- ##### FUNCTION gtk_layout_get_hadjustment ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtklinkbutton.sgml b/docs/reference/gtk/tmpl/gtklinkbutton.sgml
index f7ed378..084efab 100644
--- a/docs/reference/gtk/tmpl/gtklinkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtklinkbutton.sgml
@@ -39,6 +39,9 @@ on it: see gtk_link_button_set_uri_hook().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkLinkButton ##### -->
<para>
The #GtkLinkButton struct contains private data only, and should be
diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml
index 3577740..24f3a1c 100644
--- a/docs/reference/gtk/tmpl/gtkliststore.sgml
+++ b/docs/reference/gtk/tmpl/gtkliststore.sgml
@@ -166,6 +166,9 @@ and common wisdom is to separate the two, as far as possible.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkListStore ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index b7af513..a45cde4 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -84,11 +84,15 @@ functions such as g_signal_connect().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### FUNCTION gtk_set_locale ##### -->
<para>
</para>
+ void:
@Returns:
@@ -97,6 +101,7 @@ functions such as g_signal_connect().
</para>
+ void:
<!-- ##### FUNCTION gtk_get_default_language ##### -->
@@ -104,6 +109,7 @@ functions such as g_signal_connect().
</para>
+ void:
@Returns:
@@ -180,6 +186,7 @@ and invoke timeouts etc. while doing some time intensive computation.
</programlisting>
</example>
+ void:
@Returns: %TRUE if any events are pending, %FALSE otherwise.
@@ -190,6 +197,7 @@ gtk_main(). In that case gtk_main_quit() will make the innermost invocation
of the main loop return.
</para>
+ void:
<!-- ##### FUNCTION gtk_main_level ##### -->
@@ -198,6 +206,7 @@ Asks for the current nesting level of the main loop. This can be useful
when calling gtk_quit_add().
</para>
+ void:
@Returns: the nesting level of the current invocation of the main loop.
@@ -207,6 +216,7 @@ Makes the innermost invocation of the main loop return when it regains
control.
</para>
+ void:
<!-- ##### FUNCTION gtk_main_iteration ##### -->
@@ -217,6 +227,7 @@ want to block look at gtk_main_iteration_do() or check if any events are
pending with gtk_events_pending() first.
</para>
+ void:
@Returns: %TRUE if gtk_main_quit() has been called for the innermost mainloop.
@@ -351,6 +362,7 @@ main (int argc, char **argv)
</programlisting>
</example>
+ void:
@Returns: %TRUE
@@ -360,6 +372,7 @@ Analogical to gtk_true() this function does nothing
but always returns %FALSE.
</para>
+ void:
@Returns: %FALSE
@@ -382,6 +395,7 @@ widget and this function does nothing.
Queries the current grab of the default window group.
</para>
+ void:
@Returns: The widget which currently has the grab or %NULL if no grab is active.
@@ -481,6 +495,7 @@ GTK+ to compute the sizes of widgets. This priority is higher than
</para>
+
<!-- ##### FUNCTION gtk_key_snooper_install ##### -->
<para>
Installs a key snooper function, which will get called on all key events
@@ -517,6 +532,7 @@ Removes the key snooper function with the given id.
</para>
+ void:
@Returns:
@@ -525,6 +541,7 @@ Removes the key snooper function with the given id.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index fc4b42e..d0497ae 100644
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -79,6 +79,9 @@ my_popup_handler (GtkWidget *widget, GdkEvent *event)
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkMenu ##### -->
<para>
The #GtkMenu struct contains private data only, and
@@ -194,6 +197,7 @@ should be accessed using the functions below.
Creates a new #GtkMenu.
</para>
+ void:
@Returns: a new #GtkMenu.
diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml
index 9a6b11c..8950463 100644
--- a/docs/reference/gtk/tmpl/gtkmenubar.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml
@@ -17,6 +17,9 @@ The #GtkMenuBar is a subclass of #GtkMenuShell which contains one to many #GtkMe
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkMenuBar ##### -->
<para>
The #GtkMenuBar struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.)
@@ -48,40 +51,10 @@ The #GtkMenuBar struct contains the following fields. (These fields should be co
Creates the new #GtkMenuBar
</para>
+ void:
@Returns: the #GtkMenuBar
-<!-- ##### MACRO gtk_menu_bar_append ##### -->
-<para>
-Adds a new #GtkMenuItem to the end of the GtkMenuBar
-</para>
-
- menu: a #GtkMenuBar
- child: the #GtkMenuItem to add
- Deprecated: Use gtk_menu_shell_append() instead.
-
-
-<!-- ##### MACRO gtk_menu_bar_prepend ##### -->
-<para>
-Adds a new #GtkMenuItem to the beginning of the GtkMenuBar
-</para>
-
- menu: a #GtkMenuBar
- child: the #GtkMenuItem to add
- Deprecated: Use gtk_menu_shell_prepend() instead.
-
-
-<!-- ##### MACRO gtk_menu_bar_insert ##### -->
-<para>
-Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
-</para>
-
- menu: a #GtkMenuBar
- child: the #GtkMenuItem to add
- pos: the position in the item list where the @child is added.
- Deprecated: Use gtk_menu_shell_insert() instead.
-
-
<!-- ##### ENUM GtkPackDirection ##### -->
<para>
Determines how widgets should be packed insided menubars and
diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index 011430d..6f293ab 100644
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -54,6 +54,9 @@ attribute of a <child> element.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkMenuItem ##### -->
<para>
@@ -151,6 +154,7 @@ submenu. For normal applications, the relevant signal is "activate".
Creates a new #GtkMenuItem.
</para>
+ void:
@Returns: the newly created #GtkMenuItem
@@ -244,14 +248,6 @@ Creates a new #GtkMenuItem whose child is a #GtkLabel.
@Returns:
-<!-- ##### FUNCTION gtk_menu_item_remove_submenu ##### -->
-<para>
-
-</para>
-
- menu_item:
-
-
<!-- ##### FUNCTION gtk_menu_item_set_accel_path ##### -->
<para>
@@ -314,11 +310,3 @@ Emits the "toggle_size_allocate" signal on the given item.
@allocation: the allocation to use as signal data.
-<!-- ##### MACRO gtk_menu_item_right_justify ##### -->
-<para>
-Sets the menu item to be right-justified. Only useful for menu bars.
-</para>
-
- menu_item: the menu item
-
-
diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml
index 90dece5..2153098 100644
--- a/docs/reference/gtk/tmpl/gtkmenushell.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml
@@ -25,6 +25,9 @@ allowing for nested hierarchical menus.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkMenuShell ##### -->
<para>
The #GtkMenuShell-struct struct contains the following fields.
diff --git a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml
index f55163f..c56eab0 100644
--- a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml
@@ -39,6 +39,9 @@ A GtkToolItem containing a button with an additional dropdown menu
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkMenuToolButton ##### -->
<para>
The #GtkMenuToolButton struct contains only private data and
@@ -95,17 +98,6 @@ A GtkToolItem containing a button with an additional dropdown menu
@Returns:
-<!-- ##### FUNCTION gtk_menu_tool_button_set_arrow_tooltip ##### -->
-<para>
-
-</para>
-
- button:
- tooltips:
- tip_text:
- tip_private:
-
-
<!-- ##### FUNCTION gtk_menu_tool_button_set_arrow_tooltip_text ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkmisc.sgml b/docs/reference/gtk/tmpl/gtkmisc.sgml
index e930403..c3466bb 100644
--- a/docs/reference/gtk/tmpl/gtkmisc.sgml
+++ b/docs/reference/gtk/tmpl/gtkmisc.sgml
@@ -28,6 +28,9 @@ allocated area, the alignment settings will not alter the widgets position.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkMisc ##### -->
<para>
The #GtkMisc-struct struct contains the following fields.
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index b4a4827..154a642 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -66,6 +66,9 @@ element.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkNotebook ##### -->
<para>
@@ -174,16 +177,6 @@ Emitted when the user or a function changes the current page.
</para>
-<!-- ##### ARG GtkNotebook:group-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:homogeneous ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GtkNotebook:page ##### -->
<para>
@@ -204,26 +197,11 @@ Emitted when the user or a function changes the current page.
</para>
-<!-- ##### ARG GtkNotebook:tab-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-hborder ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GtkNotebook:tab-pos ##### -->
<para>
</para>
-<!-- ##### ARG GtkNotebook:tab-vborder ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GtkNotebook:detachable ##### -->
<para>
@@ -310,6 +288,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
<para>
</para>
+ void:
@Returns:
@@ -386,14 +365,6 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
@page_num:
-<!-- ##### MACRO gtk_notebook_current_page ##### -->
-<para>
-Deprecated compatibility macro.
-</para>
-
- Deprecated: Use gtk_notebook_get_current_page() instead.
-
-
<!-- ##### FUNCTION gtk_notebook_page_num ##### -->
<para>
</para>
@@ -403,14 +374,6 @@ Deprecated compatibility macro.
@Returns:
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-Deprecated compatibility macro.
-</para>
-
- Deprecated: Use gtk_notebook_set_current_page() instead.
-
-
<!-- ##### FUNCTION gtk_notebook_next_page ##### -->
<para>
</para>
@@ -466,14 +429,6 @@ Deprecated compatibility macro.
@scrollable:
-<!-- ##### FUNCTION gtk_notebook_set_tab_border ##### -->
-<para>
-</para>
-
- notebook:
- border_width:
-
-
<!-- ##### FUNCTION gtk_notebook_popup_enable ##### -->
<para>
</para>
@@ -543,14 +498,6 @@ Deprecated compatibility macro.
@pack_type:
-<!-- ##### FUNCTION gtk_notebook_set_homogeneous_tabs ##### -->
-<para>
-</para>
-
- notebook:
- homogeneous:
-
-
<!-- ##### FUNCTION gtk_notebook_set_menu_label ##### -->
<para>
</para>
@@ -569,14 +516,6 @@ Deprecated compatibility macro.
@menu_text:
-<!-- ##### FUNCTION gtk_notebook_set_tab_hborder ##### -->
-<para>
-</para>
-
- notebook:
- tab_hborder:
-
-
<!-- ##### FUNCTION gtk_notebook_set_tab_label ##### -->
<para>
</para>
@@ -606,14 +545,6 @@ Deprecated compatibility macro.
@tab_text:
-<!-- ##### FUNCTION gtk_notebook_set_tab_vborder ##### -->
-<para>
-</para>
-
- notebook:
- tab_vborder:
-
-
<!-- ##### FUNCTION gtk_notebook_set_tab_reorderable ##### -->
<para>
@@ -719,24 +650,6 @@ Deprecated compatibility macro.
@page_num:
-<!-- ##### FUNCTION gtk_notebook_set_group_id ##### -->
-<para>
-
-</para>
-
- notebook:
- group_id:
-
-
-<!-- ##### FUNCTION gtk_notebook_get_group_id ##### -->
-<para>
-
-</para>
-
- notebook:
- Returns:
-
-
<!-- ##### FUNCTION gtk_notebook_set_group ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml
index d4ab2e7..cb39a8c 100644
--- a/docs/reference/gtk/tmpl/gtkobject.sgml
+++ b/docs/reference/gtk/tmpl/gtkobject.sgml
@@ -90,6 +90,9 @@ explicitly call g_object_ref() yourself.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkObject ##### -->
<para>
The object itself. You should never use these members directly -
@@ -106,11 +109,6 @@ if all references are released.
@object: the object which received the signal.
-<!-- ##### ARG GtkObject:user-data ##### -->
-<para>
-
-</para>
-
<!-- ##### MACRO GTK_OBJECT_TYPE ##### -->
<para>
@@ -132,7 +130,6 @@ Tells about the state of the object.
@GTK_IN_DESTRUCTION: the object is currently being destroyed. This is used
internally by GTK+ to prevent reinvokations during destruction.
- GTK_FLOATING:
@GTK_RESERVED_1:
@GTK_RESERVED_2: reserved for future use
@@ -145,104 +142,6 @@ accessing its members.
@obj: the object whose flags are returned.
-<!-- ##### MACRO GTK_OBJECT_FLOATING ##### -->
-<para>
-Evaluates to %TRUE if the object still has its floating reference count.
-See the overview documentation for #GtkObject.
-</para>
-
- obj: the object to examine.
-
-
-<!-- ##### ENUM GtkArgFlags ##### -->
-<para>
-Possible flags indicating how an argument should be treated.
-</para>
-
- GTK_ARG_READABLE: the argument is readable. (i.e. can be queried)
- GTK_ARG_WRITABLE: the argument is writable. (i.e. settable)
- GTK_ARG_CONSTRUCT: the argument needs construction.
- GTK_ARG_CONSTRUCT_ONLY: the argument needs construction (and will
-be set once during object creation), but is otherwise cannot be
-set. Hence this flag is not allowed with #GTK_ARG_WRITABLE,
-and is redundant with #GTK_ARG_CONSTRUCT.
- GTK_ARG_CHILD_ARG: an argument type that applies to (and may be different for)
-each child. Used by #GtkContainer.
- Deprecated: Use corresponding #GParamSpec features instead
-
-<!-- ##### FUNCTION gtk_object_new ##### -->
-<para>
-Constructs an object given its arguments, enumerated in the call to the
-function.
-</para>
-
- type: the type identifying this object. Returned by gtk_type_unique()
-(although for a properly-written object it should be accessible through
-a #GTK_TYPE_FOO macro.)
- first_property_name: name of the first property to set when constructing
- the object.
- Varargs: the first argument's value, followed by any number of
-name/argument-value pairs, terminated with %NULL.
- Returns: the new #GtkObject.
- Deprecated: Use g_object_new() instead.
-
-
-<!-- ##### FUNCTION gtk_object_sink ##### -->
-<para>
-Removes the floating reference from a #GtkObject, if it exists;
-otherwise does nothing. See the #GtkObject overview documentation at
-the top of the page.
-</para>
-
- object: the object to sink.
- Deprecated: 2.10: Use g_object_ref_sink() instead
-
-
-<!-- ##### FUNCTION gtk_object_ref ##### -->
-<para>
-Increases the reference count of the object.
-</para>
-
- object: the object to reference.
- Returns: @object.
- Deprecated: Use g_object_ref() instead.
-
-
-<!-- ##### FUNCTION gtk_object_unref ##### -->
-<para>
-Decreases the reference count of an object. When its reference count drops
-to 0, the object is finalized (i.e. its memory is freed).
-</para>
-
- object: the object to dereference.
- Deprecated: Use g_object_unref() instead.
-
-
-<!-- ##### FUNCTION gtk_object_weakref ##### -->
-<para>
-Adds a weak reference callback to an object. Weak references are used for notification when an object is
-finalized. They are called "weak references" because they allow you to safely
-hold a pointer to an object without calling g_object_ref() (g_object_ref() adds
-a strong reference, that is, forces the object to stay alive).
-</para>
-
- object: object to weakly reference.
- notify: callback to invoke before the object is freed.
- data: extra data to pass to #notify.
- Deprecated: Use g_object_weak_ref() instead.
-
-
-<!-- ##### FUNCTION gtk_object_weakunref ##### -->
-<para>
-Removes a weak reference callback to an object.
-</para>
-
- object: object stop weakly referencing.
- notify: callback to search for.
- data: data to search for.
- Deprecated: Use g_object_weak_unref() instead.
-
-
<!-- ##### FUNCTION gtk_object_destroy ##### -->
<para>
Emits the "destroy" signal notifying all reference holders that they should
@@ -258,247 +157,3 @@ reference holders to release their references, it does not free the object.
@object: the object to destroy.
-<!-- ##### FUNCTION gtk_object_get ##### -->
-<para>
-Gets properties of an object.
-</para>
-
- object: a #GtkObject.
- first_property_name: name of first property to get the value for.
- Varargs: %NULL-terminated list of name-return location pairs.
- Deprecated: Use g_object_get() instead.
-
-
-<!-- ##### FUNCTION gtk_object_set ##### -->
-<para>
-Sets properties on an object.
-</para>
-<para>
-<informalexample>
-<programlisting>
-void set_box_properties (GtkBox* box)
-{
- gtk_object_set (GTK_OBJECT (box), "homogeneous", TRUE,
- "spacing", 8,
- NULL);
-}
-</programlisting>
-</informalexample>
-</para>
-
- object: a #GtkObject.
- first_property_name: name of the first property to set
- Varargs: the value of the first argument, followed optionally
-by more name/value pairs, followed by %NULL.
- Deprecated: Use g_object_set() instead.
-
-
-<!-- ##### FUNCTION gtk_object_set_data ##### -->
-<para>
-Each object carries around a table of associations from
-strings to pointers. This function lets you set an association.
-</para>
-<para>
-If the object already had an association with that name,
-the old association will be destroyed.
-</para>
-
- object: object containing the associations.
- key: name of the key.
- data: data to associate with that key.
- Deprecated: Use g_object_set_data() instead.
-
-
-<!-- ##### FUNCTION gtk_object_set_data_full ##### -->
-<para>
-Like gtk_object_set_data() except it adds notification
-for when the association is destroyed, either by
-gtk_object_remove_data() or when the object is destroyed.
-</para>
-
- object: object containing the associations.
- key: name of the key.
- data: data to associate with that key.
- destroy: function to call when the association is destroyed.
- Deprecated: Use g_object_set_data_full() instead.
-
-
-<!-- ##### FUNCTION gtk_object_remove_data ##### -->
-<para>
-Removes a specified datum from the object's data associations (the object_data).
-Subsequent calls to gtk_object_get_data() will return %NULL.
-</para>
-<para>
-If you specified a destroy handler with gtk_object_set_data_full(),
-it will be invoked.
-</para>
-
- object: the object maintaining the association.
- key: name of the key for that association.
- Deprecated: Use g_object_set_data() to set the object data to %NULL instead.
-
-
-<!-- ##### FUNCTION gtk_object_get_data ##### -->
-<para>
-Get a named field from the object's table of associations (the object_data).
-</para>
-
- object: the object maintaining the associations.
- key: name of the key for that association.
- Returns: the data if found, or %NULL if no such data exists.
- Deprecated: Use g_object_get_data() instead.
-
-
-<!-- ##### FUNCTION gtk_object_remove_no_notify ##### -->
-<para>
-Remove a specified datum from the object's data associations (the object_data),
-without invoking the association's destroy handler.
-</para>
-<para>
-Just like gtk_object_remove_data() except that any destroy handler
-will be ignored.
-Therefore this only affects data set using gtk_object_set_data_full().
-</para>
-
- object: the object maintaining the association.
- key: name of the key for that association.
- Deprecated: Use g_object_steal_data() instead.
-
-
-<!-- ##### FUNCTION gtk_object_set_user_data ##### -->
-<para>
-For convenience, every object offers a generic user data
-pointer. This function sets it.
-</para>
-
- object: the object whose user data should be set.
- data: the new value for the user data.
- Deprecated: Use g_object_set_data() instead.
-
-
-<!-- ##### FUNCTION gtk_object_get_user_data ##### -->
-<para>
-Get the object's user data pointer.
-</para>
-<para>
-This is intended to be a pointer for your convenience in
-writing applications.
-</para>
-
- object: the object.
- Returns: the user data field for object.
- Deprecated: Use g_object_get_data() instead.
-
-
-<!-- ##### FUNCTION gtk_object_add_arg_type ##### -->
-<para>
-Deprecated in favor of the #GObject property system including #GParamSpec.
-Add a new type of argument to an object class.
-Usually this is called when registering a new type of object.
-</para>
-
- arg_name: fully qualify object name, for example GtkObject::user_data.
- arg_type: type of the argument.
- arg_flags: bitwise-OR of the #GtkArgFlags enum. (Whether the argument is
-settable or gettable, whether it is set when the object is constructed.)
- arg_id: an internal number, passed in from here to the "set_arg" and
-"get_arg" handlers of the object.
-
-
-<!-- ##### FUNCTION gtk_object_set_data_by_id ##### -->
-<para>
-Just like gtk_object_set_data() except that it takes
-a #GQuark instead of a string, so it is slightly faster.
-</para>
-<para>
-Use gtk_object_data_try_key() and gtk_object_data_force_id()
-to get an id from a string.
-</para>
-
- object: object containing the associations.
- data_id: quark of the key.
- data: data to associate with that key.
- Deprecated: Use g_object_set_qdata() instead.
-
-
-<!-- ##### FUNCTION gtk_object_set_data_by_id_full ##### -->
-<para>
-Just like gtk_object_set_data_full() except that it takes
-a #GQuark instead of a string, so it is slightly faster.
-</para>
-<para>
-Use gtk_object_data_try_key() and gtk_object_data_force_id()
-to get an id from a string.
-</para>
-
- object: object containing the associations.
- data_id: quark of the key.
- data: data to associate with that key.
- destroy: function to call when the association is destroyed.
- Deprecated: Use g_object_set_qdata_full() instead.
-
-
-<!-- ##### FUNCTION gtk_object_get_data_by_id ##### -->
-<para>
-Just like gtk_object_get_data() except that it takes
-a #GQuark instead of a string, so it is slightly faster.
-</para>
-<para>
-Use gtk_object_data_try_key() and gtk_object_data_force_id()
-to get an id from a string.
-</para>
-
- object: object containing the associations.
- data_id: quark of the key.
- Returns: the data if found, or %NULL if no such data exists.
- Deprecated: Use g_object_get_qdata() instead.
-
-
-<!-- ##### FUNCTION gtk_object_remove_data_by_id ##### -->
-<para>
-Just like gtk_object_remove_data() except that it takes
-a #GQuark instead of a string, so it is slightly faster.
-</para>
-<para>
-Remove a specified datum from the object's data associations.
-Subsequent calls to gtk_object_get_data() will return %NULL.
-</para>
-<para>
-Use gtk_object_data_try_key() and gtk_object_data_force_id()
-to get an id from a string.
-</para>
-
- object: object containing the associations.
- data_id: quark of the key.
- Deprecated: Use g_object_set_qdata() with data of %NULL instead.
-
-
-<!-- ##### FUNCTION gtk_object_remove_no_notify_by_id ##### -->
-<para>
-Just like gtk_object_remove_no_notify() except that it takes
-a #GQuark instead of a string, so it is slightly faster.
-</para>
-<para>
-Use gtk_object_data_try_key() and gtk_object_data_force_id()
-to get an id from a string.
-</para>
-
- object: object containing the associations.
- key_id: quark of the key.
- Deprecated: Use g_object_steal_qdata() instead.
-
-
-<!-- ##### MACRO gtk_object_data_try_key ##### -->
-<para>
-Useless deprecated macro. Ignore it.
-</para>
-
-
-
-<!-- ##### MACRO gtk_object_data_force_id ##### -->
-<para>
-Useless deprecated macro. Ignore it.
-</para>
-
-
-
diff --git a/docs/reference/gtk/tmpl/gtkorientable.sgml b/docs/reference/gtk/tmpl/gtkorientable.sgml
index 1debb51..4f1a153 100644
--- a/docs/reference/gtk/tmpl/gtkorientable.sgml
+++ b/docs/reference/gtk/tmpl/gtkorientable.sgml
@@ -25,6 +25,9 @@ GtkOrientable was introduced in GTK+ 2.16.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkOrientable ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkpagesetup.sgml b/docs/reference/gtk/tmpl/gtkpagesetup.sgml
index 7739b35..cac99e1 100644
--- a/docs/reference/gtk/tmpl/gtkpagesetup.sgml
+++ b/docs/reference/gtk/tmpl/gtkpagesetup.sgml
@@ -61,6 +61,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPageSetup ##### -->
<para>
@@ -72,6 +75,7 @@ Printing support was added in GTK+ 2.10.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml b/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml
index e61fefc..8001b7e 100644
--- a/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkpagesetupunixdialog.sgml
@@ -25,6 +25,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPageSetupUnixDialog ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml
index 8ccef04..afeecfe 100644
--- a/docs/reference/gtk/tmpl/gtkpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkpaned.sgml
@@ -72,6 +72,9 @@ gtk_widget_set_size_request (frame2, 50, -1);
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPaned ##### -->
<para>
</para>
@@ -249,3 +252,12 @@ Adds a child to the bottom or right pane.
@Returns:
+<!-- ##### FUNCTION gtk_paned_get_handle_window ##### -->
+<para>
+
+</para>
+
+ paned:
+ Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkpapersize.sgml b/docs/reference/gtk/tmpl/gtkpapersize.sgml
index 7dea34e..abc19fd 100644
--- a/docs/reference/gtk/tmpl/gtkpapersize.sgml
+++ b/docs/reference/gtk/tmpl/gtkpapersize.sgml
@@ -31,6 +31,9 @@ Printing support has been added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPaperSize ##### -->
<para>
@@ -278,6 +281,7 @@ Name for the Legal paper size.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkprintcontext.sgml b/docs/reference/gtk/tmpl/gtkprintcontext.sgml
index 2c45495..651cbce 100644
--- a/docs/reference/gtk/tmpl/gtkprintcontext.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintcontext.sgml
@@ -86,6 +86,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPrintContext ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkprinter.sgml b/docs/reference/gtk/tmpl/gtkprinter.sgml
index d15d3ca..3a3f679 100644
--- a/docs/reference/gtk/tmpl/gtkprinter.sgml
+++ b/docs/reference/gtk/tmpl/gtkprinter.sgml
@@ -29,6 +29,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPrinter ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkprintjob.sgml b/docs/reference/gtk/tmpl/gtkprintjob.sgml
index 11d3ff9..09d2681 100644
--- a/docs/reference/gtk/tmpl/gtkprintjob.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintjob.sgml
@@ -32,6 +32,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPrintJob ##### -->
<para>
The GtkPrintJob struct contains only private members
diff --git a/docs/reference/gtk/tmpl/gtkprintoperation.sgml b/docs/reference/gtk/tmpl/gtkprintoperation.sgml
index 9228734..00cc328 100644
--- a/docs/reference/gtk/tmpl/gtkprintoperation.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintoperation.sgml
@@ -86,6 +86,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPrintOperation ##### -->
<para>
@@ -349,6 +352,7 @@ The #GQuark used for #GtkPrintError errors.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkprintsettings.sgml b/docs/reference/gtk/tmpl/gtkprintsettings.sgml
index 13d545f..4a1ee3b 100644
--- a/docs/reference/gtk/tmpl/gtkprintsettings.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintsettings.sgml
@@ -33,6 +33,9 @@ Printing support was added in GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPrintSettings ##### -->
<para>
@@ -54,6 +57,7 @@ Printing support was added in GTK+ 2.10.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml b/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml
index 4a732b3..d5155ad 100644
--- a/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintunixdialog.sgml
@@ -79,6 +79,9 @@ The GtkPrintUnixDialog implementation of the GtkBuildable interface exposes its
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkPrintUnixDialog ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml
index a83d5b1..3b63a76 100644
--- a/docs/reference/gtk/tmpl/gtkprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogress.sgml
@@ -19,6 +19,9 @@ the progress of a long running operation.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkProgress ##### -->
<para>
The #GtkProgress-struct struct contains private data only.
diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
index 6d6d64a..3d4b816 100644
--- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
@@ -59,6 +59,9 @@ a large chunk of deprecated 1.2 compatibility functions.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkProgressBar ##### -->
<para>
The #GtkProgressBar-struct struct contains private data only,
@@ -66,31 +69,6 @@ and should be accessed using the functions below.
</para>
-<!-- ##### ARG GtkProgressBar:activity-blocks ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:activity-step ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:adjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:bar-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:discrete-blocks ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GtkProgressBar:ellipsize ##### -->
<para>
@@ -151,6 +129,7 @@ and should be accessed using the functions below.
Creates a new #GtkProgressBar.
</para>
+ void:
@Returns: a #GtkProgressBar.
@@ -263,23 +242,6 @@ directions for the visible progress bar.
@Returns:
-<!-- ##### FUNCTION gtk_progress_bar_new_with_adjustment ##### -->
-
-
- adjustment:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_bar_style ##### -->
-<para>
-Sets the style of the #GtkProgressBar. The default style is
-%GTK_PROGRESS_CONTINUOUS.
-</para>
-
- pbar: a #GtkProgressBar.
- style: a #GtkProgressBarStyle value indicating the desired style.
-
-
<!-- ##### ENUM GtkProgressBarStyle ##### -->
<para>
An enumeration representing the styles for drawing the progress bar.
@@ -288,45 +250,3 @@ An enumeration representing the styles for drawing the progress bar.
@GTK_PROGRESS_CONTINUOUS: The progress bar grows in a smooth, continuous manner.
@GTK_PROGRESS_DISCRETE: The progress bar grows in discrete, visible blocks.
-<!-- ##### FUNCTION gtk_progress_bar_set_discrete_blocks ##### -->
-<para>
-Sets the number of blocks that the progress bar is divided into
-when the style is %GTK_PROGRESS_DISCRETE.
-</para>
-
- pbar: a #GtkProgressBar.
- blocks: number of individual blocks making up the bar.
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_activity_step ##### -->
-<para>
-Sets the step value used when the progress bar is in activity
-mode. The step is the amount by which the progress is incremented
-each iteration.
-</para>
-
- pbar: a #GtkProgressBar.
- step: the amount which the progress is incremented in activity
-mode.
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_activity_blocks ##### -->
-<para>
-Sets the number of blocks used when the progress bar is in activity
-mode. Larger numbers make the visible block smaller.
-</para>
-
- pbar: a #GtkProgressBar.
- blocks: number of blocks which can fit within the progress bar area.
-
-
-<!-- ##### FUNCTION gtk_progress_bar_update ##### -->
-<para>
-This function is deprecated. Please use gtk_progress_set_value() or
-gtk_progress_set_percentage() instead.
-</para>
-
- pbar: a #GtkProgressBar.
- percentage: the new percent complete value.
-
-
diff --git a/docs/reference/gtk/tmpl/gtkradioaction.sgml b/docs/reference/gtk/tmpl/gtkradioaction.sgml
index 55992c4..c3ccf4e 100644
--- a/docs/reference/gtk/tmpl/gtkradioaction.sgml
+++ b/docs/reference/gtk/tmpl/gtkradioaction.sgml
@@ -19,6 +19,9 @@ one time.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRadioAction ##### -->
<para>
The <structname>GtkRadioAction</structname> struct contains
diff --git a/docs/reference/gtk/tmpl/gtkradiobutton.sgml b/docs/reference/gtk/tmpl/gtkradiobutton.sgml
index 16e187b..7899959 100644
--- a/docs/reference/gtk/tmpl/gtkradiobutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiobutton.sgml
@@ -93,6 +93,9 @@ many.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRadioButton ##### -->
<para>
Contains only private data that should be read and manipulated using the
diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
index 897c5f6..3b739c6 100644
--- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
@@ -51,6 +51,9 @@ for (i = 0; i < 5; i++)
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRadioMenuItem ##### -->
<para>
The structure contains only private data that must be accessed through
@@ -126,13 +129,6 @@ Creates a new #GtkRadioMenuItem.
@Returns:
-<!-- ##### MACRO gtk_radio_menu_item_group ##### -->
-<para>
-Deprecated compatibility macro. Use gtk_radio_menu_item_get_group() instead.
-</para>
-
-
-
<!-- ##### FUNCTION gtk_radio_menu_item_set_group ##### -->
<para>
Sets the group of a radio menu item, or changes it.
diff --git a/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml b/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml
index 0f6f8b3..6187678 100644
--- a/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml
@@ -58,6 +58,9 @@ gtk_radio_tool_button_new_from_widget_with_stock() to create a new
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRadioToolButton ##### -->
<para>
The #GtkRadioToolButton contains only private data and should only
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index faa8310..d64ef08 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -24,6 +24,9 @@ of the "steppers". It also provides properties and methods for setting a
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRange ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 3fd1be5..305bc63 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -16,14 +16,13 @@ at runtime.
An application can cause GTK+ to parse a specific RC
file by calling gtk_rc_parse(). In addition to this,
certain files will be read at the end of gtk_init().
-Unless modified, the files looked for will be
-<filename><SYSCONFDIR>/gtk-2.0/gtkrc</filename>
-and <filename>.gtkrc-2.0</filename> in the users home directory.
-(<filename><SYSCONFDIR></filename> defaults to
+Unless modified, the files looked for will be
+<filename><SYSCONFDIR>/gtk-2.0/gtkrc</filename>
+and <filename>.gtkrc-3.0</filename> in the users home directory.
+(<filename><SYSCONFDIR></filename> defaults to
<filename>/usr/local/etc</filename>. It can be changed with the
-<option>--prefix</option> or <option>--sysconfdir</option> options when
-configuring GTK+.) Note that although the filenames contain the version
-number 2.0, all 2.x versions of GTK+ look for these files.
+<option>--prefix</option> or <option>--sysconfdir</option> options when
+configuring GTK+.)
</para>
<para>
The set of these <firstterm>default</firstterm> files
@@ -35,11 +34,11 @@ can be set to a #G_SEARCHPATH_SEPARATOR_S-separated list of files
in order to overwrite the set of default files at runtime.
</para>
<para><anchor id="locale-specific-rc"/>
-For each RC file, in addition to the file itself, GTK+ will look for
-a locale-specific file that will be parsed after the main file.
+For each RC file, in addition to the file itself, GTK+ will look for
+a locale-specific file that will be parsed after the main file.
For instance, if <envar>LANG</envar> is set to <literal>ja_JP.ujis</literal>,
-when loading the default file <filename>~/.gtkrc</filename> then GTK+ looks
-for <filename>~/.gtkrc.ja_JP</filename> and <filename>~/.gtkrc.ja</filename>,
+when loading the default file <filename>~/.gtkrc</filename> then GTK+ looks
+for <filename>~/.gtkrc.ja_JP</filename> and <filename>~/.gtkrc.ja</filename>,
and parses the first of those that exists.
</para>
</refsect2>
@@ -57,29 +56,29 @@ of such a statement:
widget "mywindow.*.GtkEntry" style "my-entry-class"
</programlisting></informalexample>
-attaches the style <literal>"my-entry-class"</literal> to all
-widgets whose <firstterm>widget path</firstterm> matches the
-<firstterm>pattern</firstterm> <literal>"mywindow.*.GtkEntry"</literal>.
-That is, all #GtkEntry widgets which are part of a #GtkWindow named
+attaches the style <literal>"my-entry-class"</literal> to all
+widgets whose <firstterm>widget path</firstterm> matches the
+<firstterm>pattern</firstterm> <literal>"mywindow.*.GtkEntry"</literal>.
+That is, all #GtkEntry widgets which are part of a #GtkWindow named
<literal>"mywindow"</literal>.
</para>
<para>
-The patterns here are given in the standard shell glob syntax.
-The <literal>"?"</literal> wildcard matches any character, while
-<literal>"*"</literal> matches zero or more of any character.
+The patterns here are given in the standard shell glob syntax.
+The <literal>"?"</literal> wildcard matches any character, while
+<literal>"*"</literal> matches zero or more of any character.
The three types of matching are against the widget path, the
-<firstterm>class path</firstterm> and the class hierarchy. Both the
-widget path and the class path consist of a <literal>"."</literal>
-separated list of all the parents of the widget and the widget itself
-from outermost to innermost. The difference is that in the widget path,
-the name assigned by gtk_widget_set_name() is used if present, otherwise
-the class name of the widget, while for the class path, the class name is
+<firstterm>class path</firstterm> and the class hierarchy. Both the
+widget path and the class path consist of a <literal>"."</literal>
+separated list of all the parents of the widget and the widget itself
+from outermost to innermost. The difference is that in the widget path,
+the name assigned by gtk_widget_set_name() is used if present, otherwise
+the class name of the widget, while for the class path, the class name is
always used.
</para>
<para>
Since GTK+ 2.10,<literal>widget_class</literal> paths can also contain
-<literal><classname></literal> substrings, which are matching
+<literal><classname></literal> substrings, which are matching
the class with the given name and any derived classes. For instance,
<informalexample><programlisting>
widget_class "*<GtkMenuItem>.GtkLabel" style "my-style"
@@ -87,14 +86,14 @@ widget_class "*<GtkMenuItem>.GtkLabel" style "my-style"
will match #GtkLabel widgets which are contained in any kind of menu item.
</para>
<para>
-So, if you have a #GtkEntry named <literal>"myentry"</literal>, inside of a
+So, if you have a #GtkEntry named <literal>"myentry"</literal>, inside of a
horizontal box in a window named <literal>"mywindow"</literal>, then the
widget path is: <literal>"mywindow.GtkHBox.myentry"</literal>
while the class path is: <literal>"GtkWindow.GtkHBox.GtkEntry"</literal>.
</para>
<para>
Matching against class is a little different. The pattern match is done
-against all class names in the widgets class hierarchy (not the layout
+against all class names in the widgets class hierarchy (not the layout
hierarchy) in sequence, so the pattern:
<informalexample><programlisting>
class "GtkButton" style "my-style"
@@ -737,6 +736,9 @@ same as for styles.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRcStyle ##### -->
<para>
The #GtkRcStyle structure is used to represent a set
@@ -822,6 +824,7 @@ specific portions of a RC file.
</para>
+ void:
@Returns:
@@ -845,45 +848,6 @@ specific portions of a RC file.
@Returns:
-<!-- ##### FUNCTION gtk_rc_add_widget_name_style ##### -->
-<para>
-Adds a #GtkRcStyle that will be looked up by a match against
-the widget's pathname. This is equivalent to a:
- <literal>widget PATTERN style STYLE</literal>
-statement in a RC file.
-</para>
-
- rc_style: the #GtkRcStyle to use for widgets matching @pattern
- pattern: the pattern
- Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
-
-
-<!-- ##### FUNCTION gtk_rc_add_widget_class_style ##### -->
-<para>
-Adds a #GtkRcStyle that will be looked up by a match against
-the widget's class pathname. This is equivalent to a:
-<literal>widget_class PATTERN style STYLE</literal>
-statement in a RC file.
-</para>
-
- rc_style: the #GtkRcStyle to use for widgets matching @pattern
- pattern: the pattern
- Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
-
-
-<!-- ##### FUNCTION gtk_rc_add_class_style ##### -->
-<para>
-Adds a #GtkRcStyle that will be looked up by a matching against
-the class hierarchy of the widget. This is equivalent to a:
-<literal>class PATTERN style STYLE</literal>
-statement in a RC file.
-</para>
-
- rc_style: the #GtkRcStyle to use for widgets deriving from @pattern
- pattern: the pattern
- Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
-
-
<!-- ##### FUNCTION gtk_rc_parse ##### -->
<para>
Parses a given resource file.
@@ -905,6 +869,7 @@ Parses resource information directly from a string.
<para>
</para>
+ void:
@Returns:
@@ -937,6 +902,7 @@ Parses resource information directly from a string.
<para>
</para>
+ void:
@Returns:
@@ -1018,6 +984,7 @@ otherwise %NULL.
<para>
</para>
+ void:
@Returns:
@@ -1026,6 +993,7 @@ otherwise %NULL.
</para>
+ void:
@Returns:
@@ -1034,6 +1002,7 @@ otherwise %NULL.
</para>
+ void:
@Returns:
@@ -1044,6 +1013,7 @@ be installed. (GTK+ does not actually use this directory
itself.)
</para>
+ void:
@Returns: The directory (must be freed with g_free()).
@@ -1053,6 +1023,7 @@ Creates a new #GtkRcStyle with no fields set and
a reference count of 1.
</para>
+ void:
@Returns: the newly-created #GtkRcStyle
@@ -1065,22 +1036,3 @@ a reference count of 1.
@Returns:
-<!-- ##### FUNCTION gtk_rc_style_ref ##### -->
-<para>
-Increments the reference count of a #GtkRcStyle.
-</para>
-
- rc_style: a #GtkRcStyle
- Deprecated: Use g_object_ref() instead
-
-
-<!-- ##### FUNCTION gtk_rc_style_unref ##### -->
-<para>
-Decrements the reference count of a #GtkRcStyle and
-frees if the result is 0.
-</para>
-
- rc_style: a #GtkRcStyle
- Deprecated: Use g_object_unref() instead
-
-
diff --git a/docs/reference/gtk/tmpl/gtkrecentaction.sgml b/docs/reference/gtk/tmpl/gtkrecentaction.sgml
index 5fb7802..d47ea4c 100644
--- a/docs/reference/gtk/tmpl/gtkrecentaction.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentaction.sgml
@@ -25,6 +25,9 @@ action for a <toolitem> element.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentAction ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkrecentchooser.sgml b/docs/reference/gtk/tmpl/gtkrecentchooser.sgml
index 85013ba..a491382 100644
--- a/docs/reference/gtk/tmpl/gtkrecentchooser.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentchooser.sgml
@@ -25,6 +25,9 @@ Recently used files are supported since GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentChooser ##### -->
<para>
@@ -258,24 +261,6 @@ These identify the various errors that can occur while calling
@Returns:
-<!-- ##### FUNCTION gtk_recent_chooser_set_show_numbers ##### -->
-<para>
-
-</para>
-
- chooser:
- show_numbers:
-
-
-<!-- ##### FUNCTION gtk_recent_chooser_get_show_numbers ##### -->
-<para>
-
-</para>
-
- chooser:
- Returns:
-
-
<!-- ##### ENUM GtkRecentSortType ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml b/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml
index d328db3..fd06e2b 100644
--- a/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml
@@ -60,6 +60,9 @@ Recently used files are supported since GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentChooserDialog ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml b/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml
index 79d515b..0de670b 100644
--- a/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml
@@ -40,6 +40,9 @@ Recently used files are supported since GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentChooserMenu ##### -->
<para>
@@ -56,6 +59,7 @@ Recently used files are supported since GTK+ 2.10.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml b/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml
index 97a663b..826a5aa 100644
--- a/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentchooserwidget.sgml
@@ -29,6 +29,9 @@ Recently used files are supported since GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentChooserWidget ##### -->
<para>
@@ -40,6 +43,7 @@ Recently used files are supported since GTK+ 2.10.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkrecentfilter.sgml b/docs/reference/gtk/tmpl/gtkrecentfilter.sgml
index c6d601d..d2b1b78 100644
--- a/docs/reference/gtk/tmpl/gtkrecentfilter.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentfilter.sgml
@@ -40,6 +40,9 @@ Recently used files are supported since GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentFilter ##### -->
<para>
The <structname>GtkRecentFilter</structname> struct contains
@@ -96,6 +99,7 @@ see gtk_recent_filter_add_custom().
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkrecentmanager.sgml b/docs/reference/gtk/tmpl/gtkrecentmanager.sgml
index 56a8fa0..c888b6e 100644
--- a/docs/reference/gtk/tmpl/gtkrecentmanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkrecentmanager.sgml
@@ -70,6 +70,9 @@ Recently used files are supported since GTK+ 2.10.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRecentManager ##### -->
<para>
Acts as a database of information about the list of recently
@@ -146,6 +149,7 @@ The #GQuark used for #GtkRecentManagerError errors.
</para>
+ void:
@Returns:
@@ -154,27 +158,10 @@ The #GQuark used for #GtkRecentManagerError errors.
</para>
+ void:
@Returns:
-<!-- ##### FUNCTION gtk_recent_manager_get_for_screen ##### -->
-<para>
-
-</para>
-
- screen:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_recent_manager_set_screen ##### -->
-<para>
-
-</para>
-
- manager:
- screen:
-
-
<!-- ##### FUNCTION gtk_recent_manager_add_item ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml
index c114ea5..2dc9a89 100644
--- a/docs/reference/gtk/tmpl/gtkruler.sgml
+++ b/docs/reference/gtk/tmpl/gtkruler.sgml
@@ -33,6 +33,9 @@ ruler. See #GtkHRuler to learn how to create a new horizontal ruler. See
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkRuler ##### -->
<para>
All distances are in 1/72nd's of an inch. (According to Adobe thats a point, but
diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml
index b3f5bf5..c2be86a 100644
--- a/docs/reference/gtk/tmpl/gtkscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkscale.sgml
@@ -38,6 +38,9 @@ to show at the mark. It can be translated with the usual "translatable and
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkScale ##### -->
<para>
The fields of the #GtkScale-struct struct should only be accessed via
diff --git a/docs/reference/gtk/tmpl/gtkscalebutton.sgml b/docs/reference/gtk/tmpl/gtkscalebutton.sgml
index a08c418..e499ecb 100644
--- a/docs/reference/gtk/tmpl/gtkscalebutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkscalebutton.sgml
@@ -20,6 +20,9 @@ is tailored for this use case.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkScaleButton ##### -->
<para>
@@ -153,21 +156,3 @@ is tailored for this use case.
@Returns:
-<!-- ##### FUNCTION gtk_scale_button_set_orientation ##### -->
-<para>
-
-</para>
-
- button:
- orientation:
-
-
-<!-- ##### FUNCTION gtk_scale_button_get_orientation ##### -->
-<para>
-
-</para>
-
- button:
- Returns:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index 68705f6..de7c95b 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -51,6 +51,9 @@ or page down (using for example the PageDown key).
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkScrollbar ##### -->
<para>
The #GtkScrollbar struct does not contain any public data.
diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
index ef870a6..a352927 100644
--- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
@@ -70,6 +70,9 @@ your own scrolling with #GtkScrollbar and for example a #GtkTable.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkScrolledWindow ##### -->
<para>
There are no public fields in the #GtkScrolledWindow struct; it should
diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index ce156b7..6954d5f 100644
--- a/docs/reference/gtk/tmpl/gtkselection.sgml
+++ b/docs/reference/gtk/tmpl/gtkselection.sgml
@@ -44,6 +44,9 @@ associated information.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTargetEntry ##### -->
<para>
A #GtkTargetEntry structure represents a single type of
@@ -494,15 +497,6 @@ selection handling code.
@widget:
-<!-- ##### FUNCTION gtk_selection_clear ##### -->
-<para>
-</para>
-
- widget:
- event:
- Returns:
-
-
<!-- ##### FUNCTION gtk_selection_data_copy ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkseparator.sgml b/docs/reference/gtk/tmpl/gtkseparator.sgml
index 2bff699..ac3a584 100644
--- a/docs/reference/gtk/tmpl/gtkseparator.sgml
+++ b/docs/reference/gtk/tmpl/gtkseparator.sgml
@@ -18,6 +18,9 @@ subclasses #GtkHSeparator and #GtkVSeparator.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkSeparator ##### -->
<para>
The #GtkSeparator-struct struct contains private data only.
diff --git a/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml b/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml
index 3f0d2f9..d3fcd5f 100644
--- a/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml
@@ -19,6 +19,9 @@ make it appear sunken into the interface.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkSeparatorMenuItem ##### -->
<para>
The #GtkSeparatorMenuItem-struct struct contains private data only, and
@@ -31,6 +34,7 @@ should be accessed using the functions below.
Creates a new #GtkSeparatorMenuItem.
</para>
+ void:
@Returns: a new #GtkSeparatorMenuItem.
diff --git a/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml b/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml
index 6136bdb..ac868fa 100644
--- a/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml
@@ -37,6 +37,9 @@ to the ends of the toolbar.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkSeparatorToolItem ##### -->
<para>
The #GtkSeparatorToolItem struct contains only private data and
@@ -54,6 +57,7 @@ should only be accessed through the functions described below.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index c90c239..f2b7fb4 100644
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -45,6 +45,9 @@ GtkSettings instance for the default screen.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkSettings ##### -->
<para>
@@ -394,6 +397,7 @@ GtkSettings instance for the default screen.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtksizegroup.sgml b/docs/reference/gtk/tmpl/gtksizegroup.sgml
index 7784e3a..4bf90ce 100644
--- a/docs/reference/gtk/tmpl/gtksizegroup.sgml
+++ b/docs/reference/gtk/tmpl/gtksizegroup.sgml
@@ -76,6 +76,9 @@ of the size group. The name attribute gives the id of the widget.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkSizeGroup ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
index f9f24d1..0ed732d 100644
--- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
@@ -99,6 +99,9 @@ void create_floating_spin_button (void) {
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkSpinButton ##### -->
<para>
<structfield>entry</structfield> is the #GtkEntry part of the #GtkSpinButton
@@ -324,17 +327,6 @@ Creates a new #GtkSpinButton.
@max:
-<!-- ##### MACRO gtk_spin_button_get_value_as_float ##### -->
-<para>
-Gets the value in the @spin_button.
-</para>
-
- Returns: the value of @spin_button
- Deprecated: Use gtk_spin_button_get_value() instead.
-<!-- # Unused Parameters # -->
- spin_button: a #GtkSpinButton
-
-
<!-- ##### FUNCTION gtk_spin_button_get_value_as_int ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkstatusbar.sgml b/docs/reference/gtk/tmpl/gtkstatusbar.sgml
index a012d50..2d86099 100644
--- a/docs/reference/gtk/tmpl/gtkstatusbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkstatusbar.sgml
@@ -49,6 +49,9 @@ recorded at the time it was added. This is done using gtk_statusbar_remove().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkStatusbar ##### -->
<para>
Contains private data that should be modified with the functions described
@@ -89,6 +92,7 @@ below.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkstatusicon.sgml b/docs/reference/gtk/tmpl/gtkstatusicon.sgml
index b834c81..b399ea8 100644
--- a/docs/reference/gtk/tmpl/gtkstatusicon.sgml
+++ b/docs/reference/gtk/tmpl/gtkstatusicon.sgml
@@ -42,6 +42,9 @@ on Win32 doesn't allow to embed arbitrary widgets.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkStatusIcon ##### -->
<para>
@@ -197,6 +200,7 @@ on Win32 doesn't allow to embed arbitrary widgets.
</para>
+ void:
@Returns:
@@ -362,15 +366,6 @@ on Win32 doesn't allow to embed arbitrary widgets.
@Returns:
-<!-- ##### FUNCTION gtk_status_icon_set_tooltip ##### -->
-<para>
-
-</para>
-
- status_icon:
- tooltip_text:
-
-
<!-- ##### FUNCTION gtk_status_icon_set_tooltip_text ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index ffe5671..b8f2dce 100644
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -17,6 +17,9 @@ Functions for drawing widget parts
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### MACRO GTK_STYLE_ATTACHED ##### -->
<para>
Returns whether the style is attached to a window.
@@ -74,6 +77,7 @@ Returns whether the style is attached to a window.
</para>
+ void:
@Returns:
@@ -104,23 +108,6 @@ Returns whether the style is attached to a window.
@style:
-<!-- ##### FUNCTION gtk_style_ref ##### -->
-<para>
-
-</para>
-
- style:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_style_unref ##### -->
-<para>
-
-</para>
-
- style:
-
-
<!-- ##### FUNCTION gtk_style_set_background ##### -->
<para>
@@ -147,22 +134,6 @@ Returns whether the style is attached to a window.
@height:
-<!-- ##### MACRO gtk_style_apply_default_pixmap ##### -->
-<para>
-Does the same as gtk_style_apply_default_background().
-</para>
-
- s:
- gw:
- st:
- a:
- x:
- y:
- w:
- h:
- Deprecated: Use gtk_style_apply_default_background() instead.
-
-
<!-- ##### FUNCTION gtk_style_lookup_color ##### -->
<para>
@@ -174,16 +145,6 @@ Does the same as gtk_style_apply_default_background().
@Returns:
-<!-- ##### FUNCTION gtk_style_lookup_icon_set ##### -->
-<para>
-
-</para>
-
- style:
- stock_id:
- Returns:
-
-
<!-- ##### FUNCTION gtk_style_render_icon ##### -->
<para>
@@ -199,24 +160,6 @@ Does the same as gtk_style_apply_default_background().
@Returns:
-<!-- ##### FUNCTION gtk_style_get_font ##### -->
-<para>
-
-</para>
-
- style:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_style_set_font ##### -->
-<para>
-
-</para>
-
- style:
- font:
-
-
<!-- ##### FUNCTION gtk_style_get_style_property ##### -->
<para>
@@ -545,22 +488,6 @@ Does the same as gtk_style_apply_default_background().
@height:
-<!-- ##### FUNCTION gtk_paint_string ##### -->
-<para>
-
-</para>
-
- style:
- window:
- state_type:
- area:
- widget:
- detail:
- x:
- y:
- string:
-
-
<!-- ##### FUNCTION gtk_paint_tab ##### -->
<para>
@@ -676,6 +603,7 @@ be of different width on each side.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml
index 25e36e7..4a0d7ca 100644
--- a/docs/reference/gtk/tmpl/gtktable.sgml
+++ b/docs/reference/gtk/tmpl/gtktable.sgml
@@ -47,6 +47,9 @@ table will resize themselves to the size of the largest widget in the table.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTable ##### -->
<para>
The <structname>GtkTable</structname> structure holds the data for the actual table itself.
diff --git a/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml b/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml
index 2f2560b..450c4aa 100644
--- a/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml
@@ -39,6 +39,9 @@ menu window.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTearoffMenuItem ##### -->
<para>
The #GtkTearoffMenuItem-struct struct contains private data only, and
@@ -51,6 +54,7 @@ should be accessed using the functions below.
Creates a new #GtkTearoffMenuItem.
</para>
+ void:
@Returns: a new #GtkTearoffMenuItem.
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
index 802d74b..f7cfdef 100644
--- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -24,6 +24,9 @@ types related to the text widget and how they work together.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTextBuffer ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml
index c7cf653..33f00f8 100644
--- a/docs/reference/gtk/tmpl/gtktextiter.sgml
+++ b/docs/reference/gtk/tmpl/gtktextiter.sgml
@@ -23,6 +23,9 @@ types related to the text widget and how they work together.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTextIter ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml
index 0db80bf..a15b762 100644
--- a/docs/reference/gtk/tmpl/gtktextmark.sgml
+++ b/docs/reference/gtk/tmpl/gtktextmark.sgml
@@ -56,6 +56,9 @@ Marks are typically created using the gtk_text_buffer_create_mark() function.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTextMark ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml
index c52ee0f..3126342 100644
--- a/docs/reference/gtk/tmpl/gtktexttag.sgml
+++ b/docs/reference/gtk/tmpl/gtktexttag.sgml
@@ -34,6 +34,9 @@ It is working (with minor issues) since 2.8.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTextTag ##### -->
<para>
@@ -477,6 +480,7 @@ modified directly.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktexttagtable.sgml b/docs/reference/gtk/tmpl/gtktexttagtable.sgml
index ab1341f..748682f 100644
--- a/docs/reference/gtk/tmpl/gtktexttagtable.sgml
+++ b/docs/reference/gtk/tmpl/gtktexttagtable.sgml
@@ -24,6 +24,9 @@ types related to the text widget and how they work together.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTextTagTable ##### -->
<para>
@@ -69,6 +72,7 @@ types related to the text widget and how they work together.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index 2da1a2a..bd8168d 100644
--- a/docs/reference/gtk/tmpl/gtktextview.sgml
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -23,6 +23,9 @@ types related to the text widget and how they work together.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTextView ##### -->
<para>
@@ -254,6 +257,7 @@ types related to the text widget and how they work together.
</para>
+ void:
@Returns:
@@ -284,6 +288,24 @@ types related to the text widget and how they work together.
@Returns:
+<!-- ##### FUNCTION gtk_text_view_get_hadjustment ##### -->
+<para>
+
+</para>
+
+ text_view:
+ Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_vadjustment ##### -->
+<para>
+
+</para>
+
+ text_view:
+ Returns:
+
+
<!-- ##### FUNCTION gtk_text_view_scroll_to_mark ##### -->
<para>
@@ -554,6 +576,7 @@ multiple views.
</para>
+ void:
@Returns:
@@ -841,6 +864,24 @@ multiple views.
@Returns:
+<!-- ##### FUNCTION gtk_text_view_im_context_filter_keypress ##### -->
+<para>
+
+</para>
+
+ text_view:
+ event:
+ Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_reset_im_context ##### -->
+<para>
+
+</para>
+
+ text_view:
+
+
<!-- ##### MACRO GTK_TEXT_VIEW_PRIORITY_VALIDATE ##### -->
<para>
The priority at which the text view validates onscreen lines
diff --git a/docs/reference/gtk/tmpl/gtktoggleaction.sgml b/docs/reference/gtk/tmpl/gtktoggleaction.sgml
index c6ceec7..79a2455 100644
--- a/docs/reference/gtk/tmpl/gtktoggleaction.sgml
+++ b/docs/reference/gtk/tmpl/gtktoggleaction.sgml
@@ -18,6 +18,9 @@ A #GtkToggleAction corresponds roughly to a #GtkCheckMenuItem. It has an
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkToggleAction ##### -->
<para>
The <structname>GtkToggleAction</structname> struct contains only
diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
index 5e8282a..815d6a4 100644
--- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml
@@ -80,6 +80,9 @@ void make_toggles (void) {
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkToggleButton ##### -->
<para>
The #GtkToggleButton struct contains private data only, and should be manipulated using the functions below.
@@ -114,6 +117,7 @@ Should be connected if you wish to perform an action whenever the
Creates a new toggle button. A widget should be packed into the button, as in gtk_button_new().
</para>
+ void:
@Returns: a new toggle button.
diff --git a/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml
index 21a12e9..738e4b9 100644
--- a/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml
@@ -45,6 +45,9 @@ A GtkToolItem containing a toggle button
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkToggleToolButton ##### -->
<para>
The #GtkToggleToolButton struct contains only private data and
@@ -69,6 +72,7 @@ A GtkToolItem containing a toggle button
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 86c59d6..6539b74 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -41,6 +41,9 @@ the #GtkToolbar::popup-context-menu signal.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkToolbar ##### -->
<para>
The #GtkToolbar struct only contains private data and should only be
@@ -104,11 +107,6 @@ accessed through the function described below.
</para>
-<!-- ##### ARG GtkToolbar:tooltips ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GtkToolbar:expand ##### -->
<para>
@@ -184,6 +182,7 @@ to a #GtkToolbar.
</para>
+ void:
@Returns: the newly-created toolbar.
@@ -256,24 +255,6 @@ to a #GtkToolbar.
@show_arrow:
-<!-- ##### FUNCTION gtk_toolbar_set_orientation ##### -->
-<para>
-
-</para>
-
- toolbar:
- orientation:
-
-
-<!-- ##### FUNCTION gtk_toolbar_set_tooltips ##### -->
-<para>
-
-</para>
-
- toolbar:
- enable:
-
-
<!-- ##### FUNCTION gtk_toolbar_unset_icon_size ##### -->
<para>
@@ -291,15 +272,6 @@ to a #GtkToolbar.
@Returns:
-<!-- ##### FUNCTION gtk_toolbar_get_orientation ##### -->
-<para>
-
-</para>
-
- toolbar:
- Returns:
-
-
<!-- ##### FUNCTION gtk_toolbar_get_style ##### -->
<para>
@@ -318,15 +290,6 @@ to a #GtkToolbar.
@Returns:
-<!-- ##### FUNCTION gtk_toolbar_get_tooltips ##### -->
-<para>
-
-</para>
-
- toolbar:
- Returns:
-
-
<!-- ##### FUNCTION gtk_toolbar_get_relief_style ##### -->
<para>
@@ -336,166 +299,6 @@ to a #GtkToolbar.
@Returns:
-<!-- ##### FUNCTION gtk_toolbar_append_item ##### -->
-<para>
-
-</para>
-
- toolbar:
- text:
- tooltip_text:
- tooltip_private_text:
- icon:
- callback:
- user_data:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_toolbar_prepend_item ##### -->
-<para>
-
-</para>
-
- toolbar:
- text:
- tooltip_text:
- tooltip_private_text:
- icon:
- callback:
- user_data:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_toolbar_insert_item ##### -->
-<para>
-
-</para>
-
- toolbar:
- text:
- tooltip_text:
- tooltip_private_text:
- icon:
- callback:
- user_data:
- position:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_toolbar_append_space ##### -->
-<para>
-
-</para>
-
- toolbar:
-
-
-<!-- ##### FUNCTION gtk_toolbar_prepend_space ##### -->
-<para>
-
-</para>
-
- toolbar:
-
-
-<!-- ##### FUNCTION gtk_toolbar_insert_space ##### -->
-<para>
-
-</para>
-
- toolbar:
- position:
-
-
-<!-- ##### FUNCTION gtk_toolbar_append_element ##### -->
-<para>
-
-</para>
-<para>
-
-</para>
-
- toolbar:
- type:
- widget:
- text:
- tooltip_text:
- tooltip_private_text:
- icon:
- callback:
- user_data:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_toolbar_prepend_element ##### -->
-<para>
-
-</para>
-
- toolbar:
- type:
- widget:
- text:
- tooltip_text:
- tooltip_private_text:
- icon:
- callback:
- user_data:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_toolbar_insert_element ##### -->
-<para>
-
-</para>
-
- toolbar:
- type:
- widget:
- text:
- tooltip_text:
- tooltip_private_text:
- icon:
- callback:
- user_data:
- position:
- Returns:
-
-
-<!-- ##### FUNCTION gtk_toolbar_append_widget ##### -->
-<para>
-
-</para>
-
- toolbar:
- widget:
- tooltip_text:
- tooltip_private_text:
-
-
-<!-- ##### FUNCTION gtk_toolbar_prepend_widget ##### -->
-<para>
-
-</para>
-
- toolbar:
- widget:
- tooltip_text:
- tooltip_private_text:
-
-
-<!-- ##### FUNCTION gtk_toolbar_insert_widget ##### -->
-<para>
-
-</para>
-
- toolbar:
- widget:
- tooltip_text:
- tooltip_private_text:
- position:
-
-
<!-- ##### FUNCTION gtk_toolbar_set_style ##### -->
<para>
@@ -505,21 +308,6 @@ to a #GtkToolbar.
@style:
-<!-- ##### FUNCTION gtk_toolbar_insert_stock ##### -->
-<para>
-
-</para>
-
- toolbar:
- stock_id:
- tooltip_text:
- tooltip_private_text:
- callback:
- user_data:
- position:
- Returns:
-
-
<!-- ##### FUNCTION gtk_toolbar_set_icon_size ##### -->
<para>
@@ -529,15 +317,6 @@ to a #GtkToolbar.
@icon_size:
-<!-- ##### FUNCTION gtk_toolbar_remove_space ##### -->
-<para>
-
-</para>
-
- toolbar:
- position:
-
-
<!-- ##### FUNCTION gtk_toolbar_unset_style ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
index 95561b6..10d9e1d 100644
--- a/docs/reference/gtk/tmpl/gtktoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
@@ -72,6 +72,9 @@ the button does not have a icon.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkToolButton ##### -->
<para>
The #GtkToolButton struct contains only private. It should only be
diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml
index ecef910..f4287ed 100644
--- a/docs/reference/gtk/tmpl/gtktoolitem.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml
@@ -17,29 +17,21 @@ GtkToolItem
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT GtkToolItem ##### -->
-<para>
+<!-- ##### SECTION Image ##### -->
-</para>
-
-<!-- ##### SIGNAL GtkToolItem::create-menu-proxy ##### -->
+<!-- ##### STRUCT GtkToolItem ##### -->
<para>
</para>
- toolitem: the object which received the signal.
- Returns:
-<!-- ##### SIGNAL GtkToolItem::set-tooltip ##### -->
+<!-- ##### SIGNAL GtkToolItem::create-menu-proxy ##### -->
<para>
</para>
@toolitem: the object which received the signal.
- arg1:
- arg2:
- arg3:
@Returns:
<!-- ##### SIGNAL GtkToolItem::toolbar-reconfigured ##### -->
@@ -69,6 +61,7 @@ GtkToolItem
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktooltip.sgml b/docs/reference/gtk/tmpl/gtktooltip.sgml
index 71edd35..15a8f43 100644
--- a/docs/reference/gtk/tmpl/gtktooltip.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltip.sgml
@@ -79,6 +79,9 @@ return %TRUE to show the window, %FALSE to not show it.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTooltip ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreednd.sgml b/docs/reference/gtk/tmpl/gtktreednd.sgml
index 9d9273f..a45f821 100644
--- a/docs/reference/gtk/tmpl/gtktreednd.sgml
+++ b/docs/reference/gtk/tmpl/gtktreednd.sgml
@@ -33,6 +33,9 @@ and auto-scroll, but your models have to implement the
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeDragSource ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml
index d635009..07dcd45 100644
--- a/docs/reference/gtk/tmpl/gtktreemodel.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml
@@ -196,6 +196,9 @@ enum
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeModel ##### -->
<para>
@@ -327,6 +330,7 @@ section.
</para>
+ void:
@Returns:
@@ -363,19 +367,10 @@ section.
</para>
+ void:
@Returns:
-<!-- ##### MACRO gtk_tree_path_new_root ##### -->
-<para>
-An alternate name for gtk_tree_path_new_first() provided for
-compatibility reasons.
-</para>
-
- Returns: A new #GtkTreePath.
- Deprecated: Use gtk_tree_path_new_first() instead.
-
-
<!-- ##### FUNCTION gtk_tree_path_append_index ##### -->
<para>
@@ -417,7 +412,7 @@ compatibility reasons.
</para>
- path:
+ path:
@depth:
@Returns:
@@ -674,18 +669,6 @@ compatibility reasons.
@Returns:
-<!-- ##### MACRO gtk_tree_model_get_iter_root ##### -->
-<para>
-A alternate name for gtk_tree_model_get_iter_first() provided for
-compatibility reasons; this macro will be deprecated in future
-versions of GTK+.
-</para>
-
- tree_model: A #GtkTreeModel.
- iter: uninitialized #GtkTreeIter.
- Returns: %TRUE, if @iter was set.
-
-
<!-- ##### FUNCTION gtk_tree_model_get_path ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml b/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml
index bd6d1e3..cda44ec 100644
--- a/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodelfilter.sgml
@@ -37,6 +37,9 @@ a #GtkTreePath indicating the root node for the filter at construction time.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeModelFilter ##### -->
<para>
The GtkTreeModelFilter struct contains only private fields.
diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml
index b023f1a..1582216 100644
--- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml
@@ -121,6 +121,9 @@ selection_changed (GtkTreeSelection *selection, gpointer data)
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeModelSort ##### -->
<para>
This should not be accessed directly. Use the accessor functions below.
diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml
index e5a9b92..9407aaa 100644
--- a/docs/reference/gtk/tmpl/gtktreeselection.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml
@@ -43,6 +43,9 @@ selected row).
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeSelection ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreesortable.sgml b/docs/reference/gtk/tmpl/gtktreesortable.sgml
index 967add6..f5ebb8f 100644
--- a/docs/reference/gtk/tmpl/gtktreesortable.sgml
+++ b/docs/reference/gtk/tmpl/gtktreesortable.sgml
@@ -19,6 +19,9 @@ to sort the model.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeSortable ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index f3c5c97..efa8455 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -44,6 +44,9 @@ column. The "type" attribute specifies the data type for the column.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeStore ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index 7422057..549b2e6 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -77,6 +77,9 @@ GtkTreeViewColumn objects as <child> elements in UI definitions.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkTreeView ##### -->
<para>
@@ -447,6 +450,7 @@ has some similarity to strcmp() returning 0 for equal strings.
</para>
+ void:
@Returns:
@@ -953,30 +957,6 @@ has some similarity to strcmp() returning 0 for equal strings.
@Returns:
-<!-- ##### FUNCTION gtk_tree_view_widget_to_tree_coords ##### -->
-<para>
-
-</para>
-
- tree_view:
- wx:
- wy:
- tx:
- ty:
-
-
-<!-- ##### FUNCTION gtk_tree_view_tree_to_widget_coords ##### -->
-<para>
-
-</para>
-
- tree_view:
- tx:
- ty:
- wx:
- wy:
-
-
<!-- ##### FUNCTION gtk_tree_view_convert_bin_window_to_tree_coords ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index 26cd00a..5340150 100644
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -26,6 +26,9 @@ they work together.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### ENUM GtkTreeViewColumnSizing ##### -->
<para>
The sizing method the column uses to determine its width. Please note
@@ -157,6 +160,7 @@ calling gtk_tree_view_column_set_cell_data_func()
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml
index 861c994..69a4a26 100644
--- a/docs/reference/gtk/tmpl/gtktypeutils.sgml
+++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml
@@ -18,154 +18,7 @@ managed at runtime.
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### TYPEDEF GtkType ##### -->
-<para>
-#GtkType is unique integer identifying the type. The guts of the
-information about the type is held in a private struct named
-#GtkTypeNode.
-</para>
-
-
-<!-- ##### TYPEDEF GtkFundamentalType ##### -->
-<para>
-#GtkFundamentalType is an enumerated type which lists all the possible
-fundamental types (e.g. <type>char</type>, <type>uchar</type>, <type>int</type>,
-<type>long</type>, <type>float</type>, etc).
-</para>
-
-
-<!-- ##### MACRO GTK_CLASS_NAME ##### -->
-<para>
-Returns the type name of @class.
-</para>
-
- class: a #GtkTypeClass.
- Deprecated: Use g_type_name() and G_TYPE_FROM_CLASS() instead.
-
-
-<!-- ##### MACRO GTK_CLASS_TYPE ##### -->
-<para>
-Returns the type of @class.
-</para>
-
- class: a #GtkTypeClass.
- Deprecated: Use G_TYPE_FROM_CLASS() instead.
-
-
-<!-- ##### MACRO GTK_TYPE_IS_OBJECT ##### -->
-<para>
-Returns %TRUE if @type is a %GTK_TYPE_OBJECT.
-</para>
-
- type: a #GtkType.
- Deprecated: Use G_TYPE_IS_OBJECT() instead.
-
-
-<!-- ##### MACRO GTK_TYPE_FUNDAMENTAL_LAST ##### -->
-<para>
-The highest-numbered structured or flat enumerated type value.
-</para>
-
- Deprecated: Use #G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1 instead.
-
-
-<!-- ##### MACRO GTK_TYPE_FUNDAMENTAL_MAX ##### -->
-<para>
-The maximum fundamental enumerated type value.
-</para>
-
- Deprecated: Use #G_TYPE_FUNDAMENTAL_MAX instead.
-
-
-<!-- ##### MACRO GTK_STRUCT_OFFSET ##### -->
-<para>
-Use in place of <function>offsetof()</function>, which is used if it exists.
-</para>
-
- Deprecated: Use G_STRUCT_OFFSET() instead.
-
-
-<!-- ##### MACRO GTK_CHECK_CAST ##### -->
-<para>
-Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is
-defined, just cast it. Otherwise, check to see if we can cast @tobj
-into a @cast.
-</para>
-
-
-
-<!-- ##### MACRO GTK_CHECK_CLASS_CAST ##### -->
-<para>
-Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is
-defined, just cast it. Otherwise, check to see if we can cast @tobj
-into a @cast.
-</para>
-
-<!-- # Unused Parameters # -->
- tclass: a #GtkClassInitFunc
- cast_type: a GTK+ type.
- cast: a C type
-
-
-<!-- ##### MACRO GTK_CHECK_TYPE ##### -->
-<para>
-Determines whether @type_object is a type of @otype.
-</para>
-
-<!-- # Unused Parameters # -->
- type_object: a #GtkTypeObject object
-
-
-<!-- ##### MACRO GTK_CHECK_CLASS_TYPE ##### -->
-<para>
-Determines whether @type_class is a type of @otype.
-</para>
-
-<!-- # Unused Parameters # -->
- type_class: a #GtkTypeClass class.
-
-
-<!-- ##### MACRO GTK_CHECK_GET_CLASS ##### -->
-<para>
-Gets the class of @tobj.
-</para>
-
-<!-- # Unused Parameters # -->
- tobj: a #GtkObject.
-
-
-<!-- ##### MACRO GTK_FUNDAMENTAL_TYPE ##### -->
-<para>
-Converts a GTK+ type into a fundamental type.
-</para>
-
-
-
-<!-- ##### MACRO GTK_SIGNAL_FUNC ##### -->
-<para>
-Just a macroized cast into a #GtkSignalFunc.
-</para>
-
- f:
-
-
-<!-- ##### TYPEDEF GtkClassInitFunc ##### -->
-<para>
-Defines a function pointer.
-</para>
-
-
-<!-- ##### TYPEDEF GtkObjectInitFunc ##### -->
-<para>
-Defines a function pointer.
-</para>
-
-
-<!-- ##### USER_FUNCTION GtkSignalFunc ##### -->
-<para>
-Defines a function pointer.
-</para>
-
+<!-- ##### SECTION Image ##### -->
<!-- ##### USER_FUNCTION GtkFunction ##### -->
@@ -177,14 +30,6 @@ Defines a function pointer.
@Returns: #gint
-<!-- ##### USER_FUNCTION GtkDestroyNotify ##### -->
-<para>
-Defines a function pointer.
-</para>
-
- data: #gpointer
-
-
<!-- ##### USER_FUNCTION GtkCallbackMarshal ##### -->
<para>
Defines a function pointer.
@@ -196,21 +41,6 @@ Defines a function pointer.
@args: #GtkArg*
-<!-- ##### TYPEDEF GtkSignalMarshaller ##### -->
-<para>
-Defines a function pointer.
-</para>
-
-
-<!-- ##### TYPEDEF GtkTypeObject ##### -->
-<para>
-A #GtkTypeObject defines the minimum structure requirements
-for type instances. Type instances returned from gtk_type_new ()
-and initialized through a #GtkObjectInitFunc need to directly inherit
-from this structure or at least copy its fields one by one.
-</para>
-
-
<!-- ##### STRUCT GtkArg ##### -->
<para>
This is a structure that we use to pass in typed values (and names).
@@ -219,407 +49,3 @@ This is a structure that we use to pass in typed values (and names).
@type:
@name:
-<!-- ##### MACRO GTK_VALUE_CHAR ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_CHAR.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_UCHAR ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UCHAR.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_BOOL ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOOL.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_INT ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_INT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_UINT ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_UINT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_LONG ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_LONG.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_ULONG ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ULONG.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_FLOAT ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLOAT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_DOUBLE ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_DOUBLE.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_STRING ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_STRING.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_ENUM ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_ENUM.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_FLAGS ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_FLAGS.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_BOXED ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_BOXED.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_POINTER ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_POINTER.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_OBJECT ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_OBJECT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_VALUE_SIGNAL ##### -->
-<para>
-Gets the value of a #GtkArg whose #GtkType is %GTK_TYPE_SIGNAL.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_CHAR ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_CHAR.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_UCHAR ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UCHAR.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_BOOL ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOOL.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_INT ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_INT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_UINT ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_UINT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_LONG ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_LONG.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_ULONG ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ULONG.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_FLOAT ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLOAT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_DOUBLE ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_DOUBLE.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_STRING ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_STRING.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_ENUM ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_ENUM.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_FLAGS ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_FLAGS.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_BOXED ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_BOXED.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_POINTER ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_POINTER.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### MACRO GTK_RETLOC_OBJECT ##### -->
-<para>
-If the #GtkArg contains a pointer to the value, this macro will be a pointer to a %GTK_TYPE_OBJECT.
-</para>
-
- a: a #GtkArg.
-
-
-<!-- ##### STRUCT GtkTypeInfo ##### -->
-<para>
-Holds information about the type. gtk_type_name() returns the name.
- object_size is somehow set to the number of bytes that an instance of
-the object will occupy. @class_init_func holds the type's
-initialization function. @object_init_func holds the initialization
-function for an instance of the object. @reserved_1 is used for
-#GtkEnumValue to hold the enumerated values.
-</para>
-
- type_name:
- object_size:
- class_size:
- class_init_func:
- object_init_func:
- reserved_1:
- reserved_2:
- base_class_init_func:
-
-<!-- ##### TYPEDEF GtkTypeClass ##### -->
-<para>
-The base structure for a GTK+ type. Every type inherits this as a base structure.
-</para>
-
-
-<!-- ##### TYPEDEF GtkEnumValue ##### -->
-<para>
-A structure which contains a single enum value, and its name, and its
-nickname.
-</para>
-
-
-<!-- ##### TYPEDEF GtkFlagValue ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_type_init ##### -->
-<para>
-Initializes the data structures associated with GTK+ types.
-</para>
-
- debug_flags: debug flags
-
-
-<!-- ##### FUNCTION gtk_type_unique ##### -->
-<para>
-Creates a new, unique type.
-</para>
-
- parent_type: if zero, a fundamental type is created
- gtkinfo: must not be %NULL, and @type_info->type_name must also not be %NULL
- Returns: the new #GtkType
-
-
-<!-- ##### MACRO gtk_type_name ##### -->
-<para>
-Returns a pointer to the name of a type, or %NULL if it has none.
-</para>
-
- type: a #GtkType.
- Returns: a pointer to the name of a type, or %NULL if it has none.
-
-
-<!-- ##### MACRO gtk_type_from_name ##### -->
-<para>
-Gets the internal representation of a type, given its name.
-</para>
-
- name: the name of a GTK+ type
- Returns: a #GtkType.
-
-
-<!-- ##### MACRO gtk_type_parent ##### -->
-<para>
-Returns the parent type of a #GtkType.
-</para>
-
- type: a #GtkType.
- Returns: the #GtkType of the parent.
-
-
-<!-- ##### FUNCTION gtk_type_class ##### -->
-<para>
-Returns a pointer pointing to the class of @type or %NULL if there was
-any trouble identifying @type. Initializes the class if necessary.
-</para>
-
- type: a #GtkType.
- Returns: pointer to the class.
-
-
-<!-- ##### FUNCTION gtk_type_new ##### -->
-<para>
-Creates a new object of a given type, and return a pointer to it.
-Returns %NULL if you give it an invalid type. It allocates the object
-out of the type's memory chunk if there is a memory chunk. The object
-has all the proper initializers called.
-</para>
-
- type: a #GtkType.
- Returns: pointer to a #GtkTypeObject.
-
-
-<!-- ##### MACRO gtk_type_is_a ##### -->
-<para>
-Looks in the type hierarchy to see if @type has @is_a_type among its
-ancestors. Do so with a simple lookup, not a loop.
-</para>
-
- type: a #GtkType.
- is_a_type: another #GtkType.
- Returns: %TRUE if @type is a @is_a_type.
-
-
-<!-- ##### FUNCTION gtk_type_enum_get_values ##### -->
-<para>
-If @enum_type has values, then return a pointer to all of them.
-</para>
-
- enum_type: a #GtkType.
- Returns: #GtkEnumValue*
-
-
-<!-- ##### FUNCTION gtk_type_flags_get_values ##### -->
-<para>
-If @flags_type has values, then return a pointer to all of them.
-</para>
-
- flags_type: a #GtkType.
- Returns: #GtkFlagValue*
-
-
-<!-- ##### FUNCTION gtk_type_enum_find_value ##### -->
-<para>
-Returns a pointer to one of @enum_type's #GtkEnumValues's whose name (or nickname) matches @value_name.
-</para>
-
- enum_type: a #GtkType.
- value_name: the name to look for.
- Returns: #GtkEnumValue*
-
-
-<!-- ##### FUNCTION gtk_type_flags_find_value ##### -->
-<para>
-Returns a pointer to one of @flag_type's #GtkFlagValue's whose name (or nickname) matches @value_name.
-</para>
-
- flags_type: a #GtkType.
- value_name: the name to look for.
- Returns: #GtkFlagValue*
-<!-- # Unused Parameters # -->
- flag_type: GtkType
-
-
diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index 22f5d8b..68b8700 100644
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -253,6 +253,9 @@ other parts of the constructed user interface with the help of the
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkUIManager ##### -->
<para>
The <structname>GtkUIManager</structname> struct contains only private
@@ -324,6 +327,7 @@ members and should not be accessed directly.
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index 69a9688..07c39b0 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -40,6 +40,9 @@ window (synonymous with gtk_window_add_accel_group().
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkWindow ##### -->
<para>
@@ -427,6 +430,7 @@ window (synonymous with gtk_window_add_accel_group().
</para>
+ void:
@Returns:
@@ -784,6 +788,7 @@ window (synonymous with gtk_window_add_accel_group().
</para>
+ void:
@Returns:
@@ -792,6 +797,7 @@ window (synonymous with gtk_window_add_accel_group().
</para>
+ void:
@Returns:
diff --git a/docs/reference/gtk/tmpl/gtkwindowgroup.sgml b/docs/reference/gtk/tmpl/gtkwindowgroup.sgml
index 622de26..becadf0 100644
--- a/docs/reference/gtk/tmpl/gtkwindowgroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindowgroup.sgml
@@ -17,6 +17,9 @@ Limit the effect of grabs
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### STRUCT GtkWindowGroup ##### -->
<para>
@@ -28,6 +31,7 @@ Limit the effect of grabs
</para>
+ void:
@Returns:
diff --git a/gdk-2.0-uninstalled.pc.in b/gdk-3.0-uninstalled.pc.in
similarity index 84%
rename from gdk-2.0-uninstalled.pc.in
rename to gdk-3.0-uninstalled.pc.in
index f945a3f..45adcf0 100644
--- a/gdk-2.0-uninstalled.pc.in
+++ b/gdk-3.0-uninstalled.pc.in
@@ -3,6 +3,6 @@ target= gdktarget@
Name: GDK Uninstalled
Description: GTK+ Drawing Kit (${target} target), Not Installed
Version: @VERSION@
-Requires: gdk-pixbuf-2.0-uninstalled @GDK_PACKAGES@
+Requires: gdk-pixbuf- GTK_API_VERSION@-uninstalled @GDK_PACKAGES@
Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}- GTK_API_VERSION@.la @GDK_EXTRA_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gdk -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@
diff --git a/gdk-2.0.pc.in b/gdk-3.0.pc.in
similarity index 60%
rename from gdk-2.0.pc.in
rename to gdk-3.0.pc.in
index 24a5dfb..ca12b2e 100644
--- a/gdk-2.0.pc.in
+++ b/gdk-3.0.pc.in
@@ -7,6 +7,6 @@ target= gdktarget@
Name: GDK
Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@
-Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@
+Requires: gdk-pixbuf- GTK_API_VERSION@ @GDK_PACKAGES@
Libs: -L${libdir} -lgdk-${target}- GTK_API_VERSION@ @GDK_EXTRA_LIBS@
-Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@
+Cflags: -I${includedir}/gtk- GTK_API_VERSION@ -I${libdir}/gtk- GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@
diff --git a/gdk-pixbuf-2.0-uninstalled.pc.in b/gdk-pixbuf-3.0-uninstalled.pc.in
similarity index 100%
rename from gdk-pixbuf-2.0-uninstalled.pc.in
rename to gdk-pixbuf-3.0-uninstalled.pc.in
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-3.0.pc.in
similarity index 79%
rename from gdk-pixbuf-2.0.pc.in
rename to gdk-pixbuf-3.0.pc.in
index b3b0915..e65398b 100644
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-3.0.pc.in
@@ -8,5 +8,5 @@ Description: Image loading and scaling
Version: @VERSION@
Requires: gobject-2.0,gmodule-no-export-2.0
Libs: -L${libdir} -lgdk_pixbuf- GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
-Cflags: -I${includedir}/gtk-2.0 @GDK_PIXBUF_EXTRA_CFLAGS@
+Cflags: -I${includedir}/gtk- GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 52fd710..c5606f5 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -62,9 +62,9 @@ TESTS = abicheck.sh pltcheck.sh
endif
lib_LTLIBRARIES = \
- libgdk_pixbuf-2.0.la
+ libgdk_pixbuf-3.0.la
-loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
+loaderdir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/loaders
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
@@ -524,21 +524,21 @@ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
noinst_PROGRAMS = test-gdk-pixbuf
test_gdk_pixbuf_LDADD = $(LDADDS)
-bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
-gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-gdk_pixbuf_csource_LDADD = $(LDADDS)
+bin_PROGRAMS = gdk-pixbuf-csource-3.0 gdk-pixbuf-query-loaders-3.0
+gdk_pixbuf_csource_3_0_SOURCES = gdk-pixbuf-csource.c
+gdk_pixbuf_csource_3_0_LDADD = $(LDADDS)
-gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_3_0_DEPENDENCIES = $(DEPS)
+gdk_pixbuf_query_loaders_3_0_LDADD = $(LDADDS)
-gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+gdk_pixbuf_query_loaders_3_0_SOURCES = queryloaders.c
#
# The GdkPixBuf library
#
-libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
-libgdk_pixbuf_2_0_la_SOURCES = \
+libgdk_pixbufincludedir = $(includedir)/gtk-3.0/gdk-pixbuf
+libgdk_pixbuf_3_0_la_SOURCES = \
gdk-pixbuf-i18n.h \
gdk-pixbuf.c \
gdk-pixbuf-animation.c \
@@ -552,7 +552,7 @@ libgdk_pixbuf_2_0_la_SOURCES = \
gdk-pixdata.c \
gdk-pixbuf-enum-types.c
-libgdk_pixbuf_2_0_la_LDFLAGS = \
+libgdk_pixbuf_3_0_la_LDFLAGS = \
$(gdk_pixbuf_win32_res_ldflag) \
-version-info $(LT_VERSION_INFO) \
$(LIBTOOL_EXPORT_OPTIONS) \
@@ -560,8 +560,8 @@ libgdk_pixbuf_2_0_la_LDFLAGS = \
$(gdk_pixbuf_symbols)
-libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
-libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
+libgdk_pixbuf_3_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
+libgdk_pixbuf_3_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
gdk_pixbuf_headers = \
gdk-pixbuf.h \
@@ -677,15 +677,15 @@ EXTRA_DIST += \
if HAVE_INTROSPECTION
-GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
-GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
-GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
-GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
-GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES)
-GdkPixbuf_2_0_gir_FILES = \
+GdkPixbuf-3.0.gir: libgdk_pixbuf-3.0.la Makefile
+GdkPixbuf_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
+GdkPixbuf_3_0_gir_INCLUDES = GModule-2.0 Gio-2.0
+GdkPixbuf_3_0_gir_LIBS = libgdk_pixbuf-3.0.la
+GdkPixbuf_3_0_gir_CFLAGS = $(INCLUDES)
+GdkPixbuf_3_0_gir_FILES = \
$(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
- $(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
-INTROSPECTION_GIRS += GdkPixbuf-2.0.gir
+ $(addprefix $(srcdir)/,$(libgdk_pixbuf_3_0_la_SOURCES))
+INTROSPECTION_GIRS += GdkPixbuf-3.0.gir
girdir = $(datadir)/gir-1.0
dist_gir_DATA = $(INTROSPECTION_GIRS)
@@ -710,19 +710,19 @@ endif
# after the libraries are installed in their final locations.
install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gdk-pixbuf.loaders ; \
else \
echo "***" ; \
echo "*** Warning: gdk-pixbuf.loaders not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
- echo "*** system using gdk-pixbuf-query-loaders" ; \
+ echo "*** system using gdk-pixbuf-query-loaders-3.0" ; \
echo "***" ; \
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gdk-pixbuf.loaders
if CROSS_COMPILING
else
@@ -730,11 +730,11 @@ all-local: gdk-pixbuf.loaders
endif
if BUILD_DYNAMIC_MODULES
-gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
+gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders-3.0$(EXEEXT)
LOADERS=`echo libpixbufloader-*.la` ; \
if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 $$LOADERS > ./gdk-pixbuf.loaders ;\
else \
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
touch gdk-pixbuf.loaders; \
diff --git a/gdk-pixbuf/gdk-pixbuf-csource.c b/gdk-pixbuf/gdk-pixbuf-csource.c
index b774d0c..c9b0d4f 100644
--- a/gdk-pixbuf/gdk-pixbuf-csource.c
+++ b/gdk-pixbuf/gdk-pixbuf-csource.c
@@ -31,8 +31,8 @@
/* --- defines --- */
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "Gdk-Pixbuf-CSource"
-#define PRG_NAME "gdk-pixbuf-csource"
-#define PKG_NAME "Gtk+"
+#define PRG_NAME "gdk-pixbuf-csource-3.0"
+#define PKG_NAME "GTK+"
#define PKG_HTTP_HOME "http://www.gtk.org";
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index 71805d4..e9b5fc4 100644
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -274,7 +274,7 @@ int main (int argc, char **argv)
"# Automatically generated file, do not edit\n"
"# Created by %s from gtk+-%s\n"
"#\n",
- (prgname ? prgname : "gdk-pixbuf-query-loaders"),
+ (prgname ? prgname : "gdk-pixbuf-query-loaders-3.0"),
GDK_PIXBUF_VERSION);
if (argc == 1) {
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 70248a4..c0bfea0 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -160,7 +160,7 @@ gdk_built_sources = \
# setup GDK sources and their dependencies
#
-gdkincludedir = $(includedir)/gtk-2.0/gdk
+gdkincludedir = $(includedir)/gtk-3.0/gdk
gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
common_sources = \
@@ -170,26 +170,26 @@ common_sources = \
gdkmarshalers.c \
gdkmarshalers.h
-libgdk_directfb_2_0_la_SOURCES = $(common_sources)
-libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
+libgdk_directfb_3_0_la_SOURCES = $(common_sources)
+libgdk_directfb_3_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_directfb_2_0_la_LDFLAGS = $(LDADD)
+libgdk_directfb_3_0_la_LDFLAGS = $(LDADD)
-libgdk_x11_2_0_la_SOURCES = $(common_sources)
-libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
+libgdk_x11_3_0_la_SOURCES = $(common_sources)
+libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
+libgdk_x11_3_0_la_LDFLAGS = $(LDADD)
-libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
+libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_quartz_2_0_la_LDFLAGS = $(LDADD)
+libgdk_quartz_3_0_la_LDFLAGS = $(LDADD)
-libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
-libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
+libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
+libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
+libgdk_win32_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
if HAVE_INTROSPECTION
@@ -200,13 +200,13 @@ introspection_files = \
gdkenumtypes.h \
$(srcdir)/x11/*.c
-Gdk-2.0.gir: $(gdktargetlib) Makefile
-Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
-Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-Gdk_2_0_gir_LIBS = $(gdktargetlib)
-Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
-Gdk_2_0_gir_CFLAGS = $(INCLUDES)
-INTROSPECTION_GIRS += Gdk-2.0.gir
+Gdk-3.0.gir: $(gdktargetlib) Makefile
+Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
+Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-3.0 Pango-1.0
+Gdk_3_0_gir_LIBS = $(gdktargetlib)
+Gdk_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+INTROSPECTION_GIRS += Gdk-3.0.gir
girdir = $(datadir)/gir-1.0
dist_gir_DATA = $(INTROSPECTION_GIRS)
@@ -219,9 +219,9 @@ endif
if OS_WIN32
install-def-file: gdk.def
- $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
+ $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def
+ -rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
else
install-def-file:
uninstall-def-file:
@@ -261,7 +261,7 @@ endif
lib_LTLIBRARIES = $(gdktargetlib)
-EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgdk-x11-3.0.la libgdk-win32-3.0.la libgdk-quartz-3.0.la libgdk-directfb-3.0.la
MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
EXTRA_DIST += $(gdk_built_sources)
@@ -270,7 +270,7 @@ EXTRA_HEADERS =
#
# Rule to install gdkconfig.h header file
#
-configexecincludedir = $(libdir)/gtk-2.0/include
+configexecincludedir = $(libdir)/gtk-3.0/include
#configexecinclude_DATA = gdkconfig.h
install-exec-local: gdkconfig.h
@@ -325,7 +325,7 @@ stamp-gc-h: $(top_builddir)/config.status
dist-hook: ../build/win32/vs9/gdk.vcproj
../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
- for F in $(libgdk_win32_2_0_la_SOURCES); do \
+ for F in $(libgdk_win32_3_0_la_SOURCES); do \
case $$F in \
*.c) echo ' <File RelativePath="..\..\..\gdk\'$$F'" />' \
;; \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 5d41ec8..fd4067c 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
-libgdkincludedir = $(includedir)/gtk-2.0/gdk
+libgdkincludedir = $(includedir)/gtk-3.0/gdk
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
diff --git a/gtk+-2.0-uninstalled.pc.in b/gtk+-3.0-uninstalled.pc.in
similarity index 84%
rename from gtk+-2.0-uninstalled.pc.in
rename to gtk+-3.0-uninstalled.pc.in
index d89c856..238ad6f 100644
--- a/gtk+-2.0-uninstalled.pc.in
+++ b/gtk+-3.0-uninstalled.pc.in
@@ -5,6 +5,6 @@ gtk_binary_version= GTK_BINARY_VERSION@
Name: GTK+ Uninstalled
Description: GTK+ Graphical UI Library (${target} target), Not Installed
Version: @VERSION@
-Requires: gdk-${target}-2.0-uninstalled @GTK_PACKAGES@
+Requires: gdk-${target}- GTK_API_VERSION@-uninstalled @GTK_PACKAGES@
Libs: ${pc_top_builddir}/${pcfiledir}/gtk/libgtk-${target}- GTK_API_VERSION@.la @GTK_EXTRA_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GTK_EXTRA_CFLAGS@
diff --git a/gtk+-2.0.pc.in b/gtk+-3.0.pc.in
similarity index 72%
rename from gtk+-2.0.pc.in
rename to gtk+-3.0.pc.in
index 46853e1..c159af1 100644
--- a/gtk+-2.0.pc.in
+++ b/gtk+-3.0.pc.in
@@ -10,6 +10,6 @@ gtk_host= host@
Name: GTK+
Description: GTK+ Graphical UI Library (${target} target)
Version: @VERSION@
-Requires: gdk-${target}-2.0 @GTK_PACKAGES@
+Requires: gdk-${target}- GTK_API_VERSION@ @GTK_PACKAGES@
Libs: -L${libdir} -lgtk-${target}- GTK_API_VERSION@ @GTK_EXTRA_LIBS@
-Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
+Cflags: -I${includedir}/gtk- GTK_API_VERSION@ @GTK_EXTRA_CFLAGS@
diff --git a/gtk+-unix-print-2.0.pc.in b/gtk+-unix-print-3.0.pc.in
similarity index 66%
rename from gtk+-unix-print-2.0.pc.in
rename to gtk+-unix-print-3.0.pc.in
index a0fe8f0..5b8462a 100644
--- a/gtk+-unix-print-2.0.pc.in
+++ b/gtk+-unix-print-3.0.pc.in
@@ -10,5 +10,5 @@ gtk_host= host@
Name: GTK+
Description: GTK+ Unix print support
Version: @VERSION@
-Requires: gtk+-${target}-2.0 @GTK_PACKAGES@
-Cflags: -I${includedir}/gtk-unix-print-2.0
+Requires: gtk+-${target}- GTK_API_VERSION@ @GTK_PACKAGES@
+Cflags: -I${includedir}/gtk- GTK_API_VERSION@/unix-print
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 5670626..2a0093e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -77,9 +77,9 @@ gtk-win32-res.o : gtk-win32.rc
$(WINDRES) gtk-win32.rc $@
install-def-file: gtk.def
- $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+ $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
uninstall-def-file:
- -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+ -rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
else
install-def-file:
uninstall-def-file:
@@ -122,7 +122,7 @@ if OS_LINUX
TESTS += abicheck.sh pltcheck.sh
endif
-libgtkincludedir = $(includedir)/gtk-2.0/gtk
+libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
@@ -832,48 +832,48 @@ gtktestutils.c: gtktypefuncs.c
# target platform:
lib_LTLIBRARIES = $(gtktargetlib)
-gtkincludedir = $(includedir)/gtk-2.0/gtk
+gtkincludedir = $(includedir)/gtk-3.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
-gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk
+gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
+libgtk_x11_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_win32_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_quartz_3_0_la_SOURCES = $(gtk_c_sources)
+libgtk_directfb_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
-libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_x11_3_0_la_LDFLAGS = $(libtool_opts)
+libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+libgtk_quartz_3_0_la_LDFLAGS = $(libtool_opts)
+libgtk_directfb_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_x11_2_0_la_LIBADD = $(libadd)
-libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_quartz_2_0_la_LIBADD = $(libadd)
-libgtk_directfb_2_0_la_LIBADD = $(libadd)
+libgtk_x11_3_0_la_LIBADD = $(libadd)
+libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_quartz_3_0_la_LIBADD = $(libadd)
+libgtk_directfb_3_0_la_LIBADD = $(libadd)
-libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
-libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
-libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
+libgtk_x11_3_0_la_DEPENDENCIES = $(deps)
+libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_quartz_3_0_la_DEPENDENCIES = $(deps)
+libgtk_directfb_3_0_la_DEPENDENCIES = $(deps)
if USE_WIN32
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-3.0.la libgtk-win32-3.0.la libgtk-quartz-3.0.la libgtk-directfb-3.0.la
-install-exec-hook:
+install-exec-hook:
if DISABLE_EXPLICIT_DEPS
$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
endif
if USE_QUARTZ
install-mac-key-theme:
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key
+ $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
uninstall-mac-key-theme:
- rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-2.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
else
install-mac-key-theme:
uninstall-mac-key-theme:
@@ -893,17 +893,17 @@ dist-hook: ../build/win32/vs9/gtk.vcproj
# Install a RC file for the default GTK+ theme, and key themes
install-data-local: install-ms-lib install-def-file install-mac-key-theme
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
- $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key
+ $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key
+ $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
- rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
- rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
- rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
@@ -929,17 +929,17 @@ introspection_files = \
gtktypebuiltins.h \
gtktypebuiltins.c
-Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
-Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
-Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
-Gtk_2_0_gir_CFLAGS = \
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
+Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
+Gtk_3_0_gir_CFLAGS = \
$(INCLUDES) \
-UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_2_0_gir_LIBS = $(gtktargetlib)
-Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
-INTROSPECTION_GIRS += Gtk-2.0.gir
+Gtk_3_0_gir_LIBS = $(gtktargetlib)
+Gtk_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += Gtk-3.0.gir
girdir = $(datadir)/gir-1.0
dist_gir_DATA = $(INTROSPECTION_GIRS)
@@ -954,10 +954,10 @@ endif
# Installed tools
#
bin_PROGRAMS = \
- gtk-query-immodules-2.0 \
- gtk-update-icon-cache
+ gtk-query-immodules-3.0 \
+ gtk-update-icon-cache-3.0
-bin_SCRIPTS = gtk-builder-convert
+bin_SCRIPTS = gtk-builder-convert-3.0
if OS_WIN32
@@ -992,17 +992,17 @@ gtk-update-icon-cache.exe.manifest:
endif
-gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
-gtk_query_immodules_2_0_LDADD = $(LDADDS)
+gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
+gtk_query_immodules_3_0_LDADD = $(LDADDS)
-gtk_query_immodules_2_0_SOURCES = queryimmodules.c
+gtk_query_immodules_3_0_SOURCES = queryimmodules.c
-gtk_update_icon_cache_LDADD = \
+gtk_update_icon_cache_3_0_LDADD = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(GDK_PIXBUF_DEP_LIBS)
-gtk_update_icon_cache_SOURCES = \
+gtk_update_icon_cache_3_0_SOURCES = \
updateiconcache.c
.PHONY: files test test-debug
@@ -1309,11 +1309,11 @@ gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
else
gtk_update_icon_cache_program = \
GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
- ./gtk-update-icon-cache
+ ./gtk-update-icon-cache-3.0
endif
gtkbuiltincache.h: @REBUILD@ stamp-icons
- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache-3.0$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
$(gtk_update_icon_cache_program) --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert-3.0
similarity index 99%
rename from gtk/gtk-builder-convert
rename to gtk/gtk-builder-convert-3.0
index a641b33..4cae240 100755
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert-3.0
@@ -21,7 +21,7 @@
# TODO:
# Toolbars
-"""Usage: gtk-builder-convert [OPTION] [INPUT] [OUTPUT]
+"""Usage: gtk-builder-convert-3.0 [OPTION] [INPUT] [OUTPUT]
Converts Glade files into XML files which can be loaded with GtkBuilder.
The [INPUT] file is
@@ -32,7 +32,7 @@ The [INPUT] file is
When OUTPUT is -, write to standard output.
Examples:
- gtk-builder-convert preference.glade preferences.ui
+ gtk-builder-convert-3.0 preference.glade preferences.ui
Report bugs to http://bugzilla.gnome.org/.""";
@@ -258,7 +258,7 @@ class GtkBuilderConverter(object):
for node in objects:
self._convert(node.getAttribute("class"), node)
if self._get_object(node.getAttribute('id')) is not None:
- print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
+ print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
self.objects[node.getAttribute('id')] = node
# Convert Gazpachos UI tag
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 7341b63..c64678a 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -255,7 +255,7 @@
* You can change these defaults to something else. For
* example, to add a <keycap>Shift</keycap> modifier to a few
* of the default bindings, you can include the following
- * fragment in your <filename>.gtkrc-2.0</filename> file:
+ * fragment in your <filename>.gtkrc-3.0</filename> file:
* </para>
* <programlisting>
* binding "my-own-gtkfilechooser-bindings" {
@@ -330,7 +330,7 @@
* frequently. You could then create an <keycombo>
* <keycap>Alt</keycap> <keycap>M</keycap> </keycombo>
* shortcut by including the following in your
- * <filename>.gtkrc-2.0</filename>:
+ * <filename>.gtkrc-3.0</filename>:
* <programlisting>
* binding "misc-shortcut" {
* bind "<Alt>M" {
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 2768b0b..7aec5c1 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -96,7 +96,7 @@
*
* After a new loadable input method module has been installed on the system,
* the configuration file <filename>gtk.immodules</filename> needs to be
- * regenerated by <link linkend="gtk-query-immodules-2.0">gtk-query-immodules-2.0</link>,
+ * regenerated by <link linkend="gtk-query-immodules-3.0">gtk-query-immodules-3.0</link>,
* in order for the new input method to become available to GTK+ applications.
*/
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index a6b40d8..b0b0e7e 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -66,15 +66,15 @@ get_module_path (void)
home_dir = g_get_home_dir();
if (home_dir)
- home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
+ home_gtk_dir = g_build_filename (home_dir, ".gtk-3.0", NULL);
module_path_env = g_getenv ("GTK_PATH");
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
if (exe_prefix)
- default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL);
+ default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL);
else
- default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", NULL);
+ default_dir = g_build_filename (GTK_LIBDIR, "gtk-3.0", NULL);
if (module_path_env && home_gtk_dir)
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 7ddd331..a23a605 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -399,9 +399,9 @@ gtk_rc_make_default_dir (const gchar *type)
var = g_getenv ("GTK_EXE_PREFIX");
if (var)
- path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
+ path = g_build_filename (var, "lib", "gtk-3.0", GTK_BINARY_VERSION, type, NULL);
else
- path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
+ path = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, type, NULL);
return path;
}
@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtk.immodules", NULL);
}
return result;
@@ -522,7 +522,7 @@ gtk_rc_add_initial_default_files (void)
else
{
const gchar *home;
- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL);
gtk_rc_add_default_file (str);
g_free (str);
@@ -530,7 +530,7 @@ gtk_rc_add_initial_default_files (void)
home = g_get_home_dir ();
if (home)
{
- str = g_build_filename (home, ".gtkrc-2.0", NULL);
+ str = g_build_filename (home, ".gtkrc-3.0", NULL);
gtk_rc_add_default_file (str);
g_free (str);
}
@@ -795,11 +795,11 @@ gtk_rc_parse_named (GtkRcContext *context,
gchar *subpath;
if (type)
- subpath = g_strconcat ("gtk-2.0-", type,
+ subpath = g_strconcat ("gtk-3.0-", type,
G_DIR_SEPARATOR_S "gtkrc",
NULL);
else
- subpath = g_strdup ("gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ subpath = g_strdup ("gtk-3.0" G_DIR_SEPARATOR_S "gtkrc");
/* First look in the users home directory
*/
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index d257f2b..6b9b3e4 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -63,7 +63,7 @@ crossingevents_SOURCES = crossingevents.c
crossingevents_LDADD = $(progs_ldadd)
# this doesn't work in make distcheck, since it doesn't
-# find file-chooser-test-dir
+# find file-chooser-test-dir
# TEST_PROGS += filechooser
filechooser_SOURCES = filechooser.c pixbuf-init.c
filechooser_LDADD = $(progs_ldadd)
@@ -76,7 +76,7 @@ builder_LDFLAGS = -export-dynamic
if OS_UNIX
TEST_PROGS += defaultvalue
endif
-defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c
+defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c
defaultvalue_LDADD = $(progs_ldadd)
TEST_PROGS += textbuffer
diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index 541bf9e..663616d 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -13,12 +13,12 @@ INCLUDES = \
LDADDS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-3.0.la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
-enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
engine_LTLIBRARIES = libwimp.la
diff --git a/modules/engines/ms-windows/Theme/Makefile.am b/modules/engines/ms-windows/Theme/Makefile.am
index e7fad20..dcb2dac 100644
--- a/modules/engines/ms-windows/Theme/Makefile.am
+++ b/modules/engines/ms-windows/Theme/Makefile.am
@@ -1,5 +1,5 @@
include $(top_srcdir)/Makefile.decl
-SUBDIRS=gtk-2.0
+SUBDIRS=gtk-3.0
-include $(top_srcdir)/git.mk
diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am b/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.am
similarity index 100%
rename from modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am
rename to modules/engines/ms-windows/Theme/gtk-3.0/Makefile.am
diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-3.0/gtkrc
similarity index 100%
rename from modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
rename to modules/engines/ms-windows/Theme/gtk-3.0/gtkrc
diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index f90bdd5..05f6ebb 100644
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -12,12 +12,12 @@ INCLUDES = \
$(GTK_DEP_CFLAGS)
LDADDS = \
- $(GTK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \
- $(top_builddir)/gdk/$(gdktargetlib) \
- $(top_builddir)/gtk/$(gtktargetlib)
+ $(GTK_DEP_LIBS) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(top_builddir)/gtk/$(gtktargetlib)
-enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
engine_LTLIBRARIES = libpixmap.la
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 9a1bf2e..5c58211 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -27,7 +27,7 @@ LDADDS = \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
-moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
+moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_xim_la_SOURCES = \
@@ -40,7 +40,7 @@ if HAVE_X11R6
if INCLUDE_IM_XIM
STATIC_XIM_MODULE = libstatic-im-xim.la
else
-XIM_MODULE=im-xim.la
+XIM_MODULE=im-xim.la
endif
endif
@@ -152,7 +152,7 @@ if USE_WIN32
if INCLUDE_IM_IME
STATIC_IME_MODULE = libstatic-im-ime.la
else
-IME_MODULE=im-ime.la
+IME_MODULE=im-ime.la
endif
endif
@@ -172,7 +172,7 @@ else
MULTIPRESS_MODULE = im-multipress.la
endif
-imconffiledir = $(sysconfdir)/gtk-2.0
+imconffiledir = $(sysconfdir)/gtk-3.0
dist_imconffile_DATA = im-multipress.conf
if CROSS_COMPILING
@@ -189,21 +189,21 @@ endif
# after the libraries are installed in their final locations.
install-data-hook:
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
- $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-3.0 ; \
+ echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules" ; \
+ $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules ; \
else \
echo "***" ; \
echo "*** Warning: gtk.immodules not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
- echo "*** system using gtk-query-immodules-2.0" ; \
+ echo "*** system using gtk-query-immodules-3.0" ; \
echo "***" ; \
fi
uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules
if BUILD_DYNAMIC_MODULES
@@ -240,7 +240,7 @@ noinst_LTLIBRARIES = \
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+ $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > gtk.immodules
CLEANFILES = gtk.immodules
diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 882f14e..bdbcd98 100644
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -6,7 +6,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined
endif
-moduledir = $(libdir)/gtk-2.0/modules
+moduledir = $(libdir)/gtk-3.0/modules
module_LTLIBRARIES = libgail.la
gail_c_sources = \
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 463199e..de4d774 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -20,7 +20,7 @@ LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS)
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-cups.la
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index 904f768..30469e9 100644
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined
endif
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-file.la
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 12b7fce..379fa49 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -16,9 +16,9 @@ INCLUDES = \
LDADDS = \
$(GTK_DEP_LIBS) \
- $(top_builddir)/gtk/$(gtktargetlib)
+ $(top_builddir)/gtk/$(gtktargetlib)
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-lpr.la
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index 20904fa..2f61165 100644
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
no_undefined = -no-undefined
endif
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-test.la
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 5662b32..68d1818 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -63,7 +63,7 @@ stamp-marshalers.h: @REBUILD@ marshalers.list
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \
&& (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \
&& rm -f xgen-gmlh \
- && echo timestamp > $(@F)
+ && echo timestamp > $(@F)
marshalers.c: @REBUILD@ marshalers.list
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \
&& cp xgen-gmlc marshalers.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 692e90f..3083b29 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -254,15 +254,15 @@ testentryicons_SOURCES = \
testfilechooser_SOURCES = \
prop-editor.c \
- testfilechooser.c
+ testfilechooser.c
testfilechooserbutton_SOURCES = \
prop-editor.c \
- testfilechooserbutton.c
+ testfilechooserbutton.c
testgtk_SOURCES = \
prop-editor.c \
- testgtk.c
+ testgtk.c
testtreeedit_SOURCES = \
testtreeedit.c
@@ -272,11 +272,11 @@ testtreemodel_SOURCES = \
testtreeview_SOURCES = \
prop-editor.c \
- testtreeview.c
+ testtreeview.c
testtext_SOURCES = \
prop-editor.c \
- testtext.c
+ testtext.c
testtoolbar_SOURCES = \
testtoolbar.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
