Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make 3.0 parallel-installable to 2.x

Browse Source 
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.
This commit is contained in:
Matthias Clasen
2010-05-08 01:18:53 -04:00
parent 51ddf0e1c9
commit 7447ef0fc2
242 changed files with 5986 additions and 2393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Makefile.am
View File

@@ -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 \

22
configure.ac
View File

@@ -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

4
demos/Makefile.am
View File

@@ -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

4
demos/gtk-demo/Makefile.am
View File

@@ -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

8
docs/reference/gdk-pixbuf/Makefile.am
View File

@@ -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 $<

26
docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml → docs/reference/gdk-pixbuf/gdk-pixbuf-csource-3.0.xml
View File

@@ -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>

18
docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml → docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml
View File

@@ -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>

6
docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
View File

@@ -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">

20
docs/reference/gdk-pixbuf/tmpl/animation.sgml
View File

@@ -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>

3
docs/reference/gdk-pixbuf/tmpl/creating.sgml
View File

@@ -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>

3
docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
View File

@@ -28,6 +28,9 @@ Loading a pixbuf from a file.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
<para>

3
docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
View File

@@ -21,6 +21,9 @@ to a socket or store it in a database.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
<para>

4
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
View File

@@ -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:

30
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
View File

@@ -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:

3
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml
View File

@@ -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>

3
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml
View File

@@ -23,6 +23,9 @@ Initializing the &gdk-pixbuf; Xlib library.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
<para>

3
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml
View File

@@ -24,6 +24,9 @@ Rendering a pixbuf to an X drawable.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
<para>

10
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml
View File

@@ -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

3
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
View File

@@ -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;

3
docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
View File

@@ -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.

3
docs/reference/gdk-pixbuf/tmpl/inline.sgml
View File

@@ -22,6 +22,9 @@ into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GdkPixdata ##### -->
<para>

4
docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
View File

@@ -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:

16
docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
View File

@@ -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 ##### -->

3
docs/reference/gdk-pixbuf/tmpl/scaling.sgml
View File

@@ -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

3
docs/reference/gdk-pixbuf/tmpl/util.sgml
View File

@@ -20,6 +20,9 @@ Utility and miscellaneous convenience functions.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
<para>

3
docs/reference/gdk/tmpl/cairo_interaction.sgml
View File

@@ -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>

5
docs/reference/gdk/tmpl/colors.sgml
View File

@@ -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:

5
docs/reference/gdk/tmpl/cursors.sgml
View File

@@ -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:

4
docs/reference/gdk/tmpl/dnd.sgml
View File

@@ -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:

3
docs/reference/gdk/tmpl/drawing.sgml
View File

@@ -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

3
docs/reference/gdk/tmpl/event_structs.sgml
View File

@@ -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,

7
docs/reference/gdk/tmpl/events.sgml
View File

@@ -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:

3
docs/reference/gdk/tmpl/fonts.sgml
View File

@@ -264,6 +264,9 @@ here).
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GdkFont ##### -->
<para>
The <structname>GdkFont</structname> structure represents a font or fontset. It

3
docs/reference/gdk/tmpl/gcs.sgml
View File

@@ -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.

8
docs/reference/gdk/tmpl/gdk-unused.sgml
View File

@@ -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>

4
docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml
View File

@@ -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:

4
docs/reference/gdk/tmpl/gdkdisplay.sgml
View File

@@ -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:

4
docs/reference/gdk/tmpl/gdkdisplaymanager.sgml
View File

@@ -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:

4
docs/reference/gdk/tmpl/gdkscreen.sgml
View File

@@ -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:

3
docs/reference/gdk/tmpl/gdktesting.sgml
View File

@@ -18,6 +18,9 @@ They allow to simulate some user input.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_test_render_sync ##### -->
<para>

18
docs/reference/gdk/tmpl/general.sgml
View File

@@ -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.

3
docs/reference/gdk/tmpl/images.sgml
View File

@@ -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.

3
docs/reference/gdk/tmpl/input.sgml
View File

@@ -34,6 +34,9 @@ callbacks.</para></listitem>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### FUNCTION gdk_input_add_full ##### -->

5
docs/reference/gdk/tmpl/input_devices.sgml
View File

@@ -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:

13
docs/reference/gdk/tmpl/keys.sgml
View File

@@ -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>

4
docs/reference/gdk/tmpl/pango_interaction.sgml
View File

@@ -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:

9
docs/reference/gdk/tmpl/pixbufs.sgml
View File

@@ -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:

5
docs/reference/gdk/tmpl/pixmaps.sgml
View File

@@ -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>

3
docs/reference/gdk/tmpl/properties.sgml
View File

@@ -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

4
docs/reference/gdk/tmpl/regions.sgml
View File

@@ -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:

15
docs/reference/gdk/tmpl/rgb.sgml
View File

@@ -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.

3
docs/reference/gdk/tmpl/selections.sgml
View File

@@ -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.

6
docs/reference/gdk/tmpl/threads.sgml
View File

@@ -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 ##### -->

8
docs/reference/gdk/tmpl/visuals.sgml
View File

@@ -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:

8
docs/reference/gdk/tmpl/windows.sgml
View File

@@ -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:

8
docs/reference/gdk/tmpl/x_interaction.sgml
View File

@@ -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 ##### -->

15
docs/reference/gtk/Makefile.am
View File

@@ -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)

8
docs/reference/gtk/gtk-builder-convert.xml → docs/reference/gtk/gtk-builder-convert-3.0.xml
View File

@@ -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>

6
docs/reference/gtk/gtk-docs.sgml
View File

@@ -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" />

20
docs/reference/gtk/gtk-query-immodules-2.0.xml → docs/reference/gtk/gtk-query-immodules-3.0.xml
View File

@@ -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>

44
docs/reference/gtk/gtk-update-icon-cache.xml → docs/reference/gtk/gtk-update-icon-cache-3.0.xml
View File

@@ -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>

2
docs/reference/gtk/question_index.sgml
View File

@@ -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>

92
docs/reference/gtk/running.sgml
View File

@@ -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>

4654
docs/reference/gtk/tmpl/gtk-unused.sgml
View File

File diff suppressed because it is too large Load Diff

4
docs/reference/gtk/tmpl/gtkaccelmap.sgml
View File

@@ -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:

3
docs/reference/gtk/tmpl/gtkactiongroup.sgml
View File

@@ -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

3
docs/reference/gtk/tmpl/gtkadjustment.sgml
View File

@@ -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.

29
docs/reference/gtk/tmpl/gtkbindings.sgml
View File

@@ -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>

4
docs/reference/gtk/tmpl/gtkbutton.sgml
View File

@@ -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.

26
docs/reference/gtk/tmpl/gtkcalendar.sgml
View File

@@ -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:

3
docs/reference/gtk/tmpl/gtkcelleditable.sgml
View File

@@ -18,6 +18,9 @@ to be usable when editing the contents of a #GtkTreeView cell.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GtkCellEditable ##### -->
<para>

3
docs/reference/gtk/tmpl/gtkcelllayout.sgml
View File

@@ -58,6 +58,9 @@ content of the element is the attribute value.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GtkCellLayout ##### -->
<para>

3
docs/reference/gtk/tmpl/gtkcellrenderer.sgml
View File

@@ -51,6 +51,9 @@ respectively.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### ENUM GtkCellRendererState ##### -->
<para>
Tells how a cell is to be rendererd.

4
docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcellrendererspin.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcellrenderertext.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
View File

@@ -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:

13
docs/reference/gtk/tmpl/gtkcellview.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkcheckbutton.sgml
View File

@@ -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.

4
docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
View File

@@ -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.

3
docs/reference/gtk/tmpl/gtkclipboard.sgml
View File

@@ -87,6 +87,9 @@ Storing data on clipboards
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GtkClipboard ##### -->
<para>

4
docs/reference/gtk/tmpl/gtkcolorbutton.sgml
View File

@@ -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:

31
docs/reference/gtk/tmpl/gtkcolorsel.sgml
View File

@@ -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:

3
docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
View File

@@ -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.

5
docs/reference/gtk/tmpl/gtkcombobox.sgml
View File

@@ -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:

5
docs/reference/gtk/tmpl/gtkcomboboxentry.sgml
View File

@@ -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:

179
docs/reference/gtk/tmpl/gtkcontainer.sgml
View File

@@ -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:

4
docs/reference/gtk/tmpl/gtkdialog.sgml
View File

@@ -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.

25
docs/reference/gtk/tmpl/gtkdnd.sgml
View File

@@ -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 ##### -->

19
docs/reference/gtk/tmpl/gtkdrawingarea.sgml
View File

@@ -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.

3
docs/reference/gtk/tmpl/gtkeditable.sgml
View File

@@ -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

22
docs/reference/gtk/tmpl/gtkentry.sgml
View File

@@ -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.

3
docs/reference/gtk/tmpl/gtkentrybuffer.sgml
View File

@@ -17,6 +17,9 @@ GtkEntryBuffer
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GtkEntryBuffer ##### -->
<para>

4
docs/reference/gtk/tmpl/gtkentrycompletion.sgml
View File

@@ -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:

34
docs/reference/gtk/tmpl/gtkenums.sgml
View File

@@ -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

4
docs/reference/gtk/tmpl/gtkeventbox.sgml
View File

@@ -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.

3
docs/reference/gtk/tmpl/gtkexpander.sgml
View File

@@ -89,6 +89,9 @@ a &lt;child&gt; type attribute.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### SECTION Image ##### -->
<!-- ##### STRUCT GtkExpander ##### -->
<para>

Some files were not shown because too many files have changed in this diff Show More