summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-09-07 18:17:06 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-09-07 18:17:06 +0000
commit71337db92ebab296f2567d88f06d472d2f7584d5 (patch)
tree08518ab5fd33fdb8eea95b200b34c05246d35c55
parent21b538970edd944b694f44e8a7c9f7256dca02d3 (diff)
downloadgdk-pixbuf-71337db92ebab296f2567d88f06d472d2f7584d5.tar.gz
Move gtk-reference files into GTK+ tree proper.
Thu Sep 7 14:15:03 2000 Owen Taylor <otaylor@redhat.com> * gdk/* gtk/*: Move gtk-reference files into GTK+ tree proper. * Update sections.txt files to correspond to current code, tweak .sgml files and Makefiles to correspond. * gtk/tmpl/gtkradiomenuitem.sgml (this): Remove extra <para>
-rw-r--r--ChangeLog37
-rw-r--r--ChangeLog.pre-2-037
-rw-r--r--ChangeLog.pre-2-1037
-rw-r--r--ChangeLog.pre-2-237
-rw-r--r--ChangeLog.pre-2-437
-rw-r--r--ChangeLog.pre-2-637
-rw-r--r--ChangeLog.pre-2-837
-rw-r--r--configure.in12
-rw-r--r--docs/Changes-2.0.txt2
-rw-r--r--docs/reference/ChangeLog9
-rw-r--r--docs/reference/Makefile.am2
-rw-r--r--docs/reference/gdk-pixbuf/.cvsignore3
-rw-r--r--docs/reference/gdk-pixbuf/Makefile.am83
-rw-r--r--docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt527
-rw-r--r--docs/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt0
-rw-r--r--docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt85
-rw-r--r--docs/reference/gdk-pixbuf/gdk-pixbuf.sgml15
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/animation.sgml26
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/creating.sgml4
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/file-loading.sgml3
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/from-drawables.sgml43
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml28
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml252
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml24
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/gnome-canvas-pixbuf.sgml301
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml75
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/module_interface.sgml (renamed from docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-io.sgml)32
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/refcounting.sgml41
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/rendering.sgml126
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/scaling.sgml10
-rw-r--r--docs/reference/gdk-pixbuf/tmpl/util.sgml8
-rw-r--r--docs/reference/gdk/Makefile.am146
-rw-r--r--docs/reference/gdk/gdk-decl.txt4880
-rw-r--r--docs/reference/gdk/gdk-docs.sgml14
-rw-r--r--docs/reference/gdk/gdk-overrides.txt28
-rw-r--r--docs/reference/gdk/gdk-sections.txt303
-rw-r--r--docs/reference/gdk/tmpl/colors.sgml4
-rw-r--r--docs/reference/gdk/tmpl/cursors.sgml21
-rw-r--r--docs/reference/gdk/tmpl/dnd.sgml4
-rw-r--r--docs/reference/gdk/tmpl/drawing.sgml153
-rw-r--r--docs/reference/gdk/tmpl/event_structs.sgml130
-rw-r--r--docs/reference/gdk/tmpl/events.sgml20
-rw-r--r--docs/reference/gdk/tmpl/fonts.sgml26
-rw-r--r--docs/reference/gdk/tmpl/gcs.sgml73
-rw-r--r--docs/reference/gdk/tmpl/gdk-unused.sgml195
-rw-r--r--docs/reference/gdk/tmpl/general.sgml39
-rw-r--r--docs/reference/gdk/tmpl/images.sgml26
-rw-r--r--docs/reference/gdk/tmpl/input_devices.sgml253
-rw-r--r--docs/reference/gdk/tmpl/keys.sgml28
-rw-r--r--docs/reference/gdk/tmpl/pixmaps.sgml16
-rw-r--r--docs/reference/gdk/tmpl/regions.sgml172
-rw-r--r--docs/reference/gdk/tmpl/rgb.sgml39
-rw-r--r--docs/reference/gdk/tmpl/threads.sgml12
-rw-r--r--docs/reference/gdk/tmpl/windows.sgml172
-rw-r--r--docs/reference/gtk/.cvsignore1
-rw-r--r--docs/reference/gtk/Makefile.am156
-rw-r--r--docs/reference/gtk/gtk-decl.txt4979
-rw-r--r--docs/reference/gtk/gtk-docs.sgml18
-rw-r--r--docs/reference/gtk/gtk-overrides.txt13
-rw-r--r--docs/reference/gtk/gtk-sections.txt729
-rw-r--r--docs/reference/gtk/gtk.args538
-rw-r--r--docs/reference/gtk/gtk.hierarchy12
-rw-r--r--docs/reference/gtk/gtk.signals227
-rw-r--r--docs/reference/gtk/gtk.types7
-rw-r--r--docs/reference/gtk/tmpl/gtk-unused.sgml866
-rw-r--r--docs/reference/gtk/tmpl/gtkaccelgroup.sgml22
-rw-r--r--docs/reference/gtk/tmpl/gtkarg.sgml27
-rw-r--r--docs/reference/gtk/tmpl/gtkaspectframe.sgml20
-rw-r--r--docs/reference/gtk/tmpl/gtkclist.sgml14
-rw-r--r--docs/reference/gtk/tmpl/gtkcolorsel.sgml100
-rw-r--r--docs/reference/gtk/tmpl/gtkcolorseldlg.sgml2
-rw-r--r--docs/reference/gtk/tmpl/gtkcontainer.sgml34
-rw-r--r--docs/reference/gtk/tmpl/gtkcurve.sgml25
-rw-r--r--docs/reference/gtk/tmpl/gtkdebug.sgml42
-rw-r--r--docs/reference/gtk/tmpl/gtkenums.sgml6
-rw-r--r--docs/reference/gtk/tmpl/gtkfeatures.sgml45
-rw-r--r--docs/reference/gtk/tmpl/gtkfontsel.sgml26
-rw-r--r--docs/reference/gtk/tmpl/gtkfontseldlg.sgml49
-rw-r--r--docs/reference/gtk/tmpl/gtkframe.sgml11
-rw-r--r--docs/reference/gtk/tmpl/gtkhandlebox.sgml14
-rw-r--r--docs/reference/gtk/tmpl/gtkimcontext.sgml96
-rw-r--r--docs/reference/gtk/tmpl/gtkimmulticontext.sgml30
-rw-r--r--docs/reference/gtk/tmpl/gtkitemfactory.sgml32
-rw-r--r--docs/reference/gtk/tmpl/gtklabel.sgml5
-rw-r--r--docs/reference/gtk/tmpl/gtklist.sgml20
-rw-r--r--docs/reference/gtk/tmpl/gtkmain.sgml14
-rw-r--r--docs/reference/gtk/tmpl/gtkmenu.sgml27
-rw-r--r--docs/reference/gtk/tmpl/gtkmenuitem.sgml2
-rw-r--r--docs/reference/gtk/tmpl/gtkmenushell.sgml8
-rw-r--r--docs/reference/gtk/tmpl/gtknotebook.sgml67
-rw-r--r--docs/reference/gtk/tmpl/gtkobject.sgml54
-rw-r--r--docs/reference/gtk/tmpl/gtkoptionmenu.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtkpaned.sgml42
-rw-r--r--docs/reference/gtk/tmpl/gtkpreview.sgml7
-rw-r--r--docs/reference/gtk/tmpl/gtkprivate.sgml120
-rw-r--r--docs/reference/gtk/tmpl/gtkprogress.sgml4
-rw-r--r--docs/reference/gtk/tmpl/gtkprogressbar.sgml53
-rw-r--r--docs/reference/gtk/tmpl/gtkradiomenuitem.sgml1
-rw-r--r--docs/reference/gtk/tmpl/gtkrc.sgml36
-rw-r--r--docs/reference/gtk/tmpl/gtkruler.sgml20
-rw-r--r--docs/reference/gtk/tmpl/gtkscrolledwindow.sgml32
-rw-r--r--docs/reference/gtk/tmpl/gtkspinbutton.sgml24
-rw-r--r--docs/reference/gtk/tmpl/gtkstyle.sgml22
-rw-r--r--docs/reference/gtk/tmpl/gtktextbuffer.sgml550
-rw-r--r--docs/reference/gtk/tmpl/gtktextiter.sgml570
-rw-r--r--docs/reference/gtk/tmpl/gtktextmark.sgml66
-rw-r--r--docs/reference/gtk/tmpl/gtktexttag.sgml402
-rw-r--r--docs/reference/gtk/tmpl/gtktexttagtable.sgml105
-rw-r--r--docs/reference/gtk/tmpl/gtktextview.sgml315
-rw-r--r--docs/reference/gtk/tmpl/gtkthemes.sgml23
-rw-r--r--docs/reference/gtk/tmpl/gtktipsquery.sgml55
-rw-r--r--docs/reference/gtk/tmpl/gtktoolbar.sgml25
-rw-r--r--docs/reference/gtk/tmpl/gtktooltips.sgml3
-rw-r--r--docs/reference/gtk/tmpl/gtktypeutils.sgml287
-rw-r--r--docs/reference/gtk/tmpl/gtkvbbox.sgml3
-rw-r--r--docs/reference/gtk/tmpl/gtkwidget.sgml196
-rw-r--r--docs/reference/gtk/tmpl/gtkwindow.sgml54
117 files changed, 13442 insertions, 6644 deletions
diff --git a/ChangeLog b/ChangeLog
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 01c3c11dc..58a4137d5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,36 @@
+Thu Sep 7 11:47:02 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
+ Doc comment fixing. (Mostly non-matching parameter names.)
+
+ * gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
+ comments a little to avoid looking like a doc comment.
+
+ * gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
+ GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
+ conversions be changed to GError?)
+
+ * gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
+ Move private #defines into .c file.
+
+ * gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
+ order of argument addition, remove duplicates.
+
+ * gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
+ parent class is FrameClass, not BinClass.
+
+ * gtk/gtk.h: Add gtkinvisible, which was missing.
+ (It's occasionalyl useful for client apps, if seldom.)
+
+ * gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
+ #define.
+
+Wed Sep 6 09:53:15 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkwindow-x11.c (gdk_window_new): Use X-space
+ coordinates when creating window, instead of GDK-space
+ coordinates. (Avoid BadValue on too large windows.)
+
2000-09-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in (use_mmx_asm): Remove conftest* after use along the
@@ -16,7 +49,9 @@
instead of g_basename.
2000-09-04 Elliot Lee <sopwith@redhat.com>
- * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid ANSI warning.
+
+ * gdk/gdkpixbuf.h: Put text after #endif inside a comment to avoid
+ ANSI warning.
Sun Sep 03 00:47:08 2000 George Lebl <jirka@5z.com>
diff --git a/configure.in b/configure.in
index 4b05b6f0f..d33a4fe30 100644
--- a/configure.in
+++ b/configure.in
@@ -870,6 +870,16 @@ AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
# Checks for gtk-doc and docbook-tools
##################################################
+AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+ HTML_DIR='${datadir}/gtk-doc/html'
+else
+ HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
AC_SUBST(HAVE_GTK_DOC)
@@ -1002,6 +1012,8 @@ demos/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/gdk-pixbuf/Makefile
+docs/reference/gdk/Makefile
+docs/reference/gtk/Makefile
docs/faq/Makefile
docs/tutorial/Makefile
gdk-pixbuf/Makefile
diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt
index 14cb9d009..437d73ffb 100644
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -147,7 +147,7 @@ Incompatible Changes from GTK+-1.2 to GTK+-1.4:
- The visual for a widget, and also the default visual is now derived
from the colormap for the widget and the default colormap.
- gtk_widget_set_visual(), gtk_widget_set_defualt_visual(), gtk_widget_push_visual()
+ gtk_widget_set_visual(), gtk_widget_set_default_visual(), gtk_widget_push_visual()
and gtk_widget_pop_visual() now do nothing. Since the visual always
had to match that of the colormap, it is safe to simply delete
all references to these functions.
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index b76e3993b..8e2332f8f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,12 @@
+Thu Sep 7 14:15:03 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/* gtk/*: Move gtk-reference files into GTK+ tree proper.
+
+ * Update sections.txt files to correspond to current code,
+ tweak .sgml files and Makefiles to correspond.
+
+ * gtk/tmpl/gtkradiomenuitem.sgml (this): Remove extra <para>
+
2000-06-14 Damon Chaplin <damon@helixcode.com>
* gtk/tmpl/gtktooltips.sgml: added a note about no-window widgets.
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 3bc73fc64..2cd7f681d 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = gdk-pixbuf \ No newline at end of file
+SUBDIRS = gdk-pixbuf gdk gtk \ No newline at end of file
diff --git a/docs/reference/gdk-pixbuf/.cvsignore b/docs/reference/gdk-pixbuf/.cvsignore
index 4a186dc1d..657a35978 100644
--- a/docs/reference/gdk-pixbuf/.cvsignore
+++ b/docs/reference/gdk-pixbuf/.cvsignore
@@ -2,4 +2,5 @@ Makefile
Makefile.in
html
sgml
-gdk-pixbuf.html
+gdk-pixbuf-decl-list.txt
+gdk-pixbuf-unused.txt
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 9535b90a5..f5cd156c1 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -9,63 +9,71 @@ DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR=$(GDK_PIXBUF_DIR)/gdk-pixbuf
-CFLAGS=`gnome-config --cflags gnomeui gdk_pixbuf gnomecanvaspixbuf`
-LDFLAGS=`gnome-config --libs gnomeui gdk_pixbuf gnomecanvaspixbuf`
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=
-HTML_DIR=$(datadir)/gnome/html
+# Header files to ignore when scanning
+IGNORE_HFILES=pixops.h pixops-internal.h
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+# Extra files to add when scanning
+EXTRA_HFILES= \
+ $(top_srcdir)/gtk/gdk-pixbuf-loader.h
+
+# CFLAGS and LDFLAGS for compiling scan program
+CFLAGS=
+LDFLAGS=
tmpl_sources = \
tmpl/animation.sgml \
tmpl/creating.sgml \
tmpl/file-loading.sgml \
- tmpl/from-drawables.sgml \
tmpl/gdk-pixbuf-loader.sgml \
tmpl/gdk-pixbuf-unused.sgml \
tmpl/gdk-pixbuf.sgml \
- tmpl/gnome-canvas-pixbuf.sgml \
+ tmpl/initialization_versions.sgml \
+ tmpl/module_interface.sgml \
tmpl/refcounting.sgml \
- tmpl/rendering.sgml \
tmpl/scaling.sgml \
tmpl/util.sgml
-gdk_pixbuf_docdir = $(HTML_DIR)
-gdk_pixbuf_doc_DATA = \
- gdk-pixbuf.html \
- gdk-pixbuf.hierarchy \
- gdk-pixbuf.types \
- gdk-pixbuf-decl.txt \
- gdk-pixbuf-sections.txt
-
+# Extra SGML files that are included by DOC_MAIN_SGML_FILE
content_files = \
compiling.sgml \
gdk-pixbuf.sgml
+####################################
+# Everything below here is generic #
+####################################
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
EXTRA_DIST = \
- $(gdk_pixbuf_doc_DATA) \
- $(content_files)
+ $(DOC_MAIN_SGML_FILE) \
+ $(content_files) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
if ENABLE_GTK_DOC
-gdk-pixbuf.html: html/book1.html
- -cd $(srcdir) && cp html/book1.html gdk-pixbuf.html
-else
-gdk-pixbuf.html:
-endif
+all-local: html/index.html
-html/book1.html: sgml/gdk-pixbuf-doc.bottom $(content_files)
- $(MAKE) html
+$(DOC_MODULE)-decl.txt:
+ $(MAKE) scan
-sgml/gdk-pixbuf-doc.bottom: $(tmpl_sources)
+$(tmpl_sources): $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ $(MAKE) templates
+
+sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
$(MAKE) sgml
+html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE) $(content_fiels)
+ $(MAKE) html
+endif
+
scan:
-(cd $(srcdir) \
- && env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \
- gtkdoc-scanobj --module=$(DOC_MODULE) \
- && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="pixops.h pixops-internal.h" )
+ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
-templates: scan
+templates:
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
sgml:
@@ -75,6 +83,8 @@ sgml:
html:
test -d $(srcdir)/html || mkdir $(srcdir)/html
-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @echo '-- Fixing Crossreferences'
+ gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local:
rm -f *~ *.bak *.signals *-unused.txt
@@ -94,11 +104,20 @@ install-data-local:
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
- echo '-- Fixing Crossreferences' ; \
- gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
fi)
-dist-hook:
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+ @echo "*** gtk-doc must be installed and enabled in order to make dist
+ @false
+endif
+
+dist-hook: dist-check-gtkdoc
mkdir $(distdir)/html
mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
deleted file mode 100644
index dc8992a95..000000000
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
+++ /dev/null
@@ -1,527 +0,0 @@
-<USER_FUNCTION>
-<NAME>ModulePreparedNotifyFunc</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf, gpointer user_data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>ModuleUpdatedNotifyFunc</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf,
- guint x, guint y,
- guint width, guint height,
- gpointer user_data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>ModuleFrameDoneNotifyFunc</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbufFrame *frame,
- gpointer user_data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>ModuleAnimationDoneNotifyFunc</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf,
- gpointer user_data
-</USER_FUNCTION>
-<STRUCT>
-<NAME>GdkPixbufModule</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufModule</NAME>
-struct GdkPixbufModule {
- char *module_name;
- gboolean (* format_check) (guchar *buffer, int size);
- GModule *module;
- GdkPixbuf *(* load) (FILE *f);
- GdkPixbuf *(* load_xpm_data) (const char **data);
-
- /* Incremental loading */
-
- gpointer (* begin_load) (ModulePreparedNotifyFunc prepare_func,
- ModuleUpdatedNotifyFunc update_func,
- ModuleFrameDoneNotifyFunc frame_done_func,
- ModuleAnimationDoneNotifyFunc anim_done_func,
- gpointer user_data);
- void (* stop_load) (gpointer context);
- gboolean (* load_increment) (gpointer context, const guchar *buf, guint size);
-
- /* Animation loading */
- GdkPixbufAnimation *(* load_animation) (FILE *f);
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_module</NAME>
-<RETURNS>GdkPixbufModule *</RETURNS>
-guchar *buffer, guint size
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_load_module</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbufModule *image_module
-</FUNCTION>
-<MACRO>
-<NAME>GDK_TYPE_PIXBUF_LOADER</NAME>
-#define GDK_TYPE_PIXBUF_LOADER (gdk_pixbuf_loader_get_type ())
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_LOADER</NAME>
-#define GDK_PIXBUF_LOADER(obj) (GTK_CHECK_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_LOADER_CLASS</NAME>
-#define GDK_PIXBUF_LOADER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-</MACRO>
-<MACRO>
-<NAME>GDK_IS_PIXBUF_LOADER</NAME>
-#define GDK_IS_PIXBUF_LOADER(obj) (GTK_CHECK_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
-</MACRO>
-<MACRO>
-<NAME>GDK_IS_PIXBUF_LOADER_CLASS</NAME>
-#define GDK_IS_PIXBUF_LOADER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
-</MACRO>
-<STRUCT>
-<NAME>GdkPixbufLoader</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufLoader</NAME>
-struct GdkPixbufLoader
-{
- GtkObject object;
-
- /* < Private > */
- gpointer private;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufLoaderClass</NAME>
-</STRUCT>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_get_type</NAME>
-<RETURNS>GtkType </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_new</NAME>
-<RETURNS>GdkPixbufLoader *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_write</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkPixbufLoader *loader,const guchar *buf,size_t count
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_get_pixbuf</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-GdkPixbufLoader *loader
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_get_animation</NAME>
-<RETURNS>GdkPixbufAnimation *</RETURNS>
-GdkPixbufLoader *loader
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_loader_close</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbufLoader *loader
-</FUNCTION>
-<ENUM>
-<NAME>GdkColorspace</NAME>
-typedef enum {
- GDK_COLORSPACE_RGB
-} GdkColorspace;
-</ENUM>
-<STRUCT>
-<NAME>GdkPixbuf</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufFrame</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufAnimation</NAME>
-</STRUCT>
-<USER_FUNCTION>
-<NAME>GdkPixbufDestroyNotify</NAME>
-<RETURNS>void </RETURNS>
-guchar *pixels, gpointer data
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GdkPixbufLastUnref</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf, gpointer data
-</USER_FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_ref</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_set_last_unref_handler</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf,GdkPixbufLastUnref last_unref_fn,gpointer last_unref_fn_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_finalize</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_colorspace</NAME>
-<RETURNS>GdkColorspace </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_n_channels</NAME>
-<RETURNS>int </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_has_alpha</NAME>
-<RETURNS>gboolean </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_bits_per_sample</NAME>
-<RETURNS>int </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_pixels</NAME>
-<RETURNS>guchar *</RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_width</NAME>
-<RETURNS>int </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_height</NAME>
-<RETURNS>int </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_rowstride</NAME>
-<RETURNS>int </RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_new</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample,int width, int height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_copy</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const GdkPixbuf *pixbuf
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_new_from_file</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const char *filename
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_new_from_data</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const guchar *data,GdkColorspace colorspace,gboolean has_alpha,int bits_per_sample,int width, int height,int rowstride,GdkPixbufDestroyNotify destroy_fn,gpointer destroy_fn_data
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_new_from_xpm_data</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const char **data
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_add_alpha</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const GdkPixbuf *pixbuf, gboolean substitute_color,guchar r, guchar g, guchar b
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_copy_area</NAME>
-<RETURNS>void </RETURNS>
-const GdkPixbuf *src_pixbuf,int src_x, int src_y,int width, int height,GdkPixbuf *dest_pixbuf,int dest_x, int dest_y
-</FUNCTION>
-<ENUM>
-<NAME>GdkPixbufAlphaMode</NAME>
-typedef enum {
- GDK_PIXBUF_ALPHA_BILEVEL,
- GDK_PIXBUF_ALPHA_FULL
-} GdkPixbufAlphaMode;
-</ENUM>
-<FUNCTION>
-<NAME>gdk_pixbuf_render_threshold_alpha</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf, GdkBitmap *bitmap,int src_x, int src_y,int dest_x, int dest_y,int width, int height,int alpha_threshold
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_render_to_drawable</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf,GdkDrawable *drawable, GdkGC *gc,int src_x, int src_y,int dest_x, int dest_y,int width, int height,GdkRgbDither dither,int x_dither, int y_dither
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_render_to_drawable_alpha</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf, GdkDrawable *drawable,int src_x, int src_y,int dest_x, int dest_y,int width, int height,GdkPixbufAlphaMode alpha_mode,int alpha_threshold,GdkRgbDither dither,int x_dither, int y_dither
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_render_pixmap_and_mask</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbuf *pixbuf,GdkPixmap **pixmap_return, GdkBitmap **mask_return,int alpha_threshold
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_get_from_drawable</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-GdkPixbuf *dest,GdkDrawable *src, GdkColormap *cmap,int src_x, int src_y,int dest_x, int dest_y,int width, int height
-</FUNCTION>
-<ENUM>
-<NAME>GdkInterpType</NAME>
-typedef enum {
- GDK_INTERP_NEAREST,
- GDK_INTERP_TILES,
- GDK_INTERP_BILINEAR,
- GDK_INTERP_HYPER
-} GdkInterpType;
-</ENUM>
-<FUNCTION>
-<NAME>gdk_pixbuf_scale</NAME>
-<RETURNS>void </RETURNS>
-const GdkPixbuf *src,GdkPixbuf *dest,int dest_x,int dest_y,int dest_width,int dest_height,double offset_x,double offset_y,double scale_x,double scale_y,GdkInterpType interp_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_composite</NAME>
-<RETURNS>void </RETURNS>
-const GdkPixbuf *src,GdkPixbuf *dest,int dest_x,int dest_y,int dest_width,int dest_height,double offset_x,double offset_y,double scale_x,double scale_y,GdkInterpType interp_type,int overall_alpha
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_composite_color</NAME>
-<RETURNS>void </RETURNS>
-const GdkPixbuf *src,GdkPixbuf *dest,int dest_x,int dest_y,int dest_width,int dest_height,double offset_x,double offset_y,double scale_x,double scale_y,GdkInterpType interp_type,int overall_alpha,int check_x,int check_y,int check_size,guint32 color1,guint32 color2
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_scale_simple</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const GdkPixbuf *src,int dest_width,int dest_height,GdkInterpType interp_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_composite_color_simple</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-const GdkPixbuf *src,int dest_width,int dest_height,GdkInterpType interp_type,int overall_alpha,int check_size,guint32 color1,guint32 color2
-</FUNCTION>
-<ENUM>
-<NAME>GdkPixbufFrameAction</NAME>
-typedef enum {
- GDK_PIXBUF_FRAME_RETAIN,
- GDK_PIXBUF_FRAME_DISPOSE,
- GDK_PIXBUF_FRAME_REVERT
-} GdkPixbufFrameAction;
-</ENUM>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_new_from_file</NAME>
-<RETURNS>GdkPixbufAnimation *</RETURNS>
-const char *filename
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_ref</NAME>
-<RETURNS>GdkPixbufAnimation *</RETURNS>
-GdkPixbufAnimation *animation
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkPixbufAnimation *animation
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_get_width</NAME>
-<RETURNS>int </RETURNS>
-GdkPixbufAnimation *animation
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_get_height</NAME>
-<RETURNS>int </RETURNS>
-GdkPixbufAnimation *animation
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_get_frames</NAME>
-<RETURNS>GList *</RETURNS>
-GdkPixbufAnimation *animation
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_animation_get_num_frames</NAME>
-<RETURNS>int </RETURNS>
-GdkPixbufAnimation *animation
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_frame_get_pixbuf</NAME>
-<RETURNS>GdkPixbuf *</RETURNS>
-GdkPixbufFrame *frame
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_frame_get_x_offset</NAME>
-<RETURNS>int </RETURNS>
-GdkPixbufFrame *frame
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_frame_get_y_offset</NAME>
-<RETURNS>int </RETURNS>
-GdkPixbufFrame *frame
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_frame_get_delay_time</NAME>
-<RETURNS>int </RETURNS>
-GdkPixbufFrame *frame
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_frame_get_action</NAME>
-<RETURNS>GdkPixbufFrameAction </RETURNS>
-GdkPixbufFrame *frame
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_preinit</NAME>
-<RETURNS>void </RETURNS>
-gpointer app, gpointer modinfo
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixbuf_postinit</NAME>
-<RETURNS>void </RETURNS>
-gpointer app, gpointer modinfo
-</FUNCTION>
-<MACRO>
-<NAME>GNOME_TYPE_CANVAS_PIXBUF</NAME>
-#define GNOME_TYPE_CANVAS_PIXBUF (gnome_canvas_pixbuf_get_type ())
-</MACRO>
-<MACRO>
-<NAME>GNOME_CANVAS_PIXBUF</NAME>
-#define GNOME_CANVAS_PIXBUF(obj) (GTK_CHECK_CAST ((obj), \
- GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbuf))
-</MACRO>
-<MACRO>
-<NAME>GNOME_CANVAS_PIXBUF_CLASS</NAME>
-#define GNOME_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
- GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufClass))
-</MACRO>
-<MACRO>
-<NAME>GNOME_IS_CANVAS_PIXBUF</NAME>
-#define GNOME_IS_CANVAS_PIXBUF(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CANVAS_PIXBUF))
-</MACRO>
-<MACRO>
-<NAME>GNOME_IS_CANVAS_PIXBUF_CLASS</NAME>
-#define GNOME_IS_CANVAS_PIXBUF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
- GNOME_TYPE_CANVAS_PIXBUF))
-</MACRO>
-<STRUCT>
-<NAME>GnomeCanvasPixbuf</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GnomeCanvasPixbufClass</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GnomeCanvasPixbuf</NAME>
-struct GnomeCanvasPixbuf {
- GnomeCanvasItem item;
-
- /* Private data */
- gpointer priv;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gnome_canvas_pixbuf_get_type</NAME>
-<RETURNS>GtkType </RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>GDK_PIXBUF_MAJOR</NAME>
-#define GDK_PIXBUF_MAJOR (0)
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_MINOR</NAME>
-#define GDK_PIXBUF_MINOR (7)
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_MICRO</NAME>
-#define GDK_PIXBUF_MICRO (0)
-</MACRO>
-<MACRO>
-<NAME>GDK_PIXBUF_VERSION</NAME>
-#define GDK_PIXBUF_VERSION "0.7.0"
-</MACRO>
-<VARIABLE>
-<NAME>gdk_pixbuf_version</NAME>
-extern const char *gdk_pixbuf_version;
-</VARIABLE>
-<STRUCT>
-<NAME>GdkPixbuf</NAME>
-struct GdkPixbuf {
- /* Reference count */
- int ref_count;
-
- /* Color space */
- GdkColorspace colorspace;
-
- /* Number of channels, alpha included */
- int n_channels;
-
- /* Bits per channel */
- int bits_per_sample;
-
- /* Size */
- int width, height;
-
- /* Offset between rows */
- int rowstride;
-
- /* The pixel array */
- guchar *pixels;
-
- /* Destroy notification function; it is supposed to free the pixel array */
- GdkPixbufDestroyNotify destroy_fn;
-
- /* User data for the destroy notification function */
- gpointer destroy_fn_data;
-
- /* Last unref handler, determines whether the pixbuf should be finalized */
- GdkPixbufLastUnref last_unref_fn;
-
- /* User data for the last unref handler */
- gpointer last_unref_fn_data;
-
- /* Do we have an alpha channel? */
- guint has_alpha : 1;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufFrame</NAME>
-struct GdkPixbufFrame {
- /* The pixbuf with this frame's image data */
- GdkPixbuf *pixbuf;
-
- /* Offsets for overlaying onto the animation's area */
- int x_offset;
- int y_offset;
-
- /* Frame duration in ms */
- int delay_time;
-
- /* Overlay mode */
- GdkPixbufFrameAction action;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPixbufAnimation</NAME>
-struct GdkPixbufAnimation {
- /* Reference count */
- int ref_count;
-
- /* Number of frames */
- int n_frames;
-
- /* List of GdkPixbufFrame structures */
- GList *frames;
-
- /* bounding box size */
- int width, height;
-};
-</STRUCT>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-overrides.txt
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
index e00f520fe..51192a064 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -1,9 +1,25 @@
<INCLUDE>gdk-pixbuf/gdk-pixbuf.h</INCLUDE>
<SECTION>
+<TITLE>Initialization and Versions</TITLE>
+<FILE>initialization_versions</FILE>
+gdk_pixbuf_init
+gdk_pixbuf_preinit
+gdk_pixbuf_postinit
+
+<SUBSECTION>
+gdk_pixbuf_version
+GDK_PIXBUF_VERSION
+GDK_PIXBUF_MAJOR
+GDK_PIXBUF_MINOR
+GDK_PIXBUF_MICRO
+</SECTION>
+
+<SECTION>
<FILE>gdk-pixbuf</FILE>
GdkColorspace
GdkPixbuf
+GdkPixbufClass
gdk_pixbuf_get_colorspace
gdk_pixbuf_get_n_channels
gdk_pixbuf_get_has_alpha
@@ -12,16 +28,24 @@ gdk_pixbuf_get_pixels
gdk_pixbuf_get_width
gdk_pixbuf_get_height
gdk_pixbuf_get_rowstride
+
+<SUBSECTION Standard>
+GDK_PIXBUF
+GDK_TYPE_PIXBUF
+GDK_IS_PIXBUF
+GDK_IS_PIXBUF_CLASS
+GDK_PIXBUF_CLASS
+GDK_PIXBUF_GET_CLASS
+
+<SUBSECTION Private>
+gdk_pixbuf_get_type
</SECTION>
<SECTION>
<FILE>refcounting</FILE>
GdkPixbufDestroyNotify
-GdkPixbufLastUnref
gdk_pixbuf_ref
gdk_pixbuf_unref
-gdk_pixbuf_set_last_unref_handler
-gdk_pixbuf_finalize
</SECTION>
<SECTION>
@@ -38,20 +62,6 @@ gdk_pixbuf_copy
</SECTION>
<SECTION>
-<FILE>rendering</FILE>
-GdkPixbufAlphaMode
-gdk_pixbuf_render_to_drawable_alpha
-gdk_pixbuf_render_to_drawable
-gdk_pixbuf_render_threshold_alpha
-gdk_pixbuf_render_pixmap_and_mask
-</SECTION>
-
-<SECTION>
-<FILE>from-drawables</FILE>
-gdk_pixbuf_get_from_drawable
-</SECTION>
-
-<SECTION>
<FILE>util</FILE>
gdk_pixbuf_add_alpha
gdk_pixbuf_copy_area
@@ -62,6 +72,7 @@ gdk_pixbuf_copy_area
GdkPixbufFrameAction
GdkPixbufFrame
GdkPixbufAnimation
+GdkPixbufAnimationClass
gdk_pixbuf_animation_new_from_file
gdk_pixbuf_animation_ref
gdk_pixbuf_animation_unref
@@ -74,6 +85,17 @@ gdk_pixbuf_frame_get_action
gdk_pixbuf_frame_get_y_offset
gdk_pixbuf_frame_get_delay_time
gdk_pixbuf_frame_get_x_offset
+
+<SUBSECTION Standard>
+GDK_PIXBUF_ANIMATION
+GDK_PIXBUF_ANIMATION_CLASS
+GDK_TYPE_PIXBUF_ANIMATION
+GDK_PIXBUF_ANIMATION_GET_CLASS
+GDK_IS_PIXBUF_ANIMATION_CLASS
+GDK_IS_PIXBUF_ANIMATION
+
+<SUBSECTION Private>
+gdk_pixbuf_animation_get_type
</SECTION>
<SECTION>
@@ -88,33 +110,34 @@ gdk_pixbuf_composite_color_simple
<SECTION>
<FILE>gdk-pixbuf-loader</FILE>
-GDK_PIXBUF_LOADER
<TITLE>GdkPixbufLoader</TITLE>
gdk_pixbuf_loader_new
+gdk_pixbuf_loader_new_with_type
gdk_pixbuf_loader_write
gdk_pixbuf_loader_get_pixbuf
gdk_pixbuf_loader_get_animation
gdk_pixbuf_loader_close
<SUBSECTION Standard>
+GDK_PIXBUF_LOADER
+GDK_PIXBUF_LOADER_GET_CLASS
GDK_TYPE_PIXBUF_LOADER
GDK_IS_PIXBUF_LOADER
-gdk_pixbuf_loader_get_type
GDK_PIXBUF_LOADER_CLASS
GDK_IS_PIXBUF_LOADER_CLASS
<SUBSECTION Private>
GdkPixbufLoader
+gdk_pixbuf_loader_get_type
</SECTION>
<SECTION>
-<FILE>gnome-canvas-pixbuf</FILE>
-GNOME_CANVAS_PIXBUF
-<TITLE>GnomeCanvasPixbuf</TITLE>
-<SUBSECTION Standard>
-GNOME_TYPE_CANVAS_PIXBUF
-GNOME_IS_CANVAS_PIXBUF
-gnome_canvas_pixbuf_get_type
-GNOME_CANVAS_PIXBUF_CLASS
-GNOME_IS_CANVAS_PIXBUF_CLASS
-<SUBSECTION Private>
-GnomeCanvasPixbuf
-</SECTION>
+<TITLE>Module Interface</TITLE>
+<FILE>module_interface</FILE>
+ModulePreparedNotifyFunc
+ModuleUpdatedNotifyFunc
+ModuleFrameDoneNotifyFunc
+ModuleAnimationDoneNotifyFunc
+GdkPixbufModule
+gdk_pixbuf_get_module
+gdk_pixbuf_get_named_module
+gdk_pixbuf_load_module
+</SECTION> \ No newline at end of file
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
index bafc2669f..16252c70a 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -1,4 +1,5 @@
<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!entity gdk-pixbuf-Initialization-and-Versions SYSTEM "sgml/initialization_versions.sgml">
<!entity gdk-pixbuf-gdk-pixbuf SYSTEM "sgml/gdk-pixbuf.sgml">
<!entity gdk-pixbuf-refcounting SYSTEM "sgml/refcounting.sgml">
<!entity gdk-pixbuf-file-loading SYSTEM "sgml/file-loading.sgml">
@@ -8,12 +9,13 @@
<!entity gdk-pixbuf-from-drawables SYSTEM "sgml/from-drawables.sgml">
<!entity gdk-pixbuf-util SYSTEM "sgml/util.sgml">
<!entity gdk-pixbuf-animation SYSTEM "sgml/animation.sgml">
+<!entity gdk-pixbuf-Module-Interface SYSTEM "sgml/module_interface.sgml">
<!entity GdkPixbufLoader SYSTEM "sgml/gdk-pixbuf-loader.sgml">
<!entity GnomeCanvasPixbuf SYSTEM "sgml/gnome-canvas-pixbuf.sgml">
<!entity Compiling SYSTEM "compiling.sgml">
]>
-<book>
+<book id="index">
<bookinfo>
<title>The <application>gdk-pixbuf</application> Library</title>
@@ -35,7 +37,7 @@
</copyright>
</bookinfo>
- <reference>
+ <reference id="api">
<title>API Reference</title>
<partintro>
@@ -47,18 +49,23 @@
</para>
</partintro>
+ &gdk-pixbuf-Initialization-and-Versions;
&gdk-pixbuf-gdk-pixbuf;
&gdk-pixbuf-refcounting;
&gdk-pixbuf-file-loading;
&gdk-pixbuf-creating;
- &gdk-pixbuf-rendering;
&gdk-pixbuf-scaling;
- &gdk-pixbuf-from-drawables;
&gdk-pixbuf-util;
&gdk-pixbuf-animation;
&GdkPixbufLoader;
&GnomeCanvasPixbuf;
</reference>
+ <reference id="internals">
+ <title>Internals</title>
+ &gdk-pixbuf-Module-Interface;
+ </reference>
+
&Compiling;
+
</book>
diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
index 500758f17..128863b5b 100644
--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
@@ -29,10 +29,8 @@ Animations as multi-frame structures.
@GDK_PIXBUF_FRAME_RETAIN: The previous image should remain displayed,
and will potentially be occluded by the new frame.
-
@GDK_PIXBUF_FRAME_DISPOSE: The animation will be reverted to the state
before the frame was shown.
-
@GDK_PIXBUF_FRAME_REVERT: The animation will be reverted to the first
frame.
@@ -44,12 +42,30 @@ frame.
action.
</para>
+@pixbuf:
+@x_offset:
+@y_offset:
+@delay_time:
+@action:
+
<!-- ##### STRUCT GdkPixbufAnimation ##### -->
<para>
This structure describes an animation, which is represented as a
list of #GdkPixbufFrame structures.
</para>
+@parent_instance:
+@n_frames:
+@frames:
+@width:
+@height:
+
+<!-- ##### STRUCT GdkPixbufAnimationClass ##### -->
+<para>
+
+</para>
+
+
<!-- ##### FUNCTION gdk_pixbuf_animation_new_from_file ##### -->
<para>
@@ -154,11 +170,11 @@ frame.
</para>
@frame:
-@Returns:
-
-<!--
+@Returns: <!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
End:
-->
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
index c8c3f7581..74cbe8159 100644
--- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml
@@ -88,9 +88,7 @@ Creating a pixbuf from image data that is already in memory.
</para>
@pixbuf:
-@Returns:
-
-<!--
+@Returns: <!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
diff --git a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
index 0d917c829..0a35bd4f4 100644
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -32,8 +32,7 @@ Loading a pixbuf from a file.
</para>
@filename:
-@Returns:
-<!--
+@Returns: <!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
diff --git a/docs/reference/gdk-pixbuf/tmpl/from-drawables.sgml b/docs/reference/gdk-pixbuf/tmpl/from-drawables.sgml
deleted file mode 100644
index c182f3d97..000000000
--- a/docs/reference/gdk-pixbuf/tmpl/from-drawables.sgml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Drawables to Pixbufs
-
-<!-- ##### SECTION Short_Description ##### -->
-Getting parts of a drawable's image data into a pixbuf.
-
-<!-- ##### SECTION Long_Description ##### -->
- <para>
- The functions in this section allow you to take the image data
- from a GDK drawable and dump it into a #GdkPixbuf. This can be
- used for screenshots and other special effects. Note that these
- operations can be expensive, since the image data has to be
- transferred from the X server to the client program and converted.
- </para>
-
-<!-- ##### SECTION See_Also ##### -->
- <para>
- gdk_image_get().
- </para>
-
-<!-- ##### FUNCTION gdk_pixbuf_get_from_drawable ##### -->
-<para>
-
-</para>
-
-@dest:
-@src:
-@cmap:
-@src_x:
-@src_y:
-@dest_x:
-@dest_y:
-@width:
-@height:
-@Returns:
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
--->
-
-
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
index 8cef09628..6ad7d7b91 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml
@@ -74,19 +74,20 @@ Application-driven progressive image loading.
gdk_pixbuf_new_from_file()
</para>
-<!-- ##### MACRO GDK_PIXBUF_LOADER ##### -->
- <para>
- Casts a #GtkObject to a #GdkPixbufLoader.
- </para>
+<!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
+<para>
-@obj: A GTK+ object.
+</para>
+
+@Returns:
-<!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
+<!-- ##### FUNCTION gdk_pixbuf_loader_new_with_type ##### -->
<para>
</para>
+@image_type:
@Returns:
@@ -136,6 +137,12 @@ Application-driven progressive image loading.
areas of an image that is being loaded.
</para>
+@gdkpixbufloader: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+@arg4:
+<!-- # Unused Parameters # -->
@loader: Loader which emitted the signal.
@x: X offset of upper-left corner of the updated area.
@y: Y offset of upper-left corner of the updated area.
@@ -151,6 +158,8 @@ Application-driven progressive image loading.
fetch the partially-loaded pixbuf.
</para>
+@gdkpixbufloader: the object which received the signal.
+<!-- # Unused Parameters # -->
@loader: Loader which emitted the signal.
<!-- ##### SIGNAL GdkPixbufLoader::frame-done ##### -->
@@ -159,6 +168,9 @@ Application-driven progressive image loading.
emitted for each frame in an animation data stream.
</para>
+@gdkpixbufloader: the object which received the signal.
+@arg1:
+<!-- # Unused Parameters # -->
@loader: Loader which emitted the signal.
@frame: Frame which just completed loading.
@@ -167,6 +179,8 @@ Application-driven progressive image loading.
This signal is emitted when an animation is done loading.
</para>
+@gdkpixbufloader: the object which received the signal.
+<!-- # Unused Parameters # -->
@loader: Loader which emitted the signal.
<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
@@ -177,6 +191,8 @@ Application-driven progressive image loading.
drives it.
</para>
+@gdkpixbufloader: the object which received the signal.
+<!-- # Unused Parameters # -->
@loader: Loader which emitted the signal.
<!--
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index 850e45fd9..366c8c445 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -1,59 +1,89 @@
-<!-- ##### FUNCTION gdk_pixbuf_load_module ##### -->
-<para>
-
-</para>
-
-@image_module:
+<!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### -->
+ <para>
+ A function of this type can be used to override the default
+ operation when a pixbuf loses its last reference, i.e. when
+ gdk_pixbuf_unref() is called on a #GdkPixbuf structure that has a
+ reference count of 1. This function should determine whether to
+ finalize the pixbuf by calling gdk_pixbuf_finalize(), or whether
+ to just resume normal execution. The last unref handler for a
+ #GdkPixbuf can be set using the
+ gdk_pixbuf_set_last_unref_handler() function. By default, pixbufs
+ will be finalized automatically if no last unref handler has been
+ defined.
+ </para>
-<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Short_Description ##### -->
+@pixbuf: The pixbuf that is losing its last reference.
+@data: User closure data.
+<!-- ##### SECTION ./tmpl/from-drawables.sgml:Title ##### -->
+Drawables to Pixbufs
-<!-- ##### STRUCT GdkPixbufModule ##### -->
+<!-- ##### ARG GnomeCanvasPixbuf:height_pixels ##### -->
<para>
</para>
-@module_name:
-@format_check:
-@module:
-@load:
-@load_xpm_data:
-@begin_load:
-@stop_load:
-@load_increment:
-<!-- ##### ARG GnomeCanvasPixbuf:x_set ##### -->
+<!-- ##### SECTION ./tmpl/rendering.sgml:See_Also ##### -->
<para>
- Determines whether the <link
- linkend="GnomeCanvasPixbuf--x">x</link> argument is used to
- translate the pixbuf from its logical origin in item-relative
- coordinates.
+ GdkRGB
</para>
-<!-- ##### USER_FUNCTION ModulePreparedNotifyFunc ##### -->
+<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
<para>
</para>
@pixbuf:
-@user_data:
-
-<!-- ##### FUNCTION gdk_pixbuf_get_module ##### -->
+@pixmap_return:
+@mask_return:
+@alpha_threshold: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable ##### -->
<para>
</para>
-@buffer:
-@size:
-@Returns:
+@pixbuf:
+@drawable:
+@gc:
+@src_x:
+@src_y:
+@dest_x:
+@dest_y:
+@width:
+@height:
+@dither:
+@x_dither:
+@y_dither:
-<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:See_Also ##### -->
+<!-- ##### FUNCTION gdk_pixbuf_get_from_drawable ##### -->
<para>
</para>
+@dest:
+@src:
+@cmap:
+@src_x:
+@src_y:
+@dest_x:
+@dest_y:
+@width:
+@height:
+@Returns: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
<!-- ##### FUNCTION gdk_pixbuf_new_from_art_pixbuf ##### -->
<para>
@@ -63,40 +93,116 @@
@art_pixbuf:
@Returns:
-<!-- ##### ARG GnomeCanvasPixbuf:height_pixels ##### -->
+<!-- ##### ARG GnomeCanvasPixbuf:y_pixels ##### -->
<para>
</para>
-<!-- ##### ARG GnomeCanvasPixbuf:y_pixels ##### -->
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/from-drawables.sgml:Long_Description ##### -->
+ <para>
+ The functions in this section allow you to take the image data
+ from a GDK drawable and dump it into a #GdkPixbuf. This can be
+ used for screenshots and other special effects. Note that these
+ operations can be expensive, since the image data has to be
+ transferred from the X server to the client program and converted.
+ </para>
+
+
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:See_Also ##### -->
<para>
</para>
-<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
+<!-- ##### FUNCTION gdk_pixbuf_finalize ##### -->
+<para>
+
+</para>
+
+@pixbuf: <!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
+End:
+-->
+
+<!-- ##### SECTION ./tmpl/rendering.sgml:Short_Description ##### -->
+Rendering a pixbuf to a GDK drawable.
+
+
+<!-- ##### FUNCTION gdk_pixbuf_set_last_unref_handler ##### -->
<para>
</para>
+@pixbuf:
+@last_unref_fn:
+@last_unref_fn_data:
-<!-- ##### USER_FUNCTION ModuleUpdatedNotifyFunc ##### -->
+<!-- ##### ARG GnomeCanvasPixbuf:x_set ##### -->
+ <para>
+ Determines whether the <link
+ linkend="GnomeCanvasPixbuf--x">x</link> argument is used to
+ translate the pixbuf from its logical origin in item-relative
+ coordinates.
+ </para>
+
+
+<!-- ##### FUNCTION gdk_pixbuf_get_format ##### -->
<para>
</para>
@pixbuf:
-@user_data:
-@x:
-@y:
+@Returns:
+
+<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable_alpha ##### -->
+<para>
+
+</para>
+
+@pixbuf:
+@drawable:
+@src_x:
+@src_y:
+@dest_x:
+@dest_y:
@width:
@height:
+@alpha_mode:
+@alpha_threshold:
+@dither:
+@x_dither:
+@y_dither:
-<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Title ##### -->
-gdk-pixbuf-io
+<!-- ##### ARG GnomeCanvasPixbuf:x_pixels ##### -->
+<para>
+
+</para>
+<!-- ##### SECTION ./tmpl/from-drawables.sgml:See_Also ##### -->
+ <para>
+ gdk_image_get().
+ </para>
+
+
+<!-- ##### SECTION ./tmpl/rendering.sgml:Title ##### -->
+Rendering
+
+
+<!-- ##### MACRO GDK_PIXBUF_LOADER ##### -->
+ <para>
+ Casts a #GtkObject to a #GdkPixbufLoader.
+ </para>
+
+@obj: A GTK+ object.
+
<!-- ##### ARG GnomeCanvasPixbuf:y_set ##### -->
<para>
Determines whether the <link
@@ -108,19 +214,50 @@ gdk-pixbuf-io
</para>
-<!-- ##### ARG GnomeCanvasPixbuf:x_pixels ##### -->
-<para>
+<!-- ##### SECTION ./tmpl/rendering.sgml:Long_Description ##### -->
+ <para>
+ The <application>gdk-pixbuf</application> library provides several
+ convenience functions to render pixbufs to GDK drawables. It uses
+ the GdkRGB to render the image data.
+ </para>
-</para>
+ <para>
+ At this point there is not a standard alpha channel extension for
+ the X Window System, so it is not possible to use full opacity
+ information when painting images to arbitrary drawables. The
+ <application>gdk-pixbuf</application> convenience functions will
+ threshold the opacity information to create a bi-level clipping
+ mask (black and white), and use that to draw the image onto a
+ drawable.
+ </para>
+ <important>
+ <para>
+ Since these functions use GdkRGB for rendering, you must
+ initialize GdkRGB before using any of them. You can do this by
+ calling gdk_rgb_init() near the beginning of your program.
+ </para>
+ </important>
-<!-- ##### FUNCTION gdk_pixbuf_get_format ##### -->
+
+<!-- ##### SECTION ./tmpl/from-drawables.sgml:Short_Description ##### -->
+Getting parts of a drawable's image data into a pixbuf.
+
+
+<!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
<para>
</para>
@pixbuf:
-@Returns:
+@bitmap:
+@src_x:
+@src_y:
+@dest_x:
+@dest_y:
+@width:
+@height:
+@alpha_threshold:
<!-- ##### ARG GnomeCanvasPixbuf:width_pixels ##### -->
<para>
@@ -128,3 +265,32 @@ gdk-pixbuf-io
</para>
+<!-- ##### ENUM GdkPixbufAlphaMode ##### -->
+ <para>
+ These values can be passed to
+ gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
+ chanel of an image should be handled. This function can create a
+ bilevel clipping mask (black and white) and use it while painting
+ the image. In the future, when the X Window System gets an alpha
+ channel extension, it will be possible to do full alpha
+ compositing onto arbitrary drawables. For now both cases fall
+ back to a bilevel clipping mask.
+ </para>
+
+@GDK_PIXBUF_ALPHA_BILEVEL: A bilevel clipping mask (black and white)
+will be created and used to draw the image. Pixels below 0.5 opacity
+will be considered fully transparent, and all others will be
+considered fully opaque.
+@GDK_PIXBUF_ALPHA_FULL: For now falls back to #GDK_PIXBUF_ALPHA_BILEVEL.
+In the future it will do full alpha compositing.
+
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Title ##### -->
+gdk-pixbuf-io
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
index 111c921fd..9decee178 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
@@ -33,6 +33,24 @@ Information that describes an image.
rowstride or number of bytes between rows.
</para>
+@parent_instance:
+@colorspace:
+@n_channels:
+@bits_per_sample:
+@width:
+@height:
+@rowstride:
+@pixels:
+@destroy_fn:
+@destroy_fn_data:
+@has_alpha:
+
+<!-- ##### STRUCT GdkPixbufClass ##### -->
+<para>
+
+</para>
+
+
<!-- ##### FUNCTION gdk_pixbuf_get_colorspace ##### -->
<para>
@@ -102,11 +120,11 @@ Information that describes an image.
</para>
@pixbuf:
-@Returns:
-
-<!--
+@Returns: <!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
End:
-->
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/gnome-canvas-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gnome-canvas-pixbuf.sgml
deleted file mode 100644
index 75cc31ea3..000000000
--- a/docs/reference/gdk-pixbuf/tmpl/gnome-canvas-pixbuf.sgml
+++ /dev/null
@@ -1,301 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GnomeCanvasPixbuf
-
-<!-- ##### SECTION Short_Description ##### -->
-Canvas item to display #GdkPixbuf images.
-
-<!-- ##### SECTION Long_Description ##### -->
- <para>
- This canvas item displays #GdkPixbuf images. It handles full
- affine transformations in both GDK and antialiased modes, and also
- supports the <ulink url="http://www.w3.org">W3C</ulink>'s <ulink
- url="http://www.w3.org/Graphics/SVG/">SVG</ulink>-like scaling and
- translation semantics for absolute pixel values.
- </para>
-
- <para>
- #GdkPixbuf structures may be shared among different pixbuf canvas
- items; the pixbuf item uses #GdkPixbuf's reference counting
- functions for this.
- </para>
-
- <refsect2>
- <title>Custom Scaling and Translation</title>
-
- <para>
- In addition to the normal affine transformations supported by
- canvas items, the #GnomeCanvasPixbuf item supports independent
- object arguments for scaling and translation. This is useful
- for explicitly setting a size to which the pixbuf's image will
- be scaled, and for specifying translation offsets that take
- place in the item's local coordinate system.
- </para>
-
- <para>
- By default, the pixbuf canvas item will attain the size in units
- of the #GdkPixbuf it contains. If a #GnomeCanvasPixbuf is
- configured to use a #GdkPixbuf that has a size of 300 by 200
- pixels, then the pixbuf item will automatically obtain a size of
- 300 by 200 units in the item's local coordinate system. If the
- item is transformed with a scaling transformation of (0.5, 2.0),
- then the final image size will be of 150 by 400 pixels.
- </para>
-
- <para>
- To set custom width and height values, you must set the <link
- linkend="GnomeCanvasPixbuf--width-set">width_set</link> or <link
- linkend="GnomeCanvasPixbuf--height-set">height_set</link>
- arguments to %TRUE, and then set the <link
- linkend="GnomeCanvasPixbuf--width">width</link> or <link
- linkend="GnomeCanvasPixbuf--height">height</link> arguments to
- the desired values. The former two arguments control whether
- the latter two are used when computing the final image's size;
- they are both %FALSE by default so that the pixbuf item will
- attain a size in units equal to the size in pixels of the
- #GdkPixbuf that the item contains.
- </para>
-
- <para>
- The custom translation offsets are controlled by the <link
- linkend="GnomeCanvasPixbuf--x">x</link> and <link
- linkend="GnomeCanvasPixbuf--y">y</link> arguments. The logical
- upper-left vertex of the image will be translated by the
- specified distance, aligned with the item's local coordinate
- system.
- </para>
- </refsect2>
-
- <refsect2>
- <title>Absolute Pixel Scaling and Translation</title>
-
- <para>
- The <ulink url="http://www.w3.org/Graphics/SVG/">Scalable Vector
- Graphics</ulink> specification (SVG) of the <ulink
- url="http://www.w3.org">World Wide Web Consortium</ulink> also
- allows images to be translated and scaled by absolute pixel
- values that are independent of an item's normal affine
- transformation.
- </para>
-
- <para>
- Normally, the pixbuf item's translation and scaling arguments
- are interpreted in units, so they will be modified by the item's
- affine transformation. The <link
- linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>,
- <link
- linkend="GnomeCanvasPixbuf--height-in-pixels">height_in_pixels</link>,
- <link
- linkend="GnomeCanvasPixbuf--x-in-pixels">x_in_pixels</link>, and
- <link
- linkend="GnomeCanvasPixbuf--y-in-pixels">y_in_pixels</link>
- object arguments can be used to modify this behavior. If one of
- these arguments is %TRUE, then the corresponding scaling or
- translation value will not be affected lengthwise by the pixbuf
- item's affine transformation.
- </para>
-
- <para>
- For example, consider a pixbuf item whose size is (300, 200).
- If the item is modified with a scaling transformation of (0.5,
- 2.0) but the <link
- linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
- is set to %TRUE, then the item will appear to be (300, 400)
- pixels in size. This means that in this case the item's affine
- transformation only applies to the height value, while the width
- value is kept in absolute pixels.
- </para>
-
- <para>
- Likewise, consider a pixbuf item whose (<link
- linkend="GnomeCanvasPixbuf--x">x</link>, <link
- linkend="GnomeCanvasPixbuf--y">y</link>) arguments are set to
- (30, 40). If the item is then modified by the same scaling
- transformation of (0.5, 2.0) but the <link
- linkend="GnomeCanvasPixbuf--y-in-pixels">y_in_pixels</link>
- argument is set to %TRUE, then the image's upper-left corner
- will appear to be at position (15, 40). In this case, the
- affine transformation is applied only to the x offset, while the
- y offset is kept in absolute pixels.
- </para>
-
- <para>
- In short, these arguments control whether a particular dimension
- of a pixbuf item is scaled or not in the normal way by the
- item's affine transformation.
- </para>
- </refsect2>
-
- <refsect2>
- <title>Resource Management</title>
-
- <para>
- When you set the #GdkPixbuf structure that a #GnomeCanvasPixbuf
- item will use by setting the <link
- linkend="GnomeCanvasPixbuf--pixbuf">pixbuf</link> argument, a
- reference count will be added to that #GdkPixbuf structure.
- When the pixbuf item no longer needs the #GdkPixbuf structure,
- such as when the item is destroyed or when a new pixbuf
- structure is passed to it, then the old #GdkPixbuf structure
- will be automatically unreferenced.
- </para>
-
- <para>
- This means that if an application just needs to load a pixbuf
- image and set it into a pixbuf canvas item, it can do the
- following to &lsquo;forget&rsquo; about the pixbuf structure:
-
- <programlisting>
- GdkPixbuf *pixbuf;
- GnomeCanvasItem *item;
-
- pixbuf = gdk_pixbuf_new_from_file ("foo.png");
- g_assert (pixbuf != NULL);
-
- item = gnome_canvas_item_new (gnome_canvas_root (my_canvas),
- gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixbuf,
- NULL);
- gdk_pixbuf_unref (pixbuf);
- </programlisting>
- </para>
-
- <para>
- After this happens, the reference count of the pixbuf structure
- will be 1: the gdk_pixbuf_new_from_file() function creates it
- with a reference count of 1, then setting the <link
- linkend="GnomeCanvasPixbuf--pixbuf">pixbuf</link> argument of
- the #GnomeCanvasPixbuf item increases it to 2, and then it is
- decremented to 1 by the call to gdk_pixbuf_unref(). When the
- canvas item is destroyed, it will automatically unreference the
- pixbuf structure again, causing its reference count to drop to
- zero and thus be freed.
- </para>
- </refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
- <para>
- #GnomeCanvas, #GdkPixbuf
- </para>
-
-<!-- ##### MACRO GNOME_CANVAS_PIXBUF ##### -->
- <para>
- Casts a #GtkOjbect to a #GnomeCanvasPixbuf.
- </para>
-
-@obj: A GTK+ object.
-
-
-<!-- ##### ARG GnomeCanvasPixbuf:pixbuf ##### -->
- <para>
- Contains a pointer to a #GdkPixbuf structure that will be used by
- the pixbuf canvas item as an image source. When a pixbuf is set
- its reference count is incremented; if the pixbuf item kept a
- pointer to another #GdkPixbuf structure, the reference count of
- this structure will be decremented. Also, the GdkPixbuf's
- reference count will automatically be decremented when the
- #GnomeCanvasPixbuf item is destroyed. When a pixbuf is queried, a
- reference count will not be added to the return value; you must do
- this yourself if you intend to keep the pixbuf structure around.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:width ##### -->
- <para>
- Indicates the width the pixbuf will be scaled to. This argument
- will only be used if the <link
- linkend="GnomeCanvasPixbuf--width-set">width_set</link> argument
- is %TRUE. If the <link
- linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
- argument is %FALSE, the width will be taken to be in canvas units,
- and thus will be scaled along with the canvas item's affine
- transformation. If width_in_pixels is %TRUE, the width will be
- taken to be in pixels, and will visually remain a constant size
- even if the item's affine transformation changes.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:width_set ##### -->
- <para>
- Determines whether the <link
- linkend="GnomeCanvasPixbuf--width">width</link> argument is taken
- into account when scaling the pixbuf item. If this argument is
- %FALSE, then the width value of the pixbuf will be used instead.
- This argument is %FALSE by default.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:width_in_pixels ##### -->
- <para>
- If this argument is %TRUE, then the width of the pixbuf will be
- considered to be in pixels, that is, it will not be visually
- scaled even if the item's affine transformation changes. If this
- is %FALSE, then the width of the pixbuf will be considered to be
- in canvas units, and so will be scaled normally by affine
- transformations. The default is %FALSE.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:height ##### -->
- <para>
- Indicates the height the pixbuf will be scaled to. This argument
- will only be used if the <link
- linkend="GnomeCanvasPixbuf--height-set">height_set</link> argument
- is %TRUE. Works in the same way as the <link
- linkend="GnomeCanvasPixbuf--width">width</link> argument.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:height_set ##### -->
- <para>
- Determines whether the <link
- linkend="GnomeCanvasPixbuf--height">height</link> argument is
- taken into account when scaling the pixbuf item. Works in the
- same way as the <link
- linkend="GnomeCanvasPixbuf--width-set">width_set</link> argument.
- The default is %FALSE.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:height_in_pixels ##### -->
- <para>
- Works in the same way as the <link
- linkend="GnomeCanvasPixbuf--width-in-pixels">width_in_pixels</link>
- argument. The default is %FALSE.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:x ##### -->
- <para>
- Indicates the horizontal translation offset of the pixbuf item's
- image. This offset may not actually appear horizontal, since it
- will be affected by the item's affine transformation. The default
- is 0.0.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:x_in_pixels ##### -->
- <para>
- If this argument is %TRUE, the pixbuf's translation with respect
- to its logical origin in item-relative coordinates will be in
- pixels, that is, the visible offset will not change even if the
- item's affine transformation changes. If it is %FALSE, the
- pixbuf's translation will be taken to be in canvas units, and thus
- will change along with the item's affine transformation. The
- default is %FALSE.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:y ##### -->
- <para>
- Indicates the vertical translation offset of the pixbuf item's
- image. Works in the same way as the <link
- linkend="GnomeCanvasPixbuf--x">x</link> argument. The default is
- 0.0.
- </para>
-
-<!-- ##### ARG GnomeCanvasPixbuf:y_in_pixels ##### -->
- <para>
- Works in the same way as the <link
- linkend="GnomeCanvasPixbuf--x-in-pixels">x_in_pixels</link>
- argument, but controls whether the <link
- linkend="GnomeCanvasPixbuf--y">y</link> translation offset is
- scaled or not. The default is %FALSE.
- </para>
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
--->
diff --git a/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
new file mode 100644
index 000000000..41302c27c
--- /dev/null
+++ b/docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml
@@ -0,0 +1,75 @@
+<!-- ##### SECTION Title ##### -->
+Initialization and Versions
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION gdk_pixbuf_init ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION gdk_pixbuf_preinit ##### -->
+<para>
+
+</para>
+
+@app:
+@modinfo:
+
+
+<!-- ##### FUNCTION gdk_pixbuf_postinit ##### -->
+<para>
+
+</para>
+
+@app:
+@modinfo:
+
+
+<!-- ##### VARIABLE gdk_pixbuf_version ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GDK_PIXBUF_VERSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GDK_PIXBUF_MAJOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GDK_PIXBUF_MINOR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GDK_PIXBUF_MICRO ##### -->
+<para>
+
+</para>
+
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-io.sgml b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
index cc03e4648..b1719b797 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-io.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
-gdk-pixbuf-io
+Module Interface
<!-- ##### SECTION Short_Description ##### -->
@@ -29,11 +29,29 @@ gdk-pixbuf-io
</para>
@pixbuf:
-@user_data:
@x:
@y:
@width:
@height:
+@user_data:
+
+
+<!-- ##### USER_FUNCTION ModuleFrameDoneNotifyFunc ##### -->
+<para>
+
+</para>
+
+@frame:
+@user_data:
+
+
+<!-- ##### USER_FUNCTION ModuleAnimationDoneNotifyFunc ##### -->
+<para>
+
+</para>
+
+@pixbuf:
+@user_data:
<!-- ##### STRUCT GdkPixbufModule ##### -->
@@ -49,6 +67,7 @@ gdk-pixbuf-io
@begin_load:
@stop_load:
@load_increment:
+@load_animation:
<!-- ##### FUNCTION gdk_pixbuf_get_module ##### -->
<para>
@@ -60,6 +79,15 @@ gdk-pixbuf-io
@Returns:
+<!-- ##### FUNCTION gdk_pixbuf_get_named_module ##### -->
+<para>
+
+</para>
+
+@name:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_pixbuf_load_module ##### -->
<para>
diff --git a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
index 5a6824810..f975e4f69 100644
--- a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml
@@ -68,24 +68,6 @@ Functions to perform reference counting and memory management on a
@data: User closure data.
-<!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### -->
- <para>
- A function of this type can be used to override the default
- operation when a pixbuf loses its last reference, i.e. when
- gdk_pixbuf_unref() is called on a #GdkPixbuf structure that has a
- reference count of 1. This function should determine whether to
- finalize the pixbuf by calling gdk_pixbuf_finalize(), or whether
- to just resume normal execution. The last unref handler for a
- #GdkPixbuf can be set using the
- gdk_pixbuf_set_last_unref_handler() function. By default, pixbufs
- will be finalized automatically if no last unref handler has been
- defined.
- </para>
-
-@pixbuf: The pixbuf that is losing its last reference.
-@data: User closure data.
-
-
<!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
<para>
@@ -103,26 +85,3 @@ Functions to perform reference counting and memory management on a
@pixbuf:
-<!-- ##### FUNCTION gdk_pixbuf_set_last_unref_handler ##### -->
-<para>
-
-</para>
-
-@pixbuf:
-@last_unref_fn:
-@last_unref_fn_data:
-
-
-<!-- ##### FUNCTION gdk_pixbuf_finalize ##### -->
-<para>
-
-</para>
-
-@pixbuf:
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
--->
diff --git a/docs/reference/gdk-pixbuf/tmpl/rendering.sgml b/docs/reference/gdk-pixbuf/tmpl/rendering.sgml
deleted file mode 100644
index 2fffd57bc..000000000
--- a/docs/reference/gdk-pixbuf/tmpl/rendering.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Rendering
-
-<!-- ##### SECTION Short_Description ##### -->
-Rendering a pixbuf to a GDK drawable.
-
-<!-- ##### SECTION Long_Description ##### -->
- <para>
- The <application>gdk-pixbuf</application> library provides several
- convenience functions to render pixbufs to GDK drawables. It uses
- the GdkRGB to render the image data.
- </para>
-
- <para>
- At this point there is not a standard alpha channel extension for
- the X Window System, so it is not possible to use full opacity
- information when painting images to arbitrary drawables. The
- <application>gdk-pixbuf</application> convenience functions will
- threshold the opacity information to create a bi-level clipping
- mask (black and white), and use that to draw the image onto a
- drawable.
- </para>
-
- <important>
- <para>
- Since these functions use GdkRGB for rendering, you must
- initialize GdkRGB before using any of them. You can do this by
- calling gdk_rgb_init() near the beginning of your program.
- </para>
- </important>
-
-<!-- ##### SECTION See_Also ##### -->
- <para>
- GdkRGB
- </para>
-
-<!-- ##### ENUM GdkPixbufAlphaMode ##### -->
- <para>
- These values can be passed to
- gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
- chanel of an image should be handled. This function can create a
- bilevel clipping mask (black and white) and use it while painting
- the image. In the future, when the X Window System gets an alpha
- channel extension, it will be possible to do full alpha
- compositing onto arbitrary drawables. For now both cases fall
- back to a bilevel clipping mask.
- </para>
-
-@GDK_PIXBUF_ALPHA_BILEVEL: A bilevel clipping mask (black and white)
-will be created and used to draw the image. Pixels below 0.5 opacity
-will be considered fully transparent, and all others will be
-considered fully opaque.
-@GDK_PIXBUF_ALPHA_FULL: For now falls back to #GDK_PIXBUF_ALPHA_BILEVEL.
-In the future it will do full alpha compositing.
-
-<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf:
-@drawable:
-@src_x:
-@src_y:
-@dest_x:
-@dest_y:
-@width:
-@height:
-@alpha_mode:
-@alpha_threshold:
-@dither:
-@x_dither:
-@y_dither:
-
-
-<!-- ##### FUNCTION gdk_pixbuf_render_to_drawable ##### -->
-<para>
-
-</para>
-
-@pixbuf:
-@drawable:
-@gc:
-@src_x:
-@src_y:
-@dest_x:
-@dest_y:
-@width:
-@height:
-@dither:
-@x_dither:
-@y_dither:
-
-
-<!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
-<para>
-
-</para>
-
-@pixbuf:
-@bitmap:
-@src_x:
-@src_y:
-@dest_x:
-@dest_y:
-@width:
-@height:
-@alpha_threshold:
-
-<!-- ##### FUNCTION gdk_pixbuf_render_pixmap_and_mask ##### -->
-<para>
-
-</para>
-
-@pixbuf:
-@pixmap_return:
-@mask_return:
-@alpha_threshold:
-
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
-End:
--->
diff --git a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
index 996b51807..0e4cf95a5 100644
--- a/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/scaling.sgml
@@ -84,18 +84,15 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
@GDK_INTERP_NEAREST: Nearest neighbor sampling; this is the fastest
and lowest quality mode.
-
@GDK_INTERP_TILES: This is an accurate simulation of the PostScript
image operator without any interpolation enabled. Each pixel is
rendered as a tiny parallelogram of solid color, the edges of which
are implemented with antialiasing. It resembles nearest neighbor for
enlargement, and bilinear for reduction.
-
@GDK_INTERP_BILINEAR: Bilinear interpolation. For enlargement, it is
equivalent to point-sampling the ideal bilinear-interpolated image.
For reduction, it is equivalent to laying down small tiles and
integrating over the coverage area.
-
@GDK_INTERP_HYPER: This is the slowest and highest quality
reconstruction function. It is derived from the hyperbolic filters in
Wolberg's "Digital Image Warping", and is formally defined as the
@@ -188,12 +185,11 @@ image (the filter is designed to be idempotent for 1:1 pixel mapping).
@check_size:
@color1:
@color2:
-@Returns:
-
-
-<!--
+@Returns: <!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
End:
-->
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/util.sgml b/docs/reference/gdk-pixbuf/tmpl/util.sgml
index 43942cc61..fc429f424 100644
--- a/docs/reference/gdk-pixbuf/tmpl/util.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/util.sgml
@@ -29,6 +29,7 @@ Utility and miscellaneous convenience functions.
@b:
@Returns:
+
<!-- ##### FUNCTION gdk_pixbuf_copy_area ##### -->
<para>
@@ -41,12 +42,11 @@ Utility and miscellaneous convenience functions.
@height:
@dest_pixbuf:
@dest_x:
-@dest_y:
-
-
-<!--
+@dest_y: <!--
Local variables:
mode: sgml
sgml-parent-document: ("../gdk-pixbuf.sgml" "book" "refsect2" "")
End:
-->
+
+
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 0b0b0eacf..2a6a6c549 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -6,45 +6,145 @@ DOC_MODULE=gdk
# The top-level SGML file.
DOC_MAIN_SGML_FILE=gdk-docs.sgml
-# We could alternatively use this for using installed headers.
-INCLUDE_DIR=`gtk-config --prefix`/include/gdk
+# The directory containing the source code (if it contains documentation).
+DOC_SOURCE_DIR=$(top_srcdir)/gdk
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
+
+# Header files to ignore when scanning
+IGNORE_HFILES= \
+ gdkkeysyms.h \
+ gdkinternals.h \
+ gdkprivate.h \
+ gdkpoly-generic.h \
+ gdkregion-generic.h \
+ linux-fb \
+ nanox \
+ win32 \
+ x11
+
+# Extra files to add when scanning
+EXTRA_HFILES= \
+ $(top_srcdir)/gdk/x11/gdkx.h
+
+tmpl_sources = \
+ tmpl/color_contexts.sgml \
+ tmpl/colors.sgml \
+ tmpl/cursors.sgml \
+ tmpl/dnd.sgml \
+ tmpl/drawing.sgml \
+ tmpl/event_structs.sgml \
+ tmpl/events.sgml \
+ tmpl/fonts.sgml \
+ tmpl/gcs.sgml \
+ tmpl/gdk-unused.sgml \
+ tmpl/general.sgml \
+ tmpl/images.sgml \
+ tmpl/input.sgml \
+ tmpl/input_contexts.sgml \
+ tmpl/input_devices.sgml \
+ tmpl/input_methods.sgml \
+ tmpl/keys.sgml \
+ tmpl/pango_interaction.sgml \
+ tmpl/pixbufs.sgml \
+ tmpl/pixmaps.sgml \
+ tmpl/properties.sgml \
+ tmpl/regions.sgml \
+ tmpl/rgb.sgml \
+ tmpl/selections.sgml \
+ tmpl/threads.sgml \
+ tmpl/visuals.sgml \
+ tmpl/windows.sgml \
+ tmpl/x_interaction.sgml
+
+# Extra SGML files that are included by DOC_MAIN_SGML_FILE
+content_files =
+
+
+####################################
+# Everything below here is generic #
+####################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+EXTRA_DIST = \
+ $(DOC_MAIN_SGML_FILE) \
+ $(content_files) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
+if ENABLE_GTK_DOC
+all-local: html/index.html
+
+$(DOC_MODULE)-decl.txt:
+ $(MAKE) scan
+
+$(tmpl_sources): $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ $(MAKE) templates
+
+sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
+ $(MAKE) sgml
+
+html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE) $(content_fiels)
+ $(MAKE) html
+endif
+
scan:
- gtkdoc-scan --module=$(DOC_MODULE) $(INCLUDE_DIR)/gdk.h $(INCLUDE_DIR)/gdktypes.h $(INCLUDE_DIR)/gdkrgb.h
+ -(cd $(srcdir) \
+ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
-templates: scan
- gtkdoc-mktmpl --module=$(DOC_MODULE)
+templates:
+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
sgml:
- gtkdoc-mkdb --module=$(DOC_MODULE)
+ cd $(srcdir) \
+ && gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
html:
- if ! test -d html ; then mkdir html ; fi
- -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ test -d $(srcdir)/html || mkdir $(srcdir)/html
+ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @echo '-- Fixing Crossreferences'
+ gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local:
- rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt
+ rm -f *~ *.bak *.signals *-unused.txt
maintainer-clean-local: clean
- rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
- install -d -m 0755 $(TARGET_DIR)
- install -m 0644 html/*.html $(TARGET_DIR)
- install -m 0644 html/index.sgml $(TARGET_DIR)
- gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
-
-EXTRA_DIST = \
- $(DOC_MAIN_SGML_FILE) \
- $(DOC_MODULE)-sections.txt \
- gdk-overrides.txt \
- gdk-decl.txt
-
-dist-hook:
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+ (installfiles=`echo $(srcdir)/html/*.html`; \
+ if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+ then echo '-- Nothing to install' ; \
+ else \
+ for i in $$installfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ done; \
+ echo '-- Installing $(srcdir)/html/index.sgml' ; \
+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ fi)
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+ @echo "*** gtk-doc must be installed and enabled in order to make dist
+ @false
+endif
+
+dist-hook: dist-check-gtkdoc
+ mkdir $(distdir)/html
+ mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl
- cp -p tmpl/*.sgml $(distdir)/tmpl
+ -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+ -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+ -cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
.PHONY : html sgml templates scan
diff --git a/docs/reference/gdk/gdk-decl.txt b/docs/reference/gdk/gdk-decl.txt
index cd75a1e2a..4108b0b2c 100644
--- a/docs/reference/gdk/gdk-decl.txt
+++ b/docs/reference/gdk/gdk-decl.txt
@@ -1,3 +1,282 @@
+<STRUCT>
+<NAME>GdkGCXData</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkColormapPrivateX11</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkCursorPrivate</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkFontPrivateX</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkImagePrivateX11</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkVisualPrivate</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkICPrivate</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkCursorPrivate</NAME>
+struct GdkCursorPrivate
+{
+ GdkCursor cursor;
+ Cursor xcursor;
+ Display *xdisplay;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkFontPrivateX</NAME>
+struct GdkFontPrivateX
+{
+ GdkFontPrivate base;
+ /* XFontStruct *xfont; */
+ /* generic pointer point to XFontStruct or XFontSet */
+ gpointer xfont;
+ Display *xdisplay;
+
+ GSList *names;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkVisualPrivate</NAME>
+struct GdkVisualPrivate
+{
+ GdkVisual visual;
+ Visual *xvisual;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkColormapPrivateX11</NAME>
+struct GdkColormapPrivateX11
+{
+ Colormap xcolormap;
+ Display *xdisplay;
+ gint private_val;
+
+ GHashTable *hash;
+ GdkColorInfo *info;
+ time_t last_sync_time;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkImagePrivateX11</NAME>
+struct GdkImagePrivateX11
+{
+ XImage *ximage;
+ Display *xdisplay;
+ gpointer x_shm_info;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkICPrivate</NAME>
+struct GdkICPrivate
+{
+ XIC xic;
+ GdkICAttr *attr;
+ GdkICAttributesType mask;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkGCX11</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkGCX11Class</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_GC_X11</NAME>
+#define GDK_TYPE_GC_X11 (gdk_gc_x11_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_X11</NAME>
+#define GDK_GC_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC_X11, GdkGCX11))
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_X11_CLASS</NAME>
+#define GDK_GC_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GC_X11, GdkGCX11Class))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_GC_X11</NAME>
+#define GDK_IS_GC_X11(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC_X11))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_GC_X11_CLASS</NAME>
+#define GDK_IS_GC_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GC_X11))
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_X11_GET_CLASS</NAME>
+#define GDK_GC_X11_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GC_X11, GdkGCX11Class))
+</MACRO>
+<STRUCT>
+<NAME>GdkGCX11</NAME>
+struct GdkGCX11
+{
+ GdkGC parent_instance;
+
+ GC xgc;
+ Display *xdisplay;
+ GdkRegion *clip_region;
+ guint dirty_mask;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_gc_x11_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
+</FUNCTION>
+<MACRO>
+<NAME>GDK_ROOT_WINDOW</NAME>
+#define GDK_ROOT_WINDOW() gdk_root_window
+</MACRO>
+<MACRO>
+<NAME>GDK_ROOT_PARENT</NAME>
+#define GDK_ROOT_PARENT() ((GdkWindow *)gdk_parent_root)
+</MACRO>
+<MACRO>
+<NAME>GDK_DISPLAY</NAME>
+#define GDK_DISPLAY() gdk_display
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW_XDISPLAY</NAME>
+#define GDK_WINDOW_XDISPLAY(win) (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xdisplay)
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW_XID</NAME>
+#define GDK_WINDOW_XID(win) (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXMAP_XDISPLAY</NAME>
+#define GDK_PIXMAP_XDISPLAY(win) (GDK_DRAWABLE_IMPL_X11(((GdkPixmapObject *)win)->impl)->xdisplay)
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXMAP_XID</NAME>
+#define GDK_PIXMAP_XID(win) (GDK_DRAWABLE_IMPL_X11(((GdkPixmapObject *)win)->impl)->xid)
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAWABLE_XDISPLAY</NAME>
+#define GDK_DRAWABLE_XDISPLAY(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XDISPLAY (win) : GDK_PIXMAP_XDISPLAY (win))
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAWABLE_XID</NAME>
+#define GDK_DRAWABLE_XID(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XID (win) : GDK_PIXMAP_XID (win))
+</MACRO>
+<MACRO>
+<NAME>GDK_IMAGE_XDISPLAY</NAME>
+#define GDK_IMAGE_XDISPLAY(image) (((GdkImagePrivateX11 *) GDK_IMAGE (image)->windowing_data)->xdisplay)
+</MACRO>
+<MACRO>
+<NAME>GDK_IMAGE_XIMAGE</NAME>
+#define GDK_IMAGE_XIMAGE(image) (((GdkImagePrivateX11 *) GDK_IMAGE (image)->windowing_data)->ximage)
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_XDISPLAY</NAME>
+#define GDK_GC_XDISPLAY(gc) (GDK_GC_X11(gc)->xdisplay)
+</MACRO>
+<MACRO>
+<NAME>GDK_COLORMAP_XDISPLAY</NAME>
+#define GDK_COLORMAP_XDISPLAY(cmap) (((GdkColormapPrivateX11 *)GDK_COLORMAP (cmap)->windowing_data)->xdisplay)
+</MACRO>
+<MACRO>
+<NAME>GDK_COLORMAP_XCOLORMAP</NAME>
+#define GDK_COLORMAP_XCOLORMAP(cmap) (((GdkColormapPrivateX11 *)GDK_COLORMAP (cmap)->windowing_data)->xcolormap)
+</MACRO>
+<MACRO>
+<NAME>GDK_VISUAL_XVISUAL</NAME>
+#define GDK_VISUAL_XVISUAL(vis) (((GdkVisualPrivate *) vis)->xvisual)
+</MACRO>
+<MACRO>
+<NAME>GDK_FONT_XDISPLAY</NAME>
+#define GDK_FONT_XDISPLAY(font) (((GdkFontPrivate *) font)->xdisplay)
+</MACRO>
+<MACRO>
+<NAME>GDK_FONT_XFONT</NAME>
+#define GDK_FONT_XFONT(font) (((GdkFontPrivateX *)font)->xfont)
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_XGC</NAME>
+#define GDK_GC_XGC(gc) (GDK_GC_X11(gc)->xgc)
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_GET_XGC</NAME>
+#define GDK_GC_GET_XGC(gc) (GDK_GC_X11(gc)->dirty_mask ? _gdk_x11_gc_flush (gc) : GDK_GC_XGC (gc))
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW_XWINDOW</NAME>
+#define GDK_WINDOW_XWINDOW GDK_DRAWABLE_XID
+</MACRO>
+<VARIABLE>
+<NAME>gdk_display</NAME>
+extern Display *gdk_display;
+</VARIABLE>
+<VARIABLE>
+<NAME>gdk_root_window</NAME>
+extern Window gdk_root_window;
+</VARIABLE>
+<VARIABLE>
+<NAME>gdk_screen</NAME>
+extern gint gdk_screen;
+</VARIABLE>
+<VARIABLE>
+<NAME>gdk_display_name</NAME>
+extern gchar *gdk_display_name;
+</VARIABLE>
+<VARIABLE>
+<NAME>gdk_leader_window</NAME>
+extern Window gdk_leader_window;
+</VARIABLE>
+<VARIABLE>
+<NAME>gdk_selection_property</NAME>
+extern Atom gdk_selection_property;
+</VARIABLE>
+<VARIABLE>
+<NAME>gdk_progclass</NAME>
+extern gchar *gdk_progclass;
+</VARIABLE>
+<FUNCTION>
+<NAME>gdkx_visual_get</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+VisualID xvisualid
+</FUNCTION>
+<FUNCTION>
+<NAME>gdkx_colormap_get</NAME>
+<RETURNS>GdkColormap *</RETURNS>
+Colormap xcolormap
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_get_client_window</NAME>
+<RETURNS>Window </RETURNS>
+Display *dpy,Window win
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_foreign_new</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkNativeWindow anid
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_foreign_new</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+GdkNativeWindow anid
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_xid_table_lookup</NAME>
+<RETURNS>gpointer </RETURNS>
+XID xid
+</FUNCTION>
+<MACRO>
+<NAME>gdk_window_lookup</NAME>
+#define gdk_window_lookup(xid) ((GdkWindow*) gdk_xid_table_lookup (xid))
+</MACRO>
+<MACRO>
+<NAME>gdk_pixmap_lookup</NAME>
+#define gdk_pixmap_lookup(xid) ((GdkPixmap*) gdk_xid_table_lookup (xid))
+</MACRO>
+<MACRO>
+<NAME>gdk_font_lookup</NAME>
+#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup (xid))
+</MACRO>
<MACRO>
<NAME>GDK_PRIORITY_EVENTS</NAME>
#define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT)
@@ -33,68 +312,13 @@ void
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_events_pending</NAME>
-<RETURNS>gboolean </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_get</NAME>
-<RETURNS>GdkEvent *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_peek</NAME>
-<RETURNS>GdkEvent *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_get_graphics_expose</NAME>
-<RETURNS>GdkEvent *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_put</NAME>
-<RETURNS>void </RETURNS>
-GdkEvent *event
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_copy</NAME>
-<RETURNS>GdkEvent *</RETURNS>
-GdkEvent *event
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_free</NAME>
-<RETURNS>void </RETURNS>
-GdkEvent *event
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_get_time</NAME>
-<RETURNS>guint32 </RETURNS>
-GdkEvent *event
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_event_handler_set</NAME>
-<RETURNS>void </RETURNS>
-GdkEventFunc func,gpointer data,GDestroyNotify notify
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_set_show_events</NAME>
-<RETURNS>void </RETURNS>
-gint show_events
-</FUNCTION>
-<FUNCTION>
<NAME>gdk_set_use_xshm</NAME>
<RETURNS>void </RETURNS>
-gint use_xshm
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_get_show_events</NAME>
-<RETURNS>gint </RETURNS>
-void
+gboolean use_xshm
</FUNCTION>
<FUNCTION>
<NAME>gdk_get_use_xshm</NAME>
-<RETURNS>gint </RETURNS>
+<RETURNS>gboolean </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -103,31 +327,6 @@ void
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_time_get</NAME>
-<RETURNS>guint32 </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_timer_get</NAME>
-<RETURNS>guint32 </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_timer_set</NAME>
-<RETURNS>void </RETURNS>
-guint32 milliseconds
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_timer_enable</NAME>
-<RETURNS>void </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_timer_disable</NAME>
-<RETURNS>void </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
<NAME>gdk_input_add_full</NAME>
<RETURNS>gint </RETURNS>
gint source,GdkInputCondition condition,GdkInputFunction function,gpointer data,GdkDestroyNotify destroy
@@ -144,27 +343,27 @@ gint tag
</FUNCTION>
<FUNCTION>
<NAME>gdk_pointer_grab</NAME>
-<RETURNS>gint </RETURNS>
-GdkWindow * window,gint owner_events,GdkEventMask event_mask,GdkWindow * confine_to,GdkCursor * cursor,guint32 time
+<RETURNS>GdkGrabStatus </RETURNS>
+GdkWindow *window,gboolean owner_events,GdkEventMask event_mask,GdkWindow *confine_to,GdkCursor *cursor,guint32 time
</FUNCTION>
<FUNCTION>
<NAME>gdk_pointer_ungrab</NAME>
<RETURNS>void </RETURNS>
-guint32 time
+guint32 time
</FUNCTION>
<FUNCTION>
<NAME>gdk_keyboard_grab</NAME>
-<RETURNS>gint </RETURNS>
-GdkWindow * window,gint owner_events,guint32 time
+<RETURNS>GdkGrabStatus </RETURNS>
+GdkWindow *window,gboolean owner_events,guint32 time
</FUNCTION>
<FUNCTION>
<NAME>gdk_keyboard_ungrab</NAME>
<RETURNS>void </RETURNS>
-guint32 time
+guint32 time
</FUNCTION>
<FUNCTION>
<NAME>gdk_pointer_is_grabbed</NAME>
-<RETURNS>gint </RETURNS>
+<RETURNS>gboolean </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -208,209 +407,605 @@ void
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_best_depth</NAME>
-<RETURNS>gint </RETURNS>
-void
+<NAME>gdk_rectangle_intersect</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkRectangle *src1,GdkRectangle *src2,GdkRectangle *dest
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_best_type</NAME>
-<RETURNS>GdkVisualType </RETURNS>
-void
+<NAME>gdk_rectangle_union</NAME>
+<RETURNS>void </RETURNS>
+GdkRectangle *src1,GdkRectangle *src2,GdkRectangle *dest
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_system</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-void
+<NAME>gdk_wcstombs</NAME>
+<RETURNS>gchar *</RETURNS>
+const GdkWChar *src
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_best</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-void
+<NAME>gdk_mbstowcs</NAME>
+<RETURNS>gint </RETURNS>
+GdkWChar *dest,const gchar *src,gint dest_max
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_best_with_depth</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-gint depth
+<NAME>gdk_event_send_clientmessage_toall</NAME>
+<RETURNS>void </RETURNS>
+GdkEvent *event
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_best_with_type</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-GdkVisualType visual_type
+<NAME>gdk_event_send_client_message</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkEvent *event,guint32 xid
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_get_best_with_both</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-gint depth,GdkVisualType visual_type
+<NAME>gdk_keyval_name</NAME>
+<RETURNS>gchar *</RETURNS>
+guint keyval
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_ref</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-GdkVisual *visual
+<NAME>gdk_keyval_from_name</NAME>
+<RETURNS>guint </RETURNS>
+const gchar *keyval_name
</FUNCTION>
<FUNCTION>
-<NAME>gdk_visual_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkVisual *visual
+<NAME>gdk_keyval_convert_case</NAME>
+<RETURNS>void </RETURNS>
+guint symbol,guint *lower,guint *upper
</FUNCTION>
<FUNCTION>
-<NAME>gdk_query_depths</NAME>
-<RETURNS>void </RETURNS>
-gint **depths,gint *count
+<NAME>gdk_keyval_to_upper</NAME>
+<RETURNS>guint </RETURNS>
+guint keyval
</FUNCTION>
<FUNCTION>
-<NAME>gdk_query_visual_types</NAME>
-<RETURNS>void </RETURNS>
-GdkVisualType **visual_types,gint *count
+<NAME>gdk_keyval_to_lower</NAME>
+<RETURNS>guint </RETURNS>
+guint keyval
</FUNCTION>
<FUNCTION>
-<NAME>gdk_list_visuals</NAME>
-<RETURNS>GList *</RETURNS>
-void
+<NAME>gdk_keyval_is_upper</NAME>
+<RETURNS>gboolean </RETURNS>
+guint keyval
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_new</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-GdkWindow *parent,GdkWindowAttr *attributes,gint attributes_mask
+<NAME>gdk_keyval_is_lower</NAME>
+<RETURNS>gboolean </RETURNS>
+guint keyval
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_destroy</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_keyval_to_unicode</NAME>
+<RETURNS>guint32 </RETURNS>
+guint keyval
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_ref</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-GdkWindow *window
+<NAME>gdk_unicode_to_keyval</NAME>
+<RETURNS>guint </RETURNS>
+guint32 wc
</FUNCTION>
+<VARIABLE>
+<NAME>gdk_threads_mutex</NAME>
+extern GMutex *gdk_threads_mutex;
+</VARIABLE>
<FUNCTION>
-<NAME>gdk_window_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_threads_enter</NAME>
+<RETURNS>void </RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_at_pointer</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-gint *win_x,gint *win_y
+<NAME>gdk_threads_leave</NAME>
+<RETURNS>void </RETURNS>
+void
</FUNCTION>
+<MACRO>
+<NAME>GDK_THREADS_ENTER</NAME>
+# define GDK_THREADS_ENTER() G_STMT_START { \
+ if (gdk_threads_mutex) \
+ g_mutex_lock (gdk_threads_mutex); \
+ } G_STMT_END
+</MACRO>
+<MACRO>
+<NAME>GDK_THREADS_LEAVE</NAME>
+# define GDK_THREADS_LEAVE() G_STMT_START { \
+ if (gdk_threads_mutex) \
+ g_mutex_unlock (gdk_threads_mutex); \
+ } G_STMT_END
+</MACRO>
+<MACRO>
+<NAME>GDK_THREADS_ENTER</NAME>
+# define GDK_THREADS_ENTER()
+</MACRO>
+<MACRO>
+<NAME>GDK_THREADS_LEAVE</NAME>
+# define GDK_THREADS_LEAVE()
+</MACRO>
+<STRUCT>
+<NAME>GdkColorContextDither</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkColorContext</NAME>
+</STRUCT>
+<ENUM>
+<NAME>GdkColorContextMode</NAME>
+typedef enum
+{
+ GDK_CC_MODE_UNDEFINED,
+ GDK_CC_MODE_BW,
+ GDK_CC_MODE_STD_CMAP,
+ GDK_CC_MODE_TRUE,
+ GDK_CC_MODE_MY_GRAY,
+ GDK_CC_MODE_PALETTE
+} GdkColorContextMode;
+</ENUM>
+<STRUCT>
+<NAME>GdkColorContextDither</NAME>
+struct GdkColorContextDither
+{
+ gint fast_rgb[32][32][32]; /* quick look-up table for faster rendering */
+ gint fast_err[32][32][32]; /* internal RGB error information */
+ gint fast_erg[32][32][32];
+ gint fast_erb[32][32][32];
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkColorContext</NAME>
+struct GdkColorContext
+{
+ GdkVisual *visual;
+ GdkColormap *colormap;
+
+ gint num_colors; /* available no. of colors in colormap */
+ gint max_colors; /* maximum no. of colors */
+ gint num_allocated; /* no. of allocated colors */
+
+ GdkColorContextMode mode;
+ gint need_to_free_colormap;
+ GdkAtom std_cmap_atom;
+
+ gulong *clut; /* color look-up table */
+ GdkColor *cmap; /* colormap */
+
+ GHashTable *color_hash; /* hash table of allocated colors */
+ GdkColor *palette; /* preallocated palette */
+ gint num_palette; /* size of palette */
+
+ GdkColorContextDither *fast_dither; /* fast dither matrix */
+
+ struct
+ {
+ gint red;
+ gint green;
+ gint blue;
+ } shifts;
+
+</STRUCT>
<FUNCTION>
-<NAME>gdk_window_show</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_context_new</NAME>
+<RETURNS>GdkColorContext *</RETURNS>
+GdkVisual *visual,GdkColormap *colormap
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_hide</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_context_new_mono</NAME>
+<RETURNS>GdkColorContext *</RETURNS>
+GdkVisual *visual,GdkColormap *colormap
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_withdraw</NAME>
+<NAME>gdk_color_context_free</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window
+GdkColorContext *cc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_move</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint x,gint y
+<NAME>gdk_color_context_get_pixel</NAME>
+<RETURNS>gulong </RETURNS>
+GdkColorContext *cc,gushort red,gushort green,gushort blue,gint *failed
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_resize</NAME>
+<NAME>gdk_color_context_get_pixels</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,gint width,gint height
+GdkColorContext *cc,gushort *reds,gushort *greens,gushort *blues,gint ncolors,gulong *colors,gint *nallocated
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_move_resize</NAME>
+<NAME>gdk_color_context_get_pixels_incremental</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,gint x,gint y,gint width,gint height
+GdkColorContext *cc,gushort *reds,gushort *greens,gushort *blues,gint ncolors,gint *used,gulong *colors,gint *nallocated
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_reparent</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkWindow *new_parent,gint x,gint y
+<NAME>gdk_color_context_query_color</NAME>
+<RETURNS>gint </RETURNS>
+GdkColorContext *cc,GdkColor *color
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_clear</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_context_query_colors</NAME>
+<RETURNS>gint </RETURNS>
+GdkColorContext *cc,GdkColor *colors,gint num_colors
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_clear_area</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint x,gint y,gint width,gint height
+<NAME>gdk_color_context_add_palette</NAME>
+<RETURNS>gint </RETURNS>
+GdkColorContext *cc,GdkColor *palette,gint num_palette
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_clear_area_e</NAME>
+<NAME>gdk_color_context_init_dither</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,gint x,gint y,gint width,gint height
+GdkColorContext *cc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_copy_area</NAME>
+<NAME>gdk_color_context_free_dither</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,GdkGC *gc,gint x,gint y,GdkWindow *source_window,gint source_x,gint source_y,gint width,gint height
+GdkColorContext *cc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_raise</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_context_get_pixel_from_palette</NAME>
+<RETURNS>gulong </RETURNS>
+GdkColorContext *cc,gushort *red,gushort *green,gushort *blue,gint *failed
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_lower</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_context_get_index_from_palette</NAME>
+<RETURNS>guchar </RETURNS>
+GdkColorContext *cc,gint *red,gint *green,gint *blue,gint *failed
+</FUNCTION>
+<STRUCT>
+<NAME>GdkColor</NAME>
+struct GdkColor
+{
+ gulong pixel;
+ gushort red;
+ gushort green;
+ gushort blue;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkColormapClass</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_COLORMAP</NAME>
+#define GDK_TYPE_COLORMAP (gdk_colormap_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_COLORMAP</NAME>
+#define GDK_COLORMAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_COLORMAP, GdkColormap))
+</MACRO>
+<MACRO>
+<NAME>GDK_COLORMAP_CLASS</NAME>
+#define GDK_COLORMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_COLORMAP, GdkColormapClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_COLORMAP</NAME>
+#define GDK_IS_COLORMAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_COLORMAP))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_COLORMAP_CLASS</NAME>
+#define GDK_IS_COLORMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_COLORMAP))
+</MACRO>
+<MACRO>
+<NAME>GDK_COLORMAP_GET_CLASS</NAME>
+#define GDK_COLORMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_COLORMAP, GdkColormapClass))
+</MACRO>
+<STRUCT>
+<NAME>GdkColormap</NAME>
+struct GdkColormap
+{
+ GObject parent_instance;
+
+ /*< public >*/
+ gint size;
+ GdkColor *colors;
+
+ /*< private >*/
+ GdkVisual *visual;
+
+ gpointer windowing_data;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_colormap_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_set_user_data</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gpointer user_data
+<NAME>gdk_colormap_new</NAME>
+<RETURNS>GdkColormap *</RETURNS>
+GdkVisual *visual,gboolean allocate
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_set_override_redirect</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gboolean override_redirect
+<NAME>gdk_colormap_ref</NAME>
+<RETURNS>GdkColormap *</RETURNS>
+GdkColormap *cmap
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_add_filter</NAME>
+<NAME>gdk_colormap_unref</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,GdkFilterFunc function,gpointer data
+GdkColormap *cmap
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_remove_filter</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkFilterFunc function,gpointer data
+<NAME>gdk_colormap_get_system</NAME>
+<RETURNS>GdkColormap *</RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_shape_combine_mask</NAME>
+<NAME>gdk_colormap_get_system_size</NAME>
+<RETURNS>gint </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_colormap_change</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,GdkBitmap *shape_mask,gint offset_x,gint offset_y
+GdkColormap *colormap,gint ncolors
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_set_child_shapes</NAME>
+<NAME>gdk_colormap_alloc_colors</NAME>
+<RETURNS>gint </RETURNS>
+GdkColormap *colormap,GdkColor *colors,gint ncolors,gboolean writeable,gboolean best_match,gboolean *success
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_colormap_alloc_color</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkColormap *colormap,GdkColor *color,gboolean writeable,gboolean best_match
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_colormap_free_colors</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window
+GdkColormap *colormap,GdkColor *colors,gint ncolors
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_merge_child_shapes</NAME>
+<NAME>gdk_colormap_get_visual</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+GdkColormap *colormap
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_color_copy</NAME>
+<RETURNS>GdkColor *</RETURNS>
+const GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_color_free</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window
+GdkColor *color
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_is_visible</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_parse</NAME>
+<RETURNS>gint </RETURNS>
+const gchar *spec,GdkColor *color
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_is_viewable</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkWindow *window
+<NAME>gdk_color_hash</NAME>
+<RETURNS>guint </RETURNS>
+const GdkColor *colora
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_set_static_gravities</NAME>
+<NAME>gdk_color_equal</NAME>
<RETURNS>gboolean </RETURNS>
-GdkWindow *window,gboolean use_static
+const GdkColor *colora,const GdkColor *colorb
</FUNCTION>
<FUNCTION>
-<NAME>gdk_add_client_message_filter</NAME>
+<NAME>gdk_colors_store</NAME>
<RETURNS>void </RETURNS>
-GdkAtom message_type,GdkFilterFunc func,gpointer data
+GdkColormap *colormap,GdkColor *colors,gint ncolors
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_colors_alloc</NAME>
+<RETURNS>gint </RETURNS>
+GdkColormap *colormap,gboolean contiguous,gulong *planes,gint nplanes,gulong *pixels,gint npixels
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_colors_free</NAME>
+<RETURNS>void </RETURNS>
+GdkColormap *colormap,gulong *pixels,gint npixels,gulong planes
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_color_white</NAME>
+<RETURNS>gint </RETURNS>
+GdkColormap *colormap,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_color_black</NAME>
+<RETURNS>gint </RETURNS>
+GdkColormap *colormap,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_color_alloc</NAME>
+<RETURNS>gint </RETURNS>
+GdkColormap *colormap,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_color_change</NAME>
+<RETURNS>gint </RETURNS>
+GdkColormap *colormap,GdkColor *color
+</FUNCTION>
+<MACRO>
+<NAME>gdk_draw_pixmap</NAME>
+#define gdk_draw_pixmap gdk_draw_drawable
+</MACRO>
+<MACRO>
+<NAME>gdk_draw_bitmap</NAME>
+#define gdk_draw_bitmap gdk_draw_drawable
+</MACRO>
+<MACRO>
+<NAME>gdk_window_get_size</NAME>
+#define gdk_window_get_size gdk_drawable_get_size
+</MACRO>
+<MACRO>
+<NAME>gdk_window_get_type</NAME>
+#define gdk_window_get_type gdk_window_get_window_type
+</MACRO>
+<MACRO>
+<NAME>gdk_window_get_colormap</NAME>
+#define gdk_window_get_colormap gdk_drawable_get_colormap
+</MACRO>
+<MACRO>
+<NAME>gdk_window_set_colormap</NAME>
+#define gdk_window_set_colormap gdk_drawable_set_colormap
+</MACRO>
+<MACRO>
+<NAME>gdk_window_get_visual</NAME>
+#define gdk_window_get_visual gdk_drawable_get_visual
+</MACRO>
+<MACRO>
+<NAME>gdk_window_ref</NAME>
+#define gdk_window_ref gdk_drawable_ref
+</MACRO>
+<MACRO>
+<NAME>gdk_window_unref</NAME>
+#define gdk_window_unref gdk_drawable_unref
+</MACRO>
+<MACRO>
+<NAME>gdk_bitmap_ref</NAME>
+#define gdk_bitmap_ref gdk_drawable_ref
+</MACRO>
+<MACRO>
+<NAME>gdk_bitmap_unref</NAME>
+#define gdk_bitmap_unref gdk_drawable_unref
+</MACRO>
+<MACRO>
+<NAME>gdk_pixmap_ref</NAME>
+#define gdk_pixmap_ref gdk_drawable_ref
+</MACRO>
+<MACRO>
+<NAME>gdk_pixmap_unref</NAME>
+#define gdk_pixmap_unref gdk_drawable_unref
+</MACRO>
+<MACRO>
+<NAME>gdk_window_copy_area</NAME>
+#define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \
+ gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
+</MACRO>
+<MACRO>
+<NAME>gdk_gc_destroy</NAME>
+#define gdk_gc_destroy gdk_gc_unref
+</MACRO>
+<MACRO>
+<NAME>gdk_image_destroy</NAME>
+#define gdk_image_destroy gdk_image_unref
+</MACRO>
+<MACRO>
+<NAME>gdk_cursor_destroy</NAME>
+#define gdk_cursor_destroy gdk_cursor_unref
+</MACRO>
+<MACRO>
+<NAME>gdk_rgb_get_cmap</NAME>
+#define gdk_rgb_get_cmap gdk_rgb_get_colormap
+</MACRO>
+<ENUM>
+<NAME>GdkCursorType</NAME>
+typedef enum
+{
+#include <gdk/gdkcursors.h>
+ GDK_LAST_CURSOR,
+ GDK_CURSOR_IS_PIXMAP = -1
+} GdkCursorType;
+</ENUM>
+<STRUCT>
+<NAME>GdkCursor</NAME>
+struct GdkCursor
+{
+ GdkCursorType type;
+ guint ref_count;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_cursor_new</NAME>
+<RETURNS>GdkCursor *</RETURNS>
+GdkCursorType cursor_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_cursor_new_from_pixmap</NAME>
+<RETURNS>GdkCursor *</RETURNS>
+GdkPixmap *source,GdkPixmap *mask,GdkColor *fg,GdkColor *bg,gint x,gint y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_cursor_ref</NAME>
+<RETURNS>GdkCursor *</RETURNS>
+GdkCursor *cursor
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_cursor_unref</NAME>
+<RETURNS>void </RETURNS>
+GdkCursor *cursor
+</FUNCTION>
+<STRUCT>
+<NAME>GdkDragContext</NAME>
+</STRUCT>
+<ENUM>
+<NAME>GdkDragAction</NAME>
+typedef enum
+{
+ GDK_ACTION_DEFAULT = 1 << 0,
+ GDK_ACTION_COPY = 1 << 1,
+ GDK_ACTION_MOVE = 1 << 2,
+ GDK_ACTION_LINK = 1 << 3,
+ GDK_ACTION_PRIVATE = 1 << 4,
+ GDK_ACTION_ASK = 1 << 5
+} GdkDragAction;
+</ENUM>
+<ENUM>
+<NAME>GdkDragProtocol</NAME>
+typedef enum
+{
+ GDK_DRAG_PROTO_MOTIF,
+ GDK_DRAG_PROTO_XDND,
+ GDK_DRAG_PROTO_ROOTWIN, /* A root window with nobody claiming
+ * drags */
+ GDK_DRAG_PROTO_NONE, /* Not a valid drag window */
+ GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
+ GDK_DRAG_PROTO_OLE2, /* The complex OLE2 dnd (not implemented) */
+ GDK_DRAG_PROTO_LOCAL /* Intra-app */
+} GdkDragProtocol;
+</ENUM>
+<STRUCT>
+<NAME>GdkDragContextClass</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_DRAG_CONTEXT</NAME>
+#define GDK_TYPE_DRAG_CONTEXT (gdk_drag_context_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAG_CONTEXT</NAME>
+#define GDK_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAG_CONTEXT_CLASS</NAME>
+#define GDK_DRAG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_DRAG_CONTEXT</NAME>
+#define GDK_IS_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_DRAG_CONTEXT_CLASS</NAME>
+#define GDK_IS_DRAG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAG_CONTEXT_GET_CLASS</NAME>
+#define GDK_DRAG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
+</MACRO>
+<STRUCT>
+<NAME>GdkDragContext</NAME>
+struct GdkDragContext {
+ GObject parent_instance;
+
+ /*< public >*/
+
+ GdkDragProtocol protocol;
+
+ gboolean is_source;
+
+ GdkWindow *source_window;
+ GdkWindow *dest_window;
+
+ GList *targets;
+ GdkDragAction actions;
+ GdkDragAction suggested_action;
+ GdkDragAction action;
+
+ guint32 start_time;
+
+ /*< private >*/
+
+ gpointer windowing_data;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_drag_context_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
</FUNCTION>
<FUNCTION>
<NAME>gdk_drag_context_new</NAME>
@@ -477,515 +1072,705 @@ GdkDragContext *context,guint32 time
<RETURNS>void </RETURNS>
GdkDragContext *context,guint32 time
</FUNCTION>
+<STRUCT>
+<NAME>GdkDrawableClass</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_DRAWABLE</NAME>
+#define GDK_TYPE_DRAWABLE (gdk_drawable_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAWABLE</NAME>
+#define GDK_DRAWABLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAWABLE, GdkDrawable))
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAWABLE_CLASS</NAME>
+#define GDK_DRAWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAWABLE, GdkDrawableClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_DRAWABLE</NAME>
+#define GDK_IS_DRAWABLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAWABLE))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_DRAWABLE_CLASS</NAME>
+#define GDK_IS_DRAWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAWABLE))
+</MACRO>
+<MACRO>
+<NAME>GDK_DRAWABLE_GET_CLASS</NAME>
+#define GDK_DRAWABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAWABLE, GdkDrawableClass))
+</MACRO>
+<STRUCT>
+<NAME>GdkDrawable</NAME>
+struct GdkDrawable
+{
+ GObject parent_instance;
+};
+</STRUCT>
<FUNCTION>
-<NAME>gdk_drag_get_selection</NAME>
-<RETURNS>GdkAtom </RETURNS>
-GdkDragContext *context
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_hints</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint x,gint y,gint min_width,gint min_height,gint max_width,gint max_height,gint flags
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_geometry_hints</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkGeometry *geometry,GdkWindowHints flags
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_set_sm_client_id</NAME>
-<RETURNS>void </RETURNS>
-const gchar *sm_client_id
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_title</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,const gchar *title
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_role</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,const gchar *role
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_transient_for</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkWindow *leader
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_background</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkColor *color
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_back_pixmap</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkPixmap *pixmap,gint parent_relative
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_cursor</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkCursor *cursor
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_colormap</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkColormap *colormap
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_user_data</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gpointer *data
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_geometry</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint *x,gint *y,gint *width,gint *height,gint *depth
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_position</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint *x,gint *y
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_size</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint *width,gint *height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_visual</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_colormap</NAME>
-<RETURNS>GdkColormap *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_type</NAME>
-<RETURNS>GdkWindowType </RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_origin</NAME>
-<RETURNS>gint </RETURNS>
-GdkWindow *window,gint *x,gint *y
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_deskrelative_origin</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkWindow *window,gint *x,gint *y
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_root_origin</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gint *x,gint *y
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_pointer</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-GdkWindow *window,gint *x,gint *y,GdkModifierType *mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_parent</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_toplevel</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_children</NAME>
-<RETURNS>GList *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_events</NAME>
-<RETURNS>GdkEventMask </RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_events</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkEventMask event_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_icon</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkWindow *icon_window,GdkPixmap *pixmap,GdkBitmap *mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_icon_name</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,gchar *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_group</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkWindow *leader
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_decorations</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkWMDecoration decorations
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_set_functions</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkWMFunction functions
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_window_get_toplevels</NAME>
-<RETURNS>GList *</RETURNS>
+<NAME>gdk_drawable_get_type</NAME>
+<RETURNS>GType </RETURNS>
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_window_register_dnd</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
<NAME>gdk_drawable_set_data</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,const gchar *key,gpointer data,GDestroyNotify destroy_func
+GdkDrawable *drawable,const gchar *key,gpointer data,GDestroyNotify destroy_func
</FUNCTION>
<FUNCTION>
-<NAME>gdk_cursor_new</NAME>
-<RETURNS>GdkCursor *</RETURNS>
-GdkCursorType cursor_type
+<NAME>gdk_drawable_get_data</NAME>
+<RETURNS>gpointer </RETURNS>
+GdkDrawable *drawable,const gchar *key
</FUNCTION>
<FUNCTION>
-<NAME>gdk_cursor_new_from_pixmap</NAME>
-<RETURNS>GdkCursor *</RETURNS>
-GdkPixmap *source,GdkPixmap *mask,GdkColor *fg,GdkColor *bg,gint x,gint y
+<NAME>gdk_drawable_get_size</NAME>
+<RETURNS>void </RETURNS>
+GdkDrawable *drawable,gint *width,gint *height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_cursor_destroy</NAME>
+<NAME>gdk_drawable_set_colormap</NAME>
<RETURNS>void </RETURNS>
-GdkCursor *cursor
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_gc_new</NAME>
-<RETURNS>GdkGC *</RETURNS>
-GdkWindow *window
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_gc_new_with_values</NAME>
-<RETURNS>GdkGC *</RETURNS>
-GdkWindow *window,GdkGCValues *values,GdkGCValuesMask values_mask
+GdkDrawable *drawable,GdkColormap *colormap
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_ref</NAME>
-<RETURNS>GdkGC *</RETURNS>
-GdkGC *gc
+<NAME>gdk_drawable_get_colormap</NAME>
+<RETURNS>GdkColormap *</RETURNS>
+GdkDrawable *drawable
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkGC *gc
+<NAME>gdk_drawable_get_visual</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+GdkDrawable *drawable
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_destroy</NAME>
-<RETURNS>void </RETURNS>
-GdkGC *gc
+<NAME>gdk_drawable_get_depth</NAME>
+<RETURNS>gint </RETURNS>
+GdkDrawable *drawable
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_get_values</NAME>
-<RETURNS>void </RETURNS>
-GdkGC *gc,GdkGCValues *values
+<NAME>gdk_drawable_ref</NAME>
+<RETURNS>GdkDrawable *</RETURNS>
+GdkDrawable *drawable
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_foreground</NAME>
+<NAME>gdk_drawable_unref</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkColor *color
+GdkDrawable *drawable
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_background</NAME>
+<NAME>gdk_draw_point</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkColor *color
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_font</NAME>
+<NAME>gdk_draw_line</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkFont *font
+GdkDrawable *drawable,GdkGC *gc,gint x1,gint y1,gint x2,gint y2
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_function</NAME>
+<NAME>gdk_draw_rectangle</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkFunction function
+GdkDrawable *drawable,GdkGC *gc,gint filled,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_fill</NAME>
+<NAME>gdk_draw_arc</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkFill fill
+GdkDrawable *drawable,GdkGC *gc,gint filled,gint x,gint y,gint width,gint height,gint angle1,gint angle2
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_tile</NAME>
+<NAME>gdk_draw_polygon</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkPixmap *tile
+GdkDrawable *drawable,GdkGC *gc,gint filled,GdkPoint *points,gint npoints
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_stipple</NAME>
+<NAME>gdk_draw_string</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkPixmap *stipple
+GdkDrawable *drawable,GdkFont *font,GdkGC *gc,gint x,gint y,const gchar *string
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_ts_origin</NAME>
+<NAME>gdk_draw_text</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,gint x,gint y
+GdkDrawable *drawable,GdkFont *font,GdkGC *gc,gint x,gint y,const gchar *text,gint text_length
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_clip_origin</NAME>
+<NAME>gdk_draw_text_wc</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,gint x,gint y
+GdkDrawable *drawable,GdkFont *font,GdkGC *gc,gint x,gint y,const GdkWChar *text,gint text_length
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_clip_mask</NAME>
+<NAME>gdk_draw_drawable</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkBitmap *mask
+GdkDrawable *drawable,GdkGC *gc,GdkDrawable *src,gint xsrc,gint ysrc,gint xdest,gint ydest,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_clip_rectangle</NAME>
+<NAME>gdk_draw_image</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkRectangle *rectangle
+GdkDrawable *drawable,GdkGC *gc,GdkImage *image,gint xsrc,gint ysrc,gint xdest,gint ydest,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_clip_region</NAME>
+<NAME>gdk_draw_points</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkRegion *region
+GdkDrawable *drawable,GdkGC *gc,GdkPoint *points,gint npoints
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_subwindow</NAME>
+<NAME>gdk_draw_segments</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,GdkSubwindowMode mode
+GdkDrawable *drawable,GdkGC *gc,GdkSegment *segs,gint nsegs
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_exposures</NAME>
+<NAME>gdk_draw_lines</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,gint exposures
+GdkDrawable *drawable,GdkGC *gc,GdkPoint *points,gint npoints
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_line_attributes</NAME>
+<NAME>gdk_draw_glyphs</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,gint line_width,GdkLineStyle line_style,GdkCapStyle cap_style,GdkJoinStyle join_style
+GdkDrawable *drawable,GdkGC *gc,PangoFont *font,gint x,gint y,PangoGlyphString *glyphs
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_set_dashes</NAME>
+<NAME>gdk_draw_layout_line</NAME>
<RETURNS>void </RETURNS>
-GdkGC *gc,gint dash_offset,gchar dash_list[],gint n
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,PangoLayoutLine *line
</FUNCTION>
<FUNCTION>
-<NAME>gdk_gc_copy</NAME>
+<NAME>gdk_draw_layout</NAME>
<RETURNS>void </RETURNS>
-GdkGC *dst_gc,GdkGC *src_gc
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_new</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkWindow *window,gint width,gint height,gint depth
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_bitmap_create_from_data</NAME>
-<RETURNS>GdkBitmap *</RETURNS>
-GdkWindow *window,const gchar *data,gint width,gint height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_create_from_data</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkWindow *window,const gchar *data,gint width,gint height,gint depth,GdkColor *fg,GdkColor *bg
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_create_from_xpm</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkWindow *window,GdkBitmap **mask,GdkColor *transparent_color,const gchar *filename
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_colormap_create_from_xpm</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkWindow *window,GdkColormap *colormap,GdkBitmap **mask,GdkColor *transparent_color,const gchar *filename
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_create_from_xpm_d</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkWindow *window,GdkBitmap **mask,GdkColor *transparent_color,gchar **data
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_colormap_create_from_xpm_d</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkWindow *window,GdkColormap *colormap,GdkBitmap **mask,GdkColor *transparent_color,gchar **data
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_ref</NAME>
-<RETURNS>GdkPixmap *</RETURNS>
-GdkPixmap *pixmap
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_pixmap_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkPixmap *pixmap
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_bitmap_ref</NAME>
-<RETURNS>GdkBitmap *</RETURNS>
-GdkBitmap *pixmap
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_bitmap_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkBitmap *pixmap
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_image_new_bitmap</NAME>
-<RETURNS>GdkImage *</RETURNS>
-GdkVisual *visual,gpointer data,gint width,gint height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_image_new</NAME>
-<RETURNS>GdkImage *</RETURNS>
-GdkImageType type,GdkVisual *visual,gint width,gint height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_image_get</NAME>
-<RETURNS>GdkImage *</RETURNS>
-GdkWindow *window,gint x,gint y,gint width,gint height
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_image_put_pixel</NAME>
-<RETURNS>void </RETURNS>
-GdkImage *image,gint x,gint y,guint32 pixel
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_image_get_pixel</NAME>
-<RETURNS>guint32 </RETURNS>
-GdkImage *image,gint x,gint y
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_image_destroy</NAME>
-<RETURNS>void </RETURNS>
-GdkImage *image
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_colormap_new</NAME>
-<RETURNS>GdkColormap *</RETURNS>
-GdkVisual *visual,gint allocate
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_colormap_ref</NAME>
-<RETURNS>GdkColormap *</RETURNS>
-GdkColormap *cmap
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_colormap_unref</NAME>
-<RETURNS>void </RETURNS>
-GdkColormap *cmap
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,PangoLayout *layout
</FUNCTION>
+<MACRO>
+<NAME>GDK_PRIORITY_EVENTS</NAME>
+#define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT)
+</MACRO>
+<MACRO>
+<NAME>GDK_PRIORITY_REDRAW</NAME>
+#define GDK_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 20)
+</MACRO>
+<STRUCT>
+<NAME>GdkEventAny</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventExpose</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventNoExpose</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventVisibility</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventMotion</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventButton</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventScroll</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventKey</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventFocus</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventCrossing</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventConfigure</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventProperty</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventSelection</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventProximity</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventClient</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventDND</NAME>
+</STRUCT>
+<USER_FUNCTION>
+<NAME>GdkEventFunc</NAME>
+<RETURNS>void </RETURNS>
+GdkEvent *event,
+ gpointer data
+</USER_FUNCTION>
+<TYPEDEF>
+<NAME>GdkXEvent</NAME>
+typedef void GdkXEvent; /* Can be cast to XEvent */
+</TYPEDEF>
+<ENUM>
+<NAME>GdkFilterReturn</NAME>
+typedef enum {
+ GDK_FILTER_CONTINUE, /* Event not handled, continue processesing */
+ GDK_FILTER_TRANSLATE, /* Translated event stored */
+ GDK_FILTER_REMOVE /* Terminate processing, removing event */
+} GdkFilterReturn;
+</ENUM>
+<USER_FUNCTION>
+<NAME>GdkFilterFunc</NAME>
+<RETURNS>GdkFilterReturn </RETURNS>
+GdkXEvent *xevent,
+ GdkEvent *event,
+ gpointer data
+</USER_FUNCTION>
+<ENUM>
+<NAME>GdkEventType</NAME>
+typedef enum
+{
+ GDK_NOTHING = -1,
+ GDK_DELETE = 0,
+ GDK_DESTROY = 1,
+ GDK_EXPOSE = 2,
+ GDK_MOTION_NOTIFY = 3,
+ GDK_BUTTON_PRESS = 4,
+ GDK_2BUTTON_PRESS = 5,
+ GDK_3BUTTON_PRESS = 6,
+ GDK_BUTTON_RELEASE = 7,
+ GDK_KEY_PRESS = 8,
+ GDK_KEY_RELEASE = 9,
+ GDK_ENTER_NOTIFY = 10,
+ GDK_LEAVE_NOTIFY = 11,
+ GDK_FOCUS_CHANGE = 12,
+ GDK_CONFIGURE = 13,
+ GDK_MAP = 14,
+ GDK_UNMAP = 15,
+ GDK_PROPERTY_NOTIFY = 16,
+ GDK_SELECTION_CLEAR = 17,
+ GDK_SELECTION_REQUEST = 18,
+ GDK_SELECTION_NOTIFY = 19,
+ GDK_PROXIMITY_IN = 20,
+ GDK_PROXIMITY_OUT = 21,
+ GDK_DRAG_ENTER = 22,
+ GDK_DRAG_LEAVE = 23,
+ GDK_DRAG_MOTION = 24,
+ GDK_DRAG_STATUS = 25,
+ GDK_DROP_START = 26,
+ GDK_DROP_FINISHED = 27,
+ GDK_CLIENT_EVENT = 28,
+ GDK_VISIBILITY_NOTIFY = 29,
+ GDK_NO_EXPOSE = 30,
+ GDK_SCROLL = 31
+} GdkEventType;
+</ENUM>
+<ENUM>
+<NAME>GdkEventMask</NAME>
+typedef enum
+{
+ GDK_EXPOSURE_MASK = 1 << 1,
+ GDK_POINTER_MOTION_MASK = 1 << 2,
+ GDK_POINTER_MOTION_HINT_MASK = 1 << 3,
+ GDK_BUTTON_MOTION_MASK = 1 << 4,
+ GDK_BUTTON1_MOTION_MASK = 1 << 5,
+ GDK_BUTTON2_MOTION_MASK = 1 << 6,
+ GDK_BUTTON3_MOTION_MASK = 1 << 7,
+ GDK_BUTTON_PRESS_MASK = 1 << 8,
+ GDK_BUTTON_RELEASE_MASK = 1 << 9,
+ GDK_KEY_PRESS_MASK = 1 << 10,
+ GDK_KEY_RELEASE_MASK = 1 << 11,
+ GDK_ENTER_NOTIFY_MASK = 1 << 12,
+ GDK_LEAVE_NOTIFY_MASK = 1 << 13,
+ GDK_FOCUS_CHANGE_MASK = 1 << 14,
+ GDK_STRUCTURE_MASK = 1 << 15,
+ GDK_PROPERTY_CHANGE_MASK = 1 << 16,
+ GDK_VISIBILITY_NOTIFY_MASK = 1 << 17,
+ GDK_PROXIMITY_IN_MASK = 1 << 18,
+ GDK_PROXIMITY_OUT_MASK = 1 << 19,
+ GDK_SUBSTRUCTURE_MASK = 1 << 20,
+ GDK_SCROLL_MASK = 1 << 21,
+ GDK_ALL_EVENTS_MASK = 0x3FFFFE
+} GdkEventMask;
+</ENUM>
+<ENUM>
+<NAME>GdkVisibilityState</NAME>
+typedef enum
+{
+ GDK_VISIBILITY_UNOBSCURED,
+ GDK_VISIBILITY_PARTIAL,
+ GDK_VISIBILITY_FULLY_OBSCURED
+} GdkVisibilityState;
+</ENUM>
+<ENUM>
+<NAME>GdkScrollDirection</NAME>
+typedef enum
+{
+ GDK_SCROLL_UP,
+ GDK_SCROLL_DOWN,
+ GDK_SCROLL_LEFT,
+ GDK_SCROLL_RIGHT
+} GdkScrollDirection;
+</ENUM>
+<ENUM>
+<NAME>GdkNotifyType</NAME>
+typedef enum
+{
+ GDK_NOTIFY_ANCESTOR = 0,
+ GDK_NOTIFY_VIRTUAL = 1,
+ GDK_NOTIFY_INFERIOR = 2,
+ GDK_NOTIFY_NONLINEAR = 3,
+ GDK_NOTIFY_NONLINEAR_VIRTUAL = 4,
+ GDK_NOTIFY_UNKNOWN = 5
+} GdkNotifyType;
+</ENUM>
+<ENUM>
+<NAME>GdkCrossingMode</NAME>
+typedef enum
+{
+ GDK_CROSSING_NORMAL,
+ GDK_CROSSING_GRAB,
+ GDK_CROSSING_UNGRAB
+} GdkCrossingMode;
+</ENUM>
+<ENUM>
+<NAME>GdkPropertyState</NAME>
+typedef enum
+{
+ GDK_PROPERTY_NEW_VALUE,
+ GDK_PROPERTY_DELETE
+} GdkPropertyState;
+</ENUM>
+<STRUCT>
+<NAME>GdkEventAny</NAME>
+struct GdkEventAny
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventExpose</NAME>
+struct GdkEventExpose
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkRectangle area;
+ gint count; /* If non-zero, how many more events follow. */
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventNoExpose</NAME>
+struct GdkEventNoExpose
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ /* XXX: does anyone need the X major_code or minor_code fields? */
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventVisibility</NAME>
+struct GdkEventVisibility
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkVisibilityState state;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventMotion</NAME>
+struct GdkEventMotion
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ guint32 time;
+ gdouble x;
+ gdouble y;
+ gdouble *axes;
+ guint state;
+ gint16 is_hint;
+ GdkDevice *device;
+ gdouble x_root, y_root;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventButton</NAME>
+struct GdkEventButton
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ guint32 time;
+ gdouble x;
+ gdouble y;
+ gdouble *axes;
+ guint state;
+ guint button;
+ GdkDevice *device;
+ gdouble x_root, y_root;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventScroll</NAME>
+struct GdkEventScroll
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ guint32 time;
+ gdouble x;
+ gdouble y;
+ guint state;
+ GdkScrollDirection direction;
+ GdkDevice *device;
+ gdouble x_root, y_root;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventKey</NAME>
+struct GdkEventKey
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ guint32 time;
+ guint state;
+ guint keyval;
+ gint length;
+ gchar *string;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventCrossing</NAME>
+struct GdkEventCrossing
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkWindow *subwindow;
+ guint32 time;
+ gdouble x;
+ gdouble y;
+ gdouble x_root;
+ gdouble y_root;
+ GdkCrossingMode mode;
+ GdkNotifyType detail;
+ gboolean focus;
+ guint state;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventFocus</NAME>
+struct GdkEventFocus
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ gint16 in;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventConfigure</NAME>
+struct GdkEventConfigure
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ gint x, y;
+ gint width;
+ gint height;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventProperty</NAME>
+struct GdkEventProperty
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkAtom atom;
+ guint32 time;
+ guint state;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventSelection</NAME>
+struct GdkEventSelection
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkAtom selection;
+ GdkAtom target;
+ GdkAtom property;
+ guint32 time;
+ GdkNativeWindow requestor;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventProximity</NAME>
+struct GdkEventProximity
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ guint32 time;
+ GdkDevice *device;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventClient</NAME>
+struct GdkEventClient
+{
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkAtom message_type;
+ gushort data_format;
+ union {
+ char b[20];
+ short s[10];
+ long l[5];
+ } data;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkEventDND</NAME>
+struct GdkEventDND {
+ GdkEventType type;
+ GdkWindow *window;
+ gint8 send_event;
+ GdkDragContext *context;
+
+ guint32 time;
+ gshort x_root, y_root;
+};
+</STRUCT>
+<UNION>
+<NAME>GdkEvent</NAME>
+union GdkEvent
+{
+ GdkEventType type;
+ GdkEventAny any;
+ GdkEventExpose expose;
+ GdkEventNoExpose no_expose;
+ GdkEventVisibility visibility;
+ GdkEventMotion motion;
+ GdkEventButton button;
+ GdkEventScroll scroll;
+ GdkEventKey key;
+ GdkEventCrossing crossing;
+ GdkEventFocus focus_change;
+ GdkEventConfigure configure;
+ GdkEventProperty property;
+ GdkEventSelection selection;
+ GdkEventProximity proximity;
+ GdkEventClient client;
+ GdkEventDND dnd;
+};
+</UNION>
<FUNCTION>
-<NAME>gdk_colormap_get_system</NAME>
-<RETURNS>GdkColormap *</RETURNS>
+<NAME>gdk_events_pending</NAME>
+<RETURNS>gboolean </RETURNS>
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colormap_get_system_size</NAME>
-<RETURNS>gint </RETURNS>
+<NAME>gdk_event_get</NAME>
+<RETURNS>GdkEvent *</RETURNS>
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colormap_change</NAME>
-<RETURNS>void </RETURNS>
-GdkColormap *colormap,gint ncolors
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_colormap_alloc_colors</NAME>
-<RETURNS>gint </RETURNS>
-GdkColormap *colormap,GdkColor *colors,gint ncolors,gboolean writeable,gboolean best_match,gboolean *success
+<NAME>gdk_event_peek</NAME>
+<RETURNS>GdkEvent *</RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colormap_alloc_color</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkColormap *colormap,GdkColor *color,gboolean writeable,gboolean best_match
+<NAME>gdk_event_get_graphics_expose</NAME>
+<RETURNS>GdkEvent *</RETURNS>
+GdkWindow *window
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colormap_free_colors</NAME>
+<NAME>gdk_event_put</NAME>
<RETURNS>void </RETURNS>
-GdkColormap *colormap,GdkColor *colors,gint ncolors
+GdkEvent *event
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colormap_get_visual</NAME>
-<RETURNS>GdkVisual *</RETURNS>
-GdkColormap *colormap
+<NAME>gdk_event_copy</NAME>
+<RETURNS>GdkEvent *</RETURNS>
+GdkEvent *event
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_copy</NAME>
-<RETURNS>GdkColor *</RETURNS>
-GdkColor *color
+<NAME>gdk_event_free</NAME>
+<RETURNS>void </RETURNS>
+GdkEvent *event
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_free</NAME>
-<RETURNS>void </RETURNS>
-GdkColor *color
+<NAME>gdk_event_get_time</NAME>
+<RETURNS>guint32 </RETURNS>
+GdkEvent *event
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_parse</NAME>
+<NAME>gdk_event_get_axis</NAME>
<RETURNS>gboolean </RETURNS>
-const gchar *spec,GdkColor *color
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_color_hash</NAME>
-<RETURNS>guint </RETURNS>
-const GdkColor *colora,const GdkColor *colorb
+GdkEvent *event,GdkAxisUse axis_use,gdouble *value
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_equal</NAME>
-<RETURNS>gint </RETURNS>
-const GdkColor *colora,const GdkColor *colorb
+<NAME>gdk_event_handler_set</NAME>
+<RETURNS>void </RETURNS>
+GdkEventFunc func,gpointer data,GDestroyNotify notify
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colors_store</NAME>
-<RETURNS>void </RETURNS>
-GdkColormap *colormap,GdkColor *colors,gint ncolors
+<NAME>gdk_set_show_events</NAME>
+<RETURNS>void </RETURNS>
+gboolean show_events
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colors_alloc</NAME>
+<NAME>gdk_get_show_events</NAME>
<RETURNS>gboolean </RETURNS>
-GdkColormap *colormap,gint contiguous,gulong *planes,gint nplanes,gulong *pixels,gint npixels
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_colors_free</NAME>
+<NAME>gdk_add_client_message_filter</NAME>
<RETURNS>void </RETURNS>
-GdkColormap *colormap,gulong *pixels,gint npixels,gulong planes
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_color_white</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkColormap *colormap,GdkColor *color
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_color_black</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkColormap *colormap,GdkColor *color
+GdkAtom message_type,GdkFilterFunc func,gpointer data
</FUNCTION>
+<ENUM>
+<NAME>GdkFontType</NAME>
+typedef enum
+{
+ GDK_FONT_FONT,
+ GDK_FONT_FONTSET
+} GdkFontType;
+</ENUM>
+<STRUCT>
+<NAME>GdkFont</NAME>
+struct GdkFont
+{
+ GdkFontType type;
+ gint ascent;
+ gint descent;
+};
+</STRUCT>
<FUNCTION>
-<NAME>gdk_color_alloc</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkColormap *colormap,GdkColor *color
+<NAME>gdk_font_load</NAME>
+<RETURNS>GdkFont *</RETURNS>
+const gchar *font_name
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_change</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkColormap *colormap,GdkColor *color
+<NAME>gdk_fontset_load</NAME>
+<RETURNS>GdkFont *</RETURNS>
+const gchar *fontset_name
</FUNCTION>
<FUNCTION>
<NAME>gdk_font_load</NAME>
<RETURNS>GdkFont *</RETURNS>
-const gchar *font_name
+const gchar *font_name
</FUNCTION>
<FUNCTION>
<NAME>gdk_fontset_load</NAME>
<RETURNS>GdkFont *</RETURNS>
-gchar *fontset_name
+const gchar *fontset_name
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_font_from_description</NAME>
+<RETURNS>GdkFont *</RETURNS>
+PangoFontDescription *font_desc
</FUNCTION>
<FUNCTION>
<NAME>gdk_font_ref</NAME>
@@ -1004,7 +1789,7 @@ const GdkFont *font
</FUNCTION>
<FUNCTION>
<NAME>gdk_font_equal</NAME>
-<RETURNS>gint </RETURNS>
+<RETURNS>gboolean </RETURNS>
const GdkFont *fonta,const GdkFont *fontb
</FUNCTION>
<FUNCTION>
@@ -1078,208 +1863,427 @@ GdkFont *font,const GdkWChar *text,gint text_length,gint
GdkFont *font,const gchar *string,gint *lbearing,gint *rbearing,gint *width,gint *ascent,gint *descent
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_point</NAME>
-<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x,gint y
+<NAME>gdk_font_full_name_get</NAME>
+<RETURNS>gchar *</RETURNS>
+GdkFont *font
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_line</NAME>
-<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x1,gint y1,gint x2,gint y2
+<NAME>gdk_font_full_name_free</NAME>
+<RETURNS>void </RETURNS>
+gchar *name
</FUNCTION>
+<STRUCT>
+<NAME>GdkGCValues</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkGCClass</NAME>
+</STRUCT>
+<ENUM>
+<NAME>GdkCapStyle</NAME>
+typedef enum
+{
+ GDK_CAP_NOT_LAST,
+ GDK_CAP_BUTT,
+ GDK_CAP_ROUND,
+ GDK_CAP_PROJECTING
+} GdkCapStyle;
+</ENUM>
+<ENUM>
+<NAME>GdkFill</NAME>
+typedef enum
+{
+ GDK_SOLID,
+ GDK_TILED,
+ GDK_STIPPLED,
+ GDK_OPAQUE_STIPPLED
+} GdkFill;
+</ENUM>
+<ENUM>
+<NAME>GdkFunction</NAME>
+typedef enum
+{
+ GDK_COPY,
+ GDK_INVERT,
+ GDK_XOR,
+ GDK_CLEAR,
+ GDK_AND,
+ GDK_AND_REVERSE,
+ GDK_AND_INVERT,
+ GDK_NOOP,
+ GDK_OR,
+ GDK_EQUIV,
+ GDK_OR_REVERSE,
+ GDK_COPY_INVERT,
+ GDK_OR_INVERT,
+ GDK_NAND,
+ GDK_NOR,
+ GDK_SET
+} GdkFunction;
+</ENUM>
+<ENUM>
+<NAME>GdkJoinStyle</NAME>
+typedef enum
+{
+ GDK_JOIN_MITER,
+ GDK_JOIN_ROUND,
+ GDK_JOIN_BEVEL
+} GdkJoinStyle;
+</ENUM>
+<ENUM>
+<NAME>GdkLineStyle</NAME>
+typedef enum
+{
+ GDK_LINE_SOLID,
+ GDK_LINE_ON_OFF_DASH,
+ GDK_LINE_DOUBLE_DASH
+} GdkLineStyle;
+</ENUM>
+<ENUM>
+<NAME>GdkSubwindowMode</NAME>
+typedef enum
+{
+ GDK_CLIP_BY_CHILDREN = 0,
+ GDK_INCLUDE_INFERIORS = 1
+} GdkSubwindowMode;
+</ENUM>
+<ENUM>
+<NAME>GdkGCValuesMask</NAME>
+typedef enum
+{
+ GDK_GC_FOREGROUND = 1 << 0,
+ GDK_GC_BACKGROUND = 1 << 1,
+ GDK_GC_FONT = 1 << 2,
+ GDK_GC_FUNCTION = 1 << 3,
+ GDK_GC_FILL = 1 << 4,
+ GDK_GC_TILE = 1 << 5,
+ GDK_GC_STIPPLE = 1 << 6,
+ GDK_GC_CLIP_MASK = 1 << 7,
+ GDK_GC_SUBWINDOW = 1 << 8,
+ GDK_GC_TS_X_ORIGIN = 1 << 9,
+ GDK_GC_TS_Y_ORIGIN = 1 << 10,
+ GDK_GC_CLIP_X_ORIGIN = 1 << 11,
+ GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
+ GDK_GC_EXPOSURES = 1 << 13,
+ GDK_GC_LINE_WIDTH = 1 << 14,
+ GDK_GC_LINE_STYLE = 1 << 15,
+ GDK_GC_CAP_STYLE = 1 << 16,
+ GDK_GC_JOIN_STYLE = 1 << 17
+} GdkGCValuesMask;
+</ENUM>
+<STRUCT>
+<NAME>GdkGCValues</NAME>
+struct GdkGCValues
+{
+ GdkColor foreground;
+ GdkColor background;
+ GdkFont *font;
+ GdkFunction function;
+ GdkFill fill;
+ GdkPixmap *tile;
+ GdkPixmap *stipple;
+ GdkPixmap *clip_mask;
+ GdkSubwindowMode subwindow_mode;
+ gint ts_x_origin;
+ gint ts_y_origin;
+ gint clip_x_origin;
+ gint clip_y_origin;
+ gint graphics_exposures;
+ gint line_width;
+ GdkLineStyle line_style;
+ GdkCapStyle cap_style;
+ GdkJoinStyle join_style;
+};
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_GC</NAME>
+#define GDK_TYPE_GC (gdk_gc_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_GC</NAME>
+#define GDK_GC(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC, GdkGC))
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_CLASS</NAME>
+#define GDK_GC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GC, GdkGCClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_GC</NAME>
+#define GDK_IS_GC(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_GC_CLASS</NAME>
+#define GDK_IS_GC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GC))
+</MACRO>
+<MACRO>
+<NAME>GDK_GC_GET_CLASS</NAME>
+#define GDK_GC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GC, GdkGCClass))
+</MACRO>
+<STRUCT>
+<NAME>GdkGC</NAME>
+struct GdkGC
+{
+ GObject parent_instance;
+
+ gint clip_x_origin;
+ gint clip_y_origin;
+ gint ts_x_origin;
+ gint ts_y_origin;
+
+ GdkColormap *colormap;
+};
+</STRUCT>
<FUNCTION>
-<NAME>gdk_draw_rectangle</NAME>
-<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint filled,gint x,gint y,gint width,gint height
+<NAME>gdk_gc_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_arc</NAME>
-<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint filled,gint x,gint y,gint width,gint height,gint angle1,gint angle2
+<NAME>gdk_gc_new</NAME>
+<RETURNS>GdkGC *</RETURNS>
+GdkDrawable *drawable
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_polygon</NAME>
-<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint filled,GdkPoint *points,gint npoints
+<NAME>gdk_gc_new_with_values</NAME>
+<RETURNS>GdkGC *</RETURNS>
+GdkDrawable *drawable,GdkGCValues *values,GdkGCValuesMask values_mask
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_string</NAME>
-<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkFont *font,GdkGC *gc,gint x,gint y,const gchar *string
+<NAME>gdk_gc_ref</NAME>
+<RETURNS>GdkGC *</RETURNS>
+GdkGC *gc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_text</NAME>
+<NAME>gdk_gc_unref</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkFont *font,GdkGC *gc,gint x,gint y,const gchar *text,gint text_length
+GdkGC *gc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_text_wc</NAME>
+<NAME>gdk_gc_get_values</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkFont *font,GdkGC *gc,gint x,gint y,const GdkWChar *text,gint text_length
+GdkGC *gc,GdkGCValues *values
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_pixmap</NAME>
+<NAME>gdk_gc_set_values</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,GdkDrawable *src,gint xsrc,gint ysrc,gint xdest,gint ydest,gint width,gint height
+GdkGC *gc,GdkGCValues *values,GdkGCValuesMask values_mask
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_bitmap</NAME>
+<NAME>gdk_gc_set_foreground</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,GdkDrawable *src,gint xsrc,gint ysrc,gint xdest,gint ydest,gint width,gint height
+GdkGC *gc,GdkColor *color
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_image</NAME>
+<NAME>gdk_gc_set_background</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,GdkImage *image,gint xsrc,gint ysrc,gint xdest,gint ydest,gint width,gint height
+GdkGC *gc,GdkColor *color
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_points</NAME>
+<NAME>gdk_gc_set_font</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,GdkPoint *points,gint npoints
+GdkGC *gc,GdkFont *font
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_segments</NAME>
+<NAME>gdk_gc_set_function</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,GdkSegment *segs,gint nsegs
+GdkGC *gc,GdkFunction function
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_lines</NAME>
+<NAME>gdk_gc_set_fill</NAME>
<RETURNS>void </RETURNS>
-GdkDrawable *drawable,GdkGC *gc,GdkPoint *points,gint npoints
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_selection_owner_set</NAME>
-<RETURNS>gint </RETURNS>
-GdkWindow *owner,GdkAtom selection,guint32 time,gint send_event
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_selection_owner_get</NAME>
-<RETURNS>GdkWindow *</RETURNS>
-GdkAtom selection
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_selection_convert</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *requestor,GdkAtom selection,GdkAtom target,guint32 time
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_selection_property_get</NAME>
-<RETURNS>gint </RETURNS>
-GdkWindow *requestor,guchar **data,GdkAtom *prop_type,gint *prop_format
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_selection_send_notify</NAME>
-<RETURNS>void </RETURNS>
-guint32 requestor,GdkAtom selection,GdkAtom target,GdkAtom property,guint32 time
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_text_property_to_text_list</NAME>
-<RETURNS>gint </RETURNS>
-GdkAtom encoding, gint format,guchar *text, gint length,gchar ***list
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_free_text_list</NAME>
-<RETURNS>void </RETURNS>
-gchar **list
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_string_to_compound_text</NAME>
-<RETURNS>gint </RETURNS>
-gchar *str,GdkAtom *encoding, gint *format,guchar **ctext, gint *length
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_free_compound_text</NAME>
-<RETURNS>void </RETURNS>
-guchar *ctext
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_atom_intern</NAME>
-<RETURNS>GdkAtom </RETURNS>
-const gchar *atom_name,gint only_if_exists
+GdkGC *gc,GdkFill fill
</FUNCTION>
<FUNCTION>
-<NAME>gdk_atom_name</NAME>
-<RETURNS>gchar *</RETURNS>
-GdkAtom atom
+<NAME>gdk_gc_set_tile</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,GdkPixmap *tile
</FUNCTION>
<FUNCTION>
-<NAME>gdk_property_get</NAME>
-<RETURNS>gint </RETURNS>
-GdkWindow *window,GdkAtom property,GdkAtom type,gulong offset,gulong length,gint pdelete,GdkAtom *actual_property_type,gint *actual_format,gint *actual_length,guchar **data
+<NAME>gdk_gc_set_stipple</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,GdkPixmap *stipple
</FUNCTION>
<FUNCTION>
-<NAME>gdk_property_change</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkAtom property,GdkAtom type,gint format,GdkPropMode mode,guchar *data,gint nelements
+<NAME>gdk_gc_set_ts_origin</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,gint x,gint y
</FUNCTION>
<FUNCTION>
-<NAME>gdk_property_delete</NAME>
-<RETURNS>void </RETURNS>
-GdkWindow *window,GdkAtom property
+<NAME>gdk_gc_set_clip_origin</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,gint x,gint y
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rectangle_intersect</NAME>
-<RETURNS>gint </RETURNS>
-GdkRectangle *src1,GdkRectangle *src2,GdkRectangle *dest
+<NAME>gdk_gc_set_clip_mask</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,GdkBitmap *mask
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rectangle_union</NAME>
+<NAME>gdk_gc_set_clip_rectangle</NAME>
<RETURNS>void </RETURNS>
-GdkRectangle *src1,GdkRectangle *src2,GdkRectangle *dest
+GdkGC *gc,GdkRectangle *rectangle
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_init</NAME>
+<NAME>gdk_gc_set_clip_region</NAME>
<RETURNS>void </RETURNS>
-void
+GdkGC *gc,GdkRegion *region
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_exit</NAME>
+<NAME>gdk_gc_set_subwindow</NAME>
<RETURNS>void </RETURNS>
-void
+GdkGC *gc,GdkSubwindowMode mode
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_list_devices</NAME>
-<RETURNS>GList *</RETURNS>
-void
+<NAME>gdk_gc_set_exposures</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,gboolean exposures
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_set_extension_events</NAME>
+<NAME>gdk_gc_set_line_attributes</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,gint mask,GdkExtensionMode mode
+GdkGC *gc,gint line_width,GdkLineStyle line_style,GdkCapStyle cap_style,GdkJoinStyle join_style
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_set_source</NAME>
+<NAME>gdk_gc_set_dashes</NAME>
<RETURNS>void </RETURNS>
-guint32 deviceid,GdkInputSource source
+GdkGC *gc,gint dash_offset,gint8 dash_list[],gint n
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_set_mode</NAME>
-<RETURNS>gint </RETURNS>
-guint32 deviceid,GdkInputMode mode
+<NAME>gdk_gc_copy</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *dst_gc,GdkGC *src_gc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_set_axes</NAME>
+<NAME>gdk_gc_set_colormap</NAME>
<RETURNS>void </RETURNS>
-guint32 deviceid,GdkAxisUse *axes
+GdkGC *gc,GdkColormap *colormap
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_set_key</NAME>
-<RETURNS>void </RETURNS>
-guint32 deviceid,guint index,guint keyval,GdkModifierType modifiers
+<NAME>gdk_gc_get_colormap</NAME>
+<RETURNS>GdkColormap *</RETURNS>
+GdkGC *gc
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_window_get_pointer</NAME>
+<NAME>gdk_gc_set_rgb_fg_color</NAME>
<RETURNS>void </RETURNS>
-GdkWindow *window,guint32 deviceid,gdouble *x,gdouble *y,gdouble *pressure,gdouble *xtilt,gdouble *ytilt,GdkModifierType *mask
+GdkGC *gc,GdkColor *color
</FUNCTION>
<FUNCTION>
-<NAME>gdk_input_motion_events</NAME>
-<RETURNS>GdkTimeCoord *</RETURNS>
-GdkWindow *window,guint32 deviceid,guint32 start,guint32 stop,gint *nevents_return
+<NAME>gdk_gc_set_rgb_bg_color</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,GdkColor *color
</FUNCTION>
+<MACRO>
+<NAME>gdk_iswalnum</NAME>
+# define gdk_iswalnum(c) iswalnum(c)
+</MACRO>
+<MACRO>
+<NAME>gdk_iswspace</NAME>
+# define gdk_iswspace(c) iswspace(c)
+</MACRO>
+<MACRO>
+<NAME>gdk_iswalnum</NAME>
+# define gdk_iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
+</MACRO>
+<MACRO>
+<NAME>gdk_iswspace</NAME>
+# define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
+</MACRO>
+<STRUCT>
+<NAME>GdkIC</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkICAttr</NAME>
+</STRUCT>
+<ENUM>
+<NAME>GdkIMStyle</NAME>
+typedef enum /*< flags >*/
+{
+ GDK_IM_PREEDIT_AREA = 0x0001,
+ GDK_IM_PREEDIT_CALLBACKS = 0x0002,
+ GDK_IM_PREEDIT_POSITION = 0x0004,
+ GDK_IM_PREEDIT_NOTHING = 0x0008,
+ GDK_IM_PREEDIT_NONE = 0x0010,
+ GDK_IM_PREEDIT_MASK = 0x001f,
+
+ GDK_IM_STATUS_AREA = 0x0100,
+ GDK_IM_STATUS_CALLBACKS = 0x0200,
+ GDK_IM_STATUS_NOTHING = 0x0400,
+ GDK_IM_STATUS_NONE = 0x0800,
+ GDK_IM_STATUS_MASK = 0x0f00
+} GdkIMStyle;
+</ENUM>
+<ENUM>
+<NAME>GdkICAttributesType</NAME>
+typedef enum
+{
+ GDK_IC_STYLE = 1 << 0,
+ GDK_IC_CLIENT_WINDOW = 1 << 1,
+ GDK_IC_FOCUS_WINDOW = 1 << 2,
+ GDK_IC_FILTER_EVENTS = 1 << 3,
+ GDK_IC_SPOT_LOCATION = 1 << 4,
+ GDK_IC_LINE_SPACING = 1 << 5,
+ GDK_IC_CURSOR = 1 << 6,
+
+ GDK_IC_PREEDIT_FONTSET = 1 << 10,
+ GDK_IC_PREEDIT_AREA = 1 << 11,
+ GDK_IC_PREEDIT_AREA_NEEDED = 1 << 12,
+ GDK_IC_PREEDIT_FOREGROUND = 1 << 13,
+ GDK_IC_PREEDIT_BACKGROUND = 1 << 14,
+ GDK_IC_PREEDIT_PIXMAP = 1 << 15,
+ GDK_IC_PREEDIT_COLORMAP = 1 << 16,
+
+ GDK_IC_STATUS_FONTSET = 1 << 21,
+ GDK_IC_STATUS_AREA = 1 << 22,
+ GDK_IC_STATUS_AREA_NEEDED = 1 << 23,
+ GDK_IC_STATUS_FOREGROUND = 1 << 24,
+ GDK_IC_STATUS_BACKGROUND = 1 << 25,
+ GDK_IC_STATUS_PIXMAP = 1 << 26,
+ GDK_IC_STATUS_COLORMAP = 1 << 27,
+
+ GDK_IC_ALL_REQ = GDK_IC_STYLE |
+ GDK_IC_CLIENT_WINDOW,
+
+ GDK_IC_PREEDIT_AREA_REQ = GDK_IC_PREEDIT_AREA |
+ GDK_IC_PREEDIT_FONTSET,
+ GDK_IC_PREEDIT_POSITION_REQ = GDK_IC_PREEDIT_AREA | GDK_IC_SPOT_LOCATION |
+ GDK_IC_PREEDIT_FONTSET,
+
+ GDK_IC_STATUS_AREA_REQ = GDK_IC_STATUS_AREA |
+ GDK_IC_STATUS_FONTSET
+} GdkICAttributesType;
+</ENUM>
+<STRUCT>
+<NAME>GdkICAttr</NAME>
+struct GdkICAttr
+{
+ GdkIMStyle style;
+ GdkWindow *client_window;
+ GdkWindow *focus_window;
+ GdkEventMask filter_events;
+ GdkPoint spot_location;
+ gint line_spacing;
+ GdkCursor *cursor;
+
+ GdkFont *preedit_fontset;
+ GdkRectangle preedit_area;
+ GdkRectangle preedit_area_needed;
+ GdkColor preedit_foreground;
+ GdkColor preedit_background;
+ GdkPixmap *preedit_pixmap;
+ GdkColormap *preedit_colormap;
+
+ GdkFont *status_fontset;
+ GdkRectangle status_area;
+ GdkRectangle status_area_needed;
+ GdkColor status_foreground;
+ GdkColor status_background;
+ GdkPixmap *status_pixmap;
+ GdkColormap *status_colormap;
+};
+</STRUCT>
<FUNCTION>
<NAME>gdk_im_ready</NAME>
-<RETURNS>gint </RETURNS>
+<RETURNS>gboolean </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -1342,90 +2346,479 @@ GdkIC *ic,GdkICAttr *attr,GdkICAttributesType mask
<RETURNS>GdkICAttributesType </RETURNS>
GdkIC *ic,GdkICAttr *attr,GdkICAttributesType mask
</FUNCTION>
+<ENUM>
+<NAME>GdkImageType</NAME>
+typedef enum
+{
+ GDK_IMAGE_NORMAL,
+ GDK_IMAGE_SHARED,
+ GDK_IMAGE_FASTEST
+} GdkImageType;
+</ENUM>
+<STRUCT>
+<NAME>GdkImageClass</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_IMAGE</NAME>
+#define GDK_TYPE_IMAGE (gdk_image_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_IMAGE</NAME>
+#define GDK_IMAGE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_IMAGE, GdkImage))
+</MACRO>
+<MACRO>
+<NAME>GDK_IMAGE_CLASS</NAME>
+#define GDK_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_IMAGE, GdkImageClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_IMAGE</NAME>
+#define GDK_IS_IMAGE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_IMAGE))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_IMAGE_CLASS</NAME>
+#define GDK_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_IMAGE))
+</MACRO>
+<MACRO>
+<NAME>GDK_IMAGE_GET_CLASS</NAME>
+#define GDK_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_IMAGE, GdkImageClass))
+</MACRO>
+<STRUCT>
+<NAME>GdkImage</NAME>
+struct GdkImage
+{
+ GObject parent_instance;
+
+ GdkImageType type;
+ GdkVisual *visual; /* visual used to create the image */
+ GdkByteOrder byte_order;
+ gint width;
+ gint height;
+ guint16 depth;
+ guint16 bpp; /* bytes per pixel */
+ guint16 bpl; /* bytes per line */
+ gpointer mem;
+
+ gpointer windowing_data;
+};
+</STRUCT>
<FUNCTION>
-<NAME>gdk_wcstombs</NAME>
-<RETURNS>gchar *</RETURNS>
-const GdkWChar *src
+<NAME>gdk_image_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_mbstowcs</NAME>
-<RETURNS>gint </RETURNS>
-GdkWChar *dest,const gchar *src,gint dest_max
+<NAME>gdk_image_new_bitmap</NAME>
+<RETURNS>GdkImage *</RETURNS>
+GdkVisual *visual,gpointer data,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_new</NAME>
-<RETURNS>GdkColorContext *</RETURNS>
-GdkVisual *visual,GdkColormap *colormap
+<NAME>gdk_image_new</NAME>
+<RETURNS>GdkImage *</RETURNS>
+GdkImageType type,GdkVisual *visual,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_new_mono</NAME>
-<RETURNS>GdkColorContext *</RETURNS>
-GdkVisual *visual,GdkColormap *colormap
+<NAME>gdk_image_get</NAME>
+<RETURNS>GdkImage *</RETURNS>
+GdkDrawable *drawable,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_free</NAME>
-<RETURNS>void </RETURNS>
-GdkColorContext *cc
+<NAME>gdk_image_ref</NAME>
+<RETURNS>GdkImage *</RETURNS>
+GdkImage *image
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_get_pixel</NAME>
-<RETURNS>gulong </RETURNS>
-GdkColorContext *cc,gushort red,gushort green,gushort blue,gint *failed
+<NAME>gdk_image_unref</NAME>
+<RETURNS>void </RETURNS>
+GdkImage *image
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_get_pixels</NAME>
+<NAME>gdk_image_put_pixel</NAME>
<RETURNS>void </RETURNS>
-GdkColorContext *cc,gushort *reds,gushort *greens,gushort *blues,gint ncolors,gulong *colors,gint *nallocated
+GdkImage *image,gint x,gint y,guint32 pixel
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_get_pixels_incremental</NAME>
-<RETURNS>void </RETURNS>
-GdkColorContext *cc,gushort *reds,gushort *greens,gushort *blues,gint ncolors,gint *used,gulong *colors,gint *nallocated
+<NAME>gdk_image_get_pixel</NAME>
+<RETURNS>guint32 </RETURNS>
+GdkImage *image,gint x,gint y
</FUNCTION>
+<STRUCT>
+<NAME>GdkDeviceKey</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkDeviceAxis</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkDevice</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkTimeCoord</NAME>
+</STRUCT>
+<ENUM>
+<NAME>GdkExtensionMode</NAME>
+typedef enum
+{
+ GDK_EXTENSION_EVENTS_NONE,
+ GDK_EXTENSION_EVENTS_ALL,
+ GDK_EXTENSION_EVENTS_CURSOR
+} GdkExtensionMode;
+</ENUM>
+<ENUM>
+<NAME>GdkInputSource</NAME>
+typedef enum
+{
+ GDK_SOURCE_MOUSE,
+ GDK_SOURCE_PEN,
+ GDK_SOURCE_ERASER,
+ GDK_SOURCE_CURSOR
+} GdkInputSource;
+</ENUM>
+<ENUM>
+<NAME>GdkInputMode</NAME>
+typedef enum
+{
+ GDK_MODE_DISABLED,
+ GDK_MODE_SCREEN,
+ GDK_MODE_WINDOW
+} GdkInputMode;
+</ENUM>
+<ENUM>
+<NAME>GdkAxisUse</NAME>
+typedef enum
+{
+ GDK_AXIS_IGNORE,
+ GDK_AXIS_X,
+ GDK_AXIS_Y,
+ GDK_AXIS_PRESSURE,
+ GDK_AXIS_XTILT,
+ GDK_AXIS_YTILT,
+ GDK_AXIS_WHEEL,
+ GDK_AXIS_LAST
+} GdkAxisUse;
+</ENUM>
+<STRUCT>
+<NAME>GdkDeviceKey</NAME>
+struct GdkDeviceKey
+{
+ guint keyval;
+ GdkModifierType modifiers;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkDeviceAxis</NAME>
+struct GdkDeviceAxis
+{
+ GdkAxisUse use;
+ gdouble min;
+ gdouble max;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkDevice</NAME>
+struct GdkDevice
+{
+ /* All fields are read-only */
+
+ gchar *name;
+ GdkInputSource source;
+ GdkInputMode mode;
+ gboolean has_cursor; /* TRUE if the X pointer follows device motion */
+
+ gint num_axes;
+ GdkDeviceAxis *axes;
+
+ gint num_keys;
+ GdkDeviceKey *keys;
+};
+</STRUCT>
+<MACRO>
+<NAME>GDK_MAX_TIMECOORD_AXES</NAME>
+#define GDK_MAX_TIMECOORD_AXES 128
+</MACRO>
+<STRUCT>
+<NAME>GdkTimeCoord</NAME>
+struct GdkTimeCoord
+{
+ guint32 time;
+ gdouble axes[GDK_MAX_TIMECOORD_AXES];
+};
+</STRUCT>
<FUNCTION>
-<NAME>gdk_color_context_query_color</NAME>
-<RETURNS>gint </RETURNS>
-GdkColorContext *cc,GdkColor *color
+<NAME>gdk_devices_list</NAME>
+<RETURNS>GList *</RETURNS>
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_query_colors</NAME>
-<RETURNS>gint </RETURNS>
-GdkColorContext *cc,GdkColor *colors,gint num_colors
+<NAME>gdk_device_set_source</NAME>
+<RETURNS>void </RETURNS>
+GdkDevice *device,GdkInputSource source
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_add_palette</NAME>
-<RETURNS>gint </RETURNS>
-GdkColorContext *cc,GdkColor *palette,gint num_palette
+<NAME>gdk_device_set_mode</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkDevice *device,GdkInputMode mode
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_init_dither</NAME>
-<RETURNS>void </RETURNS>
-GdkColorContext *cc
+<NAME>gdk_device_set_key</NAME>
+<RETURNS>void </RETURNS>
+GdkDevice *device,guint index,guint keyval,GdkModifierType modifiers
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_free_dither</NAME>
-<RETURNS>void </RETURNS>
-GdkColorContext *cc
+<NAME>gdk_device_set_axis_use</NAME>
+<RETURNS>void </RETURNS>
+GdkDevice *device,guint index,GdkAxisUse use
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_get_pixel_from_palette</NAME>
-<RETURNS>gulong </RETURNS>
-GdkColorContext *cc,gushort *red,gushort *green,gushort *blue,gint *failed
+<NAME>gdk_device_get_state</NAME>
+<RETURNS>void </RETURNS>
+GdkDevice *device,GdkWindow *window,gdouble *axes,GdkModifierType *mask
</FUNCTION>
<FUNCTION>
-<NAME>gdk_color_context_get_index_from_palette</NAME>
-<RETURNS>guchar </RETURNS>
-GdkColorContext *cc,gint *red,gint *green,gint *blue,gint *failed
+<NAME>gdk_device_get_history</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkDevice *device,GdkWindow *window,guint32 start,guint32 stop,GdkTimeCoord ***events,gint *n_events
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_device_free_history</NAME>
+<RETURNS>void </RETURNS>
+GdkTimeCoord **events,gint n_events
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_device_get_axis</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkDevice *device,gdouble *axes,GdkAxisUse use,gdouble *value
</FUNCTION>
<FUNCTION>
+<NAME>gdk_input_set_extension_events</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint mask,GdkExtensionMode mode
+</FUNCTION>
+<VARIABLE>
+<NAME>gdk_core_pointer</NAME>
+extern GdkDevice *gdk_core_pointer;
+</VARIABLE>
+<FUNCTION>
+<NAME>gdk_pango_context_get</NAME>
+<RETURNS>PangoContext *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pango_context_set_colormap</NAME>
+<RETURNS>void </RETURNS>
+PangoContext *context,GdkColormap *colormap
+</FUNCTION>
+<ENUM>
+<NAME>GdkPixbufAlphaMode</NAME>
+typedef enum
+{
+ GDK_PIXBUF_ALPHA_BILEVEL,
+ GDK_PIXBUF_ALPHA_FULL
+} GdkPixbufAlphaMode;
+</ENUM>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_threshold_alpha</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf,GdkBitmap *bitmap,int src_x,int src_y,int dest_x,int dest_y,int width,int height,int alpha_threshold
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_to_drawable</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf,GdkDrawable *drawable,GdkGC *gc,int src_x,int src_y,int dest_x,int dest_y,int width,int height,GdkRgbDither dither,int x_dither,int y_dither
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_to_drawable_alpha</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf,GdkDrawable *drawable,int src_x,int src_y,int dest_x,int dest_y,int width,int height,GdkPixbufAlphaMode alpha_mode,int alpha_threshold,GdkRgbDither dither,int x_dither,int y_dither
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_render_pixmap_and_mask</NAME>
+<RETURNS>void </RETURNS>
+GdkPixbuf *pixbuf,GdkPixmap **pixmap_return,GdkBitmap **mask_return,int alpha_threshold
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixbuf_get_from_drawable</NAME>
+<RETURNS>GdkPixbuf *</RETURNS>
+GdkPixbuf *dest,GdkDrawable *src,GdkColormap *cmap,int src_x,int src_y,int dest_x,int dest_y,int width,int height
+</FUNCTION>
+<STRUCT>
+<NAME>GdkPixmapObject</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkPixmapObjectClass</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_PIXMAP</NAME>
+#define GDK_TYPE_PIXMAP (gdk_pixmap_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXMAP</NAME>
+#define GDK_PIXMAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_PIXMAP, GdkPixmap))
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXMAP_CLASS</NAME>
+#define GDK_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_PIXMAP</NAME>
+#define GDK_IS_PIXMAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXMAP))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_PIXMAP_CLASS</NAME>
+#define GDK_IS_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXMAP))
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXMAP_GET_CLASS</NAME>
+#define GDK_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXMAP, GdkPixmapClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_PIXMAP_OBJECT</NAME>
+#define GDK_PIXMAP_OBJECT(object) ((GdkPixmapObject *) GDK_PIXMAP (object))
+</MACRO>
+<STRUCT>
+<NAME>GdkPixmapObject</NAME>
+struct GdkPixmapObject
+{
+ GdkDrawable parent_instance;
+
+ GdkDrawable *impl; /* window-system-specific delegate object */
+
+ gint depth;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_pixmap_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_new</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkWindow *window,gint width,gint height,gint depth
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_bitmap_create_from_data</NAME>
+<RETURNS>GdkBitmap *</RETURNS>
+GdkWindow *window,const gchar *data,gint width,gint height
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_create_from_data</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkWindow *window,const gchar *data,gint width,gint height,gint depth,GdkColor *fg,GdkColor *bg
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_create_from_xpm</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkWindow *window,GdkBitmap **mask,GdkColor *transparent_color,const gchar *filename
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_colormap_create_from_xpm</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkWindow *window,GdkColormap *colormap,GdkBitmap **mask,GdkColor *transparent_color,const gchar *filename
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_create_from_xpm_d</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkWindow *window,GdkBitmap **mask,GdkColor *transparent_color,gchar **data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_pixmap_colormap_create_from_xpm_d</NAME>
+<RETURNS>GdkPixmap *</RETURNS>
+GdkWindow *window,GdkColormap *colormap,GdkBitmap **mask,GdkColor *transparent_color,gchar **data
+</FUNCTION>
+<ENUM>
+<NAME>GdkPropMode</NAME>
+typedef enum
+{
+ GDK_PROP_MODE_REPLACE,
+ GDK_PROP_MODE_PREPEND,
+ GDK_PROP_MODE_APPEND
+} GdkPropMode;
+</ENUM>
+<FUNCTION>
+<NAME>gdk_atom_intern</NAME>
+<RETURNS>GdkAtom </RETURNS>
+const gchar *atom_name,gboolean only_if_exists
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_atom_name</NAME>
+<RETURNS>gchar *</RETURNS>
+GdkAtom atom
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_property_get</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *window,GdkAtom property,GdkAtom type,gulong offset,gulong length,gint pdelete,GdkAtom *actual_property_type,gint *actual_format,gint *actual_length,guchar **data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_property_change</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkAtom property,GdkAtom type,gint format,GdkPropMode mode,const guchar *data,gint nelements
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_property_delete</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkAtom property
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_text_property_to_text_list</NAME>
+<RETURNS>gint </RETURNS>
+GdkAtom encoding,gint format,const guchar *text,gint length,gchar ***list
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_free_text_list</NAME>
+<RETURNS>void </RETURNS>
+gchar **list
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_string_to_compound_text</NAME>
+<RETURNS>gint </RETURNS>
+const gchar *str,GdkAtom *encoding,gint *format,guchar **ctext,gint *length
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_free_compound_text</NAME>
+<RETURNS>void </RETURNS>
+guchar *ctext
+</FUNCTION>
+<ENUM>
+<NAME>GdkFillRule</NAME>
+typedef enum
+{
+ GDK_EVEN_ODD_RULE,
+ GDK_WINDING_RULE
+} GdkFillRule;
+</ENUM>
+<ENUM>
+<NAME>GdkOverlapType</NAME>
+typedef enum
+{
+ GDK_OVERLAP_RECTANGLE_IN,
+ GDK_OVERLAP_RECTANGLE_OUT,
+ GDK_OVERLAP_RECTANGLE_PART
+} GdkOverlapType;
+</ENUM>
+<FUNCTION>
<NAME>gdk_region_new</NAME>
-<RETURNS>GdkRegion *</RETURNS>
+<RETURNS>GdkRegion *</RETURNS>
void
</FUNCTION>
<FUNCTION>
+<NAME>gdk_region_polygon</NAME>
+<RETURNS>GdkRegion *</RETURNS>
+GdkPoint *points,gint npoints,GdkFillRule fill_rule
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_region_copy</NAME>
+<RETURNS>GdkRegion *</RETURNS>
+GdkRegion *region
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_region_rectangle</NAME>
+<RETURNS>GdkRegion *</RETURNS>
+GdkRectangle *rectangle
+</FUNCTION>
+<FUNCTION>
<NAME>gdk_region_destroy</NAME>
-<RETURNS>void </RETURNS>
-GdkRegion *region
+<RETURNS>void </RETURNS>
+GdkRegion *region
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_get_clipbox</NAME>
@@ -1435,138 +2828,244 @@ GdkRegion *region,GdkRectangle *rectangle
<FUNCTION>
<NAME>gdk_region_empty</NAME>
<RETURNS>gboolean </RETURNS>
-GdkRegion *region
+GdkRegion *region
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_equal</NAME>
<RETURNS>gboolean </RETURNS>
-GdkRegion *region1,GdkRegion *region2
+GdkRegion *region1,GdkRegion *region2
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_point_in</NAME>
<RETURNS>gboolean </RETURNS>
-GdkRegion *region,int x,int y
+GdkRegion *region,int x,int y
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_rect_in</NAME>
<RETURNS>GdkOverlapType </RETURNS>
-GdkRegion *region,GdkRectangle *rect
-</FUNCTION>
-<FUNCTION>
-<NAME>gdk_region_polygon</NAME>
-<RETURNS>GdkRegion *</RETURNS>
-GdkPoint *points,gint npoints,GdkFillRule fill_rule
+GdkRegion *region,GdkRectangle *rect
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_offset</NAME>
-<RETURNS>void </RETURNS>
-GdkRegion *region,gint dx,gint dy
+<RETURNS>void </RETURNS>
+GdkRegion *region,gint dx,gint dy
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_shrink</NAME>
-<RETURNS>void </RETURNS>
-GdkRegion *region,gint dx,gint dy
+<RETURNS>void </RETURNS>
+GdkRegion *region,gint dx,gint dy
</FUNCTION>
<FUNCTION>
<NAME>gdk_region_union_with_rect</NAME>
-<RETURNS>GdkRegion *</RETURNS>
-GdkRegion *region,GdkRectangle *rect
+<RETURNS>void </RETURNS>
+GdkRegion *region,GdkRectangle *rect
</FUNCTION>
<FUNCTION>
-<NAME>gdk_regions_intersect</NAME>
-<RETURNS>GdkRegion *</RETURNS>
-GdkRegion *source1,GdkRegion *source2
+<NAME>gdk_region_intersect</NAME>
+<RETURNS>void </RETURNS>
+GdkRegion *source1,GdkRegion *source2
</FUNCTION>
<FUNCTION>
-<NAME>gdk_regions_union</NAME>
-<RETURNS>GdkRegion *</RETURNS>
-GdkRegion *source1,GdkRegion *source2
+<NAME>gdk_region_union</NAME>
+<RETURNS>void </RETURNS>
+GdkRegion *source1,GdkRegion *source2
</FUNCTION>
<FUNCTION>
-<NAME>gdk_regions_subtract</NAME>
-<RETURNS>GdkRegion *</RETURNS>
-GdkRegion *source1,GdkRegion *source2
+<NAME>gdk_region_subtract</NAME>
+<RETURNS>void </RETURNS>
+GdkRegion *source1,GdkRegion *source2
</FUNCTION>
<FUNCTION>
-<NAME>gdk_regions_xor</NAME>
-<RETURNS>GdkRegion *</RETURNS>
-GdkRegion *source1,GdkRegion *source2
+<NAME>gdk_region_xor</NAME>
+<RETURNS>void </RETURNS>
+GdkRegion *source1,GdkRegion *source2
</FUNCTION>
+<STRUCT>
+<NAME>GdkRgbCmap</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkRgbCmap</NAME>
+struct GdkRgbCmap {
+ guint32 colors[256];
+ gint n_colors;
+
+ /*< private >*/
+ GSList *info_list;
+};
+</STRUCT>
<FUNCTION>
-<NAME>gdk_event_send_clientmessage_toall</NAME>
+<NAME>gdk_rgb_init</NAME>
<RETURNS>void </RETURNS>
-GdkEvent *event
+void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_event_send_client_message</NAME>
-<RETURNS>gboolean </RETURNS>
-GdkEvent *event,guint32 xid
+<NAME>gdk_rgb_xpixel_from_rgb</NAME>
+<RETURNS>gulong </RETURNS>
+guint32 rgb
</FUNCTION>
<FUNCTION>
-<NAME>gdk_keyval_name</NAME>
-<RETURNS>gchar *</RETURNS>
-guint keyval
+<NAME>gdk_rgb_gc_set_foreground</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,guint32 rgb
</FUNCTION>
<FUNCTION>
-<NAME>gdk_keyval_from_name</NAME>
-<RETURNS>guint </RETURNS>
-const gchar *keyval_name
+<NAME>gdk_rgb_gc_set_background</NAME>
+<RETURNS>void </RETURNS>
+GdkGC *gc,guint32 rgb
</FUNCTION>
<FUNCTION>
-<NAME>gdk_keyval_to_upper</NAME>
-<RETURNS>guint </RETURNS>
-guint keyval
+<NAME>gdk_rgb_find_color</NAME>
+<RETURNS>void </RETURNS>
+GdkColormap *colormap,GdkColor *color
</FUNCTION>
+<ENUM>
+<NAME>GdkRgbDither</NAME>
+typedef enum
+{
+ GDK_RGB_DITHER_NONE,
+ GDK_RGB_DITHER_NORMAL,
+ GDK_RGB_DITHER_MAX
+} GdkRgbDither;
+</ENUM>
<FUNCTION>
-<NAME>gdk_keyval_to_lower</NAME>
-<RETURNS>guint </RETURNS>
-guint keyval
+<NAME>gdk_draw_rgb_image</NAME>
+<RETURNS>void </RETURNS>
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *rgb_buf,gint rowstride
</FUNCTION>
<FUNCTION>
-<NAME>gdk_keyval_is_upper</NAME>
-<RETURNS>gboolean </RETURNS>
-guint keyval
+<NAME>gdk_draw_rgb_image_dithalign</NAME>
+<RETURNS>void </RETURNS>
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *rgb_buf,gint rowstride,gint xdith,gint ydith
</FUNCTION>
<FUNCTION>
-<NAME>gdk_keyval_is_lower</NAME>
-<RETURNS>gboolean </RETURNS>
-guint keyval
+<NAME>gdk_draw_rgb_32_image</NAME>
+<RETURNS>void </RETURNS>
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride
</FUNCTION>
-<VARIABLE>
-<NAME>gdk_threads_mutex</NAME>
-extern GMutex *gdk_threads_mutex;
-</VARIABLE>
<FUNCTION>
-<NAME>gdk_threads_enter</NAME>
+<NAME>gdk_draw_rgb_32_image_dithalign</NAME>
+<RETURNS>void </RETURNS>
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride,gint xdith,gint ydith
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_draw_gray_image</NAME>
<RETURNS>void </RETURNS>
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_draw_indexed_image</NAME>
+<RETURNS>void </RETURNS>
+GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride,GdkRgbCmap *cmap
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_cmap_new</NAME>
+<RETURNS>GdkRgbCmap *</RETURNS>
+guint32 *colors,gint n_colors
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_cmap_free</NAME>
+<RETURNS>void </RETURNS>
+GdkRgbCmap *cmap
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_ditherable</NAME>
+<RETURNS>gboolean </RETURNS>
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_threads_leave</NAME>
+<NAME>gdk_rgb_set_verbose</NAME>
+<RETURNS>void </RETURNS>
+gboolean verbose
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_set_install</NAME>
+<RETURNS>void </RETURNS>
+gboolean install
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_set_min_colors</NAME>
<RETURNS>void </RETURNS>
+gint min_colors
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_get_colormap</NAME>
+<RETURNS>GdkColormap *</RETURNS>
void
</FUNCTION>
+<FUNCTION>
+<NAME>gdk_rgb_get_visual</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+void
+</FUNCTION>
+<ENUM>
+<NAME>GdkSelection</NAME>
+typedef enum
+{
+ GDK_SELECTION_PRIMARY = 1,
+ GDK_SELECTION_SECONDARY = 2
+} GdkSelection;
+</ENUM>
+<ENUM>
+<NAME>GdkTarget</NAME>
+typedef enum
+{
+ GDK_TARGET_BITMAP = 5,
+ GDK_TARGET_COLORMAP = 7,
+ GDK_TARGET_DRAWABLE = 17,
+ GDK_TARGET_PIXMAP = 20,
+ GDK_TARGET_STRING = 31
+} GdkTarget;
+</ENUM>
+<ENUM>
+<NAME>GdkSelectionType</NAME>
+typedef enum
+{
+ GDK_SELECTION_TYPE_ATOM = 4,
+ GDK_SELECTION_TYPE_BITMAP = 5,
+ GDK_SELECTION_TYPE_COLORMAP = 7,
+ GDK_SELECTION_TYPE_DRAWABLE = 17,
+ GDK_SELECTION_TYPE_INTEGER = 19,
+ GDK_SELECTION_TYPE_PIXMAP = 20,
+ GDK_SELECTION_TYPE_WINDOW = 33,
+ GDK_SELECTION_TYPE_STRING = 31
+} GdkSelectionType;
+</ENUM>
+<FUNCTION>
+<NAME>gdk_selection_owner_set</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *owner,GdkAtom selection,guint32 time,gboolean send_event
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_selection_owner_get</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+GdkAtom selection
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_selection_convert</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *requestor,GdkAtom selection,GdkAtom target,guint32 time
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_selection_property_get</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *requestor,guchar **data,GdkAtom *prop_type,gint *prop_format
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_selection_send_notify</NAME>
+<RETURNS>void </RETURNS>
+guint32 requestor,GdkAtom selection,GdkAtom target,GdkAtom property,guint32 time
+</FUNCTION>
<MACRO>
-<NAME>GDK_THREADS_ENTER</NAME>
-# define GDK_THREADS_ENTER() G_STMT_START { \
- if (gdk_threads_mutex) \
- g_mutex_lock (gdk_threads_mutex); \
- } G_STMT_END
-</MACRO>
-<MACRO>
-<NAME>GDK_THREADS_LEAVE</NAME>
-# define GDK_THREADS_LEAVE() G_STMT_START { \
- if (gdk_threads_mutex) \
- g_mutex_unlock (gdk_threads_mutex); \
- } G_STMT_END
+<NAME>GDKVAR</NAME>
+# define GDKVAR __declspec(dllexport)
</MACRO>
<MACRO>
-<NAME>GDK_THREADS_ENTER</NAME>
-# define GDK_THREADS_ENTER()
+<NAME>GDKVAR</NAME>
+# define GDKVAR extern __declspec(dllimport)
</MACRO>
<MACRO>
-<NAME>GDK_THREADS_LEAVE</NAME>
-# define GDK_THREADS_LEAVE()
+<NAME>GDKVAR</NAME>
+# define GDKVAR extern
</MACRO>
<MACRO>
<NAME>GDK_NONE</NAME>
@@ -1580,41 +3079,6 @@ void
<NAME>GDK_PARENT_RELATIVE</NAME>
#define GDK_PARENT_RELATIVE 1L
</MACRO>
-<MACRO>
-<NAME>GDK_CORE_POINTER</NAME>
-#define GDK_CORE_POINTER 0xfedc
-</MACRO>
-<TYPEDEF>
-<NAME>GdkAtom</NAME>
-typedef gulong GdkAtom;
-</TYPEDEF>
-<STRUCT>
-<NAME>GdkColor</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkColormap</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkVisual</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkWindowAttr</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkWindow</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkGeometry</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkImage</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkGCValues</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkGC</NAME>
-</STRUCT>
<STRUCT>
<NAME>GdkPoint</NAME>
</STRUCT>
@@ -1624,347 +3088,56 @@ typedef gulong GdkAtom;
<STRUCT>
<NAME>GdkSegment</NAME>
</STRUCT>
+<TYPEDEF>
+<NAME>GdkWChar</NAME>
+typedef guint32 GdkWChar;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GdkAtom</NAME>
+typedef gulong GdkAtom;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GdkNativeWindow</NAME>
+typedef gpointer GdkNativeWindow;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GdkNativeWindow</NAME>
+typedef guint32 GdkNativeWindow;
+</TYPEDEF>
<STRUCT>
-<NAME>GdkFont</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkCursor</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkColorContextDither</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkColorContext</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkDragContext</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventAny</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventExpose</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventNoExpose</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventVisibility</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventMotion</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventButton</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventKey</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventFocus</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventCrossing</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventConfigure</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventProperty</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventSelection</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventProximity</NAME>
+<NAME>GdkColor</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkEventClient</NAME>
+<NAME>GdkColormap</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkEventDND</NAME>
+<NAME>GdkCursor</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkDeviceKey</NAME>
+<NAME>GdkFont</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkDeviceInfo</NAME>
+<NAME>GdkGC</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkTimeCoord</NAME>
+<NAME>GdkImage</NAME>
</STRUCT>
<STRUCT>
<NAME>GdkRegion</NAME>
</STRUCT>
-<USER_FUNCTION>
-<NAME>GdkEventFunc</NAME>
-<RETURNS>void </RETURNS>
-GdkEvent *event,
- gpointer data
-</USER_FUNCTION>
<STRUCT>
-<NAME>GdkIC</NAME>
+<NAME>GdkVisual</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkICAttr</NAME>
+<NAME>GdkDrawable</NAME>
</STRUCT>
-<TYPEDEF>
-<NAME>GdkWChar</NAME>
-typedef guint32 GdkWChar;
-</TYPEDEF>
-<ENUM>
-<NAME>GdkWindowType</NAME>
-typedef enum
-{
- GDK_WINDOW_ROOT,
- GDK_WINDOW_TOPLEVEL,
- GDK_WINDOW_CHILD,
- GDK_WINDOW_DIALOG,
- GDK_WINDOW_TEMP,
- GDK_WINDOW_PIXMAP,
- GDK_WINDOW_FOREIGN
-} GdkWindowType;
-</ENUM>
-<ENUM>
-<NAME>GdkWindowClass</NAME>
-typedef enum
-{
- GDK_INPUT_OUTPUT,
- GDK_INPUT_ONLY
-} GdkWindowClass;
-</ENUM>
-<ENUM>
-<NAME>GdkImageType</NAME>
-typedef enum
-{
- GDK_IMAGE_NORMAL,
- GDK_IMAGE_SHARED,
- GDK_IMAGE_FASTEST
-} GdkImageType;
-</ENUM>
-<ENUM>
-<NAME>GdkVisualType</NAME>
-typedef enum
-{
- GDK_VISUAL_STATIC_GRAY,
- GDK_VISUAL_GRAYSCALE,
- GDK_VISUAL_STATIC_COLOR,
- GDK_VISUAL_PSEUDO_COLOR,
- GDK_VISUAL_TRUE_COLOR,
- GDK_VISUAL_DIRECT_COLOR
-} GdkVisualType;
-</ENUM>
<ENUM>
-<NAME>GdkFontType</NAME>
-typedef enum
-{
- GDK_FONT_FONT,
- GDK_FONT_FONTSET
-} GdkFontType;
-</ENUM>
-<ENUM>
-<NAME>GdkWindowAttributesType</NAME>
-typedef enum
-{
- GDK_WA_TITLE = 1 << 1,
- GDK_WA_X = 1 << 2,
- GDK_WA_Y = 1 << 3,
- GDK_WA_CURSOR = 1 << 4,
- GDK_WA_COLORMAP = 1 << 5,
- GDK_WA_VISUAL = 1 << 6,
- GDK_WA_WMCLASS = 1 << 7,
- GDK_WA_NOREDIR = 1 << 8
-} GdkWindowAttributesType;
-</ENUM>
-<ENUM>
-<NAME>GdkWindowHints</NAME>
-typedef enum
-{
- GDK_HINT_POS = 1 << 0,
- GDK_HINT_MIN_SIZE = 1 << 1,
- GDK_HINT_MAX_SIZE = 1 << 2,
- GDK_HINT_BASE_SIZE = 1 << 3,
- GDK_HINT_ASPECT = 1 << 4,
- GDK_HINT_RESIZE_INC = 1 << 5
-} GdkWindowHints;
-</ENUM>
-<ENUM>
-<NAME>GdkFunction</NAME>
-typedef enum
-{
- GDK_COPY,
- GDK_INVERT,
- GDK_XOR,
- GDK_CLEAR,
- GDK_AND,
- GDK_AND_REVERSE,
- GDK_AND_INVERT,
- GDK_NOOP,
- GDK_OR,
- GDK_EQUIV,
- GDK_OR_REVERSE,
- GDK_COPY_INVERT,
- GDK_OR_INVERT,
- GDK_NAND,
- GDK_SET
-} GdkFunction;
-</ENUM>
-<ENUM>
-<NAME>GdkFill</NAME>
-typedef enum
-{
- GDK_SOLID,
- GDK_TILED,
- GDK_STIPPLED,
- GDK_OPAQUE_STIPPLED
-} GdkFill;
-</ENUM>
-<ENUM>
-<NAME>GdkFillRule</NAME>
-typedef enum
-{
- GDK_EVEN_ODD_RULE,
- GDK_WINDING_RULE
-} GdkFillRule;
-</ENUM>
-<ENUM>
-<NAME>GdkLineStyle</NAME>
-typedef enum
-{
- GDK_LINE_SOLID,
- GDK_LINE_ON_OFF_DASH,
- GDK_LINE_DOUBLE_DASH
-} GdkLineStyle;
-</ENUM>
-<ENUM>
-<NAME>GdkCapStyle</NAME>
-typedef enum
-{
- GDK_CAP_NOT_LAST,
- GDK_CAP_BUTT,
- GDK_CAP_ROUND,
- GDK_CAP_PROJECTING
-} GdkCapStyle;
-</ENUM>
-<ENUM>
-<NAME>GdkJoinStyle</NAME>
-typedef enum
-{
- GDK_JOIN_MITER,
- GDK_JOIN_ROUND,
- GDK_JOIN_BEVEL
-} GdkJoinStyle;
-</ENUM>
-<ENUM>
-<NAME>GdkCursorType</NAME>
-typedef enum
-{
-#include <gdk/gdkcursors.h>
- GDK_LAST_CURSOR,
- GDK_CURSOR_IS_PIXMAP = -1
-} GdkCursorType;
-</ENUM>
-<ENUM>
-<NAME>GdkFilterReturn</NAME>
-typedef enum {
- GDK_FILTER_CONTINUE, /* Event not handled, continue processesing */
- GDK_FILTER_TRANSLATE, /* Translated event stored */
- GDK_FILTER_REMOVE /* Terminate processing, removing event */
-} GdkFilterReturn;
-</ENUM>
-<ENUM>
-<NAME>GdkVisibilityState</NAME>
-typedef enum {
- GDK_VISIBILITY_UNOBSCURED,
- GDK_VISIBILITY_PARTIAL,
- GDK_VISIBILITY_FULLY_OBSCURED
-} GdkVisibilityState;
-</ENUM>
-<ENUM>
-<NAME>GdkEventType</NAME>
-typedef enum
-{
- GDK_NOTHING = -1,
- GDK_DELETE = 0,
- GDK_DESTROY = 1,
- GDK_EXPOSE = 2,
- GDK_MOTION_NOTIFY = 3,
- GDK_BUTTON_PRESS = 4,
- GDK_2BUTTON_PRESS = 5,
- GDK_3BUTTON_PRESS = 6,
- GDK_BUTTON_RELEASE = 7,
- GDK_KEY_PRESS = 8,
- GDK_KEY_RELEASE = 9,
- GDK_ENTER_NOTIFY = 10,
- GDK_LEAVE_NOTIFY = 11,
- GDK_FOCUS_CHANGE = 12,
- GDK_CONFIGURE = 13,
- GDK_MAP = 14,
- GDK_UNMAP = 15,
- GDK_PROPERTY_NOTIFY = 16,
- GDK_SELECTION_CLEAR = 17,
- GDK_SELECTION_REQUEST = 18,
- GDK_SELECTION_NOTIFY = 19,
- GDK_PROXIMITY_IN = 20,
- GDK_PROXIMITY_OUT = 21,
- GDK_DRAG_ENTER = 22,
- GDK_DRAG_LEAVE = 23,
- GDK_DRAG_MOTION = 24,
- GDK_DRAG_STATUS = 25,
- GDK_DROP_START = 26,
- GDK_DROP_FINISHED = 27,
- GDK_CLIENT_EVENT = 28,
- GDK_VISIBILITY_NOTIFY = 29,
- GDK_NO_EXPOSE = 30
-} GdkEventType;
-</ENUM>
-<ENUM>
-<NAME>GdkEventMask</NAME>
-typedef enum
-{
- GDK_EXPOSURE_MASK = 1 << 1,
- GDK_POINTER_MOTION_MASK = 1 << 2,
- GDK_POINTER_MOTION_HINT_MASK = 1 << 3,
- GDK_BUTTON_MOTION_MASK = 1 << 4,
- GDK_BUTTON1_MOTION_MASK = 1 << 5,
- GDK_BUTTON2_MOTION_MASK = 1 << 6,
- GDK_BUTTON3_MOTION_MASK = 1 << 7,
- GDK_BUTTON_PRESS_MASK = 1 << 8,
- GDK_BUTTON_RELEASE_MASK = 1 << 9,
- GDK_KEY_PRESS_MASK = 1 << 10,
- GDK_KEY_RELEASE_MASK = 1 << 11,
- GDK_ENTER_NOTIFY_MASK = 1 << 12,
- GDK_LEAVE_NOTIFY_MASK = 1 << 13,
- GDK_FOCUS_CHANGE_MASK = 1 << 14,
- GDK_STRUCTURE_MASK = 1 << 15,
- GDK_PROPERTY_CHANGE_MASK = 1 << 16,
- GDK_VISIBILITY_NOTIFY_MASK = 1 << 17,
- GDK_PROXIMITY_IN_MASK = 1 << 18,
- GDK_PROXIMITY_OUT_MASK = 1 << 19,
- GDK_SUBSTRUCTURE_MASK = 1 << 20,
- GDK_ALL_EVENTS_MASK = 0x0FFFFF
-} GdkEventMask;
-</ENUM>
-<ENUM>
-<NAME>GdkNotifyType</NAME>
-typedef enum
-{
- GDK_NOTIFY_ANCESTOR = 0,
- GDK_NOTIFY_VIRTUAL = 1,
- GDK_NOTIFY_INFERIOR = 2,
- GDK_NOTIFY_NONLINEAR = 3,
- GDK_NOTIFY_NONLINEAR_VIRTUAL = 4,
- GDK_NOTIFY_UNKNOWN = 5
-} GdkNotifyType;
-</ENUM>
-<ENUM>
-<NAME>GdkCrossingMode</NAME>
+<NAME>GdkByteOrder</NAME>
typedef enum
{
- GDK_CROSSING_NORMAL,
- GDK_CROSSING_GRAB,
- GDK_CROSSING_UNGRAB
-} GdkCrossingMode;
+ GDK_LSB_FIRST,
+ GDK_MSB_FIRST
+} GdkByteOrder;
</ENUM>
<ENUM>
<NAME>GdkModifierType</NAME>
@@ -1983,19 +3156,13 @@ typedef enum
GDK_BUTTON3_MASK = 1 << 10,
GDK_BUTTON4_MASK = 1 << 11,
GDK_BUTTON5_MASK = 1 << 12,
- GDK_RELEASE_MASK = 1 << 13,
- GDK_MODIFIER_MASK = 0x3fff
+ /* The next few modifiers are used by XKB, so we skip to the end
+ */
+ GDK_RELEASE_MASK = 1 << 31,
+ GDK_MODIFIER_MASK = GDK_RELEASE_MASK | 0x1fff
} GdkModifierType;
</ENUM>
<ENUM>
-<NAME>GdkSubwindowMode</NAME>
-typedef enum
-{
- GDK_CLIP_BY_CHILDREN = 0,
- GDK_INCLUDE_INFERIORS = 1
-} GdkSubwindowMode;
-</ENUM>
-<ENUM>
<NAME>GdkInputCondition</NAME>
typedef enum
{
@@ -2016,185 +3183,202 @@ typedef enum
} GdkStatus;
</ENUM>
<ENUM>
-<NAME>GdkByteOrder</NAME>
-typedef enum
-{
- GDK_LSB_FIRST,
- GDK_MSB_FIRST
-} GdkByteOrder;
-</ENUM>
-<ENUM>
-<NAME>GdkGCValuesMask</NAME>
-typedef enum
-{
- GDK_GC_FOREGROUND = 1 << 0,
- GDK_GC_BACKGROUND = 1 << 1,
- GDK_GC_FONT = 1 << 2,
- GDK_GC_FUNCTION = 1 << 3,
- GDK_GC_FILL = 1 << 4,
- GDK_GC_TILE = 1 << 5,
- GDK_GC_STIPPLE = 1 << 6,
- GDK_GC_CLIP_MASK = 1 << 7,
- GDK_GC_SUBWINDOW = 1 << 8,
- GDK_GC_TS_X_ORIGIN = 1 << 9,
- GDK_GC_TS_Y_ORIGIN = 1 << 10,
- GDK_GC_CLIP_X_ORIGIN = 1 << 11,
- GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
- GDK_GC_EXPOSURES = 1 << 13,
- GDK_GC_LINE_WIDTH = 1 << 14,
- GDK_GC_LINE_STYLE = 1 << 15,
- GDK_GC_CAP_STYLE = 1 << 16,
- GDK_GC_JOIN_STYLE = 1 << 17
-} GdkGCValuesMask;
-</ENUM>
-<ENUM>
-<NAME>GdkSelection</NAME>
+<NAME>GdkGrabStatus</NAME>
typedef enum
{
- GDK_SELECTION_PRIMARY = 1,
- GDK_SELECTION_SECONDARY = 2
-} GdkSelection;
+ GDK_GRAB_SUCCESS = 0,
+ GDK_GRAB_ALREADY_GRABBED = 1,
+ GDK_GRAB_INVALID_TIME = 2,
+ GDK_GRAB_NOT_VIEWABLE = 3,
+ GDK_GRAB_FROZEN = 4
+} GdkGrabStatus;
</ENUM>
-<ENUM>
-<NAME>GdkPropertyState</NAME>
-typedef enum
+<USER_FUNCTION>
+<NAME>GdkInputFunction</NAME>
+<RETURNS>void </RETURNS>
+gpointer data,
+ gint source,
+ GdkInputCondition condition
+</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>GdkDestroyNotify</NAME>
+<RETURNS>void </RETURNS>
+gpointer data
+</USER_FUNCTION>
+<STRUCT>
+<NAME>GdkPoint</NAME>
+struct GdkPoint
{
- GDK_PROPERTY_NEW_VALUE,
- GDK_PROPERTY_DELETE
-} GdkPropertyState;
-</ENUM>
-<ENUM>
-<NAME>GdkPropMode</NAME>
-typedef enum
+ gint x;
+ gint y;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkRectangle</NAME>
+struct GdkRectangle
{
- GDK_PROP_MODE_REPLACE,
- GDK_PROP_MODE_PREPEND,
- GDK_PROP_MODE_APPEND
-} GdkPropMode;
-</ENUM>
-<ENUM>
-<NAME>GdkInputSource</NAME>
-typedef enum
+ gint x;
+ gint y;
+ gint width;
+ gint height;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GdkSegment</NAME>
+struct GdkSegment
{
- GDK_SOURCE_MOUSE,
- GDK_SOURCE_PEN,
- GDK_SOURCE_ERASER,
- GDK_SOURCE_CURSOR
-} GdkInputSource;
-</ENUM>
+ gint x1;
+ gint y1;
+ gint x2;
+ gint y2;
+};
+</STRUCT>
<ENUM>
-<NAME>GdkInputMode</NAME>
+<NAME>GdkVisualType</NAME>
typedef enum
{
- GDK_MODE_DISABLED,
- GDK_MODE_SCREEN,
- GDK_MODE_WINDOW
-} GdkInputMode;
+ GDK_VISUAL_STATIC_GRAY,
+ GDK_VISUAL_GRAYSCALE,
+ GDK_VISUAL_STATIC_COLOR,
+ GDK_VISUAL_PSEUDO_COLOR,
+ GDK_VISUAL_TRUE_COLOR,
+ GDK_VISUAL_DIRECT_COLOR
+} GdkVisualType;
</ENUM>
-<ENUM>
-<NAME>GdkAxisUse</NAME>
-typedef enum
+<STRUCT>
+<NAME>GdkVisual</NAME>
+struct GdkVisual
{
- GDK_AXIS_IGNORE,
- GDK_AXIS_X,
- GDK_AXIS_Y,
- GDK_AXIS_PRESSURE,
- GDK_AXIS_XTILT,
- GDK_AXIS_YTILT,
- GDK_AXIS_LAST
-} GdkAxisUse;
-</ENUM>
+ GdkVisualType type;
+ gint depth;
+ GdkByteOrder byte_order;
+ gint colormap_size;
+ gint bits_per_rgb;
+
+ guint32 red_mask;
+ gint red_shift;
+ gint red_prec;
+
+ guint32 green_mask;
+ gint green_shift;
+ gint green_prec;
+
+ guint32 blue_mask;
+ gint blue_shift;
+ gint blue_prec;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gdk_visual_get_best_depth</NAME>
+<RETURNS>gint </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_get_best_type</NAME>
+<RETURNS>GdkVisualType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_get_system</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_get_best</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_get_best_with_depth</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+gint depth
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_get_best_with_type</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+GdkVisualType visual_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_get_best_with_both</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+gint depth,GdkVisualType visual_type
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_ref</NAME>
+<RETURNS>GdkVisual *</RETURNS>
+GdkVisual *visual
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_visual_unref</NAME>
+<RETURNS>void </RETURNS>
+GdkVisual *visual
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_query_depths</NAME>
+<RETURNS>void </RETURNS>
+gint **depths,gint *count
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_query_visual_types</NAME>
+<RETURNS>void </RETURNS>
+GdkVisualType **visual_types,gint *count
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_list_visuals</NAME>
+<RETURNS>GList *</RETURNS>
+void
+</FUNCTION>
+<STRUCT>
+<NAME>GdkGeometry</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GdkWindowAttr</NAME>
+</STRUCT>
<ENUM>
-<NAME>GdkTarget</NAME>
+<NAME>GdkWindowClass</NAME>
typedef enum
{
- GDK_TARGET_BITMAP = 5,
- GDK_TARGET_COLORMAP = 7,
- GDK_TARGET_DRAWABLE = 17,
- GDK_TARGET_PIXMAP = 20,
- GDK_TARGET_STRING = 31
-} GdkTarget;
+ GDK_INPUT_OUTPUT,
+ GDK_INPUT_ONLY
+} GdkWindowClass;
</ENUM>
<ENUM>
-<NAME>GdkSelectionType</NAME>
+<NAME>GdkWindowType</NAME>
typedef enum
{
- GDK_SELECTION_TYPE_ATOM = 4,
- GDK_SELECTION_TYPE_BITMAP = 5,
- GDK_SELECTION_TYPE_COLORMAP = 7,
- GDK_SELECTION_TYPE_DRAWABLE = 17,
- GDK_SELECTION_TYPE_INTEGER = 19,
- GDK_SELECTION_TYPE_PIXMAP = 20,
- GDK_SELECTION_TYPE_WINDOW = 33,
- GDK_SELECTION_TYPE_STRING = 31
-} GdkSelectionType;
+ GDK_WINDOW_ROOT,
+ GDK_WINDOW_TOPLEVEL,
+ GDK_WINDOW_CHILD,
+ GDK_WINDOW_DIALOG,
+ GDK_WINDOW_TEMP,
+ GDK_WINDOW_FOREIGN
+} GdkWindowType;
</ENUM>
<ENUM>
-<NAME>GdkExtensionMode</NAME>
+<NAME>GdkWindowAttributesType</NAME>
typedef enum
{
- GDK_EXTENSION_EVENTS_NONE,
- GDK_EXTENSION_EVENTS_ALL,
- GDK_EXTENSION_EVENTS_CURSOR
-} GdkExtensionMode;
-</ENUM>
-<ENUM>
-<NAME>GdkIMStyle</NAME>
-typedef enum /*< flags >*/
-{
- GDK_IM_PREEDIT_AREA = 0x0001,
- GDK_IM_PREEDIT_CALLBACKS = 0x0002,
- GDK_IM_PREEDIT_POSITION = 0x0004,
- GDK_IM_PREEDIT_NOTHING = 0x0008,
- GDK_IM_PREEDIT_NONE = 0x0010,
- GDK_IM_PREEDIT_MASK = 0x001f,
-
- GDK_IM_STATUS_AREA = 0x0100,
- GDK_IM_STATUS_CALLBACKS = 0x0200,
- GDK_IM_STATUS_NOTHING = 0x0400,
- GDK_IM_STATUS_NONE = 0x0800,
- GDK_IM_STATUS_MASK = 0x0f00
-} GdkIMStyle;
+ GDK_WA_TITLE = 1 << 1,
+ GDK_WA_X = 1 << 2,
+ GDK_WA_Y = 1 << 3,
+ GDK_WA_CURSOR = 1 << 4,
+ GDK_WA_COLORMAP = 1 << 5,
+ GDK_WA_VISUAL = 1 << 6,
+ GDK_WA_WMCLASS = 1 << 7,
+ GDK_WA_NOREDIR = 1 << 8
+} GdkWindowAttributesType;
</ENUM>
<ENUM>
-<NAME>GdkICAttributesType</NAME>
+<NAME>GdkWindowHints</NAME>
typedef enum
{
- GDK_IC_STYLE = 1 << 0,
- GDK_IC_CLIENT_WINDOW = 1 << 1,
- GDK_IC_FOCUS_WINDOW = 1 << 2,
- GDK_IC_FILTER_EVENTS = 1 << 3,
- GDK_IC_SPOT_LOCATION = 1 << 4,
- GDK_IC_LINE_SPACING = 1 << 5,
- GDK_IC_CURSOR = 1 << 6,
-
- GDK_IC_PREEDIT_FONTSET = 1 << 10,
- GDK_IC_PREEDIT_AREA = 1 << 11,
- GDK_IC_PREEDIT_AREA_NEEDED = 1 << 12,
- GDK_IC_PREEDIT_FOREGROUND = 1 << 13,
- GDK_IC_PREEDIT_BACKGROUND = 1 << 14,
- GDK_IC_PREEDIT_PIXMAP = 1 << 15,
- GDK_IC_PREEDIT_COLORMAP = 1 << 16,
-
- GDK_IC_STATUS_FONTSET = 1 << 21,
- GDK_IC_STATUS_AREA = 1 << 22,
- GDK_IC_STATUS_AREA_NEEDED = 1 << 23,
- GDK_IC_STATUS_FOREGROUND = 1 << 24,
- GDK_IC_STATUS_BACKGROUND = 1 << 25,
- GDK_IC_STATUS_PIXMAP = 1 << 26,
- GDK_IC_STATUS_COLORMAP = 1 << 27,
-
- GDK_IC_ALL_REQ = GDK_IC_STYLE |
- GDK_IC_CLIENT_WINDOW,
-
- GDK_IC_PREEDIT_AREA_REQ = GDK_IC_PREEDIT_AREA |
- GDK_IC_PREEDIT_FONTSET,
- GDK_IC_PREEDIT_POSITION_REQ = GDK_IC_PREEDIT_AREA | GDK_IC_SPOT_LOCATION |
- GDK_IC_PREEDIT_FONTSET,
-
- GDK_IC_STATUS_AREA_REQ = GDK_IC_STATUS_AREA |
- GDK_IC_STATUS_FONTSET
-} GdkICAttributesType;
+ GDK_HINT_POS = 1 << 0,
+ GDK_HINT_MIN_SIZE = 1 << 1,
+ GDK_HINT_MAX_SIZE = 1 << 2,
+ GDK_HINT_BASE_SIZE = 1 << 3,
+ GDK_HINT_ASPECT = 1 << 4,
+ GDK_HINT_RESIZE_INC = 1 << 5
+} GdkWindowHints;
</ENUM>
<ENUM>
<NAME>GdkWMDecoration</NAME>
@@ -2221,110 +3405,15 @@ typedef enum
GDK_FUNC_CLOSE = 1 << 5
} GdkWMFunction;
</ENUM>
-<USER_FUNCTION>
-<NAME>GdkInputFunction</NAME>
-<RETURNS>void </RETURNS>
-gpointer data,
- gint source,
- GdkInputCondition condition
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GdkDestroyNotify</NAME>
-<RETURNS>void </RETURNS>
-gpointer data
-</USER_FUNCTION>
-<ENUM>
-<NAME>GdkColorContextMode</NAME>
-typedef enum
-{
- GDK_CC_MODE_UNDEFINED,
- GDK_CC_MODE_BW,
- GDK_CC_MODE_STD_CMAP,
- GDK_CC_MODE_TRUE,
- GDK_CC_MODE_MY_GRAY,
- GDK_CC_MODE_PALETTE
-} GdkColorContextMode;
-</ENUM>
-<ENUM>
-<NAME>GdkOverlapType</NAME>
-typedef enum
-{
- GDK_OVERLAP_RECTANGLE_IN,
- GDK_OVERLAP_RECTANGLE_OUT,
- GDK_OVERLAP_RECTANGLE_PART
-} GdkOverlapType;
-</ENUM>
-<ENUM>
-<NAME>GdkDragAction</NAME>
-typedef enum {
- GDK_ACTION_DEFAULT = 1 << 0,
- GDK_ACTION_COPY = 1 << 1,
- GDK_ACTION_MOVE = 1 << 2,
- GDK_ACTION_LINK = 1 << 3,
- GDK_ACTION_PRIVATE = 1 << 4,
- GDK_ACTION_ASK = 1 << 5
-} GdkDragAction;
-</ENUM>
-<ENUM>
-<NAME>GdkDragProtocol</NAME>
-typedef enum {
- GDK_DRAG_PROTO_MOTIF,
- GDK_DRAG_PROTO_XDND,
- GDK_DRAG_PROTO_ROOTWIN, /* A root window with nobody claiming
- * drags */
- GDK_DRAG_PROTO_NONE /* Not a valid drag window */
-} GdkDragProtocol;
-</ENUM>
-<STRUCT>
-<NAME>GdkColor</NAME>
-struct GdkColor
-{
- gulong pixel;
- gushort red;
- gushort green;
- gushort blue;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkColormap</NAME>
-struct GdkColormap
-{
- gint size;
- GdkColor *colors;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkVisual</NAME>
-struct GdkVisual
-{
- GdkVisualType type;
- gint depth;
- GdkByteOrder byte_order;
- gint colormap_size;
- gint bits_per_rgb;
-
- guint32 red_mask;
- gint red_shift;
- gint red_prec;
-
- guint32 green_mask;
- gint green_shift;
- gint green_prec;
-
- guint32 blue_mask;
- gint blue_shift;
- gint blue_prec;
-};
-</STRUCT>
<STRUCT>
<NAME>GdkWindowAttr</NAME>
struct GdkWindowAttr
{
gchar *title;
gint event_mask;
- gint16 x, y;
- gint16 width;
- gint16 height;
+ gint x, y;
+ gint width;
+ gint height;
GdkWindowClass wclass;
GdkVisual *visual;
GdkColormap *colormap;
@@ -2336,13 +3425,6 @@ struct GdkWindowAttr
};
</STRUCT>
<STRUCT>
-<NAME>GdkWindow</NAME>
-struct GdkWindow
-{
- gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
<NAME>GdkGeometry</NAME>
struct GdkGeometry {
gint min_width;
@@ -2359,561 +3441,421 @@ struct GdkGeometry {
};
</STRUCT>
<STRUCT>
-<NAME>GdkImage</NAME>
-struct GdkImage
-{
- GdkImageType type;
- GdkVisual *visual; /* visual used to create the image */
- GdkByteOrder byte_order;
- guint16 width;
- guint16 height;
- guint16 depth;
- guint16 bpp; /* bytes per pixel */
- guint16 bpl; /* bytes per line */
- gpointer mem;
-};
+<NAME>GdkWindowObject</NAME>
</STRUCT>
<STRUCT>
-<NAME>GdkGCValues</NAME>
-struct GdkGCValues
-{
- GdkColor foreground;
- GdkColor background;
- GdkFont *font;
- GdkFunction function;
- GdkFill fill;
- GdkPixmap *tile;
- GdkPixmap *stipple;
- GdkPixmap *clip_mask;
- GdkSubwindowMode subwindow_mode;
- gint ts_x_origin;
- gint ts_y_origin;
- gint clip_x_origin;
- gint clip_y_origin;
- gint graphics_exposures;
- gint line_width;
- GdkLineStyle line_style;
- GdkCapStyle cap_style;
- GdkJoinStyle join_style;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkGC</NAME>
-struct GdkGC
-{
- gint dummy_var;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkPoint</NAME>
-struct GdkPoint
-{
- gint16 x;
- gint16 y;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkRectangle</NAME>
-struct GdkRectangle
-{
- gint16 x;
- gint16 y;
- guint16 width;
- guint16 height;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkSegment</NAME>
-struct GdkSegment
-{
- gint16 x1;
- gint16 y1;
- gint16 x2;
- gint16 y2;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkFont</NAME>
-struct GdkFont
-{
- GdkFontType type;
- gint ascent;
- gint descent;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkCursor</NAME>
-struct GdkCursor
-{
- GdkCursorType type;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkColorContextDither</NAME>
-struct GdkColorContextDither
-{
- gint fast_rgb[32][32][32]; /* quick look-up table for faster rendering */
- gint fast_err[32][32][32]; /* internal RGB error information */
- gint fast_erg[32][32][32];
- gint fast_erb[32][32][32];
-};
+<NAME>GdkWindowObjectClass</NAME>
</STRUCT>
+<MACRO>
+<NAME>GDK_TYPE_WINDOW</NAME>
+#define GDK_TYPE_WINDOW (gdk_window_object_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW</NAME>
+#define GDK_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow))
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW_CLASS</NAME>
+#define GDK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_WINDOW</NAME>
+#define GDK_IS_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
+</MACRO>
+<MACRO>
+<NAME>GDK_IS_WINDOW_CLASS</NAME>
+#define GDK_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WINDOW))
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW_GET_CLASS</NAME>
+#define GDK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WINDOW, GdkWindowObjectClass))
+</MACRO>
+<MACRO>
+<NAME>GDK_WINDOW_OBJECT</NAME>
+#define GDK_WINDOW_OBJECT(object) ((GdkWindowObject *) GDK_WINDOW (object))
+</MACRO>
<STRUCT>
-<NAME>GdkColorContext</NAME>
-struct GdkColorContext
+<NAME>GdkWindowObject</NAME>
+struct GdkWindowObject
{
- GdkVisual *visual;
- GdkColormap *colormap;
-
- gint num_colors; /* available no. of colors in colormap */
- gint max_colors; /* maximum no. of colors */
- gint num_allocated; /* no. of allocated colors */
-
- GdkColorContextMode mode;
- gint need_to_free_colormap;
- GdkAtom std_cmap_atom;
+ GdkDrawable parent_instance;
- gulong *clut; /* color look-up table */
- GdkColor *cmap; /* colormap */
+ GdkDrawable *impl; /* window-system-specific delegate object */
+
+ GdkWindowObject *parent;
- GHashTable *color_hash; /* hash table of allocated colors */
- GdkColor *palette; /* preallocated palette */
- gint num_palette; /* size of palette */
+ gpointer user_data;
- GdkColorContextDither *fast_dither; /* fast dither matrix */
+ gint x;
+ gint y;
+
+ gint extension_events;
- struct
- {
- gint red;
- gint green;
- gint blue;
- } shifts;
+ GList *filters;
+ GList *children;
-</STRUCT>
-<STRUCT>
-<NAME>GdkDeviceKey</NAME>
-struct GdkDeviceKey
-{
- guint keyval;
- GdkModifierType modifiers;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkDeviceInfo</NAME>
-struct GdkDeviceInfo
-{
- guint32 deviceid;
- gchar *name;
- GdkInputSource source;
- GdkInputMode mode;
- gint has_cursor; /* TRUE if the X pointer follows device motion */
- gint num_axes;
- GdkAxisUse *axes; /* Specifies use for each axis */
- gint num_keys;
- GdkDeviceKey *keys;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkTimeCoord</NAME>
-struct GdkTimeCoord
-{
- guint32 time;
- gdouble x;
- gdouble y;
- gdouble pressure;
- gdouble xtilt;
- gdouble ytilt;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkDragContext</NAME>
-struct GdkDragContext {
- GdkDragProtocol protocol;
+ GdkColor bg_color;
+ GdkPixmap *bg_pixmap;
- gboolean is_source;
+ GSList *paint_stack;
- GdkWindow *source_window;
- GdkWindow *dest_window;
-
- GList *targets;
- GdkDragAction actions;
- GdkDragAction suggested_action;
- GdkDragAction action;
-
- guint32 start_time;
-};
-</STRUCT>
-<TYPEDEF>
-<NAME>GdkXEvent</NAME>
-typedef void GdkXEvent; /* Can be cast to XEvent */
-</TYPEDEF>
-<USER_FUNCTION>
-<NAME>GdkFilterFunc</NAME>
-<RETURNS>GdkFilterReturn </RETURNS>
-GdkXEvent *xevent,
- GdkEvent *event,
- gpointer data
-</USER_FUNCTION>
-<STRUCT>
-<NAME>GdkEventAny</NAME>
-struct GdkEventAny
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventExpose</NAME>
-struct GdkEventExpose
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkRectangle area;
- gint count; /* If non-zero, how many more events follow. */
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventNoExpose</NAME>
-struct GdkEventNoExpose
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- /* XXX: does anyone need the X major_code or minor_code fields? */
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventVisibility</NAME>
-struct GdkEventVisibility
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkVisibilityState state;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventMotion</NAME>
-struct GdkEventMotion
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- guint32 time;
- gdouble x;
- gdouble y;
- gdouble pressure;
- gdouble xtilt;
- gdouble ytilt;
- guint state;
- gint16 is_hint;
- GdkInputSource source;
- guint32 deviceid;
- gdouble x_root, y_root;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventButton</NAME>
-struct GdkEventButton
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- guint32 time;
- gdouble x;
- gdouble y;
- gdouble pressure;
- gdouble xtilt;
- gdouble ytilt;
- guint state;
- guint button;
- GdkInputSource source;
- guint32 deviceid;
- gdouble x_root, y_root;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventKey</NAME>
-struct GdkEventKey
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- guint32 time;
- guint state;
- guint keyval;
- gint length;
- gchar *string;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventCrossing</NAME>
-struct GdkEventCrossing
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkWindow *subwindow;
- guint32 time;
- gdouble x;
- gdouble y;
- gdouble x_root;
- gdouble y_root;
- GdkCrossingMode mode;
- GdkNotifyType detail;
- gboolean focus;
- guint state;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventFocus</NAME>
-struct GdkEventFocus
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- gint16 in;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventConfigure</NAME>
-struct GdkEventConfigure
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- gint16 x, y;
- gint16 width;
- gint16 height;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventProperty</NAME>
-struct GdkEventProperty
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkAtom atom;
- guint32 time;
- guint state;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventSelection</NAME>
-struct GdkEventSelection
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkAtom selection;
- GdkAtom target;
- GdkAtom property;
- guint32 requestor;
- guint32 time;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventProximity</NAME>
-struct GdkEventProximity
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- guint32 time;
- GdkInputSource source;
- guint32 deviceid;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventClient</NAME>
-struct GdkEventClient
-{
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkAtom message_type;
- gushort data_format;
- union {
- char b[20];
- short s[10];
- long l[5];
- } data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkEventDND</NAME>
-struct GdkEventDND {
- GdkEventType type;
- GdkWindow *window;
- gint8 send_event;
- GdkDragContext *context;
-
- guint32 time;
- gshort x_root, y_root;
-};
-</STRUCT>
-<UNION>
-<NAME>GdkEvent</NAME>
-union GdkEvent
-{
- GdkEventType type;
- GdkEventAny any;
- GdkEventExpose expose;
- GdkEventNoExpose no_expose;
- GdkEventVisibility visibility;
- GdkEventMotion motion;
- GdkEventButton button;
- GdkEventKey key;
- GdkEventCrossing crossing;
- GdkEventFocus focus_change;
- GdkEventConfigure configure;
- GdkEventProperty property;
- GdkEventSelection selection;
- GdkEventProximity proximity;
- GdkEventClient client;
- GdkEventDND dnd;
-};
-</UNION>
-<STRUCT>
-<NAME>GdkRegion</NAME>
-struct GdkRegion
-{
- gpointer user_data;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkICAttr</NAME>
-struct GdkICAttr
-{
- GdkIMStyle style;
- GdkWindow *client_window;
- GdkWindow *focus_window;
- GdkEventMask filter_events;
- GdkPoint spot_location;
- gint line_spacing;
- GdkCursor *cursor;
-
- GdkFont *preedit_fontset;
- GdkRectangle preedit_area;
- GdkRectangle preedit_area_needed;
- GdkColor preedit_foreground;
- GdkColor preedit_background;
- GdkPixmap *preedit_pixmap;
- GdkColormap *preedit_colormap;
-
- GdkFont *status_fontset;
- GdkRectangle status_area;
- GdkRectangle status_area_needed;
- GdkColor status_foreground;
- GdkColor status_background;
- GdkPixmap *status_pixmap;
- GdkColormap *status_colormap;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GdkRgbCmap</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GdkRgbCmap</NAME>
-struct GdkRgbCmap {
- guint32 colors[256];
- guchar lut[256]; /* for 8-bit modes */
+ GdkRegion *update_area;
+ guint update_freeze_count;
+
+ guint8 window_type;
+ guint8 depth;
+ guint8 resize_count;
+ guint mapped : 1;
+ guint guffaw_gravity : 1;
+ guint input_only : 1;
+
+ guint destroyed : 2;
};
</STRUCT>
<FUNCTION>
-<NAME>gdk_rgb_init</NAME>
-<RETURNS>void</RETURNS>
+<NAME>gdk_window_object_get_type</NAME>
+<RETURNS>GType </RETURNS>
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_xpixel_from_rgb</NAME>
-<RETURNS>gulong</RETURNS>
-guint32 rgb
+<NAME>gdk_window_new</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+GdkWindow *parent,GdkWindowAttr *attributes,gint attributes_mask
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_gc_set_foreground</NAME>
-<RETURNS>void</RETURNS>
-GdkGC *gc, guint32 rgb
+<NAME>gdk_window_destroy</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_gc_set_background</NAME>
-<RETURNS>void</RETURNS>
-GdkGC *gc, guint32 rgb
+<NAME>gdk_window_get_window_type</NAME>
+<RETURNS>GdkWindowType </RETURNS>
+GdkWindow *window
</FUNCTION>
-<ENUM>
-<NAME>GdkRgbDither</NAME>
-typedef enum
-{
- GDK_RGB_DITHER_NONE,
- GDK_RGB_DITHER_NORMAL,
- GDK_RGB_DITHER_MAX
-} GdkRgbDither;
-</ENUM>
<FUNCTION>
-<NAME>gdk_draw_rgb_image</NAME>
-<RETURNS>void</RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *rgb_buf,gint rowstride
+<NAME>gdk_window_at_pointer</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+gint *win_x,gint *win_y
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_rgb_image_dithalign</NAME>
-<RETURNS>void</RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *rgb_buf,gint rowstride,gint xdith,gint ydith
+<NAME>gdk_window_show</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_rgb_32_image</NAME>
-<RETURNS>void</RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride
+<NAME>gdk_window_hide</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_gray_image</NAME>
-<RETURNS>void</RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride
+<NAME>gdk_window_withdraw</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_cmap_new</NAME>
-<RETURNS>GdkRgbCmap *</RETURNS>
-guint32 *colors, gint n_colors
+<NAME>gdk_window_move</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint x,gint y
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_cmap_free</NAME>
-<RETURNS>void</RETURNS>
-GdkRgbCmap *cmap
+<NAME>gdk_window_resize</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_draw_indexed_image</NAME>
-<RETURNS>void</RETURNS>
-GdkDrawable *drawable,GdkGC *gc,gint x,gint y,gint width,gint height,GdkRgbDither dith,guchar *buf,gint rowstride,GdkRgbCmap *cmap
+<NAME>gdk_window_move_resize</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_ditherable</NAME>
-<RETURNS>gboolean</RETURNS>
-void
+<NAME>gdk_window_reparent</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkWindow *new_parent,gint x,gint y
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_set_verbose</NAME>
-<RETURNS>void</RETURNS>
-gboolean verbose
+<NAME>gdk_window_clear</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_set_install</NAME>
-<RETURNS>void</RETURNS>
-gboolean install
+<NAME>gdk_window_clear_area</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_set_min_colors</NAME>
-<RETURNS>void</RETURNS>
-gint min_colors
+<NAME>gdk_window_clear_area_e</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_get_cmap</NAME>
-<RETURNS>GdkColormap *</RETURNS>
+<NAME>gdk_window_raise</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_lower</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_user_data</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gpointer user_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_override_redirect</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gboolean override_redirect
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_add_filter</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkFilterFunc function,gpointer data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_remove_filter</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkFilterFunc function,gpointer data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_scroll</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint dx,gint dy
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_shape_combine_mask</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkBitmap *shape_mask,gint offset_x,gint offset_y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_child_shapes</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_merge_child_shapes</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_is_visible</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_is_viewable</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_static_gravities</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *window,gboolean use_static
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_hints</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint x,gint y,gint min_width,gint min_height,gint max_width,gint max_height,gint flags
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_geometry_hints</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkGeometry *geometry,GdkWindowHints flags
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_set_sm_client_id</NAME>
+<RETURNS>void </RETURNS>
+const gchar *sm_client_id
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_begin_paint_rect</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkRectangle *rectangle
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_begin_paint_region</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkRegion *region
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_end_paint</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_title</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,const gchar *title
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_role</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,const gchar *role
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_transient_for</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkWindow *leader
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_background</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_back_pixmap</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkPixmap *pixmap,gboolean parent_relative
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_cursor</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkCursor *cursor
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_user_data</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gpointer *data
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_geometry</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint *x,gint *y,gint *width,gint *height,gint *depth
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_position</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint *x,gint *y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_origin</NAME>
+<RETURNS>gint </RETURNS>
+GdkWindow *window,gint *x,gint *y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_deskrelative_origin</NAME>
+<RETURNS>gboolean </RETURNS>
+GdkWindow *window,gint *x,gint *y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_root_origin</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gint *x,gint *y
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_pointer</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+GdkWindow *window,gint *x,gint *y,GdkModifierType *mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_parent</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_toplevel</NAME>
+<RETURNS>GdkWindow *</RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_children</NAME>
+<RETURNS>GList *</RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_peek_children</NAME>
+<RETURNS>GList *</RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_events</NAME>
+<RETURNS>GdkEventMask </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_events</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkEventMask event_mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_icon</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkWindow *icon_window,GdkPixmap *pixmap,GdkBitmap *mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_icon_name</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,const gchar *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_group</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkWindow *leader
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_decorations</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkWMDecoration decorations
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_set_functions</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkWMFunction functions
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_toplevels</NAME>
+<RETURNS>GList *</RETURNS>
void
</FUNCTION>
<FUNCTION>
-<NAME>gdk_rgb_get_visual</NAME>
-<RETURNS>GdkVisual *</RETURNS>
+<NAME>gdk_window_register_dnd</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_invalidate_rect</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkRectangle *rect,gboolean invalidate_children
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_invalidate_region</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,GdkRegion *region,gboolean invalidate_children
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_get_update_area</NAME>
+<RETURNS>GdkRegion *</RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_freeze_updates</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_thaw_updates</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_process_all_updates</NAME>
+<RETURNS>void </RETURNS>
void
</FUNCTION>
+<FUNCTION>
+<NAME>gdk_window_process_updates</NAME>
+<RETURNS>void </RETURNS>
+GdkWindow *window,gboolean update_children
+</FUNCTION>
+<MACRO>
+<NAME>GDK_WINDOWING_X11</NAME>
+#define GDK_WINDOWING_X11
+</MACRO>
+<MACRO>
+<NAME>GDK_HAVE_WCHAR_H</NAME>
+#define GDK_HAVE_WCHAR_H 1
+</MACRO>
+<MACRO>
+<NAME>GDK_HAVE_WCTYPE_H</NAME>
+#define GDK_HAVE_WCTYPE_H 1
+</MACRO>
diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index a656a33d8..8da5b4377 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -3,6 +3,7 @@
<!entity gdk-Bitmaps-and-Pixmaps SYSTEM "sgml/pixmaps.sgml">
<!entity gdk-Images SYSTEM "sgml/images.sgml">
<!entity gdk-GdkRGB SYSTEM "sgml/rgb.sgml">
+<!entity gdk-Pixbufs SYSTEM "sgml/pixbufs.sgml">
<!entity gdk-Colormaps-and-Colors SYSTEM "sgml/colors.sgml">
<!entity gdk-Fonts SYSTEM "sgml/fonts.sgml">
<!entity gdk-Drawing-Primitives SYSTEM "sgml/drawing.sgml">
@@ -13,6 +14,7 @@
<!entity gdk-Properties-and-Atoms SYSTEM "sgml/properties.sgml">
<!entity gdk-Input-Methods SYSTEM "sgml/input_methods.sgml">
<!entity gdk-Input-Contexts SYSTEM "sgml/input_contexts.sgml">
+<!entity gdk-Pango-Interaction SYSTEM "sgml/pango_interaction.sgml">
<!entity gdk-Color-Contexts SYSTEM "sgml/color_contexts.sgml">
<!entity gdk-Points-Rectangles-and-Regions SYSTEM "sgml/regions.sgml">
<!entity gdk-Threads SYSTEM "sgml/threads.sgml">
@@ -23,14 +25,16 @@
<!entity gdk-Cursors SYSTEM "sgml/cursors.sgml">
<!entity gdk-Input SYSTEM "sgml/input.sgml">
<!entity gdk-Drag-and-Drop SYSTEM "sgml/dnd.sgml">
+<!entity gdk-X-Window-System-Interaction SYSTEM
+"sgml/x_interaction.sgml">
]>
<book id="index">
<bookinfo>
<title>GDK Reference Manual</title>
</bookinfo>
- <chapter id="gdk">
- <title>GDK</title>
+ <reference id="reference">
+ <title>API Reference</title>
&gdk-General;
&gdk-Points-Rectangles-and-Regions;
@@ -40,6 +44,7 @@
&gdk-Bitmaps-and-Pixmaps;
&gdk-GdkRGB;
&gdk-Images;
+ &gdk-Pixbufs;
&gdk-Colormaps-and-Colors;
&gdk-Color-Contexts;
@@ -66,7 +71,10 @@
&gdk-Key-Values;
+ &gdk-Pango-Interaction;
&gdk-Input-Methods;
&gdk-Input-Contexts;
- </chapter>
+
+ &gdk-X-Window-System-Interaction;
+ </reference>
</book>
diff --git a/docs/reference/gdk/gdk-overrides.txt b/docs/reference/gdk/gdk-overrides.txt
index 939122e78..14eed8115 100644
--- a/docs/reference/gdk/gdk-overrides.txt
+++ b/docs/reference/gdk/gdk-overrides.txt
@@ -1,6 +1,13 @@
# GdkPixmap, GdkBitmap and GdkDrawable are the same as GdkWindow.
<STRUCT>
+<NAME>GdkWindow</NAME>
+struct GdkPixmap
+{
+ gpointer user_data;
+};
+</STRUCT>
+<STRUCT>
<NAME>GdkPixmap</NAME>
struct GdkPixmap
{
@@ -21,3 +28,24 @@ struct GdkDrawable
gpointer user_data;
};
</STRUCT>
+
+<MACRO>
+<NAME>GDK_WINDOWING_X11</NAME>
+#define GDK_WINDOWING_X11
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_WIN32</NAME>
+#define GDK_WINDOWING_WIN32
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_NANOX</NAME>
+#define GDK_WINDOWING_NANOX
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_FB</NAME>
+#define GDK_WINDOWING_FB
+</MACRO>
+
diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 18ea372c9..44193f11b 100644
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -24,6 +24,7 @@ gdk_screen_height_mm
<SUBSECTION>
gdk_pointer_grab
+GdkGrabStatus
gdk_pointer_ungrab
gdk_pointer_is_grabbed
@@ -46,13 +47,15 @@ gdk_set_use_xshm
gdk_error_trap_push
gdk_error_trap_pop
+<SUBSECTION>
+GDK_WINDOWING_X11
+GDK_WINDOWING_WIN32
+GDK_WINDOWING_NANOX
+GDK_WINDOWING_FB
+
<SUBSECTION Private>
GdkStatus
-gdk_time_get
-gdk_timer_get
-gdk_timer_set
-gdk_timer_enable
-gdk_timer_disable
+GDKVAR
</SECTION>
<SECTION>
@@ -71,6 +74,20 @@ gdk_pixmap_unref
GdkBitmap
gdk_bitmap_ref
gdk_bitmap_unref
+
+<SUBSECTION Standard>
+GDK_PIXMAP
+GDK_PIXMAP_GET_CLASS
+GDK_PIXMAP_OBJECT
+GDK_TYPE_PIXMAP
+GDK_IS_PIXMAP
+GDK_PIXMAP_CLASS
+GDK_IS_PIXMAP_CLASS
+
+<SUBSECTION Private>
+gdk_pixmap_get_type
+GdkPixmapObject
+GdkPixmapObjectClass
</SECTION>
<SECTION>
@@ -81,10 +98,24 @@ gdk_image_new
GdkImageType
gdk_image_new_bitmap
gdk_image_get
+gdk_image_ref
+gdk_image_unref
gdk_image_destroy
<SUBSECTION>
gdk_image_put_pixel
gdk_image_get_pixel
+
+<SUBSECTION Standard>
+GDK_IMAGE
+GDK_TYPE_IMAGE
+GDK_IS_IMAGE
+GDK_IMAGE_CLASS
+GDK_IMAGE_GET_CLASS
+GDK_IS_IMAGE_CLASS
+
+<SUBSECTION Private>
+GdkImageClass
+gdk_image_get_type
</SECTION>
<SECTION>
@@ -98,6 +129,7 @@ gdk_draw_rgb_image_dithalign
gdk_draw_indexed_image
gdk_draw_gray_image
gdk_draw_rgb_32_image
+gdk_draw_rgb_32_image_dithalign
GdkRgbDither
<SUBSECTION>
@@ -109,17 +141,30 @@ GdkRgbCmap
gdk_rgb_gc_set_foreground
gdk_rgb_gc_set_background
gdk_rgb_xpixel_from_rgb
+gdk_rgb_find_color
<SUBSECTION>
gdk_rgb_set_install
gdk_rgb_set_min_colors
gdk_rgb_get_visual
+gdk_rgb_get_colormap
gdk_rgb_get_cmap
gdk_rgb_ditherable
gdk_rgb_set_verbose
</SECTION>
<SECTION>
+<TITLE>Pixbufs</TITLE>
+<FILE>pixbufs</FILE>
+GdkPixbufAlphaMode
+gdk_pixbuf_render_threshold_alpha
+gdk_pixbuf_render_to_drawable
+gdk_pixbuf_render_to_drawable_alpha
+gdk_pixbuf_render_pixmap_and_mask
+gdk_pixbuf_get_from_drawable
+</SECTION>
+
+<SECTION>
<TITLE>Colormaps and Colors</TITLE>
<FILE>colors</FILE>
GdkColor
@@ -146,6 +191,18 @@ gdk_color_alloc
gdk_color_change
gdk_color_equal
gdk_color_hash
+
+<SUBSECTION Standard>
+GDK_COLORMAP
+GDK_COLORMAP_GET_CLASS
+GDK_TYPE_COLORMAP
+GDK_IS_COLORMAP
+GDK_COLORMAP_CLASS
+GDK_IS_COLORMAP_CLASS
+
+<SUBSECTION Private>
+GdkColormapClass
+gdk_colormap_get_type
</SECTION>
<SECTION>
@@ -155,6 +212,7 @@ GdkFont
GdkFontType
gdk_font_load
gdk_fontset_load
+gdk_font_from_description
gdk_font_ref
gdk_font_unref
gdk_font_id
@@ -177,6 +235,10 @@ gdk_text_height
gdk_char_height
<SUBSECTION>
+gdk_font_full_name_get
+gdk_font_full_name_free
+
+<SUBSECTION>
GdkWChar
gdk_wcstombs
gdk_mbstowcs
@@ -185,6 +247,19 @@ gdk_mbstowcs
<SECTION>
<TITLE>Drawing Primitives</TITLE>
<FILE>drawing</FILE>
+GdkDrawable
+GdkDrawableClass
+gdk_drawable_ref
+gdk_drawable_unref
+gdk_drawable_set_data
+gdk_drawable_get_data
+gdk_drawable_get_visual
+gdk_drawable_set_colormap
+gdk_drawable_get_colormap
+gdk_drawable_get_depth
+gdk_drawable_get_size
+
+<SUBSECTION>
gdk_draw_point
gdk_draw_points
gdk_draw_line
@@ -194,6 +269,9 @@ GdkSegment
gdk_draw_rectangle
gdk_draw_arc
gdk_draw_polygon
+gdk_draw_glyphs
+gdk_draw_layout_line
+gdk_draw_layout
<SUBSECTION>
gdk_draw_string
@@ -202,8 +280,17 @@ gdk_draw_text_wc
<SUBSECTION>
gdk_draw_pixmap
+gdk_draw_drawable
gdk_draw_image
+<SUBSECTION Standard>
+GDK_DRAWABLE
+GDK_DRAWABLE_GET_CLASS
+GDK_TYPE_DRAWABLE
+GDK_IS_DRAWABLE
+GDK_DRAWABLE_CLASS
+GDK_IS_DRAWABLE_CLASS
+
<SUBSECTION Private>
gdk_draw_bitmap
</SECTION>
@@ -212,6 +299,7 @@ gdk_draw_bitmap
<TITLE>Graphics Contexts</TITLE>
<FILE>gcs</FILE>
GdkGC
+GdkGCClass
GdkGCValues
GdkGCValuesMask
@@ -222,9 +310,12 @@ gdk_gc_new_with_values
gdk_gc_ref
gdk_gc_unref
gdk_gc_destroy
+gdk_gc_set_values
gdk_gc_get_values
gdk_gc_set_foreground
gdk_gc_set_background
+gdk_gc_set_rgb_fg_color
+gdk_gc_set_rgb_bg_color
gdk_gc_set_font
gdk_gc_set_function
gdk_gc_set_fill
@@ -245,6 +336,17 @@ GdkCapStyle
GdkJoinStyle
gdk_gc_set_dashes
gdk_gc_copy
+gdk_gc_set_colormap
+gdk_gc_get_colormap
+
+<SUBSECTION Standard>
+GDK_GC
+GDK_TYPE_GC
+GDK_IS_GC
+gdk_gc_get_type
+GDK_GC_CLASS
+GDK_GC_GET_CLASS
+GDK_IS_GC_CLASS
</SECTION>
<SECTION>
@@ -283,6 +385,7 @@ gdk_window_new
gdk_window_destroy
gdk_window_ref
gdk_window_unref
+gdk_window_get_window_type
gdk_window_at_pointer
gdk_window_show
gdk_window_hide
@@ -292,6 +395,7 @@ gdk_window_withdraw
gdk_window_move
gdk_window_resize
gdk_window_move_resize
+gdk_window_scroll
gdk_window_reparent
gdk_window_clear
gdk_window_clear_area
@@ -300,6 +404,22 @@ gdk_window_copy_area
gdk_window_raise
gdk_window_lower
gdk_window_register_dnd
+
+<SUBSECTION>
+gdk_window_begin_paint_rect
+gdk_window_begin_paint_region
+gdk_window_end_paint
+
+<SUBSECTION>
+gdk_window_invalidate_rect
+gdk_window_invalidate_region
+gdk_window_get_update_area
+gdk_window_freeze_updates
+gdk_window_thaw_updates
+gdk_window_process_all_updates
+gdk_window_process_updates
+
+<SUBSECTION>
gdk_window_set_user_data
gdk_window_set_override_redirect
gdk_window_add_filter
@@ -334,6 +454,7 @@ GdkModifierType
gdk_window_get_parent
gdk_window_get_toplevel
gdk_window_get_children
+gdk_window_peek_children
gdk_window_get_events
gdk_window_set_events
gdk_window_set_icon
@@ -346,8 +467,21 @@ GdkWMDecoration
gdk_window_set_functions
GdkWMFunction
gdk_window_get_toplevels
-GdkDrawable
-gdk_drawable_set_data
+
+<SUBSECTION Standard>
+GDK_WINDOW
+GDK_WINDOW_GET_CLASS
+GDK_WINDOW_OBJECT
+GDK_TYPE_WINDOW
+GDK_IS_WINDOW
+GDK_WINDOW_CLASS
+GDK_IS_WINDOW_CLASS
+
+<SUBSECTION Private>
+gdk_window_object_get_type
+gdk_drawable_get_type
+GdkWindowObject
+GdkWindowObjectClass
</SECTION>
<SECTION>
@@ -391,6 +525,19 @@ gdk_im_set_best_style
<SUBSECTION>
gdk_im_begin
gdk_im_end
+
+<SUBSECTION Private>
+gdk_iswalnum
+gdk_iswspace
+GDK_HAVE_WCHAR_H
+GDK_HAVE_WCTYPE_H
+</SECTION>
+
+<SECTION>
+<TITLE>Pango Interaction</TITLE>
+<FILE>pango_interaction</FILE>
+gdk_pango_context_get
+gdk_pango_context_set_colormap
</SECTION>
<SECTION>
@@ -448,34 +595,36 @@ GdkRegion
gdk_region_new
gdk_region_polygon
GdkFillRule
+gdk_region_copy
+gdk_region_rectangle
gdk_region_destroy
<SUBSECTION>
-gdk_regions_intersect
-gdk_regions_union
-gdk_regions_subtract
-gdk_regions_xor
-gdk_region_union_with_rect
-gdk_region_offset
-gdk_region_shrink
-
-<SUBSECTION>
+gdk_region_get_clipbox
gdk_region_empty
gdk_region_equal
gdk_region_point_in
gdk_region_rect_in
GdkOverlapType
-gdk_region_get_clipbox
+
+<SUBSECTION>
+gdk_region_offset
+gdk_region_shrink
+gdk_region_union_with_rect
+gdk_region_intersect
+gdk_region_union
+gdk_region_subtract
+gdk_region_xor
</SECTION>
<SECTION>
<TITLE>Threads</TITLE>
<FILE>threads</FILE>
-gdk_threads_mutex
GDK_THREADS_ENTER
GDK_THREADS_LEAVE
gdk_threads_enter
gdk_threads_leave
+gdk_threads_mutex
</SECTION>
<SECTION>
@@ -489,33 +638,44 @@ gdk_keyval_is_upper
gdk_keyval_is_lower
<SUBSECTION>
+gdk_keyval_convert_case
gdk_keyval_to_upper
gdk_keyval_to_lower
+
+<SUBSECTION>
+gdk_keyval_to_unicode
+gdk_unicode_to_keyval
</SECTION>
<SECTION>
<TITLE>Input Devices</TITLE>
<FILE>input_devices</FILE>
-GDK_CORE_POINTER
-gdk_input_list_devices
-GdkDeviceInfo
-GdkDeviceKey
-gdk_input_set_extension_events
-GdkExtensionMode
-gdk_input_set_source
+GdkDevice
GdkInputSource
-gdk_input_set_mode
GdkInputMode
-gdk_input_set_axes
+GdkDeviceKey
+GdkDeviceAxis
GdkAxisUse
-gdk_input_set_key
-gdk_input_window_get_pointer
-gdk_input_motion_events
+gdk_devices_list
+gdk_core_pointer
+gdk_device_set_source
+gdk_device_set_mode
+gdk_device_set_key
+gdk_device_set_axis_use
+
+<SUBSECTION>
+gdk_device_get_state
+gdk_device_get_history
+gdk_device_free_history
GdkTimeCoord
+gdk_device_get_axis
+
+<SUBSECTION>
+gdk_input_set_extension_events
+GdkExtensionMode
<SUBSECTION Private>
-gdk_input_init
-gdk_input_exit
+GDK_MAX_TIMECOORD_AXES
</SECTION>
<SECTION>
@@ -525,6 +685,8 @@ GdkEventType
GdkEventMask
GDK_CURRENT_TIME
GDK_PRIORITY_EVENTS
+GDK_PRIORITY_REDRAW
+
<SUBSECTION>
gdk_events_pending
@@ -535,6 +697,7 @@ gdk_event_put
gdk_event_copy
gdk_event_free
gdk_event_get_time
+gdk_event_get_axis
<SUBSECTION>
gdk_event_handler_set
@@ -559,6 +722,7 @@ GdkEvent
GdkEventAny
GdkEventKey
GdkEventButton
+GdkEventScroll
GdkEventMotion
GdkEventExpose
GdkEventVisibility
@@ -567,12 +731,14 @@ GdkEventFocus
GdkEventConfigure
GdkEventProperty
GdkEventSelection
+GdkNativeWindow
GdkEventDND
GdkEventProximity
GdkEventClient
GdkEventNoExpose
<SUBSECTION>
+GdkScrollDirection
GdkVisibilityState
GdkCrossingMode
GdkNotifyType
@@ -586,6 +752,8 @@ GdkCursor
GdkCursorType
gdk_cursor_new
gdk_cursor_new_from_pixmap
+gdk_cursor_ref
+gdk_cursor_unref
gdk_cursor_destroy
</SECTION>
@@ -619,4 +787,75 @@ gdk_drag_context_unref
GdkDragContext
GdkDragAction
gdk_drag_status
+
+<SUBSECTION Standard>
+GDK_DRAG_CONTEXT
+GDK_TYPE_DRAG_CONTEXT
+GDK_IS_DRAG_CONTEXT
+GDK_DRAG_CONTEXT_CLASS
+GDK_DRAG_CONTEXT_GET_CLASS
+GDK_IS_DRAG_CONTEXT_CLASS
+
+<SUBSECTION Private>
+GdkDragContextClass
+gdk_drag_context_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>X Window System Interaction</TITLE>
+<FILE>x_interaction</FILE>
+GDK_GC_X11
+GDK_GC_X11_GET_CLASS
+GDK_ROOT_WINDOW
+GDK_ROOT_PARENT
+GDK_DISPLAY
+GDK_WINDOW_XDISPLAY
+GDK_WINDOW_XID
+GDK_PIXMAP_XDISPLAY
+GDK_PIXMAP_XID
+GDK_DRAWABLE_XDISPLAY
+GDK_DRAWABLE_XID
+GDK_IMAGE_XDISPLAY
+GDK_IMAGE_XIMAGE
+GDK_GC_XDISPLAY
+GDK_COLORMAP_XDISPLAY
+GDK_COLORMAP_XCOLORMAP
+GDK_VISUAL_XVISUAL
+GDK_FONT_XDISPLAY
+GDK_FONT_XFONT
+GDK_GC_XGC
+GDK_GC_GET_XGC
+GDK_WINDOW_XWINDOW
+gdk_screen
+gdk_display_name
+gdk_leader_window
+gdk_selection_property
+gdk_progclass
+gdkx_visual_get
+gdkx_colormap_get
+gdk_get_client_window
+gdk_pixmap_foreign_new
+gdk_window_foreign_new
+gdk_xid_table_lookup
+gdk_window_lookup
+gdk_pixmap_lookup
+gdk_font_lookup
+
+<SUBSECTION Private>
+GDK_TYPE_GC_X11
+GDK_IS_GC_X11
+gdk_gc_x11_get_type
+GDK_GC_X11_CLASS
+GDK_IS_GC_X11_CLASS
+GdkGCX11
+GdkGCX11Class
+GdkGCXData
+GdkColormapPrivateX11
+GdkCursorPrivate
+GdkFontPrivateX
+GdkImagePrivateX11
+GdkVisualPrivate
+GdkICPrivate
+gdk_display
+gdk_root_window
</SECTION>
diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index f9050d698..d4185b515 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -109,6 +109,7 @@ pseudo-color colormaps.</entry>
</tbody></tgroup></informaltable>
</para>
+@parent_instance:
@size:
@colors:
@@ -384,7 +385,8 @@ table that stores #GdkColor's.
</para>
@colora: a #GdkColor.
-@colorb: NOT USED.
@Returns: The hash function appled to @colora
+<!-- # Unused Parameters # -->
+@colorb: NOT USED.
diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml
index 5b33090b9..72c58962e 100644
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/docs/reference/gdk/tmpl/cursors.sgml
@@ -20,6 +20,7 @@ standard and pixmap cursors.
</para>
@type:
+@ref_count:
<!-- ##### ENUM GdkCursorType ##### -->
<para>
@@ -89,11 +90,29 @@ The color does not have to be allocated first.
@Returns: a new #GdkCursor.
-<!-- ##### FUNCTION gdk_cursor_destroy ##### -->
+<!-- ##### FUNCTION gdk_cursor_ref ##### -->
+<para>
+
+</para>
+
+@cursor:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_cursor_unref ##### -->
+<para>
+
+</para>
+
+@cursor:
+
+
+<!-- ##### MACRO gdk_cursor_destroy ##### -->
<para>
Destroys a cursor, freeing any resources allocated for it.
</para>
+<!-- # Unused Parameters # -->
@cursor: a #GdkCursor.
diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml
index c61ad4c6f..d48f0f187 100644
--- a/docs/reference/gdk/tmpl/dnd.sgml
+++ b/docs/reference/gdk/tmpl/dnd.sgml
@@ -146,6 +146,9 @@ the GTK+ documentation for more information.
@GDK_DRAG_PROTO_XDND:
@GDK_DRAG_PROTO_ROOTWIN:
@GDK_DRAG_PROTO_NONE:
+@GDK_DRAG_PROTO_WIN32_DROPFILES:
+@GDK_DRAG_PROTO_OLE2:
+@GDK_DRAG_PROTO_LOCAL:
<!-- ##### FUNCTION gdk_drag_context_unref ##### -->
<para>
@@ -160,6 +163,7 @@ the GTK+ documentation for more information.
</para>
+@parent_instance:
@protocol:
@is_source:
@source_window:
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index f9589d8fd..ec3069fd6 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -25,6 +25,103 @@ more information.
</para>
+<!-- ##### STRUCT GdkDrawable ##### -->
+<para>
+
+</para>
+
+@user_data:
+
+<!-- ##### STRUCT GdkDrawableClass ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gdk_drawable_ref ##### -->
+<para>
+
+</para>
+
+@drawable:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_drawable_unref ##### -->
+<para>
+
+</para>
+
+@drawable:
+
+
+<!-- ##### FUNCTION gdk_drawable_set_data ##### -->
+<para>
+
+</para>
+
+@drawable:
+@key:
+@data:
+@destroy_func:
+
+
+<!-- ##### FUNCTION gdk_drawable_get_data ##### -->
+<para>
+
+</para>
+
+@drawable:
+@key:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_drawable_get_visual ##### -->
+<para>
+
+</para>
+
+@drawable:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_drawable_set_colormap ##### -->
+<para>
+
+</para>
+
+@drawable:
+@colormap:
+
+
+<!-- ##### FUNCTION gdk_drawable_get_colormap ##### -->
+<para>
+
+</para>
+
+@drawable:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_drawable_get_depth ##### -->
+<para>
+
+</para>
+
+@drawable:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_drawable_get_size ##### -->
+<para>
+
+</para>
+
+@drawable:
+@width:
+@height:
+
+
<!-- ##### FUNCTION gdk_draw_point ##### -->
<para>
Draws a point, using the foreground color and other attributes of the #GdkGC.
@@ -157,6 +254,43 @@ polygon.
@npoints: the number of points.
+<!-- ##### FUNCTION gdk_draw_glyphs ##### -->
+<para>
+
+</para>
+
+@drawable:
+@gc:
+@font:
+@x:
+@y:
+@glyphs:
+
+
+<!-- ##### FUNCTION gdk_draw_layout_line ##### -->
+<para>
+
+</para>
+
+@drawable:
+@gc:
+@x:
+@y:
+@line:
+
+
+<!-- ##### FUNCTION gdk_draw_layout ##### -->
+<para>
+
+</para>
+
+@drawable:
+@gc:
+@x:
+@y:
+@layout:
+
+
<!-- ##### FUNCTION gdk_draw_string ##### -->
<para>
Draws a string of characters in the given font or fontset.
@@ -200,11 +334,12 @@ If the font is a 1-byte font, the string is converted into 1-byte characters
@text_length: the number of characters to draw.
-<!-- ##### FUNCTION gdk_draw_pixmap ##### -->
+<!-- ##### MACRO gdk_draw_pixmap ##### -->
<para>
Draws a pixmap, or a part of a pixmap, onto another drawable.
</para>
+<!-- # Unused Parameters # -->
@drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
@gc: a #GdkGC.
@src: the source #GdkPixmap to draw.
@@ -218,6 +353,22 @@ the right edge of the source pixmap.
to the bottom edge of the source pixmap.
+<!-- ##### FUNCTION gdk_draw_drawable ##### -->
+<para>
+
+</para>
+
+@drawable:
+@gc:
+@src:
+@xsrc:
+@ysrc:
+@xdest:
+@ydest:
+@width:
+@height:
+
+
<!-- ##### FUNCTION gdk_draw_image ##### -->
<para>
Draws a #GdkImage onto a drawable.
diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml
index 2e6d52b5f..a5741da40 100644
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -143,22 +143,34 @@ must also occur within 1/2 second of the first button press.
@time: the time of the event in milliseconds.
@x: the x coordinate of the mouse relative to the window.
@y: the y coordinate of the mouse relative to the window.
-@pressure: the pressure of the button press, intended for input devices such
-as graphics tablets. It defaults to 0.5.
-@xtilt: the horizontal tilt of the input device. Defaults to 0.
-@ytilt: the vertical tilt of the input device. Defaults to 0.
+@axes:
@state: a bit-mask representing the state of the modifier keys (e.g. Control,
Shift and Alt) and the pointer buttons. See #GdkModifierType.
@button: the button which was pressed or released, numbered from 1 to 5.
Normally button 1 is the left mouse button, 2 is the middle button,
and 3 is the right button. On 2-button mice, the middle button can often
be simulated by pressing both mouse buttons together.
-@source: the input device where the event came from, usually %GDK_SOURCE_MOUSE.
-@deviceid: the input device ID, usually %GDK_CORE_POINTER but may be
-different if touch screens or graphics tablets are being used.
+@device:
@x_root: the x coordinate of the mouse relative to the root of the screen.
@y_root: the y coordinate of the mouse relative to the root of the screen.
+<!-- ##### STRUCT GdkEventScroll ##### -->
+<para>
+
+</para>
+
+@type:
+@window:
+@send_event:
+@time:
+@x:
+@y:
+@state:
+@direction:
+@device:
+@x_root:
+@y_root:
+
<!-- ##### STRUCT GdkEventMotion ##### -->
<para>
@@ -170,13 +182,10 @@ different if touch screens or graphics tablets are being used.
@time:
@x:
@y:
-@pressure:
-@xtilt:
-@ytilt:
+@axes:
@state:
@is_hint:
-@source:
-@deviceid:
+@device:
@x_root:
@y_root:
@@ -206,15 +215,6 @@ Generated when the window visibility status has changed.
@state: the new visibility state (%GDK_VISIBILITY_FULLY_OBSCURED,
%GDK_VISIBILITY_PARTIAL or %GDK_VISIBILITY_UNOBSCURED).
-<!-- ##### ENUM GdkVisibilityState ##### -->
-<para>
-Specifies the visiblity status of a window for a #GdkEventVisibility.
-</para>
-
-@GDK_VISIBILITY_UNOBSCURED: the window is completely visible.
-@GDK_VISIBILITY_PARTIAL: the window is partially visible.
-@GDK_VISIBILITY_FULLY_OBSCURED: the window is not visible at all.
-
<!-- ##### STRUCT GdkEventCrossing ##### -->
<para>
@@ -234,27 +234,6 @@ Specifies the visiblity status of a window for a #GdkEventVisibility.
@focus:
@state:
-<!-- ##### ENUM GdkCrossingMode ##### -->
-<para>
-
-</para>
-
-@GDK_CROSSING_NORMAL:
-@GDK_CROSSING_GRAB:
-@GDK_CROSSING_UNGRAB:
-
-<!-- ##### ENUM GdkNotifyType ##### -->
-<para>
-
-</para>
-
-@GDK_NOTIFY_ANCESTOR:
-@GDK_NOTIFY_VIRTUAL:
-@GDK_NOTIFY_INFERIOR:
-@GDK_NOTIFY_NONLINEAR:
-@GDK_NOTIFY_NONLINEAR_VIRTUAL:
-@GDK_NOTIFY_UNKNOWN:
-
<!-- ##### STRUCT GdkEventFocus ##### -->
<para>
Describes a change of keyboard focus.
@@ -292,14 +271,6 @@ Describes a property change on a window.
@state: whether the property was changed (%GDK_PROPERTY_NEW_VALUE) or
deleted (%GDK_PROPERTY_DELETE).
-<!-- ##### ENUM GdkPropertyState ##### -->
-<para>
-Specifies the type of a property change for a #GdkEventProperty.
-</para>
-
-@GDK_PROPERTY_NEW_VALUE: the property value wan changed.
-@GDK_PROPERTY_DELETE: the property was deleted.
-
<!-- ##### STRUCT GdkEventSelection ##### -->
<para>
@@ -311,8 +282,14 @@ Specifies the type of a property change for a #GdkEventProperty.
@selection:
@target:
@property:
-@requestor:
@time: the time of the event in milliseconds.
+@requestor:
+
+<!-- ##### TYPEDEF GdkNativeWindow ##### -->
+<para>
+
+</para>
+
<!-- ##### STRUCT GdkEventDND ##### -->
<para>
@@ -336,8 +313,7 @@ Specifies the type of a property change for a #GdkEventProperty.
@window: the window which received the event.
@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
@time: the time of the event in milliseconds.
-@source:
-@deviceid:
+@device:
<!-- ##### STRUCT GdkEventClient ##### -->
<para>
@@ -366,3 +342,51 @@ FIXME: add more here.
@window: the window which received the event.
@send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent).
+<!-- ##### ENUM GdkScrollDirection ##### -->
+<para>
+
+</para>
+
+@GDK_SCROLL_UP:
+@GDK_SCROLL_DOWN:
+@GDK_SCROLL_LEFT:
+@GDK_SCROLL_RIGHT:
+
+<!-- ##### ENUM GdkVisibilityState ##### -->
+<para>
+Specifies the visiblity status of a window for a #GdkEventVisibility.
+</para>
+
+@GDK_VISIBILITY_UNOBSCURED: the window is completely visible.
+@GDK_VISIBILITY_PARTIAL: the window is partially visible.
+@GDK_VISIBILITY_FULLY_OBSCURED: the window is not visible at all.
+
+<!-- ##### ENUM GdkCrossingMode ##### -->
+<para>
+
+</para>
+
+@GDK_CROSSING_NORMAL:
+@GDK_CROSSING_GRAB:
+@GDK_CROSSING_UNGRAB:
+
+<!-- ##### ENUM GdkNotifyType ##### -->
+<para>
+
+</para>
+
+@GDK_NOTIFY_ANCESTOR:
+@GDK_NOTIFY_VIRTUAL:
+@GDK_NOTIFY_INFERIOR:
+@GDK_NOTIFY_NONLINEAR:
+@GDK_NOTIFY_NONLINEAR_VIRTUAL:
+@GDK_NOTIFY_UNKNOWN:
+
+<!-- ##### ENUM GdkPropertyState ##### -->
+<para>
+Specifies the type of a property change for a #GdkEventProperty.
+</para>
+
+@GDK_PROPERTY_NEW_VALUE: the property value wan changed.
+@GDK_PROPERTY_DELETE: the property was deleted.
+
diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml
index dca821ca7..1b3ba85e6 100644
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -81,6 +81,7 @@ has changed.
@GDK_VISIBILITY_NOTIFY: the window visibility status has changed.
@GDK_NO_EXPOSE: indicates that the source region was completely available
when parts of a drawable were copied. This is not very useful.
+@GDK_SCROLL:
<!-- ##### ENUM GdkEventMask ##### -->
<para>
@@ -118,6 +119,7 @@ events when the application asks for them, by calling gdk_window_get_pointer().
@GDK_PROXIMITY_IN_MASK:
@GDK_PROXIMITY_OUT_MASK:
@GDK_SUBSTRUCTURE_MASK:
+@GDK_SCROLL_MASK:
@GDK_ALL_EVENTS_MASK: the combination of all the above event masks.
<!-- ##### MACRO GDK_CURRENT_TIME ##### -->
@@ -135,6 +137,13 @@ This is the priority that events from the X server are given in the
+<!-- ##### MACRO GDK_PRIORITY_REDRAW ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### FUNCTION gdk_events_pending ##### -->
<para>
Checks if any events are waiting to be processed.
@@ -217,6 +226,17 @@ Gets the timestamp from a #GdkEvent.
no timestamp.
+<!-- ##### FUNCTION gdk_event_get_axis ##### -->
+<para>
+
+</para>
+
+@event:
+@axis_use:
+@value:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_event_handler_set ##### -->
<para>
Sets the function to call to handle all events from GDK.
diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml
index 479b11584..858f052fa 100644
--- a/docs/reference/gdk/tmpl/fonts.sgml
+++ b/docs/reference/gdk/tmpl/fonts.sgml
@@ -356,6 +356,15 @@ assumptions about the initial reference count.
@Returns: a #GdkFont, or NULL if the fontset could not be loaded.
+<!-- ##### FUNCTION gdk_font_from_description ##### -->
+<para>
+
+</para>
+
+@font_desc:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_font_ref ##### -->
<para>
Increase the reference count of a count by one.
@@ -579,6 +588,23 @@ relation to the baseline. See gdk_text_extents().
@Returns: the height of the character in pixels.
+<!-- ##### FUNCTION gdk_font_full_name_get ##### -->
+<para>
+
+</para>
+
+@font:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_font_full_name_free ##### -->
+<para>
+
+</para>
+
+@name:
+
+
<!-- ##### TYPEDEF GdkWChar ##### -->
<para>
Specifies a wide character type, used to represent character codes.
diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index 4ec3f3242..a72835bc6 100644
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -37,7 +37,18 @@ It is an opaque structure with no user-visible
elements.
</para>
-@dummy_var:
+@parent_instance:
+@clip_x_origin:
+@clip_y_origin:
+@ts_x_origin:
+@ts_y_origin:
+@colormap:
+
+<!-- ##### STRUCT GdkGCClass ##### -->
+<para>
+
+</para>
+
<!-- ##### STRUCT GdkGCValues ##### -->
<para>
@@ -209,6 +220,7 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
@GDK_COPY_INVERT:
@GDK_OR_INVERT:
@GDK_NAND:
+@GDK_NOR:
@GDK_SET:
<!-- ##### FUNCTION gdk_gc_new ##### -->
@@ -216,9 +228,11 @@ useful. For bitmaps, %GDK_AND and %GDK_OR are also useful.
Create a new graphics context with default values.
</para>
+@drawable:
+@Returns: the new graphics context.
+<!-- # Unused Parameters # -->
@window: a #GdkDrawable. The created GC must always be used
with drawables of the same depth as this one.
-@Returns: the new graphics context.
<!-- ##### FUNCTION gdk_gc_new_with_values ##### -->
@@ -226,12 +240,14 @@ Create a new graphics context with default values.
Create a new GC with the given initial values.
</para>
-@window: a #GdkDrawable. The created GC must always be used
- with drawables of the same depth as this one.
+@drawable:
@values: a structure containing initial values for the GC.
@values_mask: a bit mask indicating which fields in @values
are set.
@Returns: the new graphics context.
+<!-- # Unused Parameters # -->
+@window: a #GdkDrawable. The created GC must always be used
+ with drawables of the same depth as this one.
<!-- ##### FUNCTION gdk_gc_ref ##### -->
@@ -253,15 +269,26 @@ context will be destroyed.
@gc: a #GdkGC.
-<!-- ##### FUNCTION gdk_gc_destroy ##### -->
+<!-- ##### MACRO gdk_gc_destroy ##### -->
<para>
Identical to gdk_gc_unref(). This function is obsolete
and should not be used.
</para>
+<!-- # Unused Parameters # -->
@gc: a #GdkGC.
+<!-- ##### FUNCTION gdk_gc_set_values ##### -->
+<para>
+
+</para>
+
+@gc:
+@values:
+@values_mask:
+
+
<!-- ##### FUNCTION gdk_gc_get_values ##### -->
<para>
Retrieves the current values from a graphics context.
@@ -289,6 +316,24 @@ Sets the background color for a graphics context.
@color: the new background color.
+<!-- ##### FUNCTION gdk_gc_set_rgb_fg_color ##### -->
+<para>
+
+</para>
+
+@gc:
+@color:
+
+
+<!-- ##### FUNCTION gdk_gc_set_rgb_bg_color ##### -->
+<para>
+
+</para>
+
+@gc:
+@color:
+
+
<!-- ##### FUNCTION gdk_gc_set_font ##### -->
<para>
Sets the font for a graphics context. (Note that
@@ -637,3 +682,21 @@ onto another graphics context.
@src_gc: the source graphics context.
+<!-- ##### FUNCTION gdk_gc_set_colormap ##### -->
+<para>
+
+</para>
+
+@gc:
+@colormap:
+
+
+<!-- ##### FUNCTION gdk_gc_get_colormap ##### -->
+<para>
+
+</para>
+
+@gc:
+@Returns:
+
+
diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml
index e69de29bb..7b727e7c2 100644
--- a/docs/reference/gdk/tmpl/gdk-unused.sgml
+++ b/docs/reference/gdk/tmpl/gdk-unused.sgml
@@ -0,0 +1,195 @@
+<!-- ##### SECTION ./tmpl/gdkregion.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gdk_regions_xor ##### -->
+<para>
+Returns the difference between the union and the intersection of two regions.
+This is a region containing the pixels that are in one of the source regions,
+but which are not in both.
+</para>
+
+@source1: a #GdkRegion.
+@source2: a #GdkRegion.
+@Returns: the difference between the union and the intersection of @source1
+and @source2.
+
+<!-- ##### FUNCTION gdk_input_motion_events ##### -->
+<para>
+Retrieves the motion history for a given device/window pair.
+</para>
+
+@window: a #GdkWindow.
+@deviceid: the device for which to retrieve motion history.
+@start: the start time.
+@stop: the stop time.
+@nevents_return: location to store the number of events returned.
+@Returns: a newly allocated array containing all the events
+ from @start to @stop. This array should be freed
+ with g_free() when you are finished using it.
+
+<!-- ##### SECTION ./tmpl/gdkregion.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### STRUCT GdkDeviceInfo ##### -->
+<para>
+The #GdkDeviceInfo structure contains information about a
+device. It has the following fields:
+</para>
+
+@deviceid: a unique integer ID for this device.
+@name: the human-readable name for the device.
+@source: the type of device.
+@mode: a value indicating whether the device is enabled and
+ how the device coordinates map to the screen.
+@has_cursor: if %TRUE, a cursor will be displayed indicating
+ the current on-screen location to the user. Otherwise,
+ the application is responsible for drawing a cursor
+ itself.
+@num_axes: the number of axes for this device.
+@axes: a pointer to an array of GdkAxisUse values which
+ give the mapping of axes onto the possible valuators
+ for a GDK device.
+@num_keys: the number of macro buttons.
+@keys: a pointer to an array of #GdkDeviceKey structures
+ which describe what key press events are generated
+ for each macro button.
+
+<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Title ##### -->
+Pango Interaction
+
+
+<!-- ##### FUNCTION gdk_regions_union ##### -->
+<para>
+Returns the union of two regions.
+This is all pixels in either of @source1 or @source2.
+</para>
+
+@source1: a #GdkRegion.
+@source2: a #GdkRegion.
+@Returns: the union of @source1 and @source2.
+
+<!-- ##### SECTION ./tmpl/gdkregion.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### FUNCTION gdk_input_set_key ##### -->
+<para>
+Sets the key event generated when a macro button is pressed.
+</para>
+
+@deviceid: the device to configure.
+@index: the index of the macro button.
+@keyval: the key value for the #GdkKeypressEvent to generate.
+ (a value of 0 means no event will be generated.)
+@modifiers: the modifier field for the generated
+ #GdkKeyPressEvent.
+
+<!-- ##### FUNCTION gdk_input_list_devices ##### -->
+<para>
+Lists all available input devices, along with their
+configuration information.
+</para>
+
+@Returns: A #GList of #GdkDeviceInfo structures. This list
+ is internal data of GTK+ and should not be modified
+ or freed.
+
+<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gdk_regions_subtract ##### -->
+<para>
+Subtracts one region from another.
+The result is a region containing all the pixels which are in @source1, but
+which are not in @source2.
+</para>
+
+@source1: a #GdkRegion.
+@source2: a #GdkRegion to subtract from @source1.
+@Returns: @source1 - @source2.
+
+<!-- ##### FUNCTION gdk_input_window_get_pointer ##### -->
+<para>
+Returns information about the current position of the pointer
+within a window, including extended device information.
+Any of the return parameters may be %NULL, in which case,
+they will be ignored.
+</para>
+
+@window: a #GdkWindow.
+@deviceid: a device ID.
+@x: location to store current x postion.
+@y: location to store current y postion.
+@pressure: location to store current pressure.
+@xtilt: location to store current tilt in the x direction.
+@ytilt: location to store current tilt in the y direction.
+@mask: location to store the current modifier state.
+
+<!-- ##### MACRO GDK_CORE_POINTER ##### -->
+<para>
+This macro contains an integer value representing
+the device ID for the core pointer device.
+</para>
+
+
+<!-- ##### FUNCTION gdk_input_set_axes ##### -->
+<para>
+Sets the mapping of the axes (valuators) of a device
+onto the predefined valuator types that GTK+ understands.
+</para>
+
+@deviceid: the device to configure.
+@axes: an array of GdkAxisUse. This length of this array
+ must match the number of axes for the device.
+
+<!-- ##### FUNCTION gdk_input_set_source ##### -->
+<para>
+Sets the source type for a device.
+</para>
+
+@deviceid: the device to configure
+@source: the new source type.
+
+<!-- ##### SECTION ./tmpl/gdkregion.sgml:Title ##### -->
+Points, Rectangles and Regions
+
+
+<!-- ##### FUNCTION gdk_regions_intersect ##### -->
+<para>
+Returns the intersection of two regions.
+</para>
+
+@source1: a #GdkRegion.
+@source2: a #GdkRegion.
+@Returns: the intersection of @source1 and @source2.
+
+<!-- ##### FUNCTION gdk_input_set_mode ##### -->
+<para>
+Enables or disables a device, and determines how the
+device maps onto the screen.
+</para>
+
+@deviceid: the device to configure.
+@mode: the new mode.
+@Returns: %TRUE if the device supports the given mode, otherwise
+ %FALSE and the device's mode is unchanged.
+
+<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 060531596..78bddc627 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -212,6 +212,17 @@ the time isn't known.
@Returns: 0 if the grab was successful.
+<!-- ##### ENUM GdkGrabStatus ##### -->
+<para>
+
+</para>
+
+@GDK_GRAB_SUCCESS:
+@GDK_GRAB_ALREADY_GRABBED:
+@GDK_GRAB_INVALID_TIME:
+@GDK_GRAB_NOT_VIEWABLE:
+@GDK_GRAB_FROZEN:
+
<!-- ##### FUNCTION gdk_pointer_ungrab ##### -->
<para>
Ungrabs the pointer, if it is grabbed by this application.
@@ -345,3 +356,31 @@ Removes the X error trap installed with gdk_error_trap_push().
@Returns: the X error code, or 0 if no error occurred.
+<!-- ##### MACRO GDK_WINDOWING_X11 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GDK_WINDOWING_WIN32 ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GDK_WINDOWING_NANOX ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GDK_WINDOWING_FB ##### -->
+<para>
+
+</para>
+
+
+
diff --git a/docs/reference/gdk/tmpl/images.sgml b/docs/reference/gdk/tmpl/images.sgml
index 683d817f0..2a115104a 100644
--- a/docs/reference/gdk/tmpl/images.sgml
+++ b/docs/reference/gdk/tmpl/images.sgml
@@ -60,6 +60,7 @@ displays.
The #GdkImage struct contains information on the image and the pixel data.
</para>
+@parent_instance:
@type: the type of the image.
@visual: the visual.
@byte_order: the byte order.
@@ -69,6 +70,7 @@ The #GdkImage struct contains information on the image and the pixel data.
@bpp: the number of bytes per pixel.
@bpl: the number of bytes per line of the image.
@mem: the pixel data.
+@windowing_data:
<!-- ##### FUNCTION gdk_image_new ##### -->
<para>
@@ -116,19 +118,39 @@ Creates a new #GdkImage with a depth of 1 from the given data.
Gets part of a #GdkWindow and stores it in a new #GdkImage.
</para>
-@window: the #GdkWindow to copy from.
+@drawable:
@x: the left edge of the rectangle to copy from @window.
@y: the top edge of the rectangle to copy from @window.
@width: the width of the area to copy, in pixels.
@height: the height of the area to copy, in pixels.
@Returns: a new #GdkImage with a copy of the given area of @window.
+<!-- # Unused Parameters # -->
+@window: the #GdkWindow to copy from.
+
+
+<!-- ##### FUNCTION gdk_image_ref ##### -->
+<para>
+
+</para>
+
+@image:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_image_unref ##### -->
+<para>
+
+</para>
+
+@image:
-<!-- ##### FUNCTION gdk_image_destroy ##### -->
+<!-- ##### MACRO gdk_image_destroy ##### -->
<para>
Destroys a #GdkImage, freeing any resources allocated for it.
</para>
+<!-- # Unused Parameters # -->
@image: a #GdkImage.
diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml
index 325b2d5a5..572bd6974 100644
--- a/docs/reference/gdk/tmpl/input_devices.sgml
+++ b/docs/reference/gdk/tmpl/input_devices.sgml
@@ -91,48 +91,45 @@ sets of additional valuators than the pressure xtilt and ytilt.
</para>
-<!-- ##### MACRO GDK_CORE_POINTER ##### -->
+<!-- ##### STRUCT GdkDevice ##### -->
<para>
-This macro contains an integer value representing
-the device ID for the core pointer device.
-</para>
+</para>
+@name:
+@source:
+@mode:
+@has_cursor:
+@num_axes:
+@axes:
+@num_keys:
+@keys:
-<!-- ##### FUNCTION gdk_input_list_devices ##### -->
+<!-- ##### ENUM GdkInputSource ##### -->
<para>
-Lists all available input devices, along with their
-configuration information.
+An enumeration describing the type of an input device
+in general terms.
</para>
-@Returns: A #GList of #GdkDeviceInfo structures. This list
- is internal data of GTK+ and should not be modified
- or freed.
-
+@GDK_SOURCE_MOUSE: the device is a mouse. (This will be reported for the core
+ pointer, even if it is something else, such as a trackball.)
+@GDK_SOURCE_PEN: the device is a stylus of a graphics tablet or similar device.
+@GDK_SOURCE_ERASER: the device is an eraser. Typically, this would be the other end
+ of a stylus on a graphics tablet.
+@GDK_SOURCE_CURSOR: the device is a graphics tablet "puck" or similar device.
-<!-- ##### STRUCT GdkDeviceInfo ##### -->
+<!-- ##### ENUM GdkInputMode ##### -->
<para>
-The #GdkDeviceInfo structure contains information about a
-device. It has the following fields:
+An enumeration that describes the mode of an input device.
</para>
-@deviceid: a unique integer ID for this device.
-@name: the human-readable name for the device.
-@source: the type of device.
-@mode: a value indicating whether the device is enabled and
- how the device coordinates map to the screen.
-@has_cursor: if %TRUE, a cursor will be displayed indicating
- the current on-screen location to the user. Otherwise,
- the application is responsible for drawing a cursor
- itself.
-@num_axes: the number of axes for this device.
-@axes: a pointer to an array of GdkAxisUse values which
- give the mapping of axes onto the possible valuators
- for a GDK device.
-@num_keys: the number of macro buttons.
-@keys: a pointer to an array of #GdkDeviceKey structures
- which describe what key press events are generated
- for each macro button.
+@GDK_MODE_DISABLED: the device is disabled and will not report any events.
+@GDK_MODE_SCREEN: the device is enabled. The device's coordinate space
+ maps to the entire screen.
+@GDK_MODE_WINDOW: the device is enabled. The device's coordinate space
+ is mapped to a single window. The manner in which this window
+ is chosen is undefined, but it will typically be the same
+ way in which the focus window for key events is determined.
<!-- ##### STRUCT GdkDeviceKey ##### -->
<para>
@@ -145,145 +142,117 @@ a normal X key event. It has the following fields:
If this is 0, no keypress will be generated.
@modifiers: the modifiers set for the generated key event.
-<!-- ##### FUNCTION gdk_input_set_extension_events ##### -->
+<!-- ##### STRUCT GdkDeviceAxis ##### -->
<para>
-Turns extension events on or off for a particular window,
-and specifies the event mask for extension events.
-</para>
-@window: a #GdkWindow.
-@mask: the event mask
-@mode: the type of extension events that are desired.
+</para>
+@use:
+@min:
+@max:
-<!-- ##### ENUM GdkExtensionMode ##### -->
+<!-- ##### ENUM GdkAxisUse ##### -->
<para>
-An enumeration used to specify which extension events
-are desired for a particular widget.
+An enumeration describing the way in which a device
+axis (valuator) maps onto the predefined valuator
+types that GTK+ understands.
</para>
-@GDK_EXTENSION_EVENTS_NONE: no extension events are desired.
-@GDK_EXTENSION_EVENTS_ALL: all extension events are desired.
-@GDK_EXTENSION_EVENTS_CURSOR: extension events are desired only if a cursor
- will be displayed for the device.
+@GDK_AXIS_IGNORE: the axis is ignored.
+@GDK_AXIS_X: the axis is used as the x axis.
+@GDK_AXIS_Y: the axis is used as the y axis.
+@GDK_AXIS_PRESSURE: the axis is used for pressure information.
+@GDK_AXIS_XTILT: the axis is used for x tilt information.
+@GDK_AXIS_YTILT: the axis is used for x tilt information.
+@GDK_AXIS_WHEEL:
+@GDK_AXIS_LAST: a constant equal to the numerically highest axis value.
-<!-- ##### FUNCTION gdk_input_set_source ##### -->
+<!-- ##### FUNCTION gdk_devices_list ##### -->
<para>
-Sets the source type for a device.
+
</para>
-@deviceid: the device to configure
-@source: the new source type.
+@Returns:
-<!-- ##### ENUM GdkInputSource ##### -->
+<!-- ##### VARIABLE gdk_core_pointer ##### -->
<para>
-An enumeration describing the type of an input device
-in general terms.
+
</para>
-@GDK_SOURCE_MOUSE: the device is a mouse. (This will be reported for the core
- pointer, even if it is something else, such as a trackball.)
-@GDK_SOURCE_PEN: the device is a stylus of a graphics tablet or similar device.
-@GDK_SOURCE_ERASER: the device is an eraser. Typically, this would be the other end
- of a stylus on a graphics tablet.
-@GDK_SOURCE_CURSOR: the device is a graphics tablet "puck" or similar device.
-<!-- ##### FUNCTION gdk_input_set_mode ##### -->
+<!-- ##### FUNCTION gdk_device_set_source ##### -->
<para>
-Enables or disables a device, and determines how the
-device maps onto the screen.
+
</para>
-@deviceid: the device to configure.
-@mode: the new mode.
-@Returns: %TRUE if the device supports the given mode, otherwise
- %FALSE and the device's mode is unchanged.
+@device:
+@source:
-<!-- ##### ENUM GdkInputMode ##### -->
+<!-- ##### FUNCTION gdk_device_set_mode ##### -->
<para>
-An enumeration that describes the mode of an input device.
+
</para>
-@GDK_MODE_DISABLED: the device is disabled and will not report any events.
-@GDK_MODE_SCREEN: the device is enabled. The device's coordinate space
- maps to the entire screen.
-@GDK_MODE_WINDOW: the device is enabled. The device's coordinate space
- is mapped to a single window. The manner in which this window
- is chosen is undefined, but it will typically be the same
- way in which the focus window for key events is determined.
+@device:
+@mode:
+@Returns:
-<!-- ##### FUNCTION gdk_input_set_axes ##### -->
+
+<!-- ##### FUNCTION gdk_device_set_key ##### -->
<para>
-Sets the mapping of the axes (valuators) of a device
-onto the predefined valuator types that GTK+ understands.
+
</para>
-@deviceid: the device to configure.
-@axes: an array of GdkAxisUse. This length of this array
- must match the number of axes for the device.
+@device:
+@index:
+@keyval:
+@modifiers:
-<!-- ##### ENUM GdkAxisUse ##### -->
+<!-- ##### FUNCTION gdk_device_set_axis_use ##### -->
<para>
-An enumeration describing the way in which a device
-axis (valuator) maps onto the predefined valuator
-types that GTK+ understands.
+
</para>
-@GDK_AXIS_IGNORE: the axis is ignored.
-@GDK_AXIS_X: the axis is used as the x axis.
-@GDK_AXIS_Y: the axis is used as the y axis.
-@GDK_AXIS_PRESSURE: the axis is used for pressure information.
-@GDK_AXIS_XTILT: the axis is used for x tilt information.
-@GDK_AXIS_YTILT: the axis is used for x tilt information.
-@GDK_AXIS_LAST: a constant equal to the numerically highest axis value.
+@device:
+@index:
+@use:
-<!-- ##### FUNCTION gdk_input_set_key ##### -->
+
+<!-- ##### FUNCTION gdk_device_get_state ##### -->
<para>
-Sets the key event generated when a macro button is pressed.
+
</para>
-@deviceid: the device to configure.
-@index: the index of the macro button.
-@keyval: the key value for the #GdkKeypressEvent to generate.
- (a value of 0 means no event will be generated.)
-@modifiers: the modifier field for the generated
- #GdkKeyPressEvent.
+@device:
+@window:
+@axes:
+@mask:
-<!-- ##### FUNCTION gdk_input_window_get_pointer ##### -->
+<!-- ##### FUNCTION gdk_device_get_history ##### -->
<para>
-Returns information about the current position of the pointer
-within a window, including extended device information.
-Any of the return parameters may be %NULL, in which case,
-they will be ignored.
+
</para>
-@window: a #GdkWindow.
-@deviceid: a device ID.
-@x: location to store current x postion.
-@y: location to store current y postion.
-@pressure: location to store current pressure.
-@xtilt: location to store current tilt in the x direction.
-@ytilt: location to store current tilt in the y direction.
-@mask: location to store the current modifier state.
+@device:
+@window:
+@start:
+@stop:
+@events:
+@n_events:
+@Returns:
-<!-- ##### FUNCTION gdk_input_motion_events ##### -->
+<!-- ##### FUNCTION gdk_device_free_history ##### -->
<para>
-Retrieves the motion history for a given device/window pair.
+
</para>
-@window: a #GdkWindow.
-@deviceid: the device for which to retrieve motion history.
-@start: the start time.
-@stop: the stop time.
-@nevents_return: location to store the number of events returned.
-@Returns: a newly allocated array containing all the events
- from @start to @stop. This array should be freed
- with g_free() when you are finished using it.
+@events:
+@n_events:
<!-- ##### STRUCT GdkTimeCoord ##### -->
@@ -293,9 +262,39 @@ motion history. It contains the following fields:
</para>
@time: The timestamp for this event.
-@x: the x position.
-@y: the y position.
-@pressure: the pressure.
-@xtilt: the tilt in the x direction.
-@ytilt: the tilt in the y direction.
+@axes:
+
+<!-- ##### FUNCTION gdk_device_get_axis ##### -->
+<para>
+
+</para>
+
+@device:
+@axes:
+@use:
+@value:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_input_set_extension_events ##### -->
+<para>
+Turns extension events on or off for a particular window,
+and specifies the event mask for extension events.
+</para>
+
+@window: a #GdkWindow.
+@mask: the event mask
+@mode: the type of extension events that are desired.
+
+
+<!-- ##### ENUM GdkExtensionMode ##### -->
+<para>
+An enumeration used to specify which extension events
+are desired for a particular widget.
+</para>
+
+@GDK_EXTENSION_EVENTS_NONE: no extension events are desired.
+@GDK_EXTENSION_EVENTS_ALL: all extension events are desired.
+@GDK_EXTENSION_EVENTS_CURSOR: extension events are desired only if a cursor
+ will be displayed for the device.
diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index e014c6e10..4bd4cfcbc 100644
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -71,6 +71,16 @@ Returns TRUE if the given key value is in lower case.
case conversion.
+<!-- ##### FUNCTION gdk_keyval_convert_case ##### -->
+<para>
+
+</para>
+
+@symbol:
+@lower:
+@upper:
+
+
<!-- ##### FUNCTION gdk_keyval_to_upper ##### -->
<para>
Converts a key value to upper case, if applicable.
@@ -91,3 +101,21 @@ Converts a key value to lower case, if applicable.
in lower case or it is not subject to case conversion.
+<!-- ##### FUNCTION gdk_keyval_to_unicode ##### -->
+<para>
+
+</para>
+
+@keyval:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_unicode_to_keyval ##### -->
+<para>
+
+</para>
+
+@wc:
+@Returns:
+
+
diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index ea7de9ebd..8c9d79864 100644
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -147,21 +147,23 @@ in which case a default color will be used.
@Returns: the #GdkPixmap.
-<!-- ##### FUNCTION gdk_pixmap_ref ##### -->
+<!-- ##### MACRO gdk_pixmap_ref ##### -->
<para>
Increase the reference count of a pixmap.
</para>
-@pixmap: a #GdkPixmap
@Returns: @pixmap
+<!-- # Unused Parameters # -->
+@pixmap: a #GdkPixmap
-<!-- ##### FUNCTION gdk_pixmap_unref ##### -->
+<!-- ##### MACRO gdk_pixmap_unref ##### -->
<para>
Decrease the reference count of a pixmap. If the resulting
reference count is zero, destroy the pixmap.
</para>
+<!-- # Unused Parameters # -->
@pixmap: a #GdkPixmap
@@ -175,22 +177,24 @@ refers generically to any of these types.
@user_data:
-<!-- ##### FUNCTION gdk_bitmap_ref ##### -->
+<!-- ##### MACRO gdk_bitmap_ref ##### -->
<para>
Increase the reference count of a bitmap. An alias
for gdk_pixmap_ref().
</para>
-@pixmap:
@Returns:
+<!-- # Unused Parameters # -->
+@pixmap:
-<!-- ##### FUNCTION gdk_bitmap_unref ##### -->
+<!-- ##### MACRO gdk_bitmap_unref ##### -->
<para>
Decrease the reference count of a bitmap. An alias
for gdk_pixmap_unref().
</para>
+<!-- # Unused Parameters # -->
@pixmap:
diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index 32087e1d6..9f92c8e13 100644
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -30,45 +30,41 @@ usually used for clipping graphical operations (see gdk_gc_set_clip_region()).
<!-- ##### STRUCT GdkPoint ##### -->
<para>
-Defines the x and y coordinates of a point.
-Note that both are defined as #gint16 values, so the coordinates are limited
-to between -32,768 and 32,767.
+
</para>
-@x: the x coordinate of the point.
-@y: the y coordinate of the point.
+@x:
+@y:
<!-- ##### STRUCT GdkRectangle ##### -->
<para>
-Defines the position and size of a rectangle.
+
</para>
-@x: the x coordinate of the left edge of the rectangle.
-@y: the y coordinate of the top of the rectangle.
-@width: the width of the rectangle.
-@height: the height of the rectangle.
+@x:
+@y:
+@width:
+@height:
<!-- ##### FUNCTION gdk_rectangle_intersect ##### -->
<para>
-Calculates the intersection of two rectangles.
+
</para>
-@src1: a #GdkRectangle.
-@src2: a #GdkRectangle.
-@dest: the intersection of @src1 and @src2.
-@Returns: TRUE if the rectangles intersect.
+@src1:
+@src2:
+@dest:
+@Returns:
<!-- ##### FUNCTION gdk_rectangle_union ##### -->
<para>
-Calculates the union of two rectangles.
-The union of rectangles @src1 and @src2 is the smallest rectangle which
-includes both @src1 and @src2 within it.
+
</para>
-@src1: a #GdkRectangle.
-@src2: a #GdkRectangle.
-@dest: the union of @src1 and @src2.
+@src1:
+@src2:
+@dest:
<!-- ##### STRUCT GdkRegion ##### -->
@@ -78,7 +74,6 @@ The only user-visible field of the structure is the user_data member, which
can be used to attach arbitrary data to the #GdkRegion.
</para>
-@user_data: arbitrary data attached to the #GdkRegion.
<!-- ##### FUNCTION gdk_region_new ##### -->
<para>
@@ -112,6 +107,24 @@ The fill rule is only relevant for polygons which overlap themselves.
included in the region, while areas overlapped an even number of times are not.
@GDK_WINDING_RULE: overlapping areas are always included.
+<!-- ##### FUNCTION gdk_region_copy ##### -->
+<para>
+
+</para>
+
+@region:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_region_rectangle ##### -->
+<para>
+
+</para>
+
+@rectangle:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_region_destroy ##### -->
<para>
Destroys a #GdkRegion.
@@ -120,61 +133,65 @@ Destroys a #GdkRegion.
@region: a #GdkRegion.
-<!-- ##### FUNCTION gdk_regions_intersect ##### -->
+<!-- ##### FUNCTION gdk_region_get_clipbox ##### -->
<para>
-Returns the intersection of two regions.
+Returns the smallest rectangle which includes the entire #GdkRegion.
</para>
-@source1: a #GdkRegion.
-@source2: a #GdkRegion.
-@Returns: the intersection of @source1 and @source2.
+@region: a #GdkRegion.
+@rectangle: returns the smallest rectangle which includes all of @region.
-<!-- ##### FUNCTION gdk_regions_union ##### -->
+<!-- ##### FUNCTION gdk_region_empty ##### -->
<para>
-Returns the union of two regions.
-This is all pixels in either of @source1 or @source2.
+Returns TRUE if the #GdkRegion is empty.
</para>
-@source1: a #GdkRegion.
-@source2: a #GdkRegion.
-@Returns: the union of @source1 and @source2.
+@region: a #GdkRegion.
+@Returns: TRUE if @region is empty.
-<!-- ##### FUNCTION gdk_regions_subtract ##### -->
+<!-- ##### FUNCTION gdk_region_equal ##### -->
<para>
-Subtracts one region from another.
-The result is a region containing all the pixels which are in @source1, but
-which are not in @source2.
+Returns TRUE if the two regions are the same.
</para>
-@source1: a #GdkRegion.
-@source2: a #GdkRegion to subtract from @source1.
-@Returns: @source1 - @source2.
+@region1: a #GdkRegion.
+@region2: a #GdkRegion.
+@Returns: TRUE if @region1 and @region2 are equal.
-<!-- ##### FUNCTION gdk_regions_xor ##### -->
+<!-- ##### FUNCTION gdk_region_point_in ##### -->
<para>
-Returns the difference between the union and the intersection of two regions.
-This is a region containing the pixels that are in one of the source regions,
-but which are not in both.
+Returns TRUE if a point is in a region.
</para>
-@source1: a #GdkRegion.
-@source2: a #GdkRegion.
-@Returns: the difference between the union and the intersection of @source1
-and @source2.
+@region: a #GdkRegion.
+@x: the x coordinate of a point.
+@y: the y coordinate of a point.
+@Returns: TRUE if the point is in @region.
-<!-- ##### FUNCTION gdk_region_union_with_rect ##### -->
+<!-- ##### FUNCTION gdk_region_rect_in ##### -->
<para>
-Returns the union of a region and a rectangle.
+Tests whether a rectangle is within a region.
</para>
@region: a #GdkRegion.
@rect: a #GdkRectangle.
-@Returns: the union of @region and @rect.
+@Returns: GDK_OVERLAP_RECTANGLE_IN, GDK_OVERLAP_RECTANGLE_OUT, or
+GDK_OVERLAP_RECTANGLE_PART, depending on whether the rectangle is inside,
+outside, or partly inside the #GdkRegion, respectively.
+
+
+<!-- ##### ENUM GdkOverlapType ##### -->
+<para>
+Specifies the possible values returned by gdk_region_rect_in().
+</para>
+@GDK_OVERLAP_RECTANGLE_IN: if the rectangle is inside the #GdkRegion.
+@GDK_OVERLAP_RECTANGLE_OUT: if the rectangle is outside the #GdkRegion.
+@GDK_OVERLAP_RECTANGLE_PART: if the rectangle is partly inside the #GdkRegion.
<!-- ##### FUNCTION gdk_region_offset ##### -->
<para>
@@ -197,63 +214,50 @@ Positive values shrink the region. Negative values expand it.
@dy: the number of pixels to shrink the region vertically.
-<!-- ##### FUNCTION gdk_region_empty ##### -->
+<!-- ##### FUNCTION gdk_region_union_with_rect ##### -->
<para>
-Returns TRUE if the #GdkRegion is empty.
+Returns the union of a region and a rectangle.
</para>
@region: a #GdkRegion.
-@Returns: TRUE if @region is empty.
+@rect: a #GdkRectangle.
+<!-- # Unused Parameters # -->
+@Returns: the union of @region and @rect.
-<!-- ##### FUNCTION gdk_region_equal ##### -->
+<!-- ##### FUNCTION gdk_region_intersect ##### -->
<para>
-Returns TRUE if the two regions are the same.
+
</para>
-@region1: a #GdkRegion.
-@region2: a #GdkRegion.
-@Returns: TRUE if @region1 and @region2 are equal.
+@source1:
+@source2:
-<!-- ##### FUNCTION gdk_region_point_in ##### -->
+<!-- ##### FUNCTION gdk_region_union ##### -->
<para>
-Returns TRUE if a point is in a region.
+
</para>
-@region: a #GdkRegion.
-@x: the x coordinate of a point.
-@y: the y coordinate of a point.
-@Returns: TRUE if the point is in @region.
+@source1:
+@source2:
-<!-- ##### FUNCTION gdk_region_rect_in ##### -->
+<!-- ##### FUNCTION gdk_region_subtract ##### -->
<para>
-Tests whether a rectangle is within a region.
+
</para>
-@region: a #GdkRegion.
-@rect: a #GdkRectangle.
-@Returns: GDK_OVERLAP_RECTANGLE_IN, GDK_OVERLAP_RECTANGLE_OUT, or
-GDK_OVERLAP_RECTANGLE_PART, depending on whether the rectangle is inside,
-outside, or partly inside the #GdkRegion, respectively.
+@source1:
+@source2:
-<!-- ##### ENUM GdkOverlapType ##### -->
+<!-- ##### FUNCTION gdk_region_xor ##### -->
<para>
-Specifies the possible values returned by gdk_region_rect_in().
-</para>
-
-@GDK_OVERLAP_RECTANGLE_IN: if the rectangle is inside the #GdkRegion.
-@GDK_OVERLAP_RECTANGLE_OUT: if the rectangle is outside the #GdkRegion.
-@GDK_OVERLAP_RECTANGLE_PART: if the rectangle is partly inside the #GdkRegion.
-<!-- ##### FUNCTION gdk_region_get_clipbox ##### -->
-<para>
-Returns the smallest rectangle which includes the entire #GdkRegion.
</para>
-@region: a #GdkRegion.
-@rectangle: returns the smallest rectangle which includes all of @region.
+@source1:
+@source2:
diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index 9d7beab23..c60cde24a 100644
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -292,6 +292,24 @@ memory bandwidth.
start of the next.
+<!-- ##### FUNCTION gdk_draw_rgb_32_image_dithalign ##### -->
+<para>
+
+</para>
+
+@drawable:
+@gc:
+@x:
+@y:
+@width:
+@height:
+@dith:
+@buf:
+@rowstride:
+@xdith:
+@ydith:
+
+
<!-- ##### ENUM GdkRgbDither ##### -->
<para>
@@ -359,7 +377,7 @@ colors. This is used only for gdk_draw_indexed_image().
</para>
@colors:
-@lut:
+@n_colors:
<!-- ##### FUNCTION gdk_rgb_gc_set_foreground ##### -->
<para>
@@ -392,6 +410,15 @@ a #GdkColor struct.
@Returns: The X pixel value.
+<!-- ##### FUNCTION gdk_rgb_find_color ##### -->
+<para>
+
+</para>
+
+@colormap:
+@color:
+
+
<!-- ##### FUNCTION gdk_rgb_set_install ##### -->
<para>
If @install is TRUE, directs GdkRgb to always install a new "private"
@@ -428,7 +455,15 @@ colormap should be used when creating windows that will be drawn in by GdkRgb.
@Returns: The #GdkVisual chosen by GdkRgb.
-<!-- ##### FUNCTION gdk_rgb_get_cmap ##### -->
+<!-- ##### FUNCTION gdk_rgb_get_colormap ##### -->
+<para>
+
+</para>
+
+@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.
diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml
index 3b14e8ce3..5e7e049ab 100644
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -14,12 +14,6 @@ Threads
</para>
-<!-- ##### VARIABLE gdk_threads_mutex ##### -->
-<para>
-
-</para>
-
-
<!-- ##### MACRO GDK_THREADS_ENTER ##### -->
<para>
@@ -48,3 +42,9 @@ Threads
+<!-- ##### VARIABLE gdk_threads_mutex ##### -->
+<para>
+
+</para>
+
+
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 5a4ddfdf6..1aa9d0d86 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -51,7 +51,6 @@ Windows
@GDK_WINDOW_CHILD:
@GDK_WINDOW_DIALOG:
@GDK_WINDOW_TEMP:
-@GDK_WINDOW_PIXMAP:
@GDK_WINDOW_FOREIGN:
<!-- ##### ENUM GdkWindowClass ##### -->
@@ -123,23 +122,34 @@ Windows
@window:
-<!-- ##### FUNCTION gdk_window_ref ##### -->
+<!-- ##### MACRO gdk_window_ref ##### -->
<para>
</para>
-@window:
@Returns:
+<!-- # Unused Parameters # -->
+@window:
-<!-- ##### FUNCTION gdk_window_unref ##### -->
+<!-- ##### MACRO gdk_window_unref ##### -->
<para>
</para>
+<!-- # Unused Parameters # -->
@window:
+<!-- ##### FUNCTION gdk_window_get_window_type ##### -->
+<para>
+
+</para>
+
+@window:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_window_at_pointer ##### -->
<para>
@@ -224,6 +234,16 @@ Windows
@height:
+<!-- ##### FUNCTION gdk_window_scroll ##### -->
+<para>
+
+</para>
+
+@window:
+@dx:
+@dy:
+
+
<!-- ##### FUNCTION gdk_window_reparent ##### -->
<para>
@@ -267,20 +287,23 @@ Windows
@height:
-<!-- ##### FUNCTION gdk_window_copy_area ##### -->
+<!-- ##### MACRO gdk_window_copy_area ##### -->
<para>
</para>
-@window:
+@drawable:
@gc:
@x:
@y:
-@source_window:
+@source_drawable:
@source_x:
@source_y:
@width:
@height:
+<!-- # Unused Parameters # -->
+@window:
+@source_window:
<!-- ##### FUNCTION gdk_window_raise ##### -->
@@ -307,6 +330,93 @@ Windows
@window:
+<!-- ##### FUNCTION gdk_window_begin_paint_rect ##### -->
+<para>
+
+</para>
+
+@window:
+@rectangle:
+
+
+<!-- ##### FUNCTION gdk_window_begin_paint_region ##### -->
+<para>
+
+</para>
+
+@window:
+@region:
+
+
+<!-- ##### FUNCTION gdk_window_end_paint ##### -->
+<para>
+
+</para>
+
+@window:
+
+
+<!-- ##### FUNCTION gdk_window_invalidate_rect ##### -->
+<para>
+
+</para>
+
+@window:
+@rect:
+@invalidate_children:
+
+
+<!-- ##### FUNCTION gdk_window_invalidate_region ##### -->
+<para>
+
+</para>
+
+@window:
+@region:
+@invalidate_children:
+
+
+<!-- ##### FUNCTION gdk_window_get_update_area ##### -->
+<para>
+
+</para>
+
+@window:
+@Returns:
+
+
+<!-- ##### FUNCTION gdk_window_freeze_updates ##### -->
+<para>
+
+</para>
+
+@window:
+
+
+<!-- ##### FUNCTION gdk_window_thaw_updates ##### -->
+<para>
+
+</para>
+
+@window:
+
+
+<!-- ##### FUNCTION gdk_window_process_all_updates ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION gdk_window_process_updates ##### -->
+<para>
+
+</para>
+
+@window:
+@update_children:
+
+
<!-- ##### FUNCTION gdk_window_set_user_data ##### -->
<para>
@@ -467,11 +577,12 @@ Windows
@cursor:
-<!-- ##### FUNCTION gdk_window_set_colormap ##### -->
+<!-- ##### MACRO gdk_window_set_colormap ##### -->
<para>
</para>
+<!-- # Unused Parameters # -->
@window:
@colormap:
@@ -528,41 +639,45 @@ Windows
@y:
-<!-- ##### FUNCTION gdk_window_get_size ##### -->
+<!-- ##### MACRO gdk_window_get_size ##### -->
<para>
</para>
+<!-- # Unused Parameters # -->
@window:
@width:
@height:
-<!-- ##### FUNCTION gdk_window_get_visual ##### -->
+<!-- ##### MACRO gdk_window_get_visual ##### -->
<para>
</para>
-@window:
@Returns:
+<!-- # Unused Parameters # -->
+@window:
-<!-- ##### FUNCTION gdk_window_get_colormap ##### -->
+<!-- ##### MACRO gdk_window_get_colormap ##### -->
<para>
</para>
-@window:
@Returns:
+<!-- # Unused Parameters # -->
+@window:
-<!-- ##### FUNCTION gdk_window_get_type ##### -->
+<!-- ##### MACRO gdk_window_get_type ##### -->
<para>
</para>
-@window:
@Returns:
+<!-- # Unused Parameters # -->
+@window:
<!-- ##### FUNCTION gdk_window_get_origin ##### -->
@@ -647,6 +762,15 @@ Windows
@Returns:
+<!-- ##### FUNCTION gdk_window_peek_children ##### -->
+<para>
+
+</para>
+
+@window:
+@Returns:
+
+
<!-- ##### FUNCTION gdk_window_get_events ##### -->
<para>
@@ -763,21 +887,3 @@ Windows
@Returns:
-<!-- ##### STRUCT GdkDrawable ##### -->
-<para>
-
-</para>
-
-@user_data:
-
-<!-- ##### FUNCTION gdk_drawable_set_data ##### -->
-<para>
-
-</para>
-
-@drawable:
-@key:
-@data:
-@destroy_func:
-
-
diff --git a/docs/reference/gtk/.cvsignore b/docs/reference/gtk/.cvsignore
index 53762fb5a..af3d54ca2 100644
--- a/docs/reference/gtk/.cvsignore
+++ b/docs/reference/gtk/.cvsignore
@@ -2,5 +2,6 @@ Makefile
Makefile.in
sgml
html
+.libs
gtk-decl-list.txt
gtk-unused.txt
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index a83672348..8e22afd26 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -6,54 +6,148 @@ DOC_MODULE=gtk
# The top-level SGML file.
DOC_MAIN_SGML_FILE=gtk-docs.sgml
-# We could alternatively use this for using installed headers.
-INCLUDE_DIR=`gtk-config --prefix`/include/gtk
+# The directory containing the source code
+DOC_SOURCE_DIR=$(top_srcdir)/gtk
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+
+# Header files to ignore when scanning
+IGNORE_HFILES= \
+ fnmatch.h \
+ gdk-pixbuf-loader.h \
+ gtkdebug.h \
+ gtkhsv.h \
+ gtkimcontextsimple.h \
+ gtkintl.h \
+ gtkprivate.h \
+ gtktextbtree.h \
+ gtktextchild.h \
+ gtktextdisplay.h \
+ gtktextiterprivate.h \
+ gtktextlayout.h \
+ gtktextmarkprivate.h \
+ gtktextsegment.h \
+ gtktexttagprivate.h \
+ gtktexttypes.h \
+ gtktypebuiltins.h
+
+GTKDOC_CFLAGS = @STRIP_BEGIN@ \
+ @CFLAGS@ \
+ -I$(top_srcdir) \
+ -I$(top_builddir)/gdk \
+ -DGTK_DISABLE_COMPAT_H \
+ @GTK_DEBUG_FLAGS@ \
+ @GTK_XIM_FLAGS@ \
+ @GTK_LOCALE_FLAGS@ \
+ @PANGO_CFLAGS@ \
+ @GLIB_CFLAGS@ \
+ @more_cflags@ \
+@STRIP_END@
+
+GTKDOC_LIBS = @STRIP_BEGIN@ \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
+ $(top_builddir)/gdk/@gdktargetlib@ \
+ $(top_builddir)/gtk/@gtktargetlib@ \
+ @more_ldflags@ \
+ @more_libs@ \
+ @GDK_WLIBS@ \
+ @PANGO_LIBS@ \
+ @GLIB_LIBS@ \
+ @GTK_LIBS_EXTRA@ \
+ -lm \
+@STRIP_END@
+
+GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
+GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
+
+content_files = \
+ objects_grouped.sgml
+####################################
+# Everything below here is generic #
+####################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-CFLAGS=`gtk-config --cflags`
-LDFLAGS=`gtk-config --libs`
+EXTRA_DIST = \
+ $(DOC_MAIN_SGML_FILE) \
+ $(content_files) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
+if ENABLE_GTK_DOC
+all-local: html/index.html
+
+$(DOC_MODULE)-decl.txt:
+ $(MAKE) scan
+
+$(tmpl_sources): $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ $(MAKE) templates
+
+sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
+ $(MAKE) sgml
+
+html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE) $(content_fiels)
+ $(MAKE) html
+endif
scan:
- CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) gtkdoc-scanobj --module=$(DOC_MODULE)
- gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers='gtkintl.h' $(INCLUDE_DIR)/*.h
+ (cd $(srcdir) \
+ && CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) \
+ && gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
-templates: scan
- gtkdoc-mktmpl --module=$(DOC_MODULE)
+templates:
+ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
sgml:
- gtkdoc-mkdb --module=$(DOC_MODULE)
+ cd $(srcdir) \
+ && gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
html:
- if ! test -d html ; then mkdir html ; fi
- -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ test -d $(srcdir)/html || mkdir $(srcdir)/html
+ -cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ @echo '-- Fixing Crossreferences'
+ gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
clean-local:
- rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt
+ rm -f *~ *.bak *.signals *-unused.txt
maintainer-clean-local: clean
- rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
- install -d -m 0755 $(TARGET_DIR)
- install -m 0644 html/*.html $(TARGET_DIR)
- install -m 0644 html/index.sgml $(TARGET_DIR)
- gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)
-
-EXTRA_DIST = \
- $(DOC_MAIN_SGML_FILE) \
- $(DOC_MODULE)-sections.txt \
- gtk-overrides.txt \
- gtk-decl.txt \
- gtk.hierarchy \
- gtk.signals \
- gtk.args \
- gtk.types \
- objects_grouped.sgml
-
-dist-hook:
+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+ (installfiles=`echo $(srcdir)/html/*.html`; \
+ if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+ then echo '-- Nothing to install' ; \
+ else \
+ for i in $$installfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ done; \
+ echo '-- Installing $(srcdir)/html/index.sgml' ; \
+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ fi)
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+ @echo "*** gtk-doc must be installed and enabled in order to make dist
+ @false
+endif
+
+dist-hook: dist-check-gtkdoc
+ mkdir $(distdir)/html
+ mkdir $(distdir)/sgml
mkdir $(distdir)/tmpl
- cp -p tmpl/*.sgml $(distdir)/tmpl
+ -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+ -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
+ -cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
.PHONY : html sgml templates scan
diff --git a/docs/reference/gtk/gtk-decl.txt b/docs/reference/gtk/gtk-decl.txt
index 06169bfa5..c7ecde8f9 100644
--- a/docs/reference/gtk/gtk-decl.txt
+++ b/docs/reference/gtk/gtk-decl.txt
@@ -49,6 +49,31 @@ struct GtkAccelEntry
};
</STRUCT>
<FUNCTION>
+<NAME>gtk_accelerator_valid</NAME>
+<RETURNS>gboolean </RETURNS>
+guint keyval,GdkModifierType modifiers
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_accelerator_parse</NAME>
+<RETURNS>void </RETURNS>
+const gchar *accelerator,guint *accelerator_key,GdkModifierType *accelerator_mods
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_accelerator_name</NAME>
+<RETURNS>gchar *</RETURNS>
+guint accelerator_key,GdkModifierType accelerator_mods
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_accelerator_set_default_mod_mask</NAME>
+<RETURNS>void </RETURNS>
+GdkModifierType default_mod_mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_accelerator_get_default_mod_mask</NAME>
+<RETURNS>guint </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_accel_group_new</NAME>
<RETURNS>GtkAccelGroup *</RETURNS>
void
@@ -69,9 +94,14 @@ GtkAccelGroup *accel_group
GtkAccelGroup *accel_group
</FUNCTION>
<FUNCTION>
-<NAME>gtk_accel_group_activate</NAME>
-<RETURNS>gboolean </RETURNS>
-GtkAccelGroup *accel_group,guint accel_key,GdkModifierType accel_mods
+<NAME>gtk_accel_group_lock</NAME>
+<RETURNS>void </RETURNS>
+GtkAccelGroup *accel_group
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_accel_group_unlock</NAME>
+<RETURNS>void </RETURNS>
+GtkAccelGroup *accel_group
</FUNCTION>
<FUNCTION>
<NAME>gtk_accel_groups_activate</NAME>
@@ -79,6 +109,11 @@ GtkAccelGroup *accel_group,guint accel_key,GdkModifierType accel_mods
GtkObject *object,guint accel_key,GdkModifierType accel_mods
</FUNCTION>
<FUNCTION>
+<NAME>gtk_accel_group_activate</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkAccelGroup *accel_group,guint accel_key,GdkModifierType accel_mods
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_accel_group_attach</NAME>
<RETURNS>void </RETURNS>
GtkAccelGroup *accel_group,GtkObject *object
@@ -89,16 +124,6 @@ GtkAccelGroup *accel_group,GtkObject *object
GtkAccelGroup *accel_group,GtkObject *object
</FUNCTION>
<FUNCTION>
-<NAME>gtk_accel_group_lock</NAME>
-<RETURNS>void </RETURNS>
-GtkAccelGroup *accel_group
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accel_group_unlock</NAME>
-<RETURNS>void </RETURNS>
-GtkAccelGroup *accel_group
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_accel_group_get_entry</NAME>
<RETURNS>GtkAccelEntry *</RETURNS>
GtkAccelGroup *accel_group,guint accel_key,GdkModifierType accel_mods
@@ -144,16 +169,6 @@ GtkType class_type,GtkSignalRunType signal_flags,guint handler_offset
GtkType class_type,GtkSignalRunType signal_flags,guint handler_offset
</FUNCTION>
<FUNCTION>
-<NAME>gtk_accel_group_marshal_add</NAME>
-<RETURNS>void </RETURNS>
-GtkObject *object,GtkSignalFunc func,gpointer func_data,GtkArg *args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accel_group_marshal_remove</NAME>
-<RETURNS>void </RETURNS>
-GtkObject *object,GtkSignalFunc func,gpointer func_data,GtkArg *args
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_accel_groups_from_object</NAME>
<RETURNS>GSList *</RETURNS>
GtkObject *object
@@ -163,31 +178,6 @@ GtkObject *object
<RETURNS>GSList *</RETURNS>
GtkObject *object
</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accelerator_valid</NAME>
-<RETURNS>gboolean </RETURNS>
-guint keyval,GdkModifierType modifiers
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accelerator_parse</NAME>
-<RETURNS>void </RETURNS>
-const gchar *accelerator,guint *accelerator_key,GdkModifierType *accelerator_mods
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accelerator_name</NAME>
-<RETURNS>gchar *</RETURNS>
-guint accelerator_key,GdkModifierType accelerator_mods
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accelerator_set_default_mod_mask</NAME>
-<RETURNS>void </RETURNS>
-GdkModifierType default_mod_mask
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_accelerator_get_default_mod_mask</NAME>
-<RETURNS>guint </RETURNS>
-void
-</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_ACCEL_LABEL</NAME>
#define GTK_TYPE_ACCEL_LABEL (gtk_accel_label_get_type ())
@@ -208,6 +198,10 @@ void
<NAME>GTK_IS_ACCEL_LABEL_CLASS</NAME>
#define GTK_IS_ACCEL_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_LABEL))
</MACRO>
+<MACRO>
+<NAME>GTK_ACCEL_LABEL_GET_CLASS</NAME>
+#define GTK_ACCEL_LABEL_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ACCEL_LABEL, GtkAccelLabelClass))
+</MACRO>
<STRUCT>
<NAME>GtkAccelLabel</NAME>
</STRUCT>
@@ -272,6 +266,10 @@ GtkAccelLabel *accel_label
<NAME>GTK_IS_ADJUSTMENT_CLASS</NAME>
#define GTK_IS_ADJUSTMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ADJUSTMENT))
</MACRO>
+<MACRO>
+<NAME>GTK_ADJUSTMENT_GET_CLASS</NAME>
+#define GTK_ADJUSTMENT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
+</MACRO>
<STRUCT>
<NAME>GtkAdjustment</NAME>
</STRUCT>
@@ -342,6 +340,10 @@ GtkAdjustment *adjustment,gfloat value
<NAME>GTK_IS_ALIGNMENT_CLASS</NAME>
#define GTK_IS_ALIGNMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT))
</MACRO>
+<MACRO>
+<NAME>GTK_ALIGNMENT_GET_CLASS</NAME>
+#define GTK_ALIGNMENT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
+</MACRO>
<STRUCT>
<NAME>GtkAlignment</NAME>
</STRUCT>
@@ -485,6 +487,10 @@ GtkArg *arg,gpointer value_pointer
<NAME>GTK_IS_ARROW_CLASS</NAME>
#define GTK_IS_ARROW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
</MACRO>
+<MACRO>
+<NAME>GTK_ARROW_GET_CLASS</NAME>
+#define GTK_ARROW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
+</MACRO>
<STRUCT>
<NAME>GtkArrow</NAME>
</STRUCT>
@@ -536,6 +542,10 @@ GtkArrow *arrow,GtkArrowType arrow_type,GtkShadowType shadow_type
<NAME>GTK_IS_ASPECT_FRAME_CLASS</NAME>
#define GTK_IS_ASPECT_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
</MACRO>
+<MACRO>
+<NAME>GTK_ASPECT_FRAME_GET_CLASS</NAME>
+#define GTK_ASPECT_FRAME_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
+</MACRO>
<STRUCT>
<NAME>GtkAspectFrame</NAME>
</STRUCT>
@@ -551,7 +561,7 @@ struct GtkAspectFrame
gfloat xalign;
gfloat yalign;
gfloat ratio;
- gint obey_child;
+ gboolean obey_child;
GtkAllocation center_allocation;
};
@@ -564,32 +574,36 @@ void
<FUNCTION>
<NAME>gtk_aspect_frame_new</NAME>
<RETURNS>GtkWidget *</RETURNS>
-const gchar *label,gfloat xalign,gfloat yalign,gfloat ratio,gint obey_child
+const gchar *label,gfloat xalign,gfloat yalign,gfloat ratio,gboolean obey_child
</FUNCTION>
<FUNCTION>
<NAME>gtk_aspect_frame_set</NAME>
<RETURNS>void </RETURNS>
-GtkAspectFrame *aspect_frame,gfloat xalign,gfloat yalign,gfloat ratio,gint obey_child
+GtkAspectFrame *aspect_frame,gfloat xalign,gfloat yalign,gfloat ratio,gboolean obey_child
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_BUTTON_BOX</NAME>
-#define GTK_TYPE_BUTTON_BOX (gtk_button_box_get_type ())
+#define GTK_TYPE_BUTTON_BOX (gtk_button_box_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_BUTTON_BOX</NAME>
-#define GTK_BUTTON_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
+#define GTK_BUTTON_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
</MACRO>
<MACRO>
<NAME>GTK_BUTTON_BOX_CLASS</NAME>
-#define GTK_BUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
+#define GTK_BUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_BUTTON_BOX</NAME>
-#define GTK_IS_BUTTON_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON_BOX))
+#define GTK_IS_BUTTON_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON_BOX))
</MACRO>
<MACRO>
<NAME>GTK_IS_BUTTON_BOX_CLASS</NAME>
-#define GTK_IS_BUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON_BOX))
+#define GTK_IS_BUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_BUTTON_BOX_GET_CLASS</NAME>
+#define GTK_BUTTON_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_BUTTONBOX_DEFAULT</NAME>
@@ -704,6 +718,10 @@ GtkWidget *widget,int *nvis_children,int *width,int *height
<NAME>GTK_IS_BIN_CLASS</NAME>
#define GTK_IS_BIN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BIN))
</MACRO>
+<MACRO>
+<NAME>GTK_BIN_GET_CLASS</NAME>
+#define GTK_BIN_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BIN, GtkBinClass))
+</MACRO>
<STRUCT>
<NAME>GtkBin</NAME>
</STRUCT>
@@ -889,23 +907,27 @@ GScanner *scanner
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_BOX</NAME>
-#define GTK_TYPE_BOX (gtk_box_get_type ())
+#define GTK_TYPE_BOX (gtk_box_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_BOX</NAME>
-#define GTK_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BOX, GtkBox))
+#define GTK_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BOX, GtkBox))
</MACRO>
<MACRO>
<NAME>GTK_BOX_CLASS</NAME>
-#define GTK_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass))
+#define GTK_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_BOX</NAME>
-#define GTK_IS_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BOX))
+#define GTK_IS_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BOX))
</MACRO>
<MACRO>
<NAME>GTK_IS_BOX_CLASS</NAME>
-#define GTK_IS_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX))
+#define GTK_IS_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_BOX_GET_CLASS</NAME>
+#define GTK_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
</MACRO>
<STRUCT>
<NAME>GtkBox</NAME>
@@ -990,23 +1012,27 @@ GtkBox *box,GtkWidget *child,gboolean expand,gboolean fill,gui
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_BUTTON</NAME>
-#define GTK_TYPE_BUTTON (gtk_button_get_type ())
+#define GTK_TYPE_BUTTON (gtk_button_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_BUTTON</NAME>
-#define GTK_BUTTON(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
+#define GTK_BUTTON(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
</MACRO>
<MACRO>
<NAME>GTK_BUTTON_CLASS</NAME>
-#define GTK_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
+#define GTK_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_BUTTON</NAME>
-#define GTK_IS_BUTTON(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON))
+#define GTK_IS_BUTTON(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON))
</MACRO>
<MACRO>
<NAME>GTK_IS_BUTTON_CLASS</NAME>
-#define GTK_IS_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
+#define GTK_IS_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
+</MACRO>
+<MACRO>
+<NAME>GTK_BUTTON_GET_CLASS</NAME>
+#define GTK_BUTTON_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
</MACRO>
<STRUCT>
<NAME>GtkButton</NAME>
@@ -1081,23 +1107,27 @@ GtkButton *button
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_CALENDAR</NAME>
-#define GTK_TYPE_CALENDAR (gtk_calendar_get_type ())
+#define GTK_TYPE_CALENDAR (gtk_calendar_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_CALENDAR</NAME>
-#define GTK_CALENDAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
+#define GTK_CALENDAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
</MACRO>
<MACRO>
<NAME>GTK_CALENDAR_CLASS</NAME>
-#define GTK_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
+#define GTK_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_CALENDAR</NAME>
-#define GTK_IS_CALENDAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CALENDAR))
+#define GTK_IS_CALENDAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CALENDAR))
</MACRO>
<MACRO>
<NAME>GTK_IS_CALENDAR_CLASS</NAME>
-#define GTK_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
+#define GTK_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
+</MACRO>
+<MACRO>
+<NAME>GTK_CALENDAR_GET_CLASS</NAME>
+#define GTK_CALENDAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CALENDAR, GtkCalendarClass))
</MACRO>
<STRUCT>
<NAME>GtkCalendar</NAME>
@@ -1225,6 +1255,10 @@ GtkCalendar *calendar
<NAME>GTK_IS_CHECK_BUTTON_CLASS</NAME>
#define GTK_IS_CHECK_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_BUTTON))
</MACRO>
+<MACRO>
+<NAME>GTK_CHECK_BUTTON_GET_CLASS</NAME>
+#define GTK_CHECK_BUTTON_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButtonClass))
+</MACRO>
<STRUCT>
<NAME>GtkCheckButton</NAME>
</STRUCT>
@@ -1255,11 +1289,11 @@ const gchar *label
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_CHECK_MENU_ITEM</NAME>
-#define GTK_TYPE_CHECK_MENU_ITEM (gtk_check_menu_item_get_type ())
+#define GTK_TYPE_CHECK_MENU_ITEM (gtk_check_menu_item_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_CHECK_MENU_ITEM</NAME>
-#define GTK_CHECK_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
+#define GTK_CHECK_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
</MACRO>
<MACRO>
<NAME>GTK_CHECK_MENU_ITEM_CLASS</NAME>
@@ -1267,12 +1301,16 @@ const gchar *label
</MACRO>
<MACRO>
<NAME>GTK_IS_CHECK_MENU_ITEM</NAME>
-#define GTK_IS_CHECK_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM))
+#define GTK_IS_CHECK_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM))
</MACRO>
<MACRO>
<NAME>GTK_IS_CHECK_MENU_ITEM_CLASS</NAME>
#define GTK_IS_CHECK_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_MENU_ITEM))
</MACRO>
+<MACRO>
+<NAME>GTK_CHECK_MENU_ITEM_GET_CLASS</NAME>
+#define GTK_CHECK_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass))
+</MACRO>
<STRUCT>
<NAME>GtkCheckMenuItem</NAME>
</STRUCT>
@@ -1371,6 +1409,10 @@ typedef enum
#define GTK_IS_CLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIST))
</MACRO>
<MACRO>
+<NAME>GTK_CLIST_GET_CLASS</NAME>
+#define GTK_CLIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CLIST, GtkCListClass))
+</MACRO>
+<MACRO>
<NAME>GTK_CLIST_FLAGS</NAME>
#define GTK_CLIST_FLAGS(clist) (GTK_CLIST (clist)->flags)
</MACRO>
@@ -1522,7 +1564,6 @@ struct GtkCList
/* rows */
gint rows;
- gint row_center_offset;
gint row_height;
GList *row_list;
GList *row_list_end;
@@ -1535,7 +1576,7 @@ struct GtkCList
/* dynamicly allocated array of column structures */
GtkCListColumn *column;
- /*the scrolling window and it's height and width to
+ /* the scrolling window and its height and width to
* make things a little speedier */
GdkWindow *clist_window;
gint clist_window_width;
@@ -2107,28 +2148,28 @@ GtkCList *clist
GtkCList *clist,gboolean auto_sort
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_COLOR_SELECTION</NAME>
+#define GTK_TYPE_COLOR_SELECTION (gtk_color_selection_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_COLOR_SELECTION</NAME>
-#define GTK_COLOR_SELECTION(obj) GTK_CHECK_CAST (obj, gtk_color_selection_get_type (), GtkColorSelection)
+#define GTK_COLOR_SELECTION(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection))
</MACRO>
<MACRO>
<NAME>GTK_COLOR_SELECTION_CLASS</NAME>
-#define GTK_COLOR_SELECTION_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_color_selection_get_type (), GtkColorSelectionClass)
+#define GTK_COLOR_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_COLOR_SELECTION</NAME>
-#define GTK_IS_COLOR_SELECTION(obj) GTK_CHECK_TYPE (obj, gtk_color_selection_get_type ())
+#define GTK_IS_COLOR_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_COLOR_SELECTION))
</MACRO>
<MACRO>
-<NAME>GTK_COLOR_SELECTION_DIALOG</NAME>
-#define GTK_COLOR_SELECTION_DIALOG(obj) GTK_CHECK_CAST (obj, gtk_color_selection_dialog_get_type (), GtkColorSelectionDialog)
+<NAME>GTK_IS_COLOR_SELECTION_CLASS</NAME>
+#define GTK_IS_COLOR_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_COLOR_SELECTION))
</MACRO>
<MACRO>
-<NAME>GTK_COLOR_SELECTION_DIALOG_CLASS</NAME>
-#define GTK_COLOR_SELECTION_DIALOG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_color_selection_dialog_get_type (), GtkColorSelectionDialogClass)
-</MACRO>
-<MACRO>
-<NAME>GTK_IS_COLOR_SELECTION_DIALOG</NAME>
-#define GTK_IS_COLOR_SELECTION_DIALOG(obj) GTK_CHECK_TYPE (obj, gtk_color_selection_dialog_get_type ())
+<NAME>GTK_COLOR_SELECTION_GET_CLASS</NAME>
+#define GTK_COLOR_SELECTION_GET_CLASS(obj) (GTK_CHECK_GET_CLAS ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
</MACRO>
<STRUCT>
<NAME>GtkColorSelection</NAME>
@@ -2137,89 +2178,135 @@ GtkCList *clist,gboolean auto_sort
<NAME>GtkColorSelectionClass</NAME>
</STRUCT>
<STRUCT>
-<NAME>GtkColorSelectionDialog</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GtkColorSelectionDialogClass</NAME>
-</STRUCT>
-<STRUCT>
<NAME>GtkColorSelection</NAME>
struct GtkColorSelection
{
- GtkVBox vbox;
-
- GtkWidget *wheel_area;
- GtkWidget *value_area;
- GtkWidget *sample_area;
- GtkWidget *sample_area_eb;
-
- GtkWidget *scales[8];
- GtkWidget *entries[8];
- GtkWidget *opacity_label;
-
- GdkGC *wheel_gc;
- GdkGC *value_gc;
- GdkGC *sample_gc;
-
- GtkUpdateType policy;
- gint use_opacity;
- gint timer_active;
- gint timer_tag;
- gdouble values[8];
- gdouble old_values[8];
-
- guchar *wheel_buf;
- guchar *value_buf;
- guchar *sample_buf;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GtkColorSelectionDialog</NAME>
-struct GtkColorSelectionDialog
-{
- GtkWindow window;
+ GtkVBox parent_instance;
- GtkWidget *colorsel;
- GtkWidget *main_vbox;
- GtkWidget *ok_button;
- GtkWidget *reset_button;
- GtkWidget *cancel_button;
- GtkWidget *help_button;
+ /* < private_data > */
+ gpointer private_data;
};
</STRUCT>
<FUNCTION>
<NAME>gtk_color_selection_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_color_selection_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_color_selection_set_update_policy</NAME>
<RETURNS>void </RETURNS>
-GtkColorSelection *colorsel,GtkUpdateType policy
+GtkColorSelection *colorsel,GtkUpdateType policy
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_get_use_opacity</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkColorSelection *colorsel
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_set_use_opacity</NAME>
+<RETURNS>void </RETURNS>
+GtkColorSelection *colorsel,gboolean use_opacity
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_get_use_palette</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkColorSelection *colorsel
</FUNCTION>
<FUNCTION>
-<NAME>gtk_color_selection_set_opacity</NAME>
+<NAME>gtk_color_selection_set_use_palette</NAME>
<RETURNS>void </RETURNS>
-GtkColorSelection *colorsel,gint use_opacity
+GtkColorSelection *colorsel,gboolean use_palette
</FUNCTION>
<FUNCTION>
<NAME>gtk_color_selection_set_color</NAME>
<RETURNS>void </RETURNS>
-GtkColorSelection *colorsel,gdouble *color
+GtkColorSelection *colorsel,gdouble *color
</FUNCTION>
<FUNCTION>
<NAME>gtk_color_selection_get_color</NAME>
<RETURNS>void </RETURNS>
-GtkColorSelection *colorsel,gdouble *color
+GtkColorSelection *colorsel,gdouble *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_set_old_color</NAME>
+<RETURNS>void </RETURNS>
+GtkColorSelection *colorsel,gdouble *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_get_old_color</NAME>
+<RETURNS>void </RETURNS>
+GtkColorSelection *colorsel,gdouble *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_set_palette_color</NAME>
+<RETURNS>void </RETURNS>
+GtkColorSelection *colorsel,gint x,gint y,gdouble *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_get_palette_color</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkColorSelection *colorsel,gint x,gint y,gdouble *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_color_selection_unset_palette_color</NAME>
+<RETURNS>void </RETURNS>
+GtkColorSelection *colorsel,gint x,gint y
</FUNCTION>
<FUNCTION>
+<NAME>gtk_color_selection_is_adjusting</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkColorSelection *colorsel
+</FUNCTION>
+<MACRO>
+<NAME>GTK_TYPE_COLOR_SELECTION_DIALOG</NAME>
+#define GTK_TYPE_COLOR_SELECTION_DIALOG (gtk_color_selection_dialog_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_COLOR_SELECTION_DIALOG</NAME>
+#define GTK_COLOR_SELECTION_DIALOG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog))
+</MACRO>
+<MACRO>
+<NAME>GTK_COLOR_SELECTION_DIALOG_CLASS</NAME>
+#define GTK_COLOR_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_COLOR_SELECTION_DIALOG</NAME>
+#define GTK_IS_COLOR_SELECTION_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_COLOR_SELECTION_DIALOG_CLASS</NAME>
+#define GTK_IS_COLOR_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SELECTION_DIALOG))
+</MACRO>
+<MACRO>
+<NAME>GTK_COLOR_SELECTION_DIALOG_GET_CLASS</NAME>
+#define GTK_COLOR_SELECTION_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialogClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkColorSelectionDialog</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkColorSelectionDialogClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkColorSelectionDialog</NAME>
+struct GtkColorSelectionDialog
+{
+ GtkDialog parent_instance;
+
+ GtkWidget *colorsel;
+ GtkWidget *ok_button;
+ GtkWidget *cancel_button;
+ GtkWidget *help_button;
+};
+</STRUCT>
+<FUNCTION>
<NAME>gtk_color_selection_dialog_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -2228,16 +2315,28 @@ void
const gchar *title
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_COMBO</NAME>
+#define GTK_TYPE_COMBO (gtk_combo_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_COMBO</NAME>
-#define GTK_COMBO(obj) GTK_CHECK_CAST (obj, gtk_combo_get_type (), GtkCombo)
+#define GTK_COMBO(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_COMBO, GtkCombo))
</MACRO>
<MACRO>
<NAME>GTK_COMBO_CLASS</NAME>
-#define GTK_COMBO_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_combo_get_type (), GtkComboClass)
+#define GTK_COMBO_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO, GtkComboClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_COMBO</NAME>
-#define GTK_IS_COMBO(obj) GTK_CHECK_TYPE (obj, gtk_combo_get_type ())
+#define GTK_IS_COMBO(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_COMBO))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_COMBO_CLASS</NAME>
+#define GTK_IS_COMBO_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COMBO))
+</MACRO>
+<MACRO>
+<NAME>GTK_COMBO_GET_CLASS</NAME>
+#define GTK_COMBO_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_COMBO, GtkComboClass))
</MACRO>
<STRUCT>
<NAME>GtkCombo</NAME>
@@ -2270,12 +2369,12 @@ struct GtkCombo {
</STRUCT>
<FUNCTION>
<NAME>gtk_combo_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_combo_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -2314,61 +2413,12 @@ GtkCombo* combo,GList *strings
GtkCombo* combo
</FUNCTION>
<MACRO>
-<NAME>gtk_accel_label_accelerator_width</NAME>
-#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width
-</MACRO>
-<MACRO>
-<NAME>gtk_container_border_width</NAME>
-#define gtk_container_border_width gtk_container_set_border_width
-</MACRO>
-<MACRO>
-<NAME>gtk_notebook_current_page</NAME>
-#define gtk_notebook_current_page gtk_notebook_get_current_page
-</MACRO>
-<MACRO>
-<NAME>gtk_packer_configure</NAME>
-#define gtk_packer_configure gtk_packer_set_child_packing
-</MACRO>
-<MACRO>
-<NAME>gtk_paned_gutter_size</NAME>
-#define gtk_paned_gutter_size gtk_paned_set_gutter_size
-</MACRO>
-<MACRO>
-<NAME>gtk_paned_handle_size</NAME>
-#define gtk_paned_handle_size gtk_paned_set_handle_size
-</MACRO>
-<MACRO>
-<NAME>gtk_scale_value_width</NAME>
-#define gtk_scale_value_width gtk_scale_get_value_width
-</MACRO>
-<MACRO>
-<NAME>gtk_window_position</NAME>
-#define gtk_window_position gtk_window_set_position
-</MACRO>
-<MACRO>
-<NAME>gtk_toggle_button_set_state</NAME>
-#define gtk_toggle_button_set_state gtk_toggle_button_set_active
-</MACRO>
-<MACRO>
-<NAME>gtk_check_menu_item_set_state</NAME>
-#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
-</MACRO>
-<MACRO>
-<NAME>gtk_ctree_set_reorderable</NAME>
-#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r))
-</MACRO>
-<MACRO>
-<NAME>gtk_style_apply_default_pixmap</NAME>
-#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) \
- gtk_style_apply_default_background (s,gw,TRUE,st,a,x,y,w,h)
-</MACRO>
-<MACRO>
<NAME>GTK_TYPE_CONTAINER</NAME>
-#define GTK_TYPE_CONTAINER (gtk_container_get_type ())
+#define GTK_TYPE_CONTAINER (gtk_container_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_CONTAINER</NAME>
-#define GTK_CONTAINER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
+#define GTK_CONTAINER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
</MACRO>
<MACRO>
<NAME>GTK_CONTAINER_CLASS</NAME>
@@ -2376,13 +2426,17 @@ GtkCombo* combo
</MACRO>
<MACRO>
<NAME>GTK_IS_CONTAINER</NAME>
-#define GTK_IS_CONTAINER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CONTAINER))
+#define GTK_IS_CONTAINER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CONTAINER))
</MACRO>
<MACRO>
<NAME>GTK_IS_CONTAINER_CLASS</NAME>
#define GTK_IS_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
</MACRO>
<MACRO>
+<NAME>GTK_CONTAINER_GET_CLASS</NAME>
+#define GTK_CONTAINER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
+</MACRO>
+<MACRO>
<NAME>GTK_IS_RESIZE_CONTAINER</NAME>
#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && ((GtkContainer*) (widget))->resize_mode != GTK_RESIZE_PARENT)
</MACRO>
@@ -2403,7 +2457,7 @@ struct GtkContainer
guint border_width : 16;
guint need_resize : 1;
guint resize_mode : 2;
-
+ guint reallocate_redraws : 1;
/* The list of children that requested a resize
*/
@@ -2461,6 +2515,11 @@ GtkContainer *container
GtkContainer *container,GtkDirectionType direction
</FUNCTION>
<FUNCTION>
+<NAME>gtk_container_set_reallocate_redraws</NAME>
+<RETURNS>void </RETURNS>
+GtkContainer *container,gboolean needs_redraws
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_container_set_focus_child</NAME>
<RETURNS>void </RETURNS>
GtkContainer *container,GtkWidget *child
@@ -2476,21 +2535,6 @@ GtkContainer *container,GtkAdjustment *adjustment
GtkContainer *container,GtkAdjustment *adjustment
</FUNCTION>
<FUNCTION>
-<NAME>gtk_container_register_toplevel</NAME>
-<RETURNS>void </RETURNS>
-GtkContainer *container
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_container_unregister_toplevel</NAME>
-<RETURNS>void </RETURNS>
-GtkContainer *container
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_container_get_toplevels</NAME>
-<RETURNS>GList *</RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_container_resize_children</NAME>
<RETURNS>void </RETURNS>
GtkContainer *container
@@ -2548,17 +2592,17 @@ GtkContainer *container
<FUNCTION>
<NAME>gtk_container_arg_set</NAME>
<RETURNS>void </RETURNS>
-GtkContainer *container,GtkWidget *child,GtkArg *arg,GtkArgInfo *info
+GtkContainer *container,GtkWidget *child,GtkArg *arg,GtkArgInfo *info
</FUNCTION>
<FUNCTION>
<NAME>gtk_container_arg_get</NAME>
<RETURNS>void </RETURNS>
-GtkContainer *container,GtkWidget *child,GtkArg *arg,GtkArgInfo *info
+GtkContainer *container,GtkWidget *child,GtkArg *arg,GtkArgInfo *info
</FUNCTION>
<FUNCTION>
<NAME>gtk_container_child_args_collect</NAME>
<RETURNS>gchar *</RETURNS>
-GtkType object_type,GSList **arg_list_p,GSList **info_list_p,const gchar *first_arg_name,va_list args
+GtkType object_type,GSList **arg_list_p,GSList **info_list_p,const gchar *first_arg_name,va_list args
</FUNCTION>
<FUNCTION>
<NAME>gtk_container_child_arg_get_info</NAME>
@@ -2568,12 +2612,17 @@ GtkType object_type,const gchar *arg_name,GtkArgInfo **info_p
<FUNCTION>
<NAME>gtk_container_forall</NAME>
<RETURNS>void </RETURNS>
-GtkContainer *container,GtkCallback callback,gpointer callback_data
+GtkContainer *container,GtkCallback callback,gpointer callback_data
</FUNCTION>
<FUNCTION>
<NAME>gtk_container_child_composite_name</NAME>
<RETURNS>gchar *</RETURNS>
-GtkContainer *container,GtkWidget *child
+GtkContainer *container,GtkWidget *child
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_container_dequeue_resize_handler</NAME>
+<RETURNS>void </RETURNS>
+GtkContainer *container
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_CTREE</NAME>
@@ -2596,6 +2645,10 @@ GtkContainer *container,GtkWidget *child
#define GTK_IS_CTREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CTREE))
</MACRO>
<MACRO>
+<NAME>GTK_CTREE_GET_CLASS</NAME>
+#define GTK_CTREE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CTREE, GtkCTreeClass))
+</MACRO>
+<MACRO>
<NAME>GTK_CTREE_ROW</NAME>
#define GTK_CTREE_ROW(_node_) ((GtkCTreeRow *)(((GList *)(_node_))->data))
</MACRO>
@@ -3098,6 +3151,10 @@ GtkCTree *ctree,GtkCTreeNode *node
<NAME>GTK_IS_CURVE_CLASS</NAME>
#define GTK_IS_CURVE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CURVE))
</MACRO>
+<MACRO>
+<NAME>GTK_CURVE_GET_CLASS</NAME>
+#define GTK_CURVE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CURVE, GtkCurveClass))
+</MACRO>
<STRUCT>
<NAME>GtkCurve</NAME>
</STRUCT>
@@ -3172,24 +3229,28 @@ GtkCurve *curve, GtkCurveType type
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_DATA</NAME>
-#define GTK_TYPE_DATA (gtk_data_get_type ())
+#define GTK_TYPE_DATA (gtk_data_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_DATA</NAME>
-#define GTK_DATA(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_DATA, GtkData))
+#define GTK_DATA(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_DATA, GtkData))
</MACRO>
<MACRO>
<NAME>GTK_DATA_CLASS</NAME>
-#define GTK_DATA_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DATA, GtkDataClass))
+#define GTK_DATA_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DATA, GtkDataClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_DATA</NAME>
-#define GTK_IS_DATA(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_DATA))
+#define GTK_IS_DATA(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_DATA))
</MACRO>
<MACRO>
<NAME>GTK_IS_DATA_CLASS</NAME>
#define GTK_IS_DATA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DATA))
</MACRO>
+<MACRO>
+<NAME>GTK_DATA_GET_CLASS</NAME>
+#define GTK_DATA_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DATA, GtkDataClass))
+</MACRO>
<STRUCT>
<NAME>GtkData</NAME>
</STRUCT>
@@ -3208,30 +3269,6 @@ struct GtkData
<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
-<ENUM>
-<NAME>GtkDebugFlag</NAME>
-typedef enum {
- GTK_DEBUG_OBJECTS = 1 << 0,
- GTK_DEBUG_MISC = 1 << 1,
- GTK_DEBUG_SIGNALS = 1 << 2,
- GTK_DEBUG_DND = 1 << 3,
- GTK_DEBUG_PLUGSOCKET = 1 << 4
-} GtkDebugFlag;
-</ENUM>
-<MACRO>
-<NAME>GTK_NOTE</NAME>
-#define GTK_NOTE(type,action) G_STMT_START { \
- if (gtk_debug_flags & GTK_DEBUG_##type) \
- { action; }; } G_STMT_END
-</MACRO>
-<MACRO>
-<NAME>GTK_NOTE</NAME>
-#define GTK_NOTE(type, action)
-</MACRO>
-<VARIABLE>
-<NAME>gtk_debug_flags</NAME>
-extern guint gtk_debug_flags;
-</VARIABLE>
<MACRO>
<NAME>GTK_TYPE_DIALOG</NAME>
#define GTK_TYPE_DIALOG (gtk_dialog_get_type ())
@@ -3252,6 +3289,10 @@ extern guint gtk_debug_flags;
<NAME>GTK_IS_DIALOG_CLASS</NAME>
#define GTK_IS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DIALOG))
</MACRO>
+<MACRO>
+<NAME>GTK_DIALOG_GET_CLASS</NAME>
+#define GTK_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DIALOG, GtkDialogClass))
+</MACRO>
<STRUCT>
<NAME>GtkDialog</NAME>
</STRUCT>
@@ -3407,6 +3448,10 @@ GtkWidget *toplevel,GdkEvent *event
<NAME>GTK_IS_DRAWING_AREA_CLASS</NAME>
#define GTK_IS_DRAWING_AREA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DRAWING_AREA))
</MACRO>
+<MACRO>
+<NAME>GTK_DRAWING_AREA_GET_CLASS</NAME>
+#define GTK_DRAWING_AREA_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingAreaClass))
+</MACRO>
<STRUCT>
<NAME>GtkDrawingArea</NAME>
</STRUCT>
@@ -3457,6 +3502,10 @@ GtkDrawingArea *darea,gint width,gint heigh
<NAME>GTK_IS_EDITABLE_CLASS</NAME>
#define GTK_IS_EDITABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EDITABLE))
</MACRO>
+<MACRO>
+<NAME>GTK_EDITABLE_GET_CLASS</NAME>
+#define GTK_EDITABLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_EDITABLE, GtkEditableClass))
+</MACRO>
<STRUCT>
<NAME>GtkEditable</NAME>
</STRUCT>
@@ -3580,6 +3629,10 @@ GtkEditable *editable,gboolean is_editable
<NAME>GTK_IS_ENTRY_CLASS</NAME>
#define GTK_IS_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY))
</MACRO>
+<MACRO>
+<NAME>GTK_ENTRY_GET_CLASS</NAME>
+#define GTK_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ENTRY, GtkEntryClass))
+</MACRO>
<STRUCT>
<NAME>GtkEntry</NAME>
</STRUCT>
@@ -3595,27 +3648,22 @@ struct GtkEntry
GdkWindow *text_area;
GdkPixmap *backing_pixmap;
GdkCursor *cursor;
- GdkWChar *text;
+ gchar *text;
- guint16 text_size; /* allocated size */
- guint16 text_length; /* length in use */
- guint16 text_max_length;
- gint scroll_offset;
- guint visible : 1; /* deprecated - see editable->visible */
- guint32 timer;
- guint button;
+ guint16 text_size; /* allocated size, in bytes */
- /* The x-offset of each character (including the last insertion position)
- * only valid when the widget is realized */
- gint *char_offset;
+ guint16 text_length; /* length in use, in chars */
+ guint16 text_max_length;
- /* Same as 'text', but in multibyte */
- gchar *text_mb;
- /* If true, 'text' and 'text_mb' are not coherent */
- guint text_mb_dirty : 1;
- /* If true, we use the encoding of wchar_t as the encoding of 'text'.
- * Otherwise we use the encoding of multi-byte characters instead. */
- guint use_wchar : 1;
+ /*< private >*/
+ guint button;
+ guint32 timer;
+ guint16 n_bytes; /* length in use, in bytes */
+ PangoLayout *layout;
+ gint scroll_offset;
+ gint ascent; /* font ascent, in pango units */
+ gint descent; /* font descent, in pango units */
+ GtkIMContext *im_context;
};
</STRUCT>
<FUNCTION>
@@ -3730,6 +3778,15 @@ typedef enum
} GtkDirectionType;
</ENUM>
<ENUM>
+<NAME>GtkTextDirection</NAME>
+typedef enum
+{
+ GTK_TEXT_DIR_NONE,
+ GTK_TEXT_DIR_LTR,
+ GTK_TEXT_DIR_RTL
+} GtkTextDirection;
+</ENUM>
+<ENUM>
<NAME>GtkJustification</NAME>
typedef enum
{
@@ -3949,7 +4006,8 @@ typedef enum
{
GTK_TOOLBAR_ICONS,
GTK_TOOLBAR_TEXT,
- GTK_TOOLBAR_BOTH
+ GTK_TOOLBAR_BOTH,
+ GTK_TOOLBAR_BOTH_HORIZ
} GtkToolbarStyle;
</ENUM>
<ENUM>
@@ -3986,7 +4044,8 @@ typedef enum
{
GTK_WIN_POS_NONE,
GTK_WIN_POS_CENTER,
- GTK_WIN_POS_MOUSE
+ GTK_WIN_POS_MOUSE,
+ GTK_WIN_POS_CENTER_ALWAYS
} GtkWindowPosition;
</ENUM>
<ENUM>
@@ -4008,23 +4067,27 @@ typedef enum
</ENUM>
<MACRO>
<NAME>GTK_TYPE_EVENT_BOX</NAME>
-#define GTK_TYPE_EVENT_BOX (gtk_event_box_get_type ())
+#define GTK_TYPE_EVENT_BOX (gtk_event_box_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_EVENT_BOX</NAME>
-#define GTK_EVENT_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox))
+#define GTK_EVENT_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox))
</MACRO>
<MACRO>
<NAME>GTK_EVENT_BOX_CLASS</NAME>
-#define GTK_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
+#define GTK_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_EVENT_BOX</NAME>
-#define GTK_IS_EVENT_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_EVENT_BOX))
+#define GTK_IS_EVENT_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_EVENT_BOX))
</MACRO>
<MACRO>
<NAME>GTK_IS_EVENT_BOX_CLASS</NAME>
-#define GTK_IS_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EVENT_BOX))
+#define GTK_IS_EVENT_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EVENT_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_EVENT_BOX_GET_CLASS</NAME>
+#define GTK_EVENT_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_EVENT_BOX, GtkEventBoxClass))
</MACRO>
<STRUCT>
<NAME>GtkEventBox</NAME>
@@ -4050,94 +4113,6 @@ void
void
</FUNCTION>
<MACRO>
-<NAME>GTK_MAJOR_VERSION</NAME>
-#define GTK_MAJOR_VERSION (1)
-</MACRO>
-<MACRO>
-<NAME>GTK_MINOR_VERSION</NAME>
-#define GTK_MINOR_VERSION (2)
-</MACRO>
-<MACRO>
-<NAME>GTK_MICRO_VERSION</NAME>
-#define GTK_MICRO_VERSION (3)
-</MACRO>
-<MACRO>
-<NAME>GTK_BINARY_AGE</NAME>
-#define GTK_BINARY_AGE (3)
-</MACRO>
-<MACRO>
-<NAME>GTK_INTERFACE_AGE</NAME>
-#define GTK_INTERFACE_AGE (1)
-</MACRO>
-<MACRO>
-<NAME>GTK_CHECK_VERSION</NAME>
-#define GTK_CHECK_VERSION(major,minor,micro) \
- (GTK_MAJOR_VERSION > (major) || \
- (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
- (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
- GTK_MICRO_VERSION >= (micro)))
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS</NAME>
-#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_SIGNAL_INIT</NAME>
-#define GTK_HAVE_SIGNAL_INIT 1-0-2
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_0</NAME>
-#define GTK_HAVE_FEATURES_1_1_0 1-1-0
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_2</NAME>
-#define GTK_HAVE_FEATURES_1_1_2 1-1-2
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_4</NAME>
-#define GTK_HAVE_FEATURES_1_1_4 1-1-4
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_5</NAME>
-#define GTK_HAVE_FEATURES_1_1_5 1-1-5
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_6</NAME>
-#define GTK_HAVE_FEATURES_1_1_6 1-1-6
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_7</NAME>
-#define GTK_HAVE_FEATURES_1_1_7 1-1-7
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_8</NAME>
-#define GTK_HAVE_FEATURES_1_1_8 1-1-8
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_9</NAME>
-#define GTK_HAVE_FEATURES_1_1_9 1-1-9
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_10</NAME>
-#define GTK_HAVE_FEATURES_1_1_10 1-1-10
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_11</NAME>
-#define GTK_HAVE_FEATURES_1_1_11 1-1-11
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_12</NAME>
-#define GTK_HAVE_FEATURES_1_1_12 1-1-12
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_13</NAME>
-#define GTK_HAVE_FEATURES_1_1_13 1-1-13
-</MACRO>
-<MACRO>
-<NAME>GTK_HAVE_FEATURES_1_1_14</NAME>
-#define GTK_HAVE_FEATURES_1_1_14 1-1-14
-</MACRO>
-<MACRO>
<NAME>GTK_TYPE_FILE_SELECTION</NAME>
#define GTK_TYPE_FILE_SELECTION (gtk_file_selection_get_type ())
</MACRO>
@@ -4157,6 +4132,10 @@ void
<NAME>GTK_IS_FILE_SELECTION_CLASS</NAME>
#define GTK_IS_FILE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SELECTION))
</MACRO>
+<MACRO>
+<NAME>GTK_FILE_SELECTION_GET_CLASS</NAME>
+#define GTK_FILE_SELECTION_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
+</MACRO>
<STRUCT>
<NAME>GtkFileSelection</NAME>
</STRUCT>
@@ -4249,6 +4228,10 @@ GtkFileSelection *filesel
<NAME>GTK_IS_FIXED_CLASS</NAME>
#define GTK_IS_FIXED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FIXED))
</MACRO>
+<MACRO>
+<NAME>GTK_FIXED_GET_CLASS</NAME>
+#define GTK_FIXED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FIXED, GtkFixedClass))
+</MACRO>
<STRUCT>
<NAME>GtkFixed</NAME>
</STRUCT>
@@ -4298,44 +4281,52 @@ GtkFixed *fixed,GtkWidget *widget,gint16 x,gint16 y
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_FONT_SELECTION</NAME>
-#define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ())
+#define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_FONT_SELECTION</NAME>
-#define GTK_FONT_SELECTION(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
+#define GTK_FONT_SELECTION(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
</MACRO>
<MACRO>
<NAME>GTK_FONT_SELECTION_CLASS</NAME>
-#define GTK_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
+#define GTK_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_FONT_SELECTION</NAME>
-#define GTK_IS_FONT_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION))
+#define GTK_IS_FONT_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION))
</MACRO>
<MACRO>
<NAME>GTK_IS_FONT_SELECTION_CLASS</NAME>
#define GTK_IS_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION))
</MACRO>
<MACRO>
+<NAME>GTK_FONT_SELECTION_GET_CLASS</NAME>
+#define GTK_FONT_SELECTION_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass))
+</MACRO>
+<MACRO>
<NAME>GTK_TYPE_FONT_SELECTION_DIALOG</NAME>
-#define GTK_TYPE_FONT_SELECTION_DIALOG (gtk_font_selection_dialog_get_type ())
+#define GTK_TYPE_FONT_SELECTION_DIALOG (gtk_font_selection_dialog_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_FONT_SELECTION_DIALOG</NAME>
-#define GTK_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialog))
+#define GTK_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialog))
</MACRO>
<MACRO>
<NAME>GTK_FONT_SELECTION_DIALOG_CLASS</NAME>
-#define GTK_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
+#define GTK_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_FONT_SELECTION_DIALOG</NAME>
-#define GTK_IS_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION_DIALOG))
+#define GTK_IS_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION_DIALOG))
</MACRO>
<MACRO>
<NAME>GTK_IS_FONT_SELECTION_DIALOG_CLASS</NAME>
#define GTK_IS_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION_DIALOG))
</MACRO>
+<MACRO>
+<NAME>GTK_FONT_SELECTION_DIALOG_GET_CLASS</NAME>
+#define GTK_FONT_SELECTION_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass))
+</MACRO>
<STRUCT>
<NAME>GtkFontSelection</NAME>
</STRUCT>
@@ -4348,65 +4339,12 @@ GtkFixed *fixed,GtkWidget *widget,gint16 x,gint16 y
<STRUCT>
<NAME>GtkFontSelectionDialogClass</NAME>
</STRUCT>
-<MACRO>
-<NAME>GTK_NUM_FONT_PROPERTIES</NAME>
-#define GTK_NUM_FONT_PROPERTIES 6
-</MACRO>
-<MACRO>
-<NAME>GTK_NUM_STYLE_PROPERTIES</NAME>
-#define GTK_NUM_STYLE_PROPERTIES 5
-</MACRO>
-<ENUM>
-<NAME>GtkFontMetricType</NAME>
-typedef enum
-{
- GTK_FONT_METRIC_PIXELS,
- GTK_FONT_METRIC_POINTS
-} GtkFontMetricType;
-</ENUM>
-<ENUM>
-<NAME>GtkFontType</NAME>
-typedef enum
-{
- GTK_FONT_BITMAP = 1 << 0,
- GTK_FONT_SCALABLE = 1 << 1,
- GTK_FONT_SCALABLE_BITMAP = 1 << 2,
-
- GTK_FONT_ALL = 0x07
-} GtkFontType;
-</ENUM>
-<MACRO>
-<NAME>GTK_NUM_FONT_FILTERS</NAME>
-#define GTK_NUM_FONT_FILTERS 2
-</MACRO>
-<ENUM>
-<NAME>GtkFontFilterType</NAME>
-typedef enum
-{
- GTK_FONT_FILTER_BASE,
- GTK_FONT_FILTER_USER
-} GtkFontFilterType;
-</ENUM>
-<STRUCT>
-<NAME>GtkFontFilter</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GtkFontFilter</NAME>
-struct GtkFontFilter
-{
- gint font_type;
- guint16 *property_filters[GTK_NUM_FONT_PROPERTIES];
- guint16 property_nfilters[GTK_NUM_FONT_PROPERTIES];
-};
-</STRUCT>
<STRUCT>
<NAME>GtkFontSelection</NAME>
struct GtkFontSelection
{
- GtkNotebook notebook;
+ GtkVBox parent_instance;
- /* These are on the font page. */
- GtkWidget *main_vbox;
GtkWidget *font_label;
GtkWidget *font_entry;
GtkWidget *font_clist;
@@ -4418,38 +4356,11 @@ struct GtkFontSelection
GtkWidget *points_button;
GtkWidget *filter_button;
GtkWidget *preview_entry;
- GtkWidget *message_label;
-
- /* These are on the font info page. */
- GtkWidget *info_vbox;
- GtkWidget *info_clist;
- GtkWidget *requested_font_name;
- GtkWidget *actual_font_name;
-
- /* These are on the filter page. */
- GtkWidget *filter_vbox;
- GtkWidget *type_bitmaps_button;
- GtkWidget *type_scalable_button;
- GtkWidget *type_scaled_bitmaps_button;
- GtkWidget *filter_clists[GTK_NUM_FONT_PROPERTIES];
-
- GdkFont *font;
- gint font_index;
- gint style;
- GtkFontMetricType metric;
- /* The size is either in pixels or deci-points, depending on the metric. */
- gint size;
-
- /* This is the last size explicitly selected. When the user selects different
- fonts we try to find the nearest size to this. */
- gint selected_size;
-
- /* These are the current property settings. They are indexes into the
- strings in the GtkFontSelInfo properties array. */
- guint16 property_values[GTK_NUM_STYLE_PROPERTIES];
-
- /* These are the base and user font filters. */
- GtkFontFilter filters[GTK_NUM_FONT_FILTERS];
+
+ PangoFontDescription *font_desc;
+ GdkFont *font; /* Cache for gdk_font_selection_get_font, so we can preserve
+ * refcounting behavior
+ */
};
</STRUCT>
<STRUCT>
@@ -4498,11 +4409,6 @@ GtkFontSelection *fontsel
GtkFontSelection *fontsel,const gchar *fontname
</FUNCTION>
<FUNCTION>
-<NAME>gtk_font_selection_set_filter</NAME>
-<RETURNS>void </RETURNS>
-GtkFontSelection *fontsel,GtkFontFilterType filter_type,GtkFontType font_type,gchar **foundries,gchar **weights,gchar **slants,gchar **setwidths,gchar **spacings,gchar **charsets
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_font_selection_get_preview_text</NAME>
<RETURNS>gchar *</RETURNS>
GtkFontSelection *fontsel
@@ -4538,11 +4444,6 @@ GtkFontSelectionDialog *fsd
GtkFontSelectionDialog *fsd,const gchar *fontname
</FUNCTION>
<FUNCTION>
-<NAME>gtk_font_selection_dialog_set_filter</NAME>
-<RETURNS>void </RETURNS>
-GtkFontSelectionDialog *fsd,GtkFontFilterType filter_type,GtkFontType font_type,gchar **foundries,gchar **weights,gchar **slants,gchar **setwidths,gchar **spacings,gchar **charsets
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_font_selection_dialog_get_preview_text</NAME>
<RETURNS>gchar *</RETURNS>
GtkFontSelectionDialog *fsd
@@ -4572,6 +4473,10 @@ GtkFontSelectionDialog *fsd,const gchar *text
<NAME>GTK_IS_FRAME_CLASS</NAME>
#define GTK_IS_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FRAME))
</MACRO>
+<MACRO>
+<NAME>GTK_FRAME_GET_CLASS</NAME>
+#define GTK_FRAME_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FRAME, GtkFrameClass))
+</MACRO>
<STRUCT>
<NAME>GtkFrame</NAME>
</STRUCT>
@@ -4583,13 +4488,13 @@ GtkFontSelectionDialog *fsd,const gchar *text
struct GtkFrame
{
GtkBin bin;
-
- gchar *label;
+
+ GtkWidget *label_widget;
gint16 shadow_type;
- gint16 label_width;
- gint16 label_height;
gfloat label_xalign;
gfloat label_yalign;
+
+ GtkAllocation child_allocation;
};
</STRUCT>
<FUNCTION>
@@ -4608,6 +4513,11 @@ const gchar *label
GtkFrame *frame,const gchar *label
</FUNCTION>
<FUNCTION>
+<NAME>gtk_frame_set_label_widget</NAME>
+<RETURNS>void </RETURNS>
+GtkFrame *frame,GtkWidget *label_widget
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_frame_set_label_align</NAME>
<RETURNS>void </RETURNS>
GtkFrame *frame,gfloat xalign,gfloat yalign
@@ -4618,19 +4528,28 @@ GtkFrame *frame,gfloat xalign,gfloat yalign
GtkFrame *frame,GtkShadowType type
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_GAMMA_CURVE</NAME>
+#define GTK_TYPE_GAMMA_CURVE (gtk_gamma_curve_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_GAMMA_CURVE</NAME>
-#define GTK_GAMMA_CURVE(obj) \
- GTK_CHECK_CAST (obj, gtk_gamma_curve_get_type (), GtkGammaCurve)
+#define GTK_GAMMA_CURVE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve))
</MACRO>
<MACRO>
<NAME>GTK_GAMMA_CURVE_CLASS</NAME>
-#define GTK_GAMMA_CURVE_CLASS(klass) \
- GTK_CHECK_CLASS_CAST (klass, gtk_gamma_curve_get_type, GtkGammaCurveClass)
+#define GTK_GAMMA_CURVE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_GAMMA_CURVE</NAME>
-#define GTK_IS_GAMMA_CURVE(obj) \
- GTK_CHECK_TYPE (obj, gtk_gamma_curve_get_type ())
+#define GTK_IS_GAMMA_CURVE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_GAMMA_CURVE))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_GAMMA_CURVE_CLASS</NAME>
+#define GTK_IS_GAMMA_CURVE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GAMMA_CURVE))
+</MACRO>
+<MACRO>
+<NAME>GTK_GAMMA_CURVE_GET_CLASS</NAME>
+#define GTK_GAMMA_CURVE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurveClass))
</MACRO>
<STRUCT>
<NAME>GtkGammaCurve</NAME>
@@ -4655,7 +4574,7 @@ struct GtkGammaCurve
</STRUCT>
<FUNCTION>
<NAME>gtk_gamma_curve_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -4674,16 +4593,28 @@ gint depth,GdkColormap *colormap,GdkGCValues *values,GdkGCVa
GdkGC *gc
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_HANDLE_BOX</NAME>
+#define GTK_TYPE_HANDLE_BOX (gtk_handle_box_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_HANDLE_BOX</NAME>
-#define GTK_HANDLE_BOX(obj) GTK_CHECK_CAST (obj, gtk_handle_box_get_type (), GtkHandleBox)
+#define GTK_HANDLE_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBox))
</MACRO>
<MACRO>
<NAME>GTK_HANDLE_BOX_CLASS</NAME>
-#define GTK_HANDLE_BOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_handle_box_get_type (), GtkHandleBoxClass)
+#define GTK_HANDLE_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_HANDLE_BOX</NAME>
-#define GTK_IS_HANDLE_BOX(obj) GTK_CHECK_TYPE (obj, gtk_handle_box_get_type ())
+#define GTK_IS_HANDLE_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HANDLE_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_HANDLE_BOX_CLASS</NAME>
+#define GTK_IS_HANDLE_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HANDLE_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_HANDLE_BOX_GET_CLASS</NAME>
+#define GTK_HANDLE_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HANDLE_BOX, GtkHandleBoxClass))
</MACRO>
<STRUCT>
<NAME>GtkHandleBox</NAME>
@@ -4718,7 +4649,7 @@ struct GtkHandleBox
</STRUCT>
<FUNCTION>
<NAME>gtk_handle_box_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -4742,16 +4673,28 @@ GtkHandleBox *handle_box,GtkPositionType position
GtkHandleBox *handle_box,GtkPositionType edge
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_HBUTTON_BOX</NAME>
+#define GTK_TYPE_HBUTTON_BOX (gtk_hbutton_box_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_HBUTTON_BOX</NAME>
-#define GTK_HBUTTON_BOX(obj) GTK_CHECK_CAST (obj, gtk_hbutton_box_get_type (), GtkHButtonBox)
+#define GTK_HBUTTON_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBox))
</MACRO>
<MACRO>
<NAME>GTK_HBUTTON_BOX_CLASS</NAME>
-#define GTK_HBUTTON_BOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_hbutton_box_get_type (), GtkHButtonBoxClass)
+#define GTK_HBUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_HBUTTON_BOX</NAME>
-#define GTK_IS_HBUTTON_BOX(obj) GTK_CHECK_TYPE (obj, gtk_hbutton_box_get_type ())
+#define GTK_IS_HBUTTON_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HBUTTON_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_HBUTTON_BOX_CLASS</NAME>
+#define GTK_IS_HBUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBUTTON_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_HBUTTON_BOX_GET_CLASS</NAME>
+#define GTK_HBUTTON_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HBUTTON_BOX, GtkHButtonBoxClass))
</MACRO>
<STRUCT>
<NAME>GtkHButtonBox</NAME>
@@ -4768,12 +4711,12 @@ struct GtkHButtonBox
</STRUCT>
<FUNCTION>
<NAME>gtk_hbutton_box_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_hbutton_box_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -4798,24 +4741,28 @@ GtkButtonBoxStyle layout
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_HBOX</NAME>
-#define GTK_TYPE_HBOX (gtk_hbox_get_type ())
+#define GTK_TYPE_HBOX (gtk_hbox_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_HBOX</NAME>
-#define GTK_HBOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
+#define GTK_HBOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HBOX, GtkHBox))
</MACRO>
<MACRO>
<NAME>GTK_HBOX_CLASS</NAME>
-#define GTK_HBOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
+#define GTK_HBOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HBOX, GtkHBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_HBOX</NAME>
-#define GTK_IS_HBOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HBOX))
+#define GTK_IS_HBOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HBOX))
</MACRO>
<MACRO>
<NAME>GTK_IS_HBOX_CLASS</NAME>
#define GTK_IS_HBOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HBOX))
</MACRO>
+<MACRO>
+<NAME>GTK_HBOX_GET_CLASS</NAME>
+#define GTK_HBOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HBOX, GtkHBoxClass))
+</MACRO>
<STRUCT>
<NAME>GtkHBox</NAME>
</STRUCT>
@@ -4840,16 +4787,28 @@ void
gboolean homogeneous,gint spacing
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_HPANED</NAME>
+#define GTK_TYPE_HPANED (gtk_hpaned_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_HPANED</NAME>
-#define GTK_HPANED(obj) GTK_CHECK_CAST (obj, gtk_hpaned_get_type (), GtkHPaned)
+#define GTK_HPANED(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HPANED, GtkHPaned))
</MACRO>
<MACRO>
<NAME>GTK_HPANED_CLASS</NAME>
-#define GTK_HPANED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_hpaned_get_type (), GtkHPanedClass)
+#define GTK_HPANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HPANED, GtkHPanedClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_HPANED</NAME>
-#define GTK_IS_HPANED(obj) GTK_CHECK_TYPE (obj, gtk_hpaned_get_type ())
+#define GTK_IS_HPANED(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HPANED))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_HPANED_CLASS</NAME>
+#define GTK_IS_HPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HPANED))
+</MACRO>
+<MACRO>
+<NAME>GTK_HPANED_GET_CLASS</NAME>
+#define GTK_HPANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HPANED, GtkHPanedClass))
</MACRO>
<STRUCT>
<NAME>GtkHPaned</NAME>
@@ -4866,25 +4825,37 @@ struct GtkHPaned
</STRUCT>
<FUNCTION>
<NAME>gtk_hpaned_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_hpaned_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
void
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_HRULER</NAME>
+#define GTK_TYPE_HRULER (gtk_hruler_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_HRULER</NAME>
-#define GTK_HRULER(obj) GTK_CHECK_CAST (obj, gtk_hruler_get_type (), GtkHRuler)
+#define GTK_HRULER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HRULER, GtkHRuler))
</MACRO>
<MACRO>
<NAME>GTK_HRULER_CLASS</NAME>
-#define GTK_HRULER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_hruler_get_type (), GtkHRulerClass)
+#define GTK_HRULER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HRULER, GtkHRulerClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_HRULER</NAME>
-#define GTK_IS_HRULER(obj) GTK_CHECK_TYPE (obj, gtk_hruler_get_type ())
+#define GTK_IS_HRULER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HRULER))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_HRULER_CLASS</NAME>
+#define GTK_IS_HRULER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HRULER))
+</MACRO>
+<MACRO>
+<NAME>GTK_HRULER_GET_CLASS</NAME>
+#define GTK_HRULER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HRULER, GtkHRulerClass))
</MACRO>
<STRUCT>
<NAME>GtkHRuler</NAME>
@@ -4901,7 +4872,7 @@ struct GtkHRuler
</STRUCT>
<FUNCTION>
<NAME>gtk_hruler_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -4929,6 +4900,10 @@ void
<NAME>GTK_IS_HSCALE_CLASS</NAME>
#define GTK_IS_HSCALE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCALE))
</MACRO>
+<MACRO>
+<NAME>GTK_HSCALE_GET_CLASS</NAME>
+#define GTK_HSCALE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HSCALE, GtkHScaleClass))
+</MACRO>
<STRUCT>
<NAME>GtkHScale</NAME>
</STRUCT>
@@ -4972,6 +4947,10 @@ GtkAdjustment *adjustment
<NAME>GTK_IS_HSCROLLBAR_CLASS</NAME>
#define GTK_IS_HSCROLLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSCROLLBAR))
</MACRO>
+<MACRO>
+<NAME>GTK_HSCROLLBAR_GET_CLASS</NAME>
+#define GTK_HSCROLLBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HSCROLLBAR, GtkHScrollbarClass))
+</MACRO>
<STRUCT>
<NAME>GtkHScrollbar</NAME>
</STRUCT>
@@ -5015,6 +4994,10 @@ GtkAdjustment *adjustment
<NAME>GTK_IS_HSEPARATOR_CLASS</NAME>
#define GTK_IS_HSEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSEPARATOR))
</MACRO>
+<MACRO>
+<NAME>GTK_HSEPARATOR_GET_CLASS</NAME>
+#define GTK_HSEPARATOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
+</MACRO>
<STRUCT>
<NAME>GtkHSeparator</NAME>
</STRUCT>
@@ -5058,6 +5041,10 @@ void
<NAME>GTK_IS_IMAGE_CLASS</NAME>
#define GTK_IS_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE))
</MACRO>
+<MACRO>
+<NAME>GTK_IMAGE_GET_CLASS</NAME>
+#define GTK_IMAGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass))
+</MACRO>
<STRUCT>
<NAME>GtkImage</NAME>
</STRUCT>
@@ -5095,6 +5082,122 @@ GtkImage *image,GdkImage *val,GdkBitmap *mask
GtkImage *image,GdkImage **val,GdkBitmap **mask
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_IM_CONTEXT</NAME>
+#define GTK_TYPE_IM_CONTEXT (gtk_im_context_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_IM_CONTEXT</NAME>
+#define GTK_IM_CONTEXT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContext))
+</MACRO>
+<MACRO>
+<NAME>GTK_IM_CONTEXT_CLASS</NAME>
+#define GTK_IM_CONTEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_IM_CONTEXT</NAME>
+#define GTK_IS_IM_CONTEXT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_CONTEXT))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_IM_CONTEXT_CLASS</NAME>
+#define GTK_IS_IM_CONTEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_CONTEXT))
+</MACRO>
+<MACRO>
+<NAME>GTK_IM_CONTEXT_GET_CLASS</NAME>
+#define GTK_IM_CONTEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_CONTEXT, GtkIMContextClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkIMContext</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkIMContextClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkIMContext</NAME>
+struct GtkIMContext
+{
+ GtkObject object;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_im_context_get_type</NAME>
+<RETURNS>GtkType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_im_context_set_client_window</NAME>
+<RETURNS>void </RETURNS>
+GtkIMContext *context,GdkWindow *window
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_im_context_get_preedit_string</NAME>
+<RETURNS>void </RETURNS>
+GtkIMContext *context,char **str,PangoAttrList **attrs
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_im_context_filter_keypress</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkIMContext *context,GdkEventKey *event
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_im_context_focus_in</NAME>
+<RETURNS>void </RETURNS>
+GtkIMContext *context
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_im_context_focus_out</NAME>
+<RETURNS>void </RETURNS>
+GtkIMContext *context
+</FUNCTION>
+<MACRO>
+<NAME>GTK_TYPE_IM_MULTICONTEXT</NAME>
+#define GTK_TYPE_IM_MULTICONTEXT (gtk_im_multicontext_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_IM_MULTICONTEXT</NAME>
+#define GTK_IM_MULTICONTEXT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontext))
+</MACRO>
+<MACRO>
+<NAME>GTK_IM_MULTICONTEXT_CLASS</NAME>
+#define GTK_IM_MULTICONTEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_IM_MULTICONTEXT</NAME>
+#define GTK_IS_IM_MULTICONTEXT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IM_MULTICONTEXT))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_IM_MULTICONTEXT_CLASS</NAME>
+#define GTK_IS_IM_MULTICONTEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IM_MULTICONTEXT))
+</MACRO>
+<MACRO>
+<NAME>GTK_IM_MULTICONTEXT_GET_CLASS</NAME>
+#define GTK_IM_MULTICONTEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkIMMulticontext</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkIMMulticontextClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkIMMulticontext</NAME>
+struct GtkIMMulticontext
+{
+ GtkIMContext object;
+
+ GtkIMContext *slave;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_im_multicontext_get_type</NAME>
+<RETURNS>GtkType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_im_multicontext_new</NAME>
+<RETURNS>GtkIMContext *</RETURNS>
+void
+</FUNCTION>
+<MACRO>
<NAME>GTK_TYPE_INPUT_DIALOG</NAME>
#define GTK_TYPE_INPUT_DIALOG (gtk_input_dialog_get_type ())
</MACRO>
@@ -5114,6 +5217,10 @@ GtkImage *image,GdkImage **val,GdkBitmap **mask
<NAME>GTK_IS_INPUT_DIALOG_CLASS</NAME>
#define GTK_IS_INPUT_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INPUT_DIALOG))
</MACRO>
+<MACRO>
+<NAME>GTK_INPUT_DIALOG_GET_CLASS</NAME>
+#define GTK_INPUT_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_INPUT_DIALOG, GtkInputDialogClass))
+</MACRO>
<STRUCT>
<NAME>GtkInputDialog</NAME>
</STRUCT>
@@ -5134,7 +5241,7 @@ struct GtkInputDialog
GtkWidget *save_button;
GtkWidget *axis_items[GDK_AXIS_LAST];
- guint32 current_device;
+ GdkDevice *current_device;
GtkWidget *keys_list;
GtkWidget *keys_listbox;
@@ -5170,6 +5277,10 @@ void
<NAME>GTK_IS_INVISIBLE_CLASS</NAME>
#define GTK_IS_INVISIBLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
</MACRO>
+<MACRO>
+<NAME>GTK_INVISIBLE_GET_CLASS</NAME>
+#define GTK_INVISIBLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
+</MACRO>
<STRUCT>
<NAME>GtkInvisible</NAME>
</STRUCT>
@@ -5180,7 +5291,8 @@ void
<NAME>GtkInvisible</NAME>
struct GtkInvisible
{
- GtkBin bin;
+ GtkWidget widget;
+ gboolean has_user_ref_count;
};
</STRUCT>
<FUNCTION>
@@ -5213,6 +5325,10 @@ void
<NAME>GTK_IS_ITEM_CLASS</NAME>
#define GTK_IS_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM))
</MACRO>
+<MACRO>
+<NAME>GTK_ITEM_GET_CLASS</NAME>
+#define GTK_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ITEM, GtkItemClass))
+</MACRO>
<STRUCT>
<NAME>GtkItem</NAME>
</STRUCT>
@@ -5250,7 +5366,7 @@ GtkItem *item
<NAME>GtkPrintFunc</NAME>
<RETURNS>void </RETURNS>
gpointer func_data,
- gchar *str
+ const gchar *str
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GtkTranslateFunc</NAME>
@@ -5272,23 +5388,27 @@ gpointer callback_data,
</USER_FUNCTION>
<MACRO>
<NAME>GTK_TYPE_ITEM_FACTORY</NAME>
-#define GTK_TYPE_ITEM_FACTORY (gtk_item_factory_get_type ())
+#define GTK_TYPE_ITEM_FACTORY (gtk_item_factory_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_ITEM_FACTORY</NAME>
-#define GTK_ITEM_FACTORY(object) (GTK_CHECK_CAST (object, GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
+#define GTK_ITEM_FACTORY(object) (GTK_CHECK_CAST ((object), GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
</MACRO>
<MACRO>
<NAME>GTK_ITEM_FACTORY_CLASS</NAME>
-#define GTK_ITEM_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
+#define GTK_ITEM_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_ITEM_FACTORY</NAME>
-#define GTK_IS_ITEM_FACTORY(object) (GTK_CHECK_TYPE (object, GTK_TYPE_ITEM_FACTORY))
+#define GTK_IS_ITEM_FACTORY(object) (GTK_CHECK_TYPE ((object), GTK_TYPE_ITEM_FACTORY))
</MACRO>
<MACRO>
<NAME>GTK_IS_ITEM_FACTORY_CLASS</NAME>
-#define GTK_IS_ITEM_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM_FACTORY))
+#define GTK_IS_ITEM_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM_FACTORY))
+</MACRO>
+<MACRO>
+<NAME>GTK_ITEM_FACTORY_GET_CLASS</NAME>
+#define GTK_ITEM_FACTORY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ITEM_FACTORY, GtkItemFactoryClass))
</MACRO>
<STRUCT>
<NAME>GtkItemFactory</NAME>
@@ -5436,7 +5556,7 @@ const gchar *file_name,GtkPatternSpec *path_pspec,gboolean modified_only
<FUNCTION>
<NAME>gtk_item_factory_print_func</NAME>
<RETURNS>void </RETURNS>
-gpointer FILE_pointer,gchar *string
+gpointer FILE_pointer,const gchar *string
</FUNCTION>
<FUNCTION>
<NAME>gtk_item_factory_create_item</NAME>
@@ -5517,23 +5637,27 @@ GtkItemFactory *ifactory,guint n_entries,GtkItemFactoryEntry *entries,gpointe
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_LABEL</NAME>
-#define GTK_TYPE_LABEL (gtk_label_get_type ())
+#define GTK_TYPE_LABEL (gtk_label_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_LABEL</NAME>
-#define GTK_LABEL(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
+#define GTK_LABEL(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LABEL, GtkLabel))
</MACRO>
<MACRO>
<NAME>GTK_LABEL_CLASS</NAME>
-#define GTK_LABEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
+#define GTK_LABEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL, GtkLabelClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_LABEL</NAME>
-#define GTK_IS_LABEL(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LABEL))
+#define GTK_IS_LABEL(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LABEL))
</MACRO>
<MACRO>
<NAME>GTK_IS_LABEL_CLASS</NAME>
-#define GTK_IS_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
+#define GTK_IS_LABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL))
+</MACRO>
+<MACRO>
+<NAME>GTK_LABEL_GET_CLASS</NAME>
+#define GTK_LABEL_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass))
</MACRO>
<STRUCT>
<NAME>GtkLabel</NAME>
@@ -5551,14 +5675,13 @@ struct GtkLabel
GtkMisc misc;
gchar *label;
- GdkWChar *label_wc;
gchar *pattern;
- GtkLabelWord *words;
-
- guint max_width : 16;
guint jtype : 2;
- gboolean wrap;
+ gboolean wrap : 1;
+
+ /*< private >*/
+ PangoLayout *layout;
};
</STRUCT>
<FUNCTION>
@@ -5568,33 +5691,28 @@ void
</FUNCTION>
<FUNCTION>
<NAME>gtk_label_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
-const gchar *str
+<RETURNS>GtkWidget *</RETURNS>
+const char *str
</FUNCTION>
<FUNCTION>
<NAME>gtk_label_set_text</NAME>
<RETURNS>void </RETURNS>
-GtkLabel *label,const gchar *str
+GtkLabel *label,const char *str
</FUNCTION>
<FUNCTION>
<NAME>gtk_label_set_justify</NAME>
<RETURNS>void </RETURNS>
-GtkLabel *label,GtkJustification jtype
+GtkLabel *label,GtkJustification jtype
</FUNCTION>
<FUNCTION>
<NAME>gtk_label_set_pattern</NAME>
-<RETURNS>void </RETURNS>
-GtkLabel *label,const gchar *pattern
+<RETURNS>void </RETURNS>
+GtkLabel *label,const gchar *pattern
</FUNCTION>
<FUNCTION>
<NAME>gtk_label_set_line_wrap</NAME>
-<RETURNS>void </RETURNS>
-GtkLabel *label,gboolean wrap
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_label_get</NAME>
<RETURNS>void </RETURNS>
-GtkLabel *label,gchar **str
+GtkLabel *label,gboolean wrap
</FUNCTION>
<FUNCTION>
<NAME>gtk_label_parse_uline</NAME>
@@ -5605,6 +5723,11 @@ GtkLabel *label,const gchar *string
<NAME>gtk_label_set</NAME>
# define gtk_label_set gtk_label_set_text
</MACRO>
+<FUNCTION>
+<NAME>gtk_label_get</NAME>
+<RETURNS>void </RETURNS>
+GtkLabel *label,char **str
+</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_LAYOUT</NAME>
#define GTK_TYPE_LAYOUT (gtk_layout_get_type ())
@@ -5625,6 +5748,10 @@ GtkLabel *label,const gchar *string
<NAME>GTK_IS_LAYOUT_CLASS</NAME>
#define GTK_IS_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LAYOUT))
</MACRO>
+<MACRO>
+<NAME>GTK_LAYOUT_GET_CLASS</NAME>
+#define GTK_LAYOUT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LAYOUT, GtkLayoutClass))
+</MACRO>
<STRUCT>
<NAME>GtkLayout</NAME>
</STRUCT>
@@ -5650,7 +5777,6 @@ struct GtkLayout {
GdkWindow *bin_window;
GdkVisibilityState visibility;
- gulong configure_serial;
gint scroll_x;
gint scroll_y;
@@ -5732,6 +5858,10 @@ GtkLayout *layout
<NAME>GTK_IS_LIST_CLASS</NAME>
#define GTK_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST))
</MACRO>
+<MACRO>
+<NAME>GTK_LIST_GET_CLASS</NAME>
+#define GTK_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST, GtkListClass))
+</MACRO>
<STRUCT>
<NAME>GtkList</NAME>
</STRUCT>
@@ -5915,6 +6045,10 @@ GtkList *list
<NAME>GTK_IS_LIST_ITEM_CLASS</NAME>
#define GTK_IS_LIST_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_ITEM))
</MACRO>
+<MACRO>
+<NAME>GTK_LIST_ITEM_GET_CLASS</NAME>
+#define GTK_LIST_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_ITEM, GtkListItemClass))
+</MACRO>
<STRUCT>
<NAME>GtkListItem</NAME>
</STRUCT>
@@ -5990,6 +6124,18 @@ GtkWidget *grab_widget,
GdkEventKey *event,
gpointer func_data
</USER_FUNCTION>
+<MACRO>
+<NAME>GTKMAIN_C_VAR</NAME>
+#define GTKMAIN_C_VAR __declspec(dllexport)
+</MACRO>
+<MACRO>
+<NAME>GTKMAIN_C_VAR</NAME>
+#define GTKMAIN_C_VAR __declspec(dllimport) extern
+</MACRO>
+<MACRO>
+<NAME>GTKMAIN_C_VAR</NAME>
+#define GTKMAIN_C_VAR extern
+</MACRO>
<VARIABLE>
<NAME>gtk_major_version</NAME>
extern const guint gtk_major_version;
@@ -6017,18 +6163,36 @@ guint required_major,guint required_minor,guint required_micro
</FUNCTION>
<FUNCTION>
<NAME>gtk_init</NAME>
-<RETURNS>void </RETURNS>
-int *argc,char ***argv
+<RETURNS>void </RETURNS>
+int *argc,char ***argv
</FUNCTION>
<FUNCTION>
<NAME>gtk_init_check</NAME>
<RETURNS>gboolean </RETURNS>
-int *argc,char ***argv
+int *argc,char ***argv
</FUNCTION>
<FUNCTION>
-<NAME>gtk_exit</NAME>
+<NAME>gtk_init_abi_check</NAME>
<RETURNS>void </RETURNS>
-gint error_code
+int *argc,char ***argv,int num_checks,size_t sizeof_GtkWindow
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_init_check_abi_check</NAME>
+<RETURNS>gboolean </RETURNS>
+int *argc,char ***argv,int num_checks,size_t sizeof_GtkWindow
+</FUNCTION>
+<MACRO>
+<NAME>gtk_init</NAME>
+#define gtk_init(argc, argv) gtk_init_abi_check (argc, argv, 1, sizeof (GtkWindow))
+</MACRO>
+<MACRO>
+<NAME>gtk_init_check</NAME>
+#define gtk_init_check(args, argv) gtk_init_check_abi_check (argc, argv, 1, sizeof (GtkWindow))
+</MACRO>
+<FUNCTION>
+<NAME>gtk_exit</NAME>
+<RETURNS>void </RETURNS>
+gint error_code
</FUNCTION>
<FUNCTION>
<NAME>gtk_set_locale</NAME>
@@ -6036,8 +6200,13 @@ gint error_code
void
</FUNCTION>
<FUNCTION>
+<NAME>gtk_get_default_language</NAME>
+<RETURNS>gchar *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_events_pending</NAME>
-<RETURNS>gint </RETURNS>
+<RETURNS>gint </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -6201,235 +6370,6 @@ GdkEvent *event
GtkWidget *widget,GdkEvent *event
</FUNCTION>
<MACRO>
-<NAME>gtk_signal_default_marshaller</NAME>
-#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_BOOL__NONE</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_BOOL__POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_BOOL__POINTER_POINTER_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_BOOL__POINTER_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_BOOL__POINTER_INT_INT_UINT</NAME>
-#define gtk_marshal_BOOL__POINTER_INT_INT_UINT gtk_marshal_BOOL__POINTER_INT_INT_INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_BOOL__POINTER_INT_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER</NAME>
-#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_ENUM__ENUM</NAME>
-#define gtk_marshal_ENUM__ENUM gtk_marshal_INT__INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_INT__INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_INT__POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_INT__POINTER_CHAR_CHAR</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__BOOL</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__BOXED</NAME>
-#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__C_CALLBACK</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__C_CALLBACK_C_CALLBACK</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__ENUM</NAME>
-#define gtk_marshal_NONE__ENUM gtk_marshal_NONE__INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__ENUM_FLOAT</NAME>
-#define gtk_marshal_NONE__ENUM_FLOAT gtk_marshal_NONE__INT_FLOAT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_FLOAT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__ENUM_FLOAT_BOOL</NAME>
-#define gtk_marshal_NONE__ENUM_FLOAT_BOOL gtk_marshal_NONE__INT_FLOAT_BOOL
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_FLOAT_BOOL</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_INT_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__NONE</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__OBJECT</NAME>
-#define gtk_marshal_NONE__OBJECT gtk_marshal_NONE__POINTER
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_POINTER_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__POINTER_STRING_STRING</NAME>
-#define gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-</MACRO>
-<MACRO>
-<NAME>gtk_marshal_NONE__POINTER_UINT</NAME>
-#define gtk_marshal_NONE__POINTER_UINT gtk_marshal_NONE__POINTER_INT
-</MACRO>
-<MACRO>
-<NAME>gtk_marshal_NONE__POINTER_UINT_ENUM</NAME>
-#define gtk_marshal_NONE__POINTER_UINT_ENUM gtk_marshal_NONE__POINTER_INT_INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__POINTER_POINTER_UINT_UINT</NAME>
-#define gtk_marshal_NONE__POINTER_POINTER_UINT_UINT gtk_marshal_NONE__POINTER_POINTER_INT_INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_POINTER_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT</NAME>
-#define gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__POINTER_UINT_UINT</NAME>
-#define gtk_marshal_NONE__POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT
-</MACRO>
-<MACRO>
-<NAME>gtk_marshal_NONE__STRING</NAME>
-#define gtk_marshal_NONE__STRING gtk_marshal_NONE__POINTER
-</MACRO>
-<MACRO>
-<NAME>gtk_marshal_NONE__STRING_INT_POINTER</NAME>
-#define gtk_marshal_NONE__STRING_INT_POINTER gtk_marshal_NONE__POINTER_INT_POINTER
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__POINTER_INT_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__UINT</NAME>
-#define gtk_marshal_NONE__UINT gtk_marshal_NONE__INT
-</MACRO>
-<MACRO>
-<NAME>gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER</NAME>
-#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM</NAME>
-#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM gtk_marshal_NONE__INT_POINTER_INT_INT_INT
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_POINTER_INT_INT_INT</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
-<NAME>gtk_marshal_NONE__UINT_STRING</NAME>
-#define gtk_marshal_NONE__UINT_STRING gtk_marshal_NONE__INT_POINTER
-</MACRO>
-<FUNCTION>
-<NAME>gtk_marshal_NONE__INT_POINTER</NAME>
-<RETURNS>void </RETURNS>
-GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
-</FUNCTION>
-<MACRO>
<NAME>GTK_TYPE_MENU</NAME>
#define GTK_TYPE_MENU (gtk_menu_get_type ())
</MACRO>
@@ -6449,6 +6389,10 @@ GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
<NAME>GTK_IS_MENU_CLASS</NAME>
#define GTK_IS_MENU_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU))
</MACRO>
+<MACRO>
+<NAME>GTK_MENU_GET_CLASS</NAME>
+#define GTK_MENU_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU, GtkMenuClass))
+</MACRO>
<STRUCT>
<NAME>GtkMenu</NAME>
</STRUCT>
@@ -6489,6 +6433,13 @@ struct GtkMenu
GtkWidget *toplevel;
GtkWidget *tearoff_window;
+ /* When a submenu of this menu is popped up, motion in this
+ * region is ignored
+ */
+ GdkRegion *navigation_region;
+ guint navigation_timeout;
+
+ guint needs_destruction_ref_count : 1;
guint torn_off : 1;
};
</STRUCT>
@@ -6578,11 +6529,6 @@ GtkMenu *menu
GtkMenu *menu
</FUNCTION>
<FUNCTION>
-<NAME>gtk_menu_detach</NAME>
-<RETURNS>void </RETURNS>
-GtkMenu *menu
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_menu_set_tearoff_state</NAME>
<RETURNS>void </RETURNS>
GtkMenu *menu,gboolean torn_off
@@ -6599,23 +6545,27 @@ GtkMenu *menu,GtkWidget *child,gint positio
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_MENU_BAR</NAME>
-#define GTK_TYPE_MENU_BAR (gtk_menu_bar_get_type ())
+#define GTK_TYPE_MENU_BAR (gtk_menu_bar_get_type ())
</MACRO>
<MACRO>
<NAME>GTK_MENU_BAR</NAME>
-#define GTK_MENU_BAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_BAR, GtkMenuBar))
+#define GTK_MENU_BAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_BAR, GtkMenuBar))
</MACRO>
<MACRO>
<NAME>GTK_MENU_BAR_CLASS</NAME>
-#define GTK_MENU_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
+#define GTK_MENU_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_MENU_BAR</NAME>
-#define GTK_IS_MENU_BAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_BAR))
+#define GTK_IS_MENU_BAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_BAR))
</MACRO>
<MACRO>
<NAME>GTK_IS_MENU_BAR_CLASS</NAME>
-#define GTK_IS_MENU_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
+#define GTK_IS_MENU_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_BAR))
+</MACRO>
+<MACRO>
+<NAME>GTK_MENU_BAR_GET_CLASS</NAME>
+#define GTK_MENU_BAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU_BAR, GtkMenuBarClass))
</MACRO>
<STRUCT>
<NAME>GtkMenuBar</NAME>
@@ -6767,6 +6717,10 @@ GtkMenuFactory *factory,const char *path
<NAME>GTK_IS_MENU_ITEM_CLASS</NAME>
#define GTK_IS_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
</MACRO>
+<MACRO>
+<NAME>GTK_MENU_ITEM_GET_CLASS</NAME>
+#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
+</MACRO>
<STRUCT>
<NAME>GtkMenuItem</NAME>
</STRUCT>
@@ -6868,6 +6822,10 @@ GtkMenuItem *menu_item
<NAME>GTK_IS_MENU_SHELL_CLASS</NAME>
#define GTK_IS_MENU_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
</MACRO>
+<MACRO>
+<NAME>GTK_MENU_SHELL_GET_CLASS</NAME>
+#define GTK_MENU_SHELL_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
+</MACRO>
<STRUCT>
<NAME>GtkMenuShell</NAME>
</STRUCT>
@@ -6955,6 +6913,10 @@ GtkMenuShell *menu_shell,GtkWidget *menu_item,gboolean fo
<NAME>GTK_IS_MISC_CLASS</NAME>
#define GTK_IS_MISC_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC))
</MACRO>
+<MACRO>
+<NAME>GTK_MISC_GET_CLASS</NAME>
+#define GTK_MISC_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MISC, GtkMiscClass))
+</MACRO>
<STRUCT>
<NAME>GtkMisc</NAME>
</STRUCT>
@@ -7010,6 +6972,10 @@ GtkMisc *misc,gint xpad,gint ypad
#define GTK_IS_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_NOTEBOOK))
</MACRO>
<MACRO>
+<NAME>GTK_NOTEBOOK_GET_CLASS</NAME>
+#define GTK_NOTEBOOK_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_NOTEBOOK, GtkNotebookClass))
+</MACRO>
+<MACRO>
<NAME>GTK_NOTEBOOK_PAGE</NAME>
#define GTK_NOTEBOOK_PAGE(_glist_) ((GtkNotebookPage *)((GList *)(_glist_))->data)
</MACRO>
@@ -7243,46 +7209,36 @@ GtkNotebook *notebook,GtkWidget *child,gboolean expand,gboolean fill,G
GtkNotebook *notebook,GtkWidget *child,gint position
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_OBJECT</NAME>
+#define GTK_TYPE_OBJECT (gtk_object_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_OBJECT</NAME>
-#define GTK_OBJECT(object) ( \
- GTK_IS_OBJECT (object) ? \
- (GtkObject*) (object) : \
- (GtkObject*) gtk_type_check_object_cast ((GtkTypeObject*) (object), GTK_TYPE_OBJECT) \
-)
+#define GTK_OBJECT(object) (GTK_CHECK_CAST ((object), GTK_TYPE_OBJECT, GtkObject))
</MACRO>
<MACRO>
<NAME>GTK_OBJECT_CLASS</NAME>
-#define GTK_OBJECT_CLASS(klass) ( \
- GTK_IS_OBJECT_CLASS (klass) ? \
- (GtkObjectClass*) (klass) : \
- (GtkObjectClass*) gtk_type_check_class_cast ((GtkTypeClass*) (klass), GTK_TYPE_OBJECT) \
-)
+#define GTK_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OBJECT, GtkObjectClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_OBJECT</NAME>
-#define GTK_IS_OBJECT(object) ( \
- (object) != NULL && \
- GTK_IS_OBJECT_CLASS (((GtkObject*) (object))->klass) \
-)
+#define GTK_IS_OBJECT(object) (GTK_CHECK_TYPE ((object), GTK_TYPE_OBJECT))
</MACRO>
<MACRO>
<NAME>GTK_IS_OBJECT_CLASS</NAME>
-#define GTK_IS_OBJECT_CLASS(klass) ( \
- (klass) != NULL && \
- GTK_FUNDAMENTAL_TYPE (((GtkObjectClass*) (klass))->type) == GTK_TYPE_OBJECT \
-)
+#define GTK_IS_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT))
</MACRO>
<MACRO>
-<NAME>GTK_OBJECT_TYPE</NAME>
-#define GTK_OBJECT_TYPE(obj) (GTK_OBJECT (obj)->klass->type)
+<NAME>GTK_OBJECT_GET_CLASS</NAME>
+#define GTK_OBJECT_GET_CLASS(object) (GTK_CHECK_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass))
</MACRO>
<MACRO>
-<NAME>GTK_OBJECT_SIGNALS</NAME>
-#define GTK_OBJECT_SIGNALS(obj) (GTK_OBJECT (obj)->klass->signals)
+<NAME>GTK_OBJECT_TYPE</NAME>
+#define GTK_OBJECT_TYPE(object) (G_TYPE_FROM_INSTANCE (object))
</MACRO>
<MACRO>
-<NAME>GTK_OBJECT_NSIGNALS</NAME>
-#define GTK_OBJECT_NSIGNALS(obj) (GTK_OBJECT (obj)->klass->nsignals)
+<NAME>GTK_OBJECT_TYPE_NAME</NAME>
+#define GTK_OBJECT_TYPE_NAME(object) (g_type_name (GTK_OBJECT_TYPE (object)))
</MACRO>
<ENUM>
<NAME>GtkObjectFlags</NAME>
@@ -7345,9 +7301,7 @@ typedef enum
<NAME>GtkObject</NAME>
struct GtkObject
{
- /* GtkTypeObject related fields: */
- GtkObjectClass *klass;
-
+ GObject parent_instance;
/* 32 bits of flags. GtkObject only uses 4 of these bits and
* GtkWidget uses the rest. This is done because structs are
@@ -7355,16 +7309,6 @@ struct GtkObject
* used in GtkWidget much space would be wasted.
*/
guint32 flags;
-
- /* reference count.
- * refer to the file docs/refcounting.txt on this issue.
- */
- guint ref_count;
-
- /* A list of keyed data pointers, used for e.g. the list of signal
- * handlers or an object's user_data.
- */
- GData *object_data;
};
</STRUCT>
<FUNCTION>
@@ -7393,27 +7337,27 @@ GtkType type,const gchar *first_arg_name,...
GtkType object_type,guint n_args,GtkArg *args
</FUNCTION>
<FUNCTION>
-<NAME>gtk_object_default_construct</NAME>
-<RETURNS>void </RETURNS>
+<NAME>gtk_object_ref</NAME>
+<RETURNS>GtkObject *</RETURNS>
GtkObject *object
</FUNCTION>
<FUNCTION>
-<NAME>gtk_object_constructed</NAME>
-<RETURNS>void </RETURNS>
+<NAME>gtk_object_unref</NAME>
+<RETURNS>void </RETURNS>
GtkObject *object
</FUNCTION>
<FUNCTION>
-<NAME>gtk_object_sink</NAME>
+<NAME>gtk_object_default_construct</NAME>
<RETURNS>void </RETURNS>
-GtkObject *object
+GtkObject *object
</FUNCTION>
<FUNCTION>
-<NAME>gtk_object_ref</NAME>
+<NAME>gtk_object_constructed</NAME>
<RETURNS>void </RETURNS>
-GtkObject *object
+GtkObject *object
</FUNCTION>
<FUNCTION>
-<NAME>gtk_object_unref</NAME>
+<NAME>gtk_object_sink</NAME>
<RETURNS>void </RETURNS>
GtkObject *object
</FUNCTION>
@@ -7555,19 +7499,6 @@ GtkType object_type,GSList **arg_list_p,GSList **info_list_p,const
<RETURNS>gchar *</RETURNS>
GtkType object_type,const gchar *arg_name,GtkArgInfo **info_p
</FUNCTION>
-<FUNCTION>
-<NAME>gtk_trace_referencing</NAME>
-<RETURNS>void </RETURNS>
-GtkObject *object,const gchar *func,guint dummy,guint line,gboolean do_ref
-</FUNCTION>
-<MACRO>
-<NAME>gtk_object_ref</NAME>
-# define gtk_object_ref(o) G_STMT_START{gtk_trace_referencing((o),G_GNUC_PRETTY_FUNCTION,0,__LINE__,1);}G_STMT_END
-</MACRO>
-<MACRO>
-<NAME>gtk_object_unref</NAME>
-# define gtk_object_unref(o) G_STMT_START{gtk_trace_referencing((o),G_GNUC_PRETTY_FUNCTION,0,__LINE__,0);}G_STMT_END
-</MACRO>
<MACRO>
<NAME>GTK_TYPE_OPTION_MENU</NAME>
#define GTK_TYPE_OPTION_MENU (gtk_option_menu_get_type ())
@@ -7588,6 +7519,10 @@ GtkObject *object,const gchar *func,guint dummy,guint line,gboolea
<NAME>GTK_IS_OPTION_MENU_CLASS</NAME>
#define GTK_IS_OPTION_MENU_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OPTION_MENU))
</MACRO>
+<MACRO>
+<NAME>GTK_OPTION_MENU_GET_CLASS</NAME>
+#define GTK_OPTION_MENU_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_OPTION_MENU, GtkOptionMenuClass))
+</MACRO>
<STRUCT>
<NAME>GtkOptionMenu</NAME>
</STRUCT>
@@ -7633,6 +7568,11 @@ GtkOptionMenu *option_menu,GtkWidget *menu
GtkOptionMenu *option_menu
</FUNCTION>
<FUNCTION>
+<NAME>gtk_option_menu_get_history</NAME>
+<RETURNS>gint </RETURNS>
+GtkOptionMenu *option_menu
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_option_menu_set_history</NAME>
<RETURNS>void </RETURNS>
GtkOptionMenu *option_menu,guint index
@@ -7657,6 +7597,10 @@ GtkOptionMenu *option_menu,guint index
<NAME>GTK_IS_PACKER_CLASS</NAME>
#define GTK_IS_PACKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PACKER))
</MACRO>
+<MACRO>
+<NAME>GTK_PACKER_GET_CLASS</NAME>
+#define GTK_PACKER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PACKER, GtkPackerClass))
+</MACRO>
<STRUCT>
<NAME>GtkPacker</NAME>
</STRUCT>
@@ -7814,6 +7758,10 @@ GtkPacker *packer,guint i_pad_x,guint i_pad_y
<NAME>GTK_IS_PANED_CLASS</NAME>
#define GTK_IS_PANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
</MACRO>
+<MACRO>
+<NAME>GTK_PANED_GET_CLASS</NAME>
+#define GTK_PANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
+</MACRO>
<STRUCT>
<NAME>GtkPaned</NAME>
</STRUCT>
@@ -7830,26 +7778,28 @@ struct GtkPaned
GtkWidget *child2;
GdkWindow *handle;
- GdkRectangle groove_rectangle;
GdkGC *xor_gc;
-
+ GdkCursorType cursor_type;
+
/*< public >*/
guint16 handle_size;
- guint16 gutter_size;
-
+
/*< private >*/
+ guint16 handle_width;
+ guint16 handle_height;
+
gint child1_size;
gint last_allocation;
gint min_position;
gint max_position;
-
+
guint position_set : 1;
guint in_drag : 1;
guint child1_shrink : 1;
guint child1_resize : 1;
guint child2_shrink : 1;
guint child2_resize : 1;
-
+
gint16 handle_xpos;
gint16 handle_ypos;
};
@@ -7880,6 +7830,11 @@ GtkPaned *paned,GtkWidget *child,gboolean resize,gboolean shrink
GtkPaned *paned,GtkWidget *child,gboolean resize,gboolean shrink
</FUNCTION>
<FUNCTION>
+<NAME>gtk_paned_get_position</NAME>
+<RETURNS>gint </RETURNS>
+GtkPaned *paned
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_paned_set_position</NAME>
<RETURNS>void </RETURNS>
GtkPaned *paned,gint position
@@ -7887,17 +7842,12 @@ GtkPaned *paned,gint position
<FUNCTION>
<NAME>gtk_paned_set_handle_size</NAME>
<RETURNS>void </RETURNS>
-GtkPaned *paned,guint16 size
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_paned_set_gutter_size</NAME>
-<RETURNS>void </RETURNS>
-GtkPaned *paned,guint16 size
+GtkPaned *paned,guint16 size
</FUNCTION>
<FUNCTION>
<NAME>gtk_paned_compute_position</NAME>
<RETURNS>void </RETURNS>
-GtkPaned *paned,gint allocation,gint child1_req,gint child2_req
+GtkPaned *paned,gint allocation,gint child1_req,gint child2_req
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_PIXMAP</NAME>
@@ -7919,6 +7869,10 @@ GtkPaned *paned,gint allocation,gint child1_req,gint child2_req
<NAME>GTK_IS_PIXMAP_CLASS</NAME>
#define GTK_IS_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP))
</MACRO>
+<MACRO>
+<NAME>GTK_PIXMAP_GET_CLASS</NAME>
+#define GTK_PIXMAP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass))
+</MACRO>
<STRUCT>
<NAME>GtkPixmap</NAME>
</STRUCT>
@@ -7964,16 +7918,28 @@ GtkPixmap *pixmap,GdkPixmap **val,GdkBitmap **mask
GtkPixmap *pixmap,guint build
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_PLUG</NAME>
+#define GTK_TYPE_PLUG (gtk_plug_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_PLUG</NAME>
-#define GTK_PLUG(obj) GTK_CHECK_CAST (obj, gtk_plug_get_type (), GtkPlug)
+#define GTK_PLUG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PLUG, GtkPlug))
</MACRO>
<MACRO>
<NAME>GTK_PLUG_CLASS</NAME>
-#define GTK_PLUG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_plug_get_type (), GtkPlugClass)
+#define GTK_PLUG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG, GtkPlugClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_PLUG</NAME>
-#define GTK_IS_PLUG(obj) GTK_CHECK_TYPE (obj, gtk_plug_get_type ())
+#define GTK_IS_PLUG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PLUG))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_PLUG_CLASS</NAME>
+#define GTK_IS_PLUG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG))
+</MACRO>
+<MACRO>
+<NAME>GTK_PLUG_GET_CLASS</NAME>
+#define GTK_PLUG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PLUG, GtkPlugClass))
</MACRO>
<STRUCT>
<NAME>GtkPlug</NAME>
@@ -7993,30 +7959,42 @@ struct GtkPlug
</STRUCT>
<FUNCTION>
<NAME>gtk_plug_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_plug_construct</NAME>
<RETURNS>void </RETURNS>
-GtkPlug *plug, guint32 socket_id
+GtkPlug *plug, GdkNativeWindow socket_id
</FUNCTION>
<FUNCTION>
<NAME>gtk_plug_new</NAME>
<RETURNS>GtkWidget *</RETURNS>
-guint32 socket_id
+GdkNativeWindow socket_id
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_PREVIEW</NAME>
+#define GTK_TYPE_PREVIEW (gtk_preview_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_PREVIEW</NAME>
-#define GTK_PREVIEW(obj) GTK_CHECK_CAST (obj, gtk_preview_get_type (), GtkPreview)
+#define GTK_PREVIEW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview))
</MACRO>
<MACRO>
<NAME>GTK_PREVIEW_CLASS</NAME>
-#define GTK_PREVIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_preview_get_type (), GtkPreviewClass)
+#define GTK_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PREVIEW, GtkPreviewClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_PREVIEW</NAME>
-#define GTK_IS_PREVIEW(obj) GTK_CHECK_TYPE (obj, gtk_preview_get_type ())
+#define GTK_IS_PREVIEW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PREVIEW))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_PREVIEW_CLASS</NAME>
+#define GTK_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PREVIEW))
+</MACRO>
+<MACRO>
+<NAME>GTK_PREVIEW_GET_CLASS</NAME>
+#define GTK_PREVIEW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PREVIEW, GtkPreviewClass))
</MACRO>
<STRUCT>
<NAME>GtkPreview</NAME>
@@ -8068,7 +8046,7 @@ union GtkDitherInfo
</UNION>
<FUNCTION>
<NAME>gtk_preview_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -8099,7 +8077,7 @@ GtkPreview *preview,guchar *data,gint x,gint
<FUNCTION>
<NAME>gtk_preview_set_expand</NAME>
<RETURNS>void </RETURNS>
-GtkPreview *preview,gint expand
+GtkPreview *preview,gboolean expand
</FUNCTION>
<FUNCTION>
<NAME>gtk_preview_set_gamma</NAME>
@@ -8146,64 +8124,6 @@ void
<RETURNS>void </RETURNS>
void
</FUNCTION>
-<ENUM>
-<NAME>GtkPrivateFlags</NAME>
-typedef enum
-{
- PRIVATE_GTK_USER_STYLE = 1 << 0,
- PRIVATE_GTK_REDRAW_PENDING = 1 << 1,
- PRIVATE_GTK_RESIZE_PENDING = 1 << 2,
- PRIVATE_GTK_RESIZE_NEEDED = 1 << 3,
- PRIVATE_GTK_LEAVE_PENDING = 1 << 4,
- PRIVATE_GTK_HAS_SHAPE_MASK = 1 << 5,
- PRIVATE_GTK_IN_REPARENT = 1 << 6,
- PRIVATE_GTK_IS_OFFSCREEN = 1 << 7
-} GtkPrivateFlags;
-</ENUM>
-<MACRO>
-<NAME>GTK_PRIVATE_FLAGS</NAME>
-#define GTK_PRIVATE_FLAGS(wid) (GTK_WIDGET (wid)->private_flags)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_USER_STYLE</NAME>
-#define GTK_WIDGET_USER_STYLE(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_REDRAW_PENDING</NAME>
-#define GTK_WIDGET_REDRAW_PENDING(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_PENDING) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_CONTAINER_RESIZE_PENDING</NAME>
-#define GTK_CONTAINER_RESIZE_PENDING(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_RESIZE_NEEDED</NAME>
-#define GTK_WIDGET_RESIZE_NEEDED(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_NEEDED) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_LEAVE_PENDING</NAME>
-#define GTK_WIDGET_LEAVE_PENDING(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_HAS_SHAPE_MASK</NAME>
-#define GTK_WIDGET_HAS_SHAPE_MASK(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_IN_REPARENT</NAME>
-#define GTK_WIDGET_IN_REPARENT(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_IN_REPARENT) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_WIDGET_IS_OFFSCREEN</NAME>
-#define GTK_WIDGET_IS_OFFSCREEN(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_IS_OFFSCREEN) != 0)
-</MACRO>
-<MACRO>
-<NAME>GTK_PRIVATE_SET_FLAG</NAME>
-#define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
-</MACRO>
-<MACRO>
-<NAME>GTK_PRIVATE_UNSET_FLAG</NAME>
-#define GTK_PRIVATE_UNSET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
-</MACRO>
<MACRO>
<NAME>GTK_TYPE_PROGRESS</NAME>
#define GTK_TYPE_PROGRESS (gtk_progress_get_type ())
@@ -8224,6 +8144,10 @@ typedef enum
<NAME>GTK_IS_PROGRESS_CLASS</NAME>
#define GTK_IS_PROGRESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS))
</MACRO>
+<MACRO>
+<NAME>GTK_PROGRESS_GET_CLASS</NAME>
+#define GTK_PROGRESS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS, GtkProgressClass))
+</MACRO>
<STRUCT>
<NAME>GtkProgress</NAME>
</STRUCT>
@@ -8244,6 +8168,7 @@ struct GtkProgress
guint show_text : 1;
guint activity_mode : 1;
+ guint use_text_format : 1;
};
</STRUCT>
<FUNCTION>
@@ -8264,7 +8189,7 @@ GtkProgress *progress,gfloat x_align,gfloat y_align
<FUNCTION>
<NAME>gtk_progress_set_format_string</NAME>
<RETURNS>void </RETURNS>
-GtkProgress *progress,gchar *format
+GtkProgress *progress,const gchar *format
</FUNCTION>
<FUNCTION>
<NAME>gtk_progress_set_adjustment</NAME>
@@ -8336,6 +8261,10 @@ GtkProgress *progress,gfloat value
<NAME>GTK_IS_PROGRESS_BAR_CLASS</NAME>
#define GTK_IS_PROGRESS_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS_BAR))
</MACRO>
+<MACRO>
+<NAME>GTK_PROGRESS_BAR_GET_CLASS</NAME>
+#define GTK_PROGRESS_BAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS_BAR, GtkProgressBarClass))
+</MACRO>
<STRUCT>
<NAME>GtkProgressBar</NAME>
</STRUCT>
@@ -8375,6 +8304,9 @@ struct GtkProgressBar
gint activity_pos;
guint activity_step;
guint activity_blocks;
+
+ gfloat pulse_fraction;
+
guint activity_dir : 1;
};
</STRUCT>
@@ -8389,6 +8321,31 @@ void
void
</FUNCTION>
<FUNCTION>
+<NAME>gtk_progress_bar_pulse</NAME>
+<RETURNS>void </RETURNS>
+GtkProgressBar *pbar
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_progress_bar_set_text</NAME>
+<RETURNS>void </RETURNS>
+GtkProgressBar *pbar,const gchar *text
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_progress_bar_set_fraction</NAME>
+<RETURNS>void </RETURNS>
+GtkProgressBar *pbar,gfloat fraction
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_progress_bar_set_pulse_step</NAME>
+<RETURNS>void </RETURNS>
+GtkProgressBar *pbar,gfloat fraction
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_progress_bar_set_orientation</NAME>
+<RETURNS>void </RETURNS>
+GtkProgressBar *pbar,GtkProgressBarOrientation orientation
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_progress_bar_new_with_adjustment</NAME>
<RETURNS>GtkWidget *</RETURNS>
GtkAdjustment *adjustment
@@ -8414,11 +8371,6 @@ GtkProgressBar *pbar,guint step
GtkProgressBar *pbar,guint blocks
</FUNCTION>
<FUNCTION>
-<NAME>gtk_progress_bar_set_orientation</NAME>
-<RETURNS>void </RETURNS>
-GtkProgressBar *pbar,GtkProgressBarOrientation orientation
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_progress_bar_update</NAME>
<RETURNS>void </RETURNS>
GtkProgressBar *pbar,gfloat percentage
@@ -8443,6 +8395,10 @@ GtkProgressBar *pbar,gfloat percentage
<NAME>GTK_IS_RADIO_BUTTON_CLASS</NAME>
#define GTK_IS_RADIO_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_BUTTON))
</MACRO>
+<MACRO>
+<NAME>GTK_RADIO_BUTTON_GET_CLASS</NAME>
+#define GTK_RADIO_BUTTON_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RADIO_BUTTON, GtkRadioButtonClass))
+</MACRO>
<STRUCT>
<NAME>GtkRadioButton</NAME>
</STRUCT>
@@ -8513,6 +8469,10 @@ GtkRadioButton *radio_button,GSList *group
<NAME>GTK_IS_RADIO_MENU_ITEM_CLASS</NAME>
#define GTK_IS_RADIO_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM))
</MACRO>
+<MACRO>
+<NAME>GTK_RADIO_MENU_ITEM_GET_CLASS</NAME>
+#define GTK_RADIO_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItemClass))
+</MACRO>
<STRUCT>
<NAME>GtkRadioMenuItem</NAME>
</STRUCT>
@@ -8573,6 +8533,10 @@ GtkRadioMenuItem *radio_menu_item,GSList *group
<NAME>GTK_IS_RANGE_CLASS</NAME>
#define GTK_IS_RANGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RANGE))
</MACRO>
+<MACRO>
+<NAME>GTK_RANGE_GET_CLASS</NAME>
+#define GTK_RANGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RANGE, GtkRangeClass))
+</MACRO>
<STRUCT>
<NAME>GtkRange</NAME>
</STRUCT>
@@ -8701,23 +8665,54 @@ GtkRange *range,gint xdelta,gint ydelta
<RETURNS>void </RETURNS>
GtkRange *range,gint xdelta,gint ydelta
</FUNCTION>
+<MACRO>
+<NAME>GTK_TYPE_RC_STYLE</NAME>
+#define GTK_TYPE_RC_STYLE (gtk_rc_style_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_RC_STYLE</NAME>
+#define GTK_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_RC_STYLE, GtkRcStyle))
+</MACRO>
+<MACRO>
+<NAME>GTK_RC_STYLE_CLASS</NAME>
+#define GTK_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_RC_STYLE</NAME>
+#define GTK_IS_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_RC_STYLE))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_RC_STYLE_CLASS</NAME>
+#define GTK_IS_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RC_STYLE))
+</MACRO>
+<MACRO>
+<NAME>GTK_RC_STYLE_GET_CLASS</NAME>
+#define GTK_RC_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RC_STYLE, GtkRcStyleClass))
+</MACRO>
<ENUM>
<NAME>GtkRcFlags</NAME>
-typedef enum {
- GTK_RC_FG = 1 << 0,
- GTK_RC_BG = 1 << 1,
- GTK_RC_TEXT = 1 << 2,
- GTK_RC_BASE = 1 << 3
+typedef enum
+{
+ GTK_RC_FG = 1 << 0,
+ GTK_RC_BG = 1 << 1,
+ GTK_RC_TEXT = 1 << 2,
+ GTK_RC_BASE = 1 << 3
} GtkRcFlags;
</ENUM>
<STRUCT>
+<NAME>GtkRcStyleClass</NAME>
+</STRUCT>
+<STRUCT>
<NAME>GtkRcStyle</NAME>
struct GtkRcStyle
{
+ GObject parent_instance;
+
+ /*< public >*/
+
gchar *name;
- gchar *font_name;
- gchar *fontset_name;
gchar *bg_pixmap_name[5];
+ PangoFontDescription *font_desc;
GtkRcFlags color_flags[5];
GdkColor fg[5];
@@ -8725,11 +8720,13 @@ struct GtkRcStyle
GdkColor text[5];
GdkColor base[5];
- GtkThemeEngine *engine;
- gpointer engine_data;
+ gint xthickness;
+ gint ythickness;
- /* Private */
- guint ref_count;
+ /*< private >*/
+
+ /* list of RC style lists including this RC style */
+ GSList *rc_style_lists;
};
</STRUCT>
<FUNCTION>
@@ -8788,19 +8785,29 @@ GtkRcStyle *rc_style,const gchar *pattern
GtkRcStyle *rc_style,const gchar *pattern
</FUNCTION>
<FUNCTION>
+<NAME>gtk_rc_style_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_rc_style_new</NAME>
<RETURNS>GtkRcStyle *</RETURNS>
void
</FUNCTION>
<FUNCTION>
+<NAME>gtk_rc_style_copy</NAME>
+<RETURNS>GtkRcStyle *</RETURNS>
+GtkRcStyle *orig
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_rc_style_ref</NAME>
<RETURNS>void </RETURNS>
-GtkRcStyle *rc_style
+GtkRcStyle *rc_style
</FUNCTION>
<FUNCTION>
<NAME>gtk_rc_style_unref</NAME>
<RETURNS>void </RETURNS>
-GtkRcStyle *rc_style
+GtkRcStyle *rc_style
</FUNCTION>
<USER_FUNCTION>
<NAME>GtkImageLoader</NAME>
@@ -8853,10 +8860,13 @@ typedef enum {
GTK_RC_TOKEN_INSENSITIVE,
GTK_RC_TOKEN_FG,
GTK_RC_TOKEN_BG,
- GTK_RC_TOKEN_BASE,
GTK_RC_TOKEN_TEXT,
+ GTK_RC_TOKEN_BASE,
+ GTK_RC_TOKEN_XTHICKNESS,
+ GTK_RC_TOKEN_YTHICKNESS,
GTK_RC_TOKEN_FONT,
GTK_RC_TOKEN_FONTSET,
+ GTK_RC_TOKEN_FONT_NAME,
GTK_RC_TOKEN_BG_PIXMAP,
GTK_RC_TOKEN_PIXMAP_PATH,
GTK_RC_TOKEN_STYLE,
@@ -8890,17 +8900,34 @@ GScanner *scanner,GtkStateType *state
<RETURNS>guint </RETURNS>
GScanner *scanner,GtkPathPriorityType *priority
</FUNCTION>
+<FUNCTION>
+<NAME>gtk_win32_get_installation_directory</NAME>
+<RETURNS>gchar *</RETURNS>
+void
+</FUNCTION>
+<MACRO>
+<NAME>GTK_TYPE_RULER</NAME>
+#define GTK_TYPE_RULER (gtk_ruler_get_type ())
+</MACRO>
<MACRO>
<NAME>GTK_RULER</NAME>
-#define GTK_RULER(obj) GTK_CHECK_CAST (obj, gtk_ruler_get_type (), GtkRuler)
+#define GTK_RULER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_RULER, GtkRuler))
</MACRO>
<MACRO>
<NAME>GTK_RULER_CLASS</NAME>
-#define GTK_RULER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_ruler_get_type (), GtkRulerClass)
+#define GTK_RULER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_RULER, GtkRulerClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_RULER</NAME>
-#define GTK_IS_RULER(obj) GTK_CHECK_TYPE (obj, gtk_ruler_get_type ())
+#define GTK_IS_RULER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_RULER))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_RULER_CLASS</NAME>
+#define GTK_IS_RULER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RULER))
+</MACRO>
+<MACRO>
+<NAME>GTK_RULER_GET_CLASS</NAME>
+#define GTK_RULER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_RULER, GtkRulerClass))
</MACRO>
<STRUCT>
<NAME>GtkRuler</NAME>
@@ -8948,28 +8975,28 @@ struct GtkRulerMetric
</STRUCT>
<FUNCTION>
<NAME>gtk_ruler_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_ruler_set_metric</NAME>
<RETURNS>void </RETURNS>
-GtkRuler *ruler,GtkMetricType metric
+GtkRuler *ruler,GtkMetricType metric
</FUNCTION>
<FUNCTION>
<NAME>gtk_ruler_set_range</NAME>
<RETURNS>void </RETURNS>
-GtkRuler *ruler,gfloat lower,gfloat upper,gfloat position,gfloat max_size
+GtkRuler *ruler,gfloat lower,gfloat upper,gfloat position,gfloat max_size
</FUNCTION>
<FUNCTION>
<NAME>gtk_ruler_draw_ticks</NAME>
<RETURNS>void </RETURNS>
-GtkRuler *ruler
+GtkRuler *ruler
</FUNCTION>
<FUNCTION>
<NAME>gtk_ruler_draw_pos</NAME>
<RETURNS>void </RETURNS>
-GtkRuler *ruler
+GtkRuler *ruler
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_SCALE</NAME>
@@ -8991,6 +9018,10 @@ GtkRuler *ruler
<NAME>GTK_IS_SCALE_CLASS</NAME>
#define GTK_IS_SCALE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCALE))
</MACRO>
+<MACRO>
+<NAME>GTK_SCALE_GET_CLASS</NAME>
+#define GTK_SCALE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SCALE, GtkScaleClass))
+</MACRO>
<STRUCT>
<NAME>GtkScale</NAME>
</STRUCT>
@@ -9033,6 +9064,11 @@ GtkScale *scale,GtkPositionType pos
GtkScale *scale
</FUNCTION>
<FUNCTION>
+<NAME>gtk_scale_get_value_size</NAME>
+<RETURNS>void </RETURNS>
+GtkScale *scale,gint *width,gint *height
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_scale_draw_value</NAME>
<RETURNS>void </RETURNS>
GtkScale *scale
@@ -9057,6 +9093,10 @@ GtkScale *scale
<NAME>GTK_IS_SCROLLBAR_CLASS</NAME>
#define GTK_IS_SCROLLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLBAR))
</MACRO>
+<MACRO>
+<NAME>GTK_SCROLLBAR_GET_CLASS</NAME>
+#define GTK_SCROLLBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbarClass))
+</MACRO>
<STRUCT>
<NAME>GtkScrollbar</NAME>
</STRUCT>
@@ -9095,6 +9135,10 @@ void
<NAME>GTK_IS_SCROLLED_WINDOW_CLASS</NAME>
#define GTK_IS_SCROLLED_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLED_WINDOW))
</MACRO>
+<MACRO>
+<NAME>GTK_SCROLLED_WINDOW_GET_CLASS</NAME>
+#define GTK_SCROLLED_WINDOW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindowClass))
+</MACRO>
<STRUCT>
<NAME>GtkScrolledWindow</NAME>
</STRUCT>
@@ -9115,6 +9159,8 @@ struct GtkScrolledWindow
guint hscrollbar_visible : 1;
guint vscrollbar_visible : 1;
guint window_placement : 2;
+
+ guint16 shadow_type;
};
</STRUCT>
<FUNCTION>
@@ -9158,6 +9204,11 @@ GtkScrolledWindow *scrolled_window,GtkPolicyType hscrollbar_policy,GtkPolic
GtkScrolledWindow *scrolled_window,GtkCornerType window_placement
</FUNCTION>
<FUNCTION>
+<NAME>gtk_scrolled_window_set_shadow_type</NAME>
+<RETURNS>void </RETURNS>
+GtkScrolledWindow *scrolled_window,GtkShadowType type
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_scrolled_window_add_with_viewport</NAME>
<RETURNS>void </RETURNS>
GtkScrolledWindow *scrolled_window,GtkWidget *child
@@ -9252,7 +9303,7 @@ GtkWidget *widget,GdkAtom selection,GdkAtom target,guint32
<FUNCTION>
<NAME>gtk_selection_data_set</NAME>
<RETURNS>void </RETURNS>
-GtkSelectionData *selection_data,GdkAtom type,gint format,guchar *data,gint length
+GtkSelectionData *selection_data,GdkAtom type,gint format,const guchar *data,gint length
</FUNCTION>
<FUNCTION>
<NAME>gtk_selection_remove_all</NAME>
@@ -9314,6 +9365,10 @@ GtkSelectionData *data
<NAME>GTK_IS_SEPARATOR_CLASS</NAME>
#define GTK_IS_SEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
</MACRO>
+<MACRO>
+<NAME>GTK_SEPARATOR_GET_CLASS</NAME>
+#define GTK_SEPARATOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
+</MACRO>
<STRUCT>
<NAME>GtkSeparator</NAME>
</STRUCT>
@@ -9568,16 +9623,28 @@ GtkObject *object
GtkSignalMarshal marshal_func,GtkSignalDestroy destroy_func
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_SOCKET</NAME>
+#define GTK_TYPE_SOCKET (gtk_socket_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_SOCKET</NAME>
-#define GTK_SOCKET(obj) GTK_CHECK_CAST (obj, gtk_socket_get_type (), GtkSocket)
+#define GTK_SOCKET(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOCKET, GtkSocket))
</MACRO>
<MACRO>
<NAME>GTK_SOCKET_CLASS</NAME>
-#define GTK_SOCKET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_socket_get_type (), GtkSocketClass)
+#define GTK_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOCKET, GtkSocketClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_SOCKET</NAME>
-#define GTK_IS_SOCKET(obj) GTK_CHECK_TYPE (obj, gtk_socket_get_type ())
+#define GTK_IS_SOCKET(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOCKET))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_SOCKET_CLASS</NAME>
+#define GTK_IS_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOCKET))
+</MACRO>
+<MACRO>
+<NAME>GTK_SOCKET_GET_CLASS</NAME>
+#define GTK_SOCKET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SOCKET, GtkSocketClass))
</MACRO>
<STRUCT>
<NAME>GtkSocket</NAME>
@@ -9610,13 +9677,13 @@ void
</FUNCTION>
<FUNCTION>
<NAME>gtk_socket_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_socket_steal</NAME>
<RETURNS>void </RETURNS>
-GtkSocket *socket,guint32 wid
+GtkSocket *socket,GdkNativeWindow wid
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_SPIN_BUTTON</NAME>
@@ -9638,6 +9705,14 @@ GtkSocket *socket,guint32 wid
<NAME>GTK_IS_SPIN_BUTTON_CLASS</NAME>
#define GTK_IS_SPIN_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SPIN_BUTTON))
</MACRO>
+<MACRO>
+<NAME>GTK_SPIN_BUTTON_GET_CLASS</NAME>
+#define GTK_SPIN_BUTTON_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_INPUT_ERROR</NAME>
+#define GTK_INPUT_ERROR -1
+</MACRO>
<ENUM>
<NAME>GtkSpinButtonUpdatePolicy</NAME>
typedef enum
@@ -9776,16 +9851,28 @@ GtkSpinButton *spin_button,gboolean snap_to_ticks
GtkSpinButton *spin_button
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_STATUSBAR</NAME>
+#define GTK_TYPE_STATUSBAR (gtk_statusbar_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_STATUSBAR</NAME>
-#define GTK_STATUSBAR(obj) GTK_CHECK_CAST (obj, gtk_statusbar_get_type (), GtkStatusbar)
+#define GTK_STATUSBAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_STATUSBAR, GtkStatusbar))
</MACRO>
<MACRO>
<NAME>GTK_STATUSBAR_CLASS</NAME>
-#define GTK_STATUSBAR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_statusbar_get_type (), GtkStatusbarClass)
+#define GTK_STATUSBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_STATUSBAR</NAME>
-#define GTK_IS_STATUSBAR(obj) GTK_CHECK_TYPE (obj, gtk_statusbar_get_type ())
+#define GTK_IS_STATUSBAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_STATUSBAR))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_STATUSBAR_CLASS</NAME>
+#define GTK_IS_STATUSBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STATUSBAR))
+</MACRO>
+<MACRO>
+<NAME>GTK_STATUSBAR_GET_CLASS</NAME>
+#define GTK_STATUSBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_STATUSBAR, GtkStatusbarClass))
</MACRO>
<STRUCT>
<NAME>GtkStatusbar</NAME>
@@ -9823,7 +9910,7 @@ struct GtkStatusbarMsg
</STRUCT>
<FUNCTION>
<NAME>gtk_statusbar_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -9857,6 +9944,30 @@ GtkStatusbar *statusbar,guint context_id,guint message_id
<STRUCT>
<NAME>GtkStyleClass</NAME>
</STRUCT>
+<MACRO>
+<NAME>GTK_TYPE_STYLE</NAME>
+#define GTK_TYPE_STYLE (gtk_style_get_type ())
+</MACRO>
+<MACRO>
+<NAME>GTK_STYLE</NAME>
+#define GTK_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_STYLE, GtkStyle))
+</MACRO>
+<MACRO>
+<NAME>GTK_STYLE_CLASS</NAME>
+#define GTK_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STYLE, GtkStyleClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_STYLE</NAME>
+#define GTK_IS_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_STYLE))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_STYLE_CLASS</NAME>
+#define GTK_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STYLE))
+</MACRO>
+<MACRO>
+<NAME>GTK_STYLE_GET_CLASS</NAME>
+#define GTK_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STYLE, GtkStyleClass))
+</MACRO>
<STRUCT>
<NAME>GtkThemeEngine</NAME>
</STRUCT>
@@ -9878,8 +9989,10 @@ GtkStatusbar *statusbar,guint context_id,guint message_id
<NAME>GtkStyle</NAME>
struct GtkStyle
{
- GtkStyleClass *klass;
+ GObject parent_instance;
+ /*< public >*/
+
GdkColor fg[5];
GdkColor bg[5];
GdkColor light[5];
@@ -9891,6 +10004,10 @@ struct GtkStyle
GdkColor black;
GdkColor white;
GdkFont *font;
+ PangoFontDescription *font_desc;
+
+ gint xthickness;
+ gint ythickness;
GdkGC *fg_gc[5];
GdkGC *bg_gc[5];
@@ -9903,19 +10020,14 @@ struct GtkStyle
GdkGC *white_gc;
GdkPixmap *bg_pixmap[5];
+
+ /*< private >*/
- /* private */
-
- gint ref_count;
gint attach_count;
gint depth;
GdkColormap *colormap;
- GtkThemeEngine *engine;
-
- gpointer engine_data;
-
GtkRcStyle *rc_style; /* the Rc style from which this style
* was created
*/
@@ -9926,15 +10038,49 @@ struct GtkStyle
<NAME>GtkStyleClass</NAME>
struct GtkStyleClass
{
- gint xthickness;
- gint ythickness;
-
+ GObjectClass parent_class;
+
+ /* Initialize for a particular colormap/depth
+ * combination. style->colormap/style->depth will have
+ * been set at this point. Will typically chain to parent.
+ */
+ void (*realize) (GtkStyle *style);
+
+ /* Clean up for a particular colormap/depth combination. Will
+ * typically chain to parent.
+ */
+ void (*unrealize) (GtkStyle *style);
+
+ /* Make style an exact duplicate of src.
+ */
+ void (*copy) (GtkStyle *style,
+ GtkStyle *src);
+
+ /* Create an empty style of the same type as this style.
+ * The default implementation, which does
+ * g_object_new (G_OBJECT_TYPE (style), NULL);
+ * should work in most cases.
+ */
+ GtkStyle *(*clone) (GtkStyle *style);
+
+ /* Initialize the GtkStyle with the values in the GtkRcStyle.
+ * should chain to the parent implementation.
+ */
+ void (*init_from_rc) (GtkStyle *style,
+ GtkRcStyle *rc_style);
+
+ void (*set_background) (GtkStyle *style,
+ GdkWindow *window,
+ GtkStateType state_type);
+
+ /* Drawing functions
+ */
void (*draw_hline) (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x1,
gint x2,
gint y);
@@ -9943,7 +10089,7 @@ struct GtkStyleClass
GtkStateType state_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint y1,
gint y2,
gint x);
@@ -9953,7 +10099,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -9964,7 +10110,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
GdkPoint *point,
gint npoints,
gboolean fill);
@@ -9974,7 +10120,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
GtkArrowType arrow_type,
gboolean fill,
gint x,
@@ -9987,7 +10133,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -9998,7 +10144,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10008,7 +10154,7 @@ struct GtkStyleClass
GtkStateType state_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
const gchar *string);
@@ -10018,7 +10164,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10029,7 +10175,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10040,7 +10186,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10051,7 +10197,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10062,7 +10208,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10073,7 +10219,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
GtkArrowType arrow_type,
gint x,
gint y,
@@ -10085,7 +10231,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10096,7 +10242,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10110,7 +10256,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10124,7 +10270,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10134,7 +10280,7 @@ struct GtkStyleClass
GdkWindow *window,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10145,7 +10291,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10157,7 +10303,7 @@ struct GtkStyleClass
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
- gchar *detail,
+ const gchar *detail,
gint x,
gint y,
gint width,
@@ -10166,6 +10312,11 @@ struct GtkStyleClass
};
</STRUCT>
<FUNCTION>
+<NAME>gtk_style_get_type</NAME>
+<RETURNS>GType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_style_new</NAME>
<RETURNS>GtkStyle *</RETURNS>
void
@@ -10208,212 +10359,212 @@ GtkStyle *style,GdkWindow *window,gboolean set_bg,GtkStateType state_
<FUNCTION>
<NAME>gtk_draw_hline</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,gint x1,gint x2,gint y
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,gint x1,gint x2,gint y
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_vline</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,gint y1,gint y2,gint x
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,gint y1,gint y2,gint x
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_shadow</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_polygon</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkPoint *points,gint npoints,gboolean fill
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkPoint *points,gint npoints,gboolean fill
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_arrow</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GtkArrowType arrow_type,gboolean fill,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GtkArrowType arrow_type,gboolean fill,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_diamond</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_oval</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_string</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,gint x,gint y,const gchar *string
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,gint x,gint y,const gchar *string
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_box</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_flat_box</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_check</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_option</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_cross</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_ramp</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GtkArrowType arrow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GtkArrowType arrow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_tab</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_shadow_gap</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_box_gap</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_extension</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkPositionType gap_side
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkPositionType gap_side
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_focus</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_slider</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkOrientation orientation
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkOrientation orientation
</FUNCTION>
<FUNCTION>
<NAME>gtk_draw_handle</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkOrientation orientation
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,gint x,gint y,gint width,gint height,GtkOrientation orientation
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_hline</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x1,gint x2,gint y
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x1,gint x2,gint y
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_vline</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint y1,gint y2,gint x
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint y1,gint y2,gint x
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_shadow</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_polygon</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,GdkPoint *points,gint npoints,gboolean fill
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,GdkPoint *points,gint npoints,gboolean fill
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_arrow</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,GtkArrowType arrow_type,gboolean fill,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,GtkArrowType arrow_type,gboolean fill,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_diamond</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_oval</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_string</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,const gchar *string
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,const gchar *string
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_box</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_flat_box</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_check</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_option</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_cross</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_ramp</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,GtkArrowType arrow_type,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,GtkArrowType arrow_type,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_tab</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_shadow_gap</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_box_gap</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkPositionType gap_side,gint gap_x,gint gap_width
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_extension</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkPositionType gap_side
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkPositionType gap_side
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_focus</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height
+GtkStyle *style,GdkWindow *window,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_slider</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkOrientation orientation
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height,GtkOrientation orientation
</FUNCTION>
<FUNCTION>
<NAME>gtk_paint_handle</NAME>
<RETURNS>void </RETURNS>
-GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,gchar *detail,gint x,gint y,gint width,gint height,GtkOrientation orientation
+GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowType shadow_type,GdkRectangle *area,GtkWidget *widget,const gchar *detail,gint x,gint y,gint width,gint height,GtkOrientation orientation
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_TABLE</NAME>
@@ -10435,6 +10586,10 @@ GtkStyle *style,GdkWindow *window,GtkStateType state_type,GtkShadowTy
<NAME>GTK_IS_TABLE_CLASS</NAME>
#define GTK_IS_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TABLE))
</MACRO>
+<MACRO>
+<NAME>GTK_TABLE_GET_CLASS</NAME>
+#define GTK_TABLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass))
+</MACRO>
<STRUCT>
<NAME>GtkTable</NAME>
</STRUCT>
@@ -10566,6 +10721,10 @@ GtkTable *table,gboolean homogeneous
<NAME>GTK_IS_TEAROFF_MENU_ITEM_CLASS</NAME>
#define GTK_IS_TEAROFF_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEAROFF_MENU_ITEM))
</MACRO>
+<MACRO>
+<NAME>GTK_TEAROFF_MENU_ITEM_GET_CLASS</NAME>
+#define GTK_TEAROFF_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEAROFF_MENU_ITEM, GtkTearoffMenuItemClass))
+</MACRO>
<STRUCT>
<NAME>GtkTearoffMenuItem</NAME>
</STRUCT>
@@ -10611,6 +10770,10 @@ void
<NAME>GTK_IS_TEXT_CLASS</NAME>
#define GTK_IS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_GET_CLASS</NAME>
+#define GTK_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
+</MACRO>
<STRUCT>
<NAME>GtkTextFont</NAME>
</STRUCT>
@@ -10738,76 +10901,1149 @@ GtkText *text,guint nchars
(t)->text.ch[(index)+(t)->gap_size]))
</MACRO>
<STRUCT>
-<NAME>GtkThemeEngine</NAME>
-struct GtkThemeEngine {
- /* Fill in engine_data pointer in a GtkRcStyle by parsing contents
- * of brackets. Returns G_TOKEN_NONE if succesfull, otherwise returns
- * the token it expected but didn't get.
- */
- guint (*parse_rc_style) (GScanner *scanner, GtkRcStyle *rc_style);
+<NAME>GtkTextBTree</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GTK_TYPE_TEXT_BUFFER</NAME>
+#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type())
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_BUFFER</NAME>
+#define GTK_TEXT_BUFFER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_BUFFER_CLASS</NAME>
+#define GTK_TEXT_BUFFER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_BUFFER</NAME>
+#define GTK_IS_TEXT_BUFFER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_BUFFER))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_BUFFER_CLASS</NAME>
+#define GTK_IS_TEXT_BUFFER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_BUFFER))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_BUFFER_GET_CLASS</NAME>
+#define GTK_TEXT_BUFFER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkTextBufferClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextBuffer</NAME>
+struct GtkTextBuffer {
+ GtkObject parent_instance;
+
+ GtkTextTagTable *tag_table;
+ GtkTextBTree *btree;
+
+ /* Text currently pasted to the clipboard */
+ gchar *clipboard_text;
+
+ /* Whether the buffer has been modified since last save */
+ gboolean modified;
+
+ /* We use this for selections */
+ GtkWidget *selection_widget;
+ gboolean have_selection;
+ gboolean selection_handlers_installed;
+ gboolean paste_interactive;
+ gboolean paste_default_editable;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_type</NAME>
+<RETURNS>GtkType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_new</NAME>
+<RETURNS>GtkTextBuffer *</RETURNS>
+GtkTextTagTable *table
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_line_count</NAME>
+<RETURNS>gint </RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_char_count</NAME>
+<RETURNS>gint </RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_tag_table</NAME>
+<RETURNS>GtkTextTagTable *</RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_insert</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,const gchar *text,gint len
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_insert_at_cursor</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,const gchar *text,gint len
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_insert_interactive</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,const gchar *text,gint len,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_insert_interactive_at_cursor</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,const gchar *text,gint len,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_delete</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *start,GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_delete_interactive</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *start_iter,GtkTextIter *end_iter,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_text</NAME>
+<RETURNS>gchar *</RETURNS>
+GtkTextBuffer *buffer,const GtkTextIter *start,const GtkTextIter *end,gboolean include_hidden_chars
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_slice</NAME>
+<RETURNS>gchar *</RETURNS>
+GtkTextBuffer *buffer,const GtkTextIter *start,const GtkTextIter *end,gboolean include_hidden_chars
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_insert_pixmap</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,GdkPixmap *pixmap,GdkBitmap *mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_create_mark</NAME>
+<RETURNS>GtkTextMark *</RETURNS>
+GtkTextBuffer *buffer,const gchar *mark_name,const GtkTextIter *where,gboolean left_gravity
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_move_mark</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextMark *mark,const GtkTextIter *where
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_delete_mark</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextMark *mark
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_mark</NAME>
+<RETURNS>GtkTextMark *</RETURNS>
+GtkTextBuffer *buffer,const gchar *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_place_cursor</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,const GtkTextIter *where
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_apply_tag</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextTag *tag,const GtkTextIter *start_index,const GtkTextIter *end_index
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_remove_tag</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextTag *tag,const GtkTextIter *start_index,const GtkTextIter *end_index
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_apply_tag_by_name</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,const gchar *name,const GtkTextIter *start_index,const GtkTextIter *end_index
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_remove_tag_by_name</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,const gchar *name,const GtkTextIter *start_index,const GtkTextIter *end_index
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_create_tag</NAME>
+<RETURNS>GtkTextTag *</RETURNS>
+GtkTextBuffer *buffer,const gchar *tag_name
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_iter_at_line_offset</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,gint line_number,gint char_offset
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_iter_at_offset</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,gint char_offset
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_iter_at_line</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,gint line_number
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_last_iter</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_bounds</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *start,GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_iter_at_mark</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,GtkTextMark *mark
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_tags</NAME>
+<RETURNS>GSList *</RETURNS>
+GtkTextBuffer *buffer,const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_modified</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_set_modified</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,gboolean setting
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_set_clipboard_contents</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,const gchar *text
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_clipboard_contents</NAME>
+<RETURNS>const gchar *</RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_paste_primary_selection</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *override_location,guint32 time,gboolean interactive,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_delete_selection</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,gboolean interactive,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_cut</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,guint32 time,gboolean interactive,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_copy</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,guint32 time
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_paste_clipboard</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer,guint32 time,gboolean interactive,gboolean default_editable
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_get_selection_bounds</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *start,GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_find_string</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,GtkTextIter *iter,const gchar *str,const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_find_regexp</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextBuffer *buffer,GRegexp *regexp,const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_buffer_spew</NAME>
+<RETURNS>void </RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<STRUCT>
+<NAME>GtkTextBuffer</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextIter</NAME>
+struct GtkTextIter {
+ gpointer dummy1;
+ gpointer dummy2;
+ gint dummy3;
+ gint dummy4;
+ gint dummy10;
+ gint dummy11;
+ gint dummy5;
+ gint dummy6;
+ gpointer dummy7;
+ gpointer dummy8;
+ gint dummy9;
+ gpointer pad1;
+ guint pad2;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_text_iter_get_buffer</NAME>
+<RETURNS>GtkTextBuffer *</RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_copy</NAME>
+<RETURNS>GtkTextIter *</RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_free</NAME>
+<RETURNS>void </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_offset</NAME>
+<RETURNS>gint </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_line</NAME>
+<RETURNS>gint </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_line_offset</NAME>
+<RETURNS>gint </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_line_index</NAME>
+<RETURNS>gint </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_char</NAME>
+<RETURNS>gunichar </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_slice</NAME>
+<RETURNS>gchar *</RETURNS>
+const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_text</NAME>
+<RETURNS>gchar *</RETURNS>
+const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_visible_slice</NAME>
+<RETURNS>gchar *</RETURNS>
+const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_visible_text</NAME>
+<RETURNS>gchar *</RETURNS>
+const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_pixmap</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,GdkPixmap **pixmap,GdkBitmap **mask
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_marks</NAME>
+<RETURNS>GSList *</RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_toggled_tags</NAME>
+<RETURNS>GSList *</RETURNS>
+const GtkTextIter *iter,gboolean toggled_on
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_begins_tag</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_ends_tag</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_toggles_tag</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_has_tag</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_editable</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,gboolean default_setting
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_starts_line</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_ends_line</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_chars_in_line</NAME>
+<RETURNS>gint </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_get_attributes</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,GtkTextAttributes *values
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_is_last</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_is_first</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_next_char</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_prev_char</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_chars</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,gint count
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_chars</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,gint count
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_line</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_line</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_lines</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,gint count
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_lines</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,gint count
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_word_ends</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,gint count
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_word_starts</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,gint count
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_word_end</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_word_start</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_set_offset</NAME>
+<RETURNS>void </RETURNS>
+GtkTextIter *iter,gint char_offset
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_set_line</NAME>
+<RETURNS>void </RETURNS>
+GtkTextIter *iter,gint line_number
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_set_line_offset</NAME>
+<RETURNS>void </RETURNS>
+GtkTextIter *iter,gint char_on_line
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_to_end</NAME>
+<RETURNS>void </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_to_newline</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_to_tag_toggle</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_to_tag_toggle</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,GtkTextTag *tag
+</FUNCTION>
+<USER_FUNCTION>
+<NAME>GtkTextCharPredicate</NAME>
+<RETURNS>gboolean </RETURNS>
+gunichar ch, gpointer user_data
+</USER_FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_find_char</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,GtkTextCharPredicate pred,gpointer user_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_find_char</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,GtkTextCharPredicate pred,gpointer user_data
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_forward_search</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,const char *str,gboolean visible_only,gboolean slice
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_backward_search</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextIter *iter,const char *str,gboolean visible_only,gboolean slice
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_equal</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *lhs,const GtkTextIter *rhs
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_compare</NAME>
+<RETURNS>gint </RETURNS>
+const GtkTextIter *lhs,const GtkTextIter *rhs
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_in_region</NAME>
+<RETURNS>gboolean </RETURNS>
+const GtkTextIter *iter,const GtkTextIter *start,const GtkTextIter *end
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_reorder</NAME>
+<RETURNS>void </RETURNS>
+GtkTextIter *first,GtkTextIter *second
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_iter_spew</NAME>
+<RETURNS>void </RETURNS>
+const GtkTextIter *iter,const gchar *desc
+</FUNCTION>
+<STRUCT>
+<NAME>GtkTextMark</NAME>
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_text_mark_set_visible</NAME>
+<RETURNS>void </RETURNS>
+GtkTextMark *mark,gboolean setting
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_mark_is_visible</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextMark *mark
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_mark_ref</NAME>
+<RETURNS>GtkTextMark *</RETURNS>
+GtkTextMark *mark
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_mark_unref</NAME>
+<RETURNS>void </RETURNS>
+GtkTextMark *mark
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_mark_deleted</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextMark *mark
+</FUNCTION>
+<STRUCT>
+<NAME>GtkTextIter</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextBTreeNode</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextTagTable</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextTabArray</NAME>
+</STRUCT>
+<ENUM>
+<NAME>GtkWrapMode</NAME>
+typedef enum {
+ GTK_WRAPMODE_NONE,
+ GTK_WRAPMODE_CHAR,
+ GTK_WRAPMODE_WORD
+} GtkWrapMode;
+</ENUM>
+<STRUCT>
+<NAME>GtkTextAttributes</NAME>
+</STRUCT>
+<MACRO>
+<NAME>GTK_TYPE_TEXT_TAG</NAME>
+#define GTK_TYPE_TEXT_TAG (gtk_text_tag_get_type())
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_TAG</NAME>
+#define GTK_TEXT_TAG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG, GtkTextTag))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_TAG_CLASS</NAME>
+#define GTK_TEXT_TAG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_TAG</NAME>
+#define GTK_IS_TEXT_TAG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_TAG))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_TAG_CLASS</NAME>
+#define GTK_IS_TEXT_TAG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_TAG_GET_CLASS</NAME>
+#define GTK_TEXT_TAG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkTextTag</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextTagClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextTag</NAME>
+struct GtkTextTag {
+ GtkObject parent_instance;
+
+ GtkTextTagTable *table;
- /* Combine RC style data from src into dest. If
- * dest->engine_data is NULL, it should be initialized to default
- * values.
+ char *name; /* Name of this tag. This field is actually
+ * a pointer to the key from the entry in
+ * tkxt->tagTable, so it needn't be freed
+ * explicitly. */
+ int priority; /* Priority of this tag within widget. 0
+ * means lowest priority. Exactly one tag
+ * has each integer value between 0 and
+ * numTags-1. */
+ /*
+ * Information for displaying text with this tag. The information
+ * belows acts as an override on information specified by lower-priority
+ * tags. If no value is specified, then the next-lower-priority tag
+ * on the text determins the value. The text widget itself provides
+ * defaults if no tag specifies an override.
*/
- void (*merge_rc_style) (GtkRcStyle *dest, GtkRcStyle *src);
- /* Fill in style->engine_data from rc_style->engine_data */
- void (*rc_style_to_style) (GtkStyle *style, GtkRcStyle *rc_style);
+ GtkTextAttributes *values;
+
+ /*
+ Flags for whether a given value is set; if a value is unset, then
+ this tag does not affect it. */
+ guint bg_color_set : 1;
+ guint border_width_set : 1;
+ guint relief_set : 1;
+ guint bg_stipple_set : 1;
+ guint fg_color_set : 1;
+ guint font_set : 1;
+ guint fg_stipple_set : 1;
+ guint justify_set : 1;
+ guint left_margin_set : 1;
+ guint left_wrapped_line_margin_set : 1;
+ guint offset_set : 1;
+ guint overstrike_set : 1;
+ guint right_margin_set : 1;
+ guint pixels_above_lines_set : 1;
+ guint pixels_below_lines_set : 1;
+ guint pixels_inside_wrap_set : 1;
+ guint tab_array_set : 1;
+ guint underline_set : 1;
+ guint wrap_mode_set : 1;
+ guint bg_full_height_set : 1;
+ guint invisible_set : 1;
+ guint editable_set : 1;
+ guint language_set : 1;
+ guint pad1 : 1;
+ guint pad2 : 1;
+ guint pad3 : 1;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_text_tag_get_type</NAME>
+<RETURNS>GtkType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_new</NAME>
+<RETURNS>GtkTextTag *</RETURNS>
+const gchar *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_get_priority</NAME>
+<RETURNS>gint </RETURNS>
+GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_set_priority</NAME>
+<RETURNS>void </RETURNS>
+GtkTextTag *tag,gint priority
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_event</NAME>
+<RETURNS>gint </RETURNS>
+GtkTextTag *tag,GtkObject *event_object,GdkEvent *event,const GtkTextIter *iter
+</FUNCTION>
+<STRUCT>
+<NAME>GtkTextAppearance</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextAppearance</NAME>
+struct GtkTextAppearance
+{
+ GdkColor bg_color;
+ GdkColor fg_color;
+ GdkBitmap *bg_stipple;
+ GdkBitmap *fg_stipple;
+
+ guint underline : 4; /* PangoUnderline */
+ guint overstrike : 1;
- /* Duplicate engine_data from src to dest. The engine_data will
- * not subsequently be modified except by a call to realize_style()
- * so if realize_style() does nothing, refcounting is appropriate.
- */
- void (*duplicate_style) (GtkStyle *dest, GtkStyle *src);
+ /* Whether to use background-related values; this is irrelevant for
+ * the values struct when in a tag, but is used for the composite
+ * values struct; it's true if any of the tags being composited
+ * had background stuff set. */
+ guint draw_bg : 1;
- /* If style needs to initialize for a particular colormap/depth
- * combination, do it here. style->colormap/style->depth will have
- * been set at this point, and style itself initialized for
- * the colormap
+ /* This is only used when we are actually laying out and rendering
+ * a paragraph; not when a GtkTextAppearance is part of a
+ * GtkTextAttributes.
*/
- void (*realize_style) (GtkStyle *new_style);
+ guint inside_selection : 1;
+};
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextAttributes</NAME>
+struct GtkTextAttributes
+{
+ guint refcount;
+
+ GtkTextAppearance appearance;
+
+ gint border_width;
+ GtkShadowType relief;
+ GtkJustification justify;
+ GtkTextDirection direction;
+
+ PangoFontDescription *font_desc;
+
+ /* lMargin1 */
+ gint left_margin;
+
+ /* lMargin2 */
+ gint left_wrapped_line_margin;
+
+ /* super/subscript offset, can be negative */
+ gint offset;
+
+ gint right_margin;
+
+ gint pixels_above_lines;
+
+ gint pixels_below_lines;
- /* If style needs to clean up for a particular colormap/depth
- * combination, do it here.
+ gint pixels_inside_wrap;
+
+ GtkTextTabArray *tab_array;
+
+ GtkWrapMode wrap_mode; /* How to handle wrap-around for this tag.
+ * Must be GTK_WRAPMODE_CHAR,
+ * GTK_WRAPMODE_NONE, GTK_WRAPMODE_WORD
+ */
+
+ gchar *language;
+
+ /* hide the text */
+ guint invisible : 1;
+
+ /* Background is fit to full line height rather than
+ * baseline +/- ascent/descent (font height) */
+ guint bg_full_height : 1;
+
+ /* can edit this text */
+ guint editable : 1;
+
+ /* colors are allocated etc. */
+ guint realized : 1;
+
+ guint pad1 : 1;
+ guint pad2 : 1;
+ guint pad3 : 1;
+ guint pad4 : 1;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_text_attributes_new</NAME>
+<RETURNS>GtkTextAttributes *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_attributes_copy</NAME>
+<RETURNS>void </RETURNS>
+GtkTextAttributes *src,GtkTextAttributes *dest
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_attributes_unref</NAME>
+<RETURNS>void </RETURNS>
+GtkTextAttributes *values
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_attributes_ref</NAME>
+<RETURNS>void </RETURNS>
+GtkTextAttributes *values
+</FUNCTION>
+<USER_FUNCTION>
+<NAME>GtkTextTagTableForeach</NAME>
+<RETURNS>void </RETURNS>
+GtkTextTag *tag, gpointer data
+</USER_FUNCTION>
+<MACRO>
+<NAME>GTK_TYPE_TEXT_TAG_TABLE</NAME>
+#define GTK_TYPE_TEXT_TAG_TABLE (gtk_text_tag_table_get_type())
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_TAG_TABLE</NAME>
+#define GTK_TEXT_TAG_TABLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_TAG_TABLE_CLASS</NAME>
+#define GTK_TEXT_TAG_TABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_TAG_TABLE</NAME>
+#define GTK_IS_TEXT_TAG_TABLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_TAG_TABLE))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_TAG_TABLE_CLASS</NAME>
+#define GTK_IS_TEXT_TAG_TABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_TAG_TABLE))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_TAG_TABLE_GET_CLASS</NAME>
+#define GTK_TEXT_TAG_TABLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkTextTagTableClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextTagTable</NAME>
+struct GtkTextTagTable {
+ GtkObject parent_instance;
+
+ GHashTable *hash;
+ GSList *anonymous;
+ gint anon_count;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gtk_text_tag_table_get_type</NAME>
+<RETURNS>GtkType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_table_new</NAME>
+<RETURNS>GtkTextTagTable *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_table_add</NAME>
+<RETURNS>void </RETURNS>
+GtkTextTagTable *table,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_table_remove</NAME>
+<RETURNS>void </RETURNS>
+GtkTextTagTable *table,GtkTextTag *tag
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_table_lookup</NAME>
+<RETURNS>GtkTextTag *</RETURNS>
+GtkTextTagTable *table,const gchar *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_table_foreach</NAME>
+<RETURNS>void </RETURNS>
+GtkTextTagTable *table,GtkTextTagTableForeach func,gpointer data
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_tag_table_size</NAME>
+<RETURNS>guint </RETURNS>
+GtkTextTagTable *table
+</FUNCTION>
+<ENUM>
+<NAME>GtkTextViewMovementStep</NAME>
+typedef enum {
+ GTK_TEXT_MOVEMENT_CHAR, /* move by forw/back chars */
+ GTK_TEXT_MOVEMENT_POSITIONS, /* move by left/right chars */
+ GTK_TEXT_MOVEMENT_WORD, /* move by forward/back words */
+ GTK_TEXT_MOVEMENT_WRAPPED_LINE, /* move up/down lines (wrapped lines) */
+ GTK_TEXT_MOVEMENT_LINE, /* move up/down paragraphs (newline-ended lines) */
+ GTK_TEXT_MOVEMENT_LINE_ENDS, /* move to either end of a paragraph */
+ GTK_TEXT_MOVEMENT_BUFFER_ENDS /* move to ends of the buffer */
+} GtkTextViewMovementStep;
+</ENUM>
+<ENUM>
+<NAME>GtkTextViewScrollType</NAME>
+typedef enum {
+ GTK_TEXT_SCROLL_TO_TOP,
+ GTK_TEXT_SCROLL_TO_BOTTOM,
+ GTK_TEXT_SCROLL_PAGE_DOWN,
+ GTK_TEXT_SCROLL_PAGE_UP
+} GtkTextViewScrollType;
+</ENUM>
+<ENUM>
+<NAME>GtkTextViewDeleteType</NAME>
+typedef enum {
+ GTK_TEXT_DELETE_CHAR,
+ GTK_TEXT_DELETE_HALF_WORD, /* delete only the portion of the word to the
+ left/right of cursor if we're in the middle
+ of a word */
+ GTK_TEXT_DELETE_WHOLE_WORD,
+ GTK_TEXT_DELETE_HALF_WRAPPED_LINE,
+ GTK_TEXT_DELETE_WHOLE_WRAPPED_LINE,
+ GTK_TEXT_DELETE_HALF_LINE, /* like C-k in Emacs (or its reverse) */
+ GTK_TEXT_DELETE_WHOLE_LINE, /* C-k in pico, kill whole line */
+ GTK_TEXT_DELETE_WHITESPACE, /* M-\ in Emacs */
+ GTK_TEXT_DELETE_WHITESPACE_LEAVE_ONE /* M-space in Emacs */
+} GtkTextViewDeleteType;
+</ENUM>
+<MACRO>
+<NAME>GTK_TYPE_TEXT_VIEW</NAME>
+#define GTK_TYPE_TEXT_VIEW (gtk_text_view_get_type())
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_VIEW</NAME>
+#define GTK_TEXT_VIEW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_VIEW, GtkTextView))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_VIEW_CLASS</NAME>
+#define GTK_TEXT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_VIEW</NAME>
+#define GTK_IS_TEXT_VIEW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_VIEW))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TEXT_VIEW_CLASS</NAME>
+#define GTK_IS_TEXT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_VIEW))
+</MACRO>
+<MACRO>
+<NAME>GTK_TEXT_VIEW_GET_CLASS</NAME>
+#define GTK_TEXT_VIEW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
+</MACRO>
+<STRUCT>
+<NAME>GtkTextView</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextViewClass</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GtkTextView</NAME>
+struct GtkTextView {
+ GtkContainer parent_instance;
+
+ struct _GtkTextLayout *layout;
+ GtkTextBuffer *buffer;
+
+ guint selection_drag_handler;
+ guint selection_drag_scan_timeout;
+ gint scrolling_accel_factor;
+
+ gboolean overwrite_mode;
+
+ GtkWrapMode wrap_mode; /* Default wrap mode */
+
+ gboolean editable; /* default editability */
+
+ gboolean cursor_visible;
+
+ GdkWindow *bin_window;
+ GtkAdjustment *hadjustment;
+ GtkAdjustment *vadjustment;
+
+ gint xoffset; /* Offsets between widget coordinates and buffer coordinates */
+ gint yoffset;
+ gint width; /* Width and height of the buffer */
+ gint height;
+
+ /* The virtual cursor position is normally the same as the
+ * actual (strong) cursor position, except in two circumstances:
+ *
+ * a) When the cursor is moved vertically with the keyboard
+ * b) When the text view is scrolled with the keyboard
+ *
+ * In case a), virtual_cursor_x is preserved, but not virtual_cursor_y
+ * In case b), both virtual_cursor_x and virtual_cursor_y are preserved.
*/
- void (*unrealize_style) (GtkStyle *new_style);
+ gint virtual_cursor_x; /* -1 means use actual cursor position */
+ gint virtual_cursor_y; /* -1 means use actual cursor position */
+
+ GtkTextMark *first_para_mark; /* Mark at the beginning of the first onscreen paragraph */
+ gint first_para_pixels; /* Offset of top of screen in the first onscreen paragraph */
- /* Clean up rc_style->engine_data before rc_style is destroyed */
- void (*destroy_rc_style) (GtkRcStyle *rc_style);
+ GtkTextMark *dnd_mark;
+ guint blink_timeout;
- /* Clean up style->engine_data before style is destroyed */
- void (*destroy_style) (GtkStyle *style);
+ guint first_validate_idle; /* Idle to revalidate onscreen portion, runs before resize */
+ guint incremental_validate_idle; /* Idle to revalidate offscreen portions, runs after redraw */
- void (*set_background) (GtkStyle *style,
- GdkWindow *window,
- GtkStateType state_type);
+ GtkIMContext *im_context;
};
</STRUCT>
<FUNCTION>
+<NAME>gtk_text_view_get_type</NAME>
+<RETURNS>GtkType </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_new</NAME>
+<RETURNS>GtkWidget *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_new_with_buffer</NAME>
+<RETURNS>GtkWidget *</RETURNS>
+GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_set_buffer</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,GtkTextBuffer *buffer
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_buffer</NAME>
+<RETURNS>GtkTextBuffer *</RETURNS>
+GtkTextView *text_view
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_iter_at_pixel</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,GtkTextIter *iter,gint x,gint y
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_scroll_to_mark</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextView *text_view,GtkTextMark *mark,gint mark_within_margin
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_move_mark_onscreen</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextView *text_view,GtkTextMark *mark
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_place_cursor_onscreen</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextView *text_view
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_visible_rect</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,GdkRectangle *visible_rect
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_set_wrap_mode</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,GtkWrapMode wrap_mode
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_wrap_mode</NAME>
+<RETURNS>GtkWrapMode </RETURNS>
+GtkTextView *text_view
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_set_editable</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,gboolean setting
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_editable</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextView *text_view
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_set_cursor_visible</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,gboolean setting
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_cursor_visible</NAME>
+<RETURNS>gboolean </RETURNS>
+GtkTextView *text_view
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_text_view_get_iter_location</NAME>
+<RETURNS>void </RETURNS>
+GtkTextView *text_view,const GtkTextIter *iter,GdkRectangle *location
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_theme_engine_get</NAME>
<RETURNS>GtkThemeEngine *</RETURNS>
-gchar *name
+const gchar *name
</FUNCTION>
<FUNCTION>
<NAME>gtk_theme_engine_ref</NAME>
<RETURNS>void </RETURNS>
-GtkThemeEngine *engine
+GtkThemeEngine *engine
</FUNCTION>
<FUNCTION>
<NAME>gtk_theme_engine_unref</NAME>
<RETURNS>void </RETURNS>
-GtkThemeEngine *engine
+GtkThemeEngine *engine
</FUNCTION>
<FUNCTION>
-<NAME>gtk_themes_init</NAME>
-<RETURNS>void </RETURNS>
-int *argc,char ***argv
+<NAME>gtk_theme_engine_create_rc_style</NAME>
+<RETURNS>GtkRcStyle *</RETURNS>
+GtkThemeEngine *engine
</FUNCTION>
<FUNCTION>
-<NAME>gtk_themes_exit</NAME>
-<RETURNS>void </RETURNS>
-gint error_code
+<NAME>gtk_theme_engine_register_type</NAME>
+<RETURNS>GType </RETURNS>
+GtkThemeEngine *engine,GType parent_type,const gchar *type_name,const GTypeInfo *type_info
</FUNCTION>
<MACRO>
<NAME>GTK_TYPE_TIPS_QUERY</NAME>
@@ -10829,6 +12065,10 @@ gint error_code
<NAME>GTK_IS_TIPS_QUERY_CLASS</NAME>
#define GTK_IS_TIPS_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TIPS_QUERY))
</MACRO>
+<MACRO>
+<NAME>GTK_TIPS_QUERY_GET_CLASS</NAME>
+#define GTK_TIPS_QUERY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass))
+</MACRO>
<STRUCT>
<NAME>GtkTipsQuery</NAME>
</STRUCT>
@@ -10902,6 +12142,10 @@ GtkTipsQuery *tips_query,const gchar *label_inactive,const gchar *label_
<NAME>GTK_IS_TOGGLE_BUTTON_CLASS</NAME>
#define GTK_IS_TOGGLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOGGLE_BUTTON))
</MACRO>
+<MACRO>
+<NAME>GTK_TOGGLE_BUTTON_GET_CLASS</NAME>
+#define GTK_TOGGLE_BUTTON_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TOGGLE_BUTTON, GtkToggleButtonClass))
+</MACRO>
<STRUCT>
<NAME>GtkToggleButton</NAME>
</STRUCT>
@@ -10956,16 +12200,28 @@ GtkToggleButton *toggle_button
GtkToggleButton *toggle_button
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_TOOLBAR</NAME>
+#define GTK_TYPE_TOOLBAR (gtk_toolbar_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_TOOLBAR</NAME>
-#define GTK_TOOLBAR(obj) GTK_CHECK_CAST (obj, gtk_toolbar_get_type (), GtkToolbar)
+#define GTK_TOOLBAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
</MACRO>
<MACRO>
<NAME>GTK_TOOLBAR_CLASS</NAME>
-#define GTK_TOOLBAR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_toolbar_get_type (), GtkToolbarClass)
+#define GTK_TOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_TOOLBAR</NAME>
-#define GTK_IS_TOOLBAR(obj) GTK_CHECK_TYPE (obj, gtk_toolbar_get_type ())
+#define GTK_IS_TOOLBAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TOOLBAR))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_TOOLBAR_CLASS</NAME>
+#define GTK_IS_TOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLBAR))
+</MACRO>
+<MACRO>
+<NAME>GTK_TOOLBAR_GET_CLASS</NAME>
+#define GTK_TOOLBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass))
</MACRO>
<ENUM>
<NAME>GtkToolbarChildType</NAME>
@@ -11027,27 +12283,27 @@ struct GtkToolbar
</STRUCT>
<FUNCTION>
<NAME>gtk_toolbar_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkOrientation orientation,GtkToolbarStyle style
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_append_item</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkToolbar *toolbar,const char *text,const char *tooltip_text,const char *tooltip_private_text,GtkWidget *icon,GtkSignalFunc callback,gpointer user_data
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_prepend_item</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkToolbar *toolbar,const char *text,const char *tooltip_text,const char *tooltip_private_text,GtkWidget *icon,GtkSignalFunc callback,gpointer user_data
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_insert_item</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkToolbar *toolbar,const char *text,const char *tooltip_text,const char *tooltip_private_text,GtkWidget *icon,GtkSignalFunc callback,gpointer user_data,gint position
</FUNCTION>
<FUNCTION>
@@ -11067,17 +12323,17 @@ GtkToolbar *toolbar,gint position
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_append_element</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkToolbar *toolbar,GtkToolbarChildType type,GtkWidget *widget,const char *text,const char *tooltip_text,const char *tooltip_private_text,GtkWidget *icon,GtkSignalFunc callback,gpointer user_data
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_prepend_element</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkToolbar *toolbar,GtkToolbarChildType type,GtkWidget *widget,const char *text,const char *tooltip_text,const char *tooltip_private_text,GtkWidget *icon,GtkSignalFunc callback,gpointer user_data
</FUNCTION>
<FUNCTION>
<NAME>gtk_toolbar_insert_element</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkToolbar *toolbar,GtkToolbarChildType type,GtkWidget *widget,const char *text,const char *tooltip_text,const char *tooltip_private_text,GtkWidget *icon,GtkSignalFunc callback,gpointer user_data,gint position
</FUNCTION>
<FUNCTION>
@@ -11150,6 +12406,10 @@ GtkToolbar *toolbar
<NAME>GTK_IS_TOOLTIPS_CLASS</NAME>
#define GTK_IS_TOOLTIPS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLTIPS))
</MACRO>
+<MACRO>
+<NAME>GTK_TOOLTIPS_GET_CLASS</NAME>
+#define GTK_TOOLTIPS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TOOLTIPS, GtkTooltipsClass))
+</MACRO>
<STRUCT>
<NAME>GtkTooltips</NAME>
</STRUCT>
@@ -11167,9 +12427,6 @@ struct GtkTooltipsData
GtkWidget *widget;
gchar *tip_text;
gchar *tip_private;
- GdkFont *font;
- gint width;
- GList *row;
};
</STRUCT>
<STRUCT>
@@ -11179,13 +12436,10 @@ struct GtkTooltips
GtkData data;
GtkWidget *tip_window;
+ GtkWidget *tip_label;
GtkTooltipsData *active_tips_data;
GList *tips_data_list;
- GdkGC *gc;
- GdkColor *foreground;
- GdkColor *background;
-
guint delay : 30;
guint enabled : 1;
gint timer_tag;
@@ -11257,6 +12511,10 @@ GtkTooltips *tooltips
#define GTK_IS_TREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE))
</MACRO>
<MACRO>
+<NAME>GTK_TREE_GET_CLASS</NAME>
+#define GTK_TREE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE, GtkTreeClass))
+</MACRO>
+<MACRO>
<NAME>GTK_IS_ROOT_TREE</NAME>
#define GTK_IS_ROOT_TREE(obj) ((GtkObject*) GTK_TREE(obj)->root_tree == (GtkObject*)obj)
</MACRO>
@@ -11402,6 +12660,10 @@ GtkTree *tree,GtkWidget *child
#define GTK_IS_TREE_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_ITEM))
</MACRO>
<MACRO>
+<NAME>GTK_TREE_ITEM_GET_CLASS</NAME>
+#define GTK_TREE_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItemClass))
+</MACRO>
+<MACRO>
<NAME>GTK_TREE_ITEM_SUBTREE</NAME>
#define GTK_TREE_ITEM_SUBTREE(obj) (GTK_TREE_ITEM(obj)->subtree)
</MACRO>
@@ -11439,7 +12701,7 @@ void
<FUNCTION>
<NAME>gtk_tree_item_new_with_label</NAME>
<RETURNS>GtkWidget *</RETURNS>
-gchar *label
+const gchar *label
</FUNCTION>
<FUNCTION>
<NAME>gtk_tree_item_set_subtree</NAME>
@@ -11471,623 +12733,99 @@ GtkTreeItem *tree_item
<RETURNS>void </RETURNS>
GtkTreeItem *tree_item
</FUNCTION>
-<VARIABLE>
-<NAME>GTK_TYPE_ACCEL_FLAGS</NAME>
-extern GtkType GTK_TYPE_ACCEL_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CALENDAR_DISPLAY_OPTIONS</NAME>
-extern GtkType GTK_TYPE_CALENDAR_DISPLAY_OPTIONS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CELL_TYPE</NAME>
-extern GtkType GTK_TYPE_CELL_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CLIST_DRAG_POS</NAME>
-extern GtkType GTK_TYPE_CLIST_DRAG_POS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_BUTTON_ACTION</NAME>
-extern GtkType GTK_TYPE_BUTTON_ACTION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CTREE_POS</NAME>
-extern GtkType GTK_TYPE_CTREE_POS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CTREE_LINE_STYLE</NAME>
-extern GtkType GTK_TYPE_CTREE_LINE_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CTREE_EXPANDER_STYLE</NAME>
-extern GtkType GTK_TYPE_CTREE_EXPANDER_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CTREE_EXPANSION_TYPE</NAME>
-extern GtkType GTK_TYPE_CTREE_EXPANSION_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_DEBUG_FLAG</NAME>
-extern GtkType GTK_TYPE_DEBUG_FLAG;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_DEST_DEFAULTS</NAME>
-extern GtkType GTK_TYPE_DEST_DEFAULTS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_TARGET_FLAGS</NAME>
-extern GtkType GTK_TYPE_TARGET_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_ARROW_TYPE</NAME>
-extern GtkType GTK_TYPE_ARROW_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_ATTACH_OPTIONS</NAME>
-extern GtkType GTK_TYPE_ATTACH_OPTIONS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_BUTTON_BOX_STYLE</NAME>
-extern GtkType GTK_TYPE_BUTTON_BOX_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CURVE_TYPE</NAME>
-extern GtkType GTK_TYPE_CURVE_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_DIRECTION_TYPE</NAME>
-extern GtkType GTK_TYPE_DIRECTION_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_JUSTIFICATION</NAME>
-extern GtkType GTK_TYPE_JUSTIFICATION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_MATCH_TYPE</NAME>
-extern GtkType GTK_TYPE_MATCH_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_MENU_DIRECTION_TYPE</NAME>
-extern GtkType GTK_TYPE_MENU_DIRECTION_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_MENU_FACTORY_TYPE</NAME>
-extern GtkType GTK_TYPE_MENU_FACTORY_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_METRIC_TYPE</NAME>
-extern GtkType GTK_TYPE_METRIC_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_ORIENTATION</NAME>
-extern GtkType GTK_TYPE_ORIENTATION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CORNER_TYPE</NAME>
-extern GtkType GTK_TYPE_CORNER_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PACK_TYPE</NAME>
-extern GtkType GTK_TYPE_PACK_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PATH_PRIORITY_TYPE</NAME>
-extern GtkType GTK_TYPE_PATH_PRIORITY_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PATH_TYPE</NAME>
-extern GtkType GTK_TYPE_PATH_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_POLICY_TYPE</NAME>
-extern GtkType GTK_TYPE_POLICY_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_POSITION_TYPE</NAME>
-extern GtkType GTK_TYPE_POSITION_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PREVIEW_TYPE</NAME>
-extern GtkType GTK_TYPE_PREVIEW_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_RELIEF_STYLE</NAME>
-extern GtkType GTK_TYPE_RELIEF_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_RESIZE_MODE</NAME>
-extern GtkType GTK_TYPE_RESIZE_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SIGNAL_RUN_TYPE</NAME>
-extern GtkType GTK_TYPE_SIGNAL_RUN_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SCROLL_TYPE</NAME>
-extern GtkType GTK_TYPE_SCROLL_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SELECTION_MODE</NAME>
-extern GtkType GTK_TYPE_SELECTION_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SHADOW_TYPE</NAME>
-extern GtkType GTK_TYPE_SHADOW_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_STATE_TYPE</NAME>
-extern GtkType GTK_TYPE_STATE_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SUBMENU_DIRECTION</NAME>
-extern GtkType GTK_TYPE_SUBMENU_DIRECTION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SUBMENU_PLACEMENT</NAME>
-extern GtkType GTK_TYPE_SUBMENU_PLACEMENT;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_TOOLBAR_STYLE</NAME>
-extern GtkType GTK_TYPE_TOOLBAR_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_TROUGH_TYPE</NAME>
-extern GtkType GTK_TYPE_TROUGH_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_UPDATE_TYPE</NAME>
-extern GtkType GTK_TYPE_UPDATE_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_VISIBILITY</NAME>
-extern GtkType GTK_TYPE_VISIBILITY;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_WINDOW_POSITION</NAME>
-extern GtkType GTK_TYPE_WINDOW_POSITION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_WINDOW_TYPE</NAME>
-extern GtkType GTK_TYPE_WINDOW_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SORT_TYPE</NAME>
-extern GtkType GTK_TYPE_SORT_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_FONT_METRIC_TYPE</NAME>
-extern GtkType GTK_TYPE_FONT_METRIC_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_FONT_TYPE</NAME>
-extern GtkType GTK_TYPE_FONT_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_FONT_FILTER_TYPE</NAME>
-extern GtkType GTK_TYPE_FONT_FILTER_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_OBJECT_FLAGS</NAME>
-extern GtkType GTK_TYPE_OBJECT_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_ARG_FLAGS</NAME>
-extern GtkType GTK_TYPE_ARG_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PACKER_OPTIONS</NAME>
-extern GtkType GTK_TYPE_PACKER_OPTIONS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SIDE_TYPE</NAME>
-extern GtkType GTK_TYPE_SIDE_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_ANCHOR_TYPE</NAME>
-extern GtkType GTK_TYPE_ANCHOR_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PRIVATE_FLAGS</NAME>
-extern GtkType GTK_TYPE_PRIVATE_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PROGRESS_BAR_STYLE</NAME>
-extern GtkType GTK_TYPE_PROGRESS_BAR_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_PROGRESS_BAR_ORIENTATION</NAME>
-extern GtkType GTK_TYPE_PROGRESS_BAR_ORIENTATION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_RC_FLAGS</NAME>
-extern GtkType GTK_TYPE_RC_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_RC_TOKEN_TYPE</NAME>
-extern GtkType GTK_TYPE_RC_TOKEN_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY</NAME>
-extern GtkType GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SPIN_TYPE</NAME>
-extern GtkType GTK_TYPE_SPIN_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_TOOLBAR_CHILD_TYPE</NAME>
-extern GtkType GTK_TYPE_TOOLBAR_CHILD_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_TOOLBAR_SPACE_STYLE</NAME>
-extern GtkType GTK_TYPE_TOOLBAR_SPACE_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_TREE_VIEW_MODE</NAME>
-extern GtkType GTK_TYPE_TREE_VIEW_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_FUNDAMENTAL_TYPE</NAME>
-extern GtkType GTK_TYPE_FUNDAMENTAL_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_WIDGET_FLAGS</NAME>
-extern GtkType GTK_TYPE_WIDGET_FLAGS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WINDOW_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_WINDOW_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WINDOW_CLASS</NAME>
-extern GtkType GTK_TYPE_GDK_WINDOW_CLASS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_IMAGE_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_IMAGE_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_VISUAL_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_VISUAL_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_FONT_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_FONT_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WINDOW_HINTS</NAME>
-extern GtkType GTK_TYPE_GDK_WINDOW_HINTS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_FUNCTION</NAME>
-extern GtkType GTK_TYPE_GDK_FUNCTION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_FILL</NAME>
-extern GtkType GTK_TYPE_GDK_FILL;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_FILL_RULE</NAME>
-extern GtkType GTK_TYPE_GDK_FILL_RULE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_LINE_STYLE</NAME>
-extern GtkType GTK_TYPE_GDK_LINE_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_CAP_STYLE</NAME>
-extern GtkType GTK_TYPE_GDK_CAP_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_JOIN_STYLE</NAME>
-extern GtkType GTK_TYPE_GDK_JOIN_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_CURSOR_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_CURSOR_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_FILTER_RETURN</NAME>
-extern GtkType GTK_TYPE_GDK_FILTER_RETURN;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_VISIBILITY_STATE</NAME>
-extern GtkType GTK_TYPE_GDK_VISIBILITY_STATE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_EVENT_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_EVENT_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_EVENT_MASK</NAME>
-extern GtkType GTK_TYPE_GDK_EVENT_MASK;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_NOTIFY_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_NOTIFY_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_CROSSING_MODE</NAME>
-extern GtkType GTK_TYPE_GDK_CROSSING_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_MODIFIER_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_MODIFIER_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_SUBWINDOW_MODE</NAME>
-extern GtkType GTK_TYPE_GDK_SUBWINDOW_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_INPUT_CONDITION</NAME>
-extern GtkType GTK_TYPE_GDK_INPUT_CONDITION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_STATUS</NAME>
-extern GtkType GTK_TYPE_GDK_STATUS;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_BYTE_ORDER</NAME>
-extern GtkType GTK_TYPE_GDK_BYTE_ORDER;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_GC_VALUES_MASK</NAME>
-extern GtkType GTK_TYPE_GDK_GC_VALUES_MASK;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_SELECTION</NAME>
-extern GtkType GTK_TYPE_GDK_SELECTION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_PROPERTY_STATE</NAME>
-extern GtkType GTK_TYPE_GDK_PROPERTY_STATE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_PROP_MODE</NAME>
-extern GtkType GTK_TYPE_GDK_PROP_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_INPUT_SOURCE</NAME>
-extern GtkType GTK_TYPE_GDK_INPUT_SOURCE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_INPUT_MODE</NAME>
-extern GtkType GTK_TYPE_GDK_INPUT_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_AXIS_USE</NAME>
-extern GtkType GTK_TYPE_GDK_AXIS_USE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_TARGET</NAME>
-extern GtkType GTK_TYPE_GDK_TARGET;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_SELECTION_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_SELECTION_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_EXTENSION_MODE</NAME>
-extern GtkType GTK_TYPE_GDK_EXTENSION_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_IM_STYLE</NAME>
-extern GtkType GTK_TYPE_GDK_IM_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_IC_ATTRIBUTES_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_IC_ATTRIBUTES_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WM_DECORATION</NAME>
-extern GtkType GTK_TYPE_GDK_WM_DECORATION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WM_FUNCTION</NAME>
-extern GtkType GTK_TYPE_GDK_WM_FUNCTION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_COLOR_CONTEXT_MODE</NAME>
-extern GtkType GTK_TYPE_GDK_COLOR_CONTEXT_MODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_OVERLAP_TYPE</NAME>
-extern GtkType GTK_TYPE_GDK_OVERLAP_TYPE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_DRAG_ACTION</NAME>
-extern GtkType GTK_TYPE_GDK_DRAG_ACTION;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_DRAG_PROTOCOL</NAME>
-extern GtkType GTK_TYPE_GDK_DRAG_PROTOCOL;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_RGB_DITHER</NAME>
-extern GtkType GTK_TYPE_GDK_RGB_DITHER;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_ACCEL_GROUP</NAME>
-extern GtkType GTK_TYPE_ACCEL_GROUP;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_SELECTION_DATA</NAME>
-extern GtkType GTK_TYPE_SELECTION_DATA;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_STYLE</NAME>
-extern GtkType GTK_TYPE_STYLE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_CTREE_NODE</NAME>
-extern GtkType GTK_TYPE_CTREE_NODE;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_COLORMAP</NAME>
-extern GtkType GTK_TYPE_GDK_COLORMAP;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_VISUAL</NAME>
-extern GtkType GTK_TYPE_GDK_VISUAL;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_FONT</NAME>
-extern GtkType GTK_TYPE_GDK_FONT;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_WINDOW</NAME>
-extern GtkType GTK_TYPE_GDK_WINDOW;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_DRAG_CONTEXT</NAME>
-extern GtkType GTK_TYPE_GDK_DRAG_CONTEXT;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_EVENT</NAME>
-extern GtkType GTK_TYPE_GDK_EVENT;
-</VARIABLE>
-<VARIABLE>
-<NAME>GTK_TYPE_GDK_COLOR</NAME>
-extern GtkType GTK_TYPE_GDK_COLOR;
-</VARIABLE>
-<MACRO>
-<NAME>GTK_TYPE_NUM_BUILTINS</NAME>
-#define GTK_TYPE_NUM_BUILTINS (121)
-</MACRO>
<ENUM>
<NAME>GtkFundamentalType</NAME>
-typedef enum
-{
- GTK_TYPE_INVALID,
- GTK_TYPE_NONE,
-
- /* flat types */
- GTK_TYPE_CHAR,
- GTK_TYPE_UCHAR,
- GTK_TYPE_BOOL,
- GTK_TYPE_INT,
- GTK_TYPE_UINT,
- GTK_TYPE_LONG,
- GTK_TYPE_ULONG,
- GTK_TYPE_FLOAT,
- GTK_TYPE_DOUBLE,
- GTK_TYPE_STRING,
- GTK_TYPE_ENUM,
- GTK_TYPE_FLAGS,
- GTK_TYPE_BOXED,
- GTK_TYPE_POINTER,
-
- /* structured types */
- GTK_TYPE_SIGNAL,
- GTK_TYPE_ARGS,
- GTK_TYPE_CALLBACK,
- GTK_TYPE_C_CALLBACK,
- GTK_TYPE_FOREIGN,
-
- /* base type node of the object system */
- GTK_TYPE_OBJECT
+typedef enum /*< skip >*/
+{
+ GTK_TYPE_INVALID = G_TYPE_INVALID,
+ GTK_TYPE_NONE = G_TYPE_NONE,
+ GTK_TYPE_ENUM = G_TYPE_ENUM,
+ GTK_TYPE_FLAGS = G_TYPE_FLAGS,
+
+ /* GtkArg types */
+ GTK_TYPE_CHAR = G_TYPE_CHAR,
+ GTK_TYPE_UCHAR = G_TYPE_UCHAR,
+ GTK_TYPE_BOOL = G_TYPE_BOOLEAN,
+ GTK_TYPE_INT = G_TYPE_INT,
+ GTK_TYPE_UINT = G_TYPE_UINT,
+ GTK_TYPE_LONG = G_TYPE_LONG,
+ GTK_TYPE_ULONG = G_TYPE_ULONG,
+ GTK_TYPE_FLOAT = G_TYPE_FLOAT,
+ GTK_TYPE_DOUBLE = G_TYPE_DOUBLE,
+ GTK_TYPE_STRING = G_TYPE_STRING,
+ GTK_TYPE_BOXED = G_TYPE_GTK_BOXED,
+ GTK_TYPE_POINTER = G_TYPE_GTK_POINTER,
+ GTK_TYPE_SIGNAL = G_TYPE_GTK_SIGNAL
} GtkFundamentalType;
</ENUM>
<MACRO>
-<NAME>GTK_TYPE_FLAT_FIRST</NAME>
-#define GTK_TYPE_FLAT_FIRST GTK_TYPE_CHAR
+<NAME>GTK_CLASS_NAME</NAME>
+#define GTK_CLASS_NAME(class) (g_type_name (G_TYPE_FROM_CLASS (class)))
</MACRO>
<MACRO>
-<NAME>GTK_TYPE_FLAT_LAST</NAME>
-#define GTK_TYPE_FLAT_LAST GTK_TYPE_POINTER
+<NAME>GTK_CLASS_TYPE</NAME>
+#define GTK_CLASS_TYPE(class) (G_TYPE_FROM_CLASS (class))
</MACRO>
<MACRO>
-<NAME>GTK_TYPE_STRUCTURED_FIRST</NAME>
-#define GTK_TYPE_STRUCTURED_FIRST GTK_TYPE_SIGNAL
-</MACRO>
-<MACRO>
-<NAME>GTK_TYPE_STRUCTURED_LAST</NAME>
-#define GTK_TYPE_STRUCTURED_LAST GTK_TYPE_FOREIGN
+<NAME>GTK_TYPE_IS_OBJECT</NAME>
+#define GTK_TYPE_IS_OBJECT(type) (g_type_is_a ((type), GTK_TYPE_OBJECT))
</MACRO>
<MACRO>
<NAME>GTK_TYPE_FUNDAMENTAL_LAST</NAME>
-#define GTK_TYPE_FUNDAMENTAL_LAST GTK_TYPE_OBJECT
+#define GTK_TYPE_FUNDAMENTAL_LAST (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1)
</MACRO>
<MACRO>
<NAME>GTK_TYPE_FUNDAMENTAL_MAX</NAME>
-#define GTK_TYPE_FUNDAMENTAL_MAX (32)
-</MACRO>
-<MACRO>
-<NAME>GTK_STRUCT_OFFSET</NAME>
-#define GTK_STRUCT_OFFSET(struct, field) ((gint) offsetof (struct, field))
+#define GTK_TYPE_FUNDAMENTAL_MAX (G_TYPE_FUNDAMENTAL_MAX)
</MACRO>
<MACRO>
<NAME>GTK_STRUCT_OFFSET</NAME>
-#define GTK_STRUCT_OFFSET(struct, field) ((gint) ((gchar*) &((struct*) 0)->field))
+#define GTK_STRUCT_OFFSET G_STRUCT_OFFSET
</MACRO>
<MACRO>
<NAME>GTK_CHECK_CAST</NAME>
-# define GTK_CHECK_CAST(tobj, cast_type, cast) ((cast*) (tobj))
+#define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST
</MACRO>
<MACRO>
<NAME>GTK_CHECK_CLASS_CAST</NAME>
-# define GTK_CHECK_CLASS_CAST(tclass,cast_type,cast) ((cast*) (tclass))
+#define GTK_CHECK_CLASS_CAST G_TYPE_CHECK_CLASS_CAST
</MACRO>
<MACRO>
-<NAME>GTK_CHECK_CAST</NAME>
-# define GTK_CHECK_CAST(tobj, cast_type, cast) \
- ((cast*) gtk_type_check_object_cast ((GtkTypeObject*) (tobj), (cast_type)))
-</MACRO>
-<MACRO>
-<NAME>GTK_CHECK_CLASS_CAST</NAME>
-# define GTK_CHECK_CLASS_CAST(tclass,cast_type,cast) \
- ((cast*) gtk_type_check_class_cast ((GtkTypeClass*) (tclass), (cast_type)))
+<NAME>GTK_CHECK_GET_CLASS</NAME>
+#define GTK_CHECK_GET_CLASS G_TYPE_INSTANCE_GET_CLASS
</MACRO>
<MACRO>
<NAME>GTK_CHECK_TYPE</NAME>
-#define GTK_CHECK_TYPE(type_object, otype) ( \
- ((GtkTypeObject*) (type_object)) != NULL && \
- GTK_CHECK_CLASS_TYPE (((GtkTypeObject*) (type_object))->klass, (otype)) \
-)
+#define GTK_CHECK_TYPE G_TYPE_CHECK_INSTANCE_TYPE
</MACRO>
<MACRO>
<NAME>GTK_CHECK_CLASS_TYPE</NAME>
-#define GTK_CHECK_CLASS_TYPE(type_class, otype) ( \
- ((GtkTypeClass*) (type_class)) != NULL && \
- gtk_type_is_a (((GtkTypeClass*) (type_class))->type, (otype)) \
-)
+#define GTK_CHECK_CLASS_TYPE G_TYPE_CHECK_CLASS_TYPE
+</MACRO>
+<MACRO>
+<NAME>GTK_FUNDAMENTAL_TYPE</NAME>
+#define GTK_FUNDAMENTAL_TYPE G_TYPE_FUNDAMENTAL
</MACRO>
<TYPEDEF>
<NAME>GtkType</NAME>
-typedef guint GtkType;
+typedef GType GtkType;
</TYPEDEF>
-<STRUCT>
+<TYPEDEF>
<NAME>GtkTypeObject</NAME>
-</STRUCT>
-<STRUCT>
+typedef GTypeInstance GtkTypeObject;
+</TYPEDEF>
+<TYPEDEF>
<NAME>GtkTypeClass</NAME>
-</STRUCT>
-<MACRO>
-<NAME>GTK_TYPE_IDENTIFIER</NAME>
-#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
-</MACRO>
-<FUNCTION>
-<NAME>gtk_identifier_get_type</NAME>
-<RETURNS>GtkType </RETURNS>
-void
-</FUNCTION>
-<MACRO>
-<NAME>GTK_TYPE_MAKE</NAME>
-#define GTK_TYPE_MAKE(parent_t, seqno) (((seqno) << 8) | GTK_FUNDAMENTAL_TYPE (parent_t))
-</MACRO>
-<MACRO>
-<NAME>GTK_FUNDAMENTAL_TYPE</NAME>
-#define GTK_FUNDAMENTAL_TYPE(type) ((GtkFundamentalType) ((type) & 0xFF))
-</MACRO>
-<MACRO>
-<NAME>GTK_TYPE_SEQNO</NAME>
-#define GTK_TYPE_SEQNO(type) ((type) > 0xFF ? (type) >> 8 : (type))
-</MACRO>
+typedef GTypeClass GtkTypeClass;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GtkClassInitFunc</NAME>
+typedef GBaseInitFunc GtkClassInitFunc;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GtkObjectInitFunc</NAME>
+typedef GInstanceInitFunc GtkObjectInitFunc;
+</TYPEDEF>
<STRUCT>
<NAME>GtkArg</NAME>
</STRUCT>
@@ -12097,79 +12835,41 @@ void
<STRUCT>
<NAME>GtkTypeInfo</NAME>
</STRUCT>
-<STRUCT>
-<NAME>GtkTypeQuery</NAME>
-</STRUCT>
-<STRUCT>
-<NAME>GtkEnumValue</NAME>
-</STRUCT>
-<MACRO>
-<NAME>GTK_SIGNAL_FUNC</NAME>
-#define GTK_SIGNAL_FUNC(f) ((GtkSignalFunc) f)
-</MACRO>
-<USER_FUNCTION>
-<NAME>GtkClassInitFunc</NAME>
-<RETURNS>void </RETURNS>
-gpointer klass
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GtkObjectInitFunc</NAME>
-<RETURNS>void </RETURNS>
-gpointer object,
- gpointer klass
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GtkSignalFunc</NAME>
-<RETURNS>void </RETURNS>
-
-</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GtkFunction</NAME>
<RETURNS>gint </RETURNS>
-gpointer data
+gpointer data
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GtkDestroyNotify</NAME>
<RETURNS>void </RETURNS>
-gpointer data
+gpointer data
</USER_FUNCTION>
<USER_FUNCTION>
<NAME>GtkCallbackMarshal</NAME>
<RETURNS>void </RETURNS>
-GtkObject *object,
- gpointer data,
- guint n_args,
- GtkArg *args
-</USER_FUNCTION>
-<USER_FUNCTION>
-<NAME>GtkSignalMarshaller</NAME>
-<RETURNS>void </RETURNS>
-GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args
+GtkObject *object,
+ gpointer data,
+ guint n_args,
+ GtkArg *args
</USER_FUNCTION>
<USER_FUNCTION>
-<NAME>GtkArgGetFunc</NAME>
+<NAME>GtkSignalFunc</NAME>
<RETURNS>void </RETURNS>
-GtkObject*, GtkArg*, guint
+
</USER_FUNCTION>
<USER_FUNCTION>
-<NAME>GtkArgSetFunc</NAME>
+<NAME>GtkSignalMarshaller</NAME>
<RETURNS>void </RETURNS>
-GtkObject*, GtkArg*, guint
+GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args
</USER_FUNCTION>
-<STRUCT>
-<NAME>GtkTypeObject</NAME>
-struct GtkTypeObject
-{
- /* A pointer to the objects class. This will actually point to
- * the derived objects class struct (which will be derived from
- * GtkTypeClass).
- */
- GtkTypeClass *klass;
-};
-</STRUCT>
+<MACRO>
+<NAME>GTK_SIGNAL_FUNC</NAME>
+#define GTK_SIGNAL_FUNC(f) ((GtkSignalFunc) (f))
+</MACRO>
<STRUCT>
<NAME>GtkArg</NAME>
struct GtkArg
@@ -12195,31 +12895,14 @@ struct GtkArg
gfloat float_data;
gdouble double_data;
gchar *string_data;
- gpointer pointer_data;
GtkObject *object_data;
+ gpointer pointer_data;
/* structured values */
struct {
GtkSignalFunc f;
gpointer d;
} signal_data;
- struct {
- gint n_args;
- GtkArg *args;
- } args_data;
- struct {
- GtkCallbackMarshal marshal;
- gpointer data;
- GtkDestroyNotify notify;
- } callback_data;
- struct {
- GtkFunction func;
- gpointer func_data;
- } c_callback_data;
- struct {
- gpointer data;
- GtkDestroyNotify notify;
- } foreign_data;
} d;
};
</STRUCT>
@@ -12276,32 +12959,16 @@ struct GtkArg
#define GTK_VALUE_BOXED(a) ((a).d.pointer_data)
</MACRO>
<MACRO>
-<NAME>GTK_VALUE_POINTER</NAME>
-#define GTK_VALUE_POINTER(a) ((a).d.pointer_data)
-</MACRO>
-<MACRO>
<NAME>GTK_VALUE_OBJECT</NAME>
#define GTK_VALUE_OBJECT(a) ((a).d.object_data)
</MACRO>
<MACRO>
-<NAME>GTK_VALUE_SIGNAL</NAME>
-#define GTK_VALUE_SIGNAL(a) ((a).d.signal_data)
-</MACRO>
-<MACRO>
-<NAME>GTK_VALUE_ARGS</NAME>
-#define GTK_VALUE_ARGS(a) ((a).d.args_data)
-</MACRO>
-<MACRO>
-<NAME>GTK_VALUE_CALLBACK</NAME>
-#define GTK_VALUE_CALLBACK(a) ((a).d.callback_data)
-</MACRO>
-<MACRO>
-<NAME>GTK_VALUE_C_CALLBACK</NAME>
-#define GTK_VALUE_C_CALLBACK(a) ((a).d.c_callback_data)
+<NAME>GTK_VALUE_POINTER</NAME>
+#define GTK_VALUE_POINTER(a) ((a).d.pointer_data)
</MACRO>
<MACRO>
-<NAME>GTK_VALUE_FOREIGN</NAME>
-#define GTK_VALUE_FOREIGN(a) ((a).d.foreign_data)
+<NAME>GTK_VALUE_SIGNAL</NAME>
+#define GTK_VALUE_SIGNAL(a) ((a).d.signal_data)
</MACRO>
<MACRO>
<NAME>GTK_RETLOC_CHAR</NAME>
@@ -12356,13 +13023,13 @@ struct GtkArg
#define GTK_RETLOC_BOXED(a) ((gpointer*) (a).d.pointer_data)
</MACRO>
<MACRO>
-<NAME>GTK_RETLOC_POINTER</NAME>
-#define GTK_RETLOC_POINTER(a) ((gpointer*) (a).d.pointer_data)
-</MACRO>
-<MACRO>
<NAME>GTK_RETLOC_OBJECT</NAME>
#define GTK_RETLOC_OBJECT(a) ((GtkObject**) (a).d.pointer_data)
</MACRO>
+<MACRO>
+<NAME>GTK_RETLOC_POINTER</NAME>
+#define GTK_RETLOC_POINTER(a) ((gpointer*) (a).d.pointer_data)
+</MACRO>
<STRUCT>
<NAME>GtkTypeInfo</NAME>
struct GtkTypeInfo
@@ -12377,54 +13044,10 @@ struct GtkTypeInfo
GtkClassInitFunc base_class_init_func;
};
</STRUCT>
-<STRUCT>
-<NAME>GtkTypeQuery</NAME>
-struct GtkTypeQuery
-{
- GtkType type;
- const gchar *type_name;
- guint object_size;
- guint class_size;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GtkEnumValue</NAME>
-struct GtkEnumValue
-{
- guint value;
- gchar *value_name;
- gchar *value_nick;
-};
-</STRUCT>
-<FUNCTION>
-<NAME>gtk_type_init</NAME>
-<RETURNS>void </RETURNS>
-void
-</FUNCTION>
<FUNCTION>
<NAME>gtk_type_unique</NAME>
<RETURNS>GtkType </RETURNS>
-GtkType parent_type,const GtkTypeInfo *type_info
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_set_chunk_alloc</NAME>
-<RETURNS>void </RETURNS>
-GtkType type,guint n_chunks
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_name</NAME>
-<RETURNS>gchar *</RETURNS>
-guint type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_from_name</NAME>
-<RETURNS>GtkType </RETURNS>
-const gchar *name
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_parent</NAME>
-<RETURNS>GtkType </RETURNS>
-GtkType type
+GtkType parent_type,const GtkTypeInfo *gtkinfo
</FUNCTION>
<FUNCTION>
<NAME>gtk_type_class</NAME>
@@ -12432,60 +13055,39 @@ GtkType type
GtkType type
</FUNCTION>
<FUNCTION>
-<NAME>gtk_type_parent_class</NAME>
-<RETURNS>gpointer </RETURNS>
-GtkType type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_children_types</NAME>
-<RETURNS>GList *</RETURNS>
-GtkType type
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_type_new</NAME>
<RETURNS>gpointer </RETURNS>
GtkType type
</FUNCTION>
<FUNCTION>
-<NAME>gtk_type_free</NAME>
-<RETURNS>void </RETURNS>
-GtkType type,gpointer mem
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_describe_heritage</NAME>
-<RETURNS>void </RETURNS>
-GtkType type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_describe_tree</NAME>
+<NAME>gtk_type_init</NAME>
<RETURNS>void </RETURNS>
-GtkType type,gboolean show_size
+void
</FUNCTION>
-<FUNCTION>
+<MACRO>
+<NAME>gtk_type_name</NAME>
+#define gtk_type_name g_type_name
+</MACRO>
+<MACRO>
+<NAME>gtk_type_from_name</NAME>
+#define gtk_type_from_name g_type_from_name
+</MACRO>
+<MACRO>
+<NAME>gtk_type_parent</NAME>
+#define gtk_type_parent g_type_parent
+</MACRO>
+<MACRO>
<NAME>gtk_type_is_a</NAME>
-<RETURNS>gboolean </RETURNS>
-GtkType type,GtkType is_a_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_check_object_cast</NAME>
-<RETURNS>GtkTypeObject *</RETURNS>
-GtkTypeObject *type_object,GtkType cast_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_check_class_cast</NAME>
-<RETURNS>GtkTypeClass *</RETURNS>
-GtkTypeClass *klass,GtkType cast_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_register_enum</NAME>
-<RETURNS>GtkType </RETURNS>
-const gchar *type_name,GtkEnumValue *values
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_register_flags</NAME>
-<RETURNS>GtkType </RETURNS>
-const gchar *type_name,GtkFlagValue *values
-</FUNCTION>
+#define gtk_type_is_a g_type_is_a
+</MACRO>
+<TYPEDEF>
+<NAME>GtkEnumValue</NAME>
+typedef GEnumValue GtkEnumValue;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GtkFlagValue</NAME>
+typedef GFlagsValue GtkFlagValue;
+</TYPEDEF>
<FUNCTION>
<NAME>gtk_type_enum_get_values</NAME>
<RETURNS>GtkEnumValue *</RETURNS>
@@ -12504,34 +13106,47 @@ GtkType enum_type,const gchar *value_name
<FUNCTION>
<NAME>gtk_type_flags_find_value</NAME>
<RETURNS>GtkFlagValue *</RETURNS>
-GtkType flag_type,const gchar *value_name
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_set_varargs_type</NAME>
-<RETURNS>void </RETURNS>
-GtkType foreign_type,GtkType varargs_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_get_varargs_type</NAME>
-<RETURNS>GtkType </RETURNS>
-GtkType foreign_type
-</FUNCTION>
-<FUNCTION>
-<NAME>gtk_type_query</NAME>
-<RETURNS>GtkTypeQuery *</RETURNS>
-GtkType type
+GtkType flags_type,const gchar *value_name
</FUNCTION>
<MACRO>
+<NAME>GTKTYPEUTILS_VAR</NAME>
+# define GTKTYPEUTILS_VAR __declspec(dllexport)
+</MACRO>
+<MACRO>
+<NAME>GTKTYPEUTILS_VAR</NAME>
+# define GTKTYPEUTILS_VAR extern __declspec(dllimport)
+</MACRO>
+<MACRO>
+<NAME>GTKTYPEUTILS_VAR</NAME>
+# define GTKTYPEUTILS_VAR extern
+</MACRO>
+<VARIABLE>
+<NAME>GTK_TYPE_IDENTIFIER</NAME>
+extern GType GTK_TYPE_IDENTIFIER;
+</VARIABLE>
+<MACRO>
+<NAME>GTK_TYPE_VBUTTON_BOX</NAME>
+#define GTK_TYPE_VBUTTON_BOX (gtk_vbutton_box_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_VBUTTON_BOX</NAME>
-#define GTK_VBUTTON_BOX(obj) GTK_CHECK_CAST (obj, gtk_vbutton_box_get_type (), GtkVButtonBox)
+#define GTK_VBUTTON_BOX(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
</MACRO>
<MACRO>
<NAME>GTK_VBUTTON_BOX_CLASS</NAME>
-#define GTK_VBUTTON_BOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_vbutton_box_get_type (), GtkVButtonBoxClass)
+#define GTK_VBUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_VBUTTON_BOX</NAME>
-#define GTK_IS_VBUTTON_BOX(obj) GTK_CHECK_TYPE (obj, gtk_vbutton_box_get_type ())
+#define GTK_IS_VBUTTON_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_VBUTTON_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_VBUTTON_BOX_CLASS</NAME>
+#define GTK_IS_VBUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX))
+</MACRO>
+<MACRO>
+<NAME>GTK_VBUTTON_BOX_GET_CLASS</NAME>
+#define GTK_VBUTTON_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
</MACRO>
<STRUCT>
<NAME>GtkVButtonBox</NAME>
@@ -12548,7 +13163,7 @@ struct GtkVButtonBox
</STRUCT>
<FUNCTION>
<NAME>gtk_vbutton_box_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -12596,6 +13211,10 @@ GtkButtonBoxStyle layout
<NAME>GTK_IS_VBOX_CLASS</NAME>
#define GTK_IS_VBOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBOX))
</MACRO>
+<MACRO>
+<NAME>GTK_VBOX_GET_CLASS</NAME>
+#define GTK_VBOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VBOX, GtkVBoxClass))
+</MACRO>
<STRUCT>
<NAME>GtkVBox</NAME>
</STRUCT>
@@ -12639,6 +13258,10 @@ gboolean homogeneous,gint spacing
<NAME>GTK_IS_VIEWPORT_CLASS</NAME>
#define GTK_IS_VIEWPORT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VIEWPORT))
</MACRO>
+<MACRO>
+<NAME>GTK_VIEWPORT_GET_CLASS</NAME>
+#define GTK_VIEWPORT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VIEWPORT, GtkViewportClass))
+</MACRO>
<STRUCT>
<NAME>GtkViewport</NAME>
</STRUCT>
@@ -12694,16 +13317,28 @@ GtkViewport *viewport,GtkAdjustment *adjustment
GtkViewport *viewport,GtkShadowType type
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_VPANED</NAME>
+#define GTK_TYPE_VPANED (gtk_vpaned_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_VPANED</NAME>
-#define GTK_VPANED(obj) GTK_CHECK_CAST (obj, gtk_vpaned_get_type (), GtkVPaned)
+#define GTK_VPANED(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
</MACRO>
<MACRO>
<NAME>GTK_VPANED_CLASS</NAME>
-#define GTK_VPANED_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_vpaned_get_type (), GtkVPanedClass)
+#define GTK_VPANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_VPANED</NAME>
-#define GTK_IS_VPANED(obj) GTK_CHECK_TYPE (obj, gtk_vpaned_get_type ())
+#define GTK_IS_VPANED(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_VPANED))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_VPANED_CLASS</NAME>
+#define GTK_IS_VPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
+</MACRO>
+<MACRO>
+<NAME>GTK_VPANED_GET_CLASS</NAME>
+#define GTK_VPANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
</MACRO>
<STRUCT>
<NAME>GtkVPaned</NAME>
@@ -12720,25 +13355,37 @@ struct GtkVPaned
</STRUCT>
<FUNCTION>
<NAME>gtk_vpaned_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>gtk_vpaned_new</NAME>
-<RETURNS>GtkWidget *</RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
void
</FUNCTION>
<MACRO>
+<NAME>GTK_TYPE_VRULER</NAME>
+#define GTK_TYPE_VRULER (gtk_vruler_get_type ())
+</MACRO>
+<MACRO>
<NAME>GTK_VRULER</NAME>
-#define GTK_VRULER(obj) GTK_CHECK_CAST (obj, gtk_vruler_get_type (), GtkVRuler)
+#define GTK_VRULER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_VRULER, GtkVRuler))
</MACRO>
<MACRO>
<NAME>GTK_VRULER_CLASS</NAME>
-#define GTK_VRULER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_vruler_get_type (), GtkVRulerClass)
+#define GTK_VRULER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VRULER, GtkVRulerClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_VRULER</NAME>
-#define GTK_IS_VRULER(obj) GTK_CHECK_TYPE (obj, gtk_vruler_get_type ())
+#define GTK_IS_VRULER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_VRULER))
+</MACRO>
+<MACRO>
+<NAME>GTK_IS_VRULER_CLASS</NAME>
+#define GTK_IS_VRULER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VRULER))
+</MACRO>
+<MACRO>
+<NAME>GTK_VRULER_GET_CLASS</NAME>
+#define GTK_VRULER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VRULER, GtkVRulerClass))
</MACRO>
<STRUCT>
<NAME>GtkVRuler</NAME>
@@ -12755,7 +13402,7 @@ struct GtkVRuler
</STRUCT>
<FUNCTION>
<NAME>gtk_vruler_get_type</NAME>
-<RETURNS>guint </RETURNS>
+<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
@@ -12783,6 +13430,10 @@ void
<NAME>GTK_IS_VSCALE_CLASS</NAME>
#define GTK_IS_VSCALE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCALE))
</MACRO>
+<MACRO>
+<NAME>GTK_VSCALE_GET_CLASS</NAME>
+#define GTK_VSCALE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VSCALE, GtkVScaleClass))
+</MACRO>
<STRUCT>
<NAME>GtkVScale</NAME>
</STRUCT>
@@ -12826,6 +13477,10 @@ GtkAdjustment *adjustment
<NAME>GTK_IS_VSCROLLBAR_CLASS</NAME>
#define GTK_IS_VSCROLLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSCROLLBAR))
</MACRO>
+<MACRO>
+<NAME>GTK_VSCROLLBAR_GET_CLASS</NAME>
+#define GTK_VSCROLLBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
+</MACRO>
<STRUCT>
<NAME>GtkVScrollbar</NAME>
</STRUCT>
@@ -12869,6 +13524,10 @@ GtkAdjustment *adjustment
<NAME>GTK_IS_VSEPARATOR_CLASS</NAME>
#define GTK_IS_VSEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSEPARATOR))
</MACRO>
+<MACRO>
+<NAME>GTK_VSEPARATOR_GET_CLASS</NAME>
+#define GTK_VSEPARATOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
+</MACRO>
<STRUCT>
<NAME>GtkVSeparator</NAME>
</STRUCT>
@@ -12905,14 +13564,26 @@ typedef enum
GTK_PARENT_SENSITIVE = 1 << 10,
GTK_CAN_FOCUS = 1 << 11,
GTK_HAS_FOCUS = 1 << 12,
+
+ /* widget is allowed to receive the default via gtk_widget_grab_default
+ * and will reserve space to draw the default if possible */
GTK_CAN_DEFAULT = 1 << 13,
+
+ /* the widget currently is receiving the default action and should be drawn
+ * appropriately if possible */
GTK_HAS_DEFAULT = 1 << 14,
+
GTK_HAS_GRAB = 1 << 15,
GTK_RC_STYLE = 1 << 16,
GTK_COMPOSITE_CHILD = 1 << 17,
GTK_NO_REPARENT = 1 << 18,
GTK_APP_PAINTABLE = 1 << 19,
- GTK_RECEIVES_DEFAULT = 1 << 20
+
+ /* the widget when focused will receive the default action and have
+ * HAS_DEFAULT set even if there is a different widget set as default */
+ GTK_RECEIVES_DEFAULT = 1 << 20,
+
+ GTK_DOUBLE_BUFFERED = 1 << 21
} GtkWidgetFlags;
</ENUM>
<MACRO>
@@ -12936,6 +13607,10 @@ typedef enum
#define GTK_IS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
</MACRO>
<MACRO>
+<NAME>GTK_WIDGET_GET_CLASS</NAME>
+#define GTK_WIDGET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass))
+</MACRO>
+<MACRO>
<NAME>GTK_WIDGET_TYPE</NAME>
#define GTK_WIDGET_TYPE(wid) (GTK_OBJECT_TYPE (wid))
</MACRO>
@@ -13025,6 +13700,10 @@ typedef enum
#define GTK_WIDGET_RECEIVES_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0)
</MACRO>
<MACRO>
+<NAME>GTK_WIDGET_DOUBLE_BUFFERED</NAME>
+#define GTK_WIDGET_DOUBLE_BUFFERED(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0)
+</MACRO>
+<MACRO>
<NAME>GTK_WIDGET_SET_FLAGS</NAME>
#define GTK_WIDGET_SET_FLAGS(wid,flag) G_STMT_START{ (GTK_WIDGET_FLAGS (wid) |= (flag)); }G_STMT_END
</MACRO>
@@ -13036,9 +13715,6 @@ typedef enum
<NAME>GtkRequisition</NAME>
</STRUCT>
<STRUCT>
-<NAME>GtkAllocation</NAME>
-</STRUCT>
-<STRUCT>
<NAME>GtkSelectionData</NAME>
</STRUCT>
<STRUCT>
@@ -13060,18 +13736,8 @@ GtkWidget *widget,
<NAME>GtkRequisition</NAME>
struct GtkRequisition
{
- gint16 width;
- gint16 height;
-};
-</STRUCT>
-<STRUCT>
-<NAME>GtkAllocation</NAME>
-struct GtkAllocation
-{
- gint16 x;
- gint16 y;
- guint16 width;
- guint16 height;
+ gint width;
+ gint height;
};
</STRUCT>
<STRUCT>
@@ -13188,7 +13854,7 @@ GtkType type,guint nargs,GtkArg *args
</FUNCTION>
<FUNCTION>
<NAME>gtk_widget_ref</NAME>
-<RETURNS>void </RETURNS>
+<RETURNS>GtkWidget *</RETURNS>
GtkWidget *widget
</FUNCTION>
<FUNCTION>
@@ -13432,6 +14098,11 @@ GtkWidget *widget,gboolean sensitive
GtkWidget *widget,gboolean app_paintable
</FUNCTION>
<FUNCTION>
+<NAME>gtk_widget_set_double_buffered</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,gboolean double_buffered
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_widget_set_parent</NAME>
<RETURNS>void </RETURNS>
GtkWidget *widget,GtkWidget *parent
@@ -13502,11 +14173,6 @@ GtkWidget *widget
GtkWidget *widget,GdkColormap *colormap
</FUNCTION>
<FUNCTION>
-<NAME>gtk_widget_set_visual</NAME>
-<RETURNS>void </RETURNS>
-GtkWidget *widget,GdkVisual *visual
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_widget_get_events</NAME>
<RETURNS>gint </RETURNS>
GtkWidget *widget
@@ -13554,12 +14220,57 @@ GtkWidget *widget
<FUNCTION>
<NAME>gtk_widget_modify_style</NAME>
<RETURNS>void </RETURNS>
-GtkWidget *widget,GtkRcStyle *style
+GtkWidget *widget,GtkRcStyle *style
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_get_modifier_style</NAME>
+<RETURNS>GtkRcStyle *</RETURNS>
+GtkWidget *widget
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_modify_fg</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,GtkStateType state,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_modify_bg</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,GtkStateType state,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_modify_text</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,GtkStateType state,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_modify_base</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,GtkStateType state,GdkColor *color
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_modify_font</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,PangoFontDescription *font_desc
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_create_pango_context</NAME>
+<RETURNS>PangoContext *</RETURNS>
+GtkWidget *widget
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_get_pango_context</NAME>
+<RETURNS>PangoContext *</RETURNS>
+GtkWidget *widget
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_create_pango_layout</NAME>
+<RETURNS>PangoLayout *</RETURNS>
+GtkWidget *widget,const gchar *text
</FUNCTION>
<FUNCTION>
<NAME>gtk_widget_set_composite_name</NAME>
<RETURNS>void </RETURNS>
-GtkWidget *widget,gchar *name
+GtkWidget *widget,const gchar *name
</FUNCTION>
<FUNCTION>
<NAME>gtk_widget_get_composite_name</NAME>
@@ -13582,11 +14293,6 @@ GtkStyle *style
GdkColormap *cmap
</FUNCTION>
<FUNCTION>
-<NAME>gtk_widget_push_visual</NAME>
-<RETURNS>void </RETURNS>
-GdkVisual *visual
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_widget_push_composite_child</NAME>
<RETURNS>void </RETURNS>
void
@@ -13607,11 +14313,6 @@ void
void
</FUNCTION>
<FUNCTION>
-<NAME>gtk_widget_pop_visual</NAME>
-<RETURNS>void </RETURNS>
-void
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_widget_set_default_style</NAME>
<RETURNS>void </RETURNS>
GtkStyle *style
@@ -13622,11 +14323,6 @@ GtkStyle *style
GdkColormap *colormap
</FUNCTION>
<FUNCTION>
-<NAME>gtk_widget_set_default_visual</NAME>
-<RETURNS>void </RETURNS>
-GdkVisual *visual
-</FUNCTION>
-<FUNCTION>
<NAME>gtk_widget_get_default_style</NAME>
<RETURNS>GtkStyle *</RETURNS>
void
@@ -13642,6 +14338,26 @@ void
void
</FUNCTION>
<FUNCTION>
+<NAME>gtk_widget_set_direction</NAME>
+<RETURNS>void </RETURNS>
+GtkWidget *widget,GtkTextDirection dir
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_get_direction</NAME>
+<RETURNS>GtkTextDirection </RETURNS>
+GtkWidget *widget
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_set_default_direction</NAME>
+<RETURNS>void </RETURNS>
+GtkTextDirection dir
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_widget_get_default_direction</NAME>
+<RETURNS>GtkTextDirection </RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_widget_shape_combine_mask</NAME>
<RETURNS>void </RETURNS>
GtkWidget *widget,GdkBitmap *shape_mask,gint offset_x,gint offset_y
@@ -13675,19 +14391,23 @@ GtkWidget *widget,guint *path_length,gchar **path,gchar **path_reverse
</MACRO>
<MACRO>
<NAME>GTK_WINDOW</NAME>
-#define GTK_WINDOW(obj) (GTK_CHECK_CAST (obj, GTK_TYPE_WINDOW, GtkWindow))
+#define GTK_WINDOW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
</MACRO>
<MACRO>
<NAME>GTK_WINDOW_CLASS</NAME>
-#define GTK_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, GTK_TYPE_WINDOW, GtkWindowClass))
+#define GTK_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
</MACRO>
<MACRO>
<NAME>GTK_IS_WINDOW</NAME>
-#define GTK_IS_WINDOW(obj) (GTK_CHECK_TYPE (obj, GTK_TYPE_WINDOW))
+#define GTK_IS_WINDOW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_WINDOW))
</MACRO>
<MACRO>
<NAME>GTK_IS_WINDOW_CLASS</NAME>
-#define GTK_IS_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE (klass, GTK_TYPE_WINDOW))
+#define GTK_IS_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
+</MACRO>
+<MACRO>
+<NAME>GTK_WINDOW_GET_CLASS</NAME>
+#define GTK_WINDOW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
</MACRO>
<STRUCT>
<NAME>GtkWindow</NAME>
@@ -13711,6 +14431,7 @@ struct GtkWindow
GtkWindow *transient_parent;
gushort resize_count;
+ guint has_user_ref_count : 1;
guint allow_shrink : 1;
guint allow_grow : 1;
guint auto_shrink : 1;
@@ -13798,6 +14519,11 @@ GtkWindow *window,gint width,gint heig
GtkWindow *window,gboolean modal
</FUNCTION>
<FUNCTION>
+<NAME>gtk_window_list_toplevels</NAME>
+<RETURNS>GList *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
<NAME>gtk_window_set_focus</NAME>
<RETURNS>void </RETURNS>
GtkWindow *window,GtkWidget *focus
@@ -13817,3 +14543,406 @@ GtkWindow *window,guint xid
<RETURNS>void </RETURNS>
GtkWindow *window,guint xid
</FUNCTION>
+<FUNCTION>
+<NAME>gtk_window_reposition</NAME>
+<RETURNS>void </RETURNS>
+GtkWindow *window,gint x,gint y
+</FUNCTION>
+<MACRO>
+<NAME>GTK_MAJOR_VERSION</NAME>
+#define GTK_MAJOR_VERSION (1)
+</MACRO>
+<MACRO>
+<NAME>GTK_MINOR_VERSION</NAME>
+#define GTK_MINOR_VERSION (3)
+</MACRO>
+<MACRO>
+<NAME>GTK_MICRO_VERSION</NAME>
+#define GTK_MICRO_VERSION (1)
+</MACRO>
+<MACRO>
+<NAME>GTK_BINARY_AGE</NAME>
+#define GTK_BINARY_AGE (0)
+</MACRO>
+<MACRO>
+<NAME>GTK_INTERFACE_AGE</NAME>
+#define GTK_INTERFACE_AGE (0)
+</MACRO>
+<MACRO>
+<NAME>GTK_CHECK_VERSION</NAME>
+#define GTK_CHECK_VERSION(major,minor,micro) \
+ (GTK_MAJOR_VERSION > (major) || \
+ (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \
+ (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \
+ GTK_MICRO_VERSION >= (micro)))
+</MACRO>
+<MACRO>
+<NAME>gtk_accel_label_accelerator_width</NAME>
+#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width
+</MACRO>
+<MACRO>
+<NAME>gtk_container_border_width</NAME>
+#define gtk_container_border_width gtk_container_set_border_width
+</MACRO>
+<MACRO>
+<NAME>gtk_notebook_current_page</NAME>
+#define gtk_notebook_current_page gtk_notebook_get_current_page
+</MACRO>
+<MACRO>
+<NAME>gtk_packer_configure</NAME>
+#define gtk_packer_configure gtk_packer_set_child_packing
+</MACRO>
+<MACRO>
+<NAME>gtk_paned_gutter_size</NAME>
+#define gtk_paned_gutter_size(p,s) (void) 0
+</MACRO>
+<MACRO>
+<NAME>gtk_paned_set_gutter_size</NAME>
+#define gtk_paned_set_gutter_size(p,s) (void) 0
+</MACRO>
+<MACRO>
+<NAME>gtk_paned_handle_size</NAME>
+#define gtk_paned_handle_size gtk_paned_set_handle_size
+</MACRO>
+<MACRO>
+<NAME>gtk_scale_value_width</NAME>
+#define gtk_scale_value_width gtk_scale_get_value_width
+</MACRO>
+<MACRO>
+<NAME>gtk_window_position</NAME>
+#define gtk_window_position gtk_window_set_position
+</MACRO>
+<MACRO>
+<NAME>gtk_toggle_button_set_state</NAME>
+#define gtk_toggle_button_set_state gtk_toggle_button_set_active
+</MACRO>
+<MACRO>
+<NAME>gtk_check_menu_item_set_state</NAME>
+#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
+</MACRO>
+<MACRO>
+<NAME>gtk_widget_set_visual</NAME>
+#define gtk_widget_set_visual(w,v) (void) 0
+</MACRO>
+<MACRO>
+<NAME>gtk_widget_set_default_visual</NAME>
+#define gtk_widget_set_default_visual(v) (void) 0
+</MACRO>
+<MACRO>
+<NAME>gtk_widget_push_visual</NAME>
+#define gtk_widget_push_visual(v) (void) 0
+</MACRO>
+<MACRO>
+<NAME>gtk_widget_pop_visual</NAME>
+#define gtk_widget_pop_visual(v) (void) 0
+</MACRO>
+<MACRO>
+<NAME>gtk_ctree_set_reorderable</NAME>
+#define gtk_ctree_set_reorderable(t,r) gtk_clist_set_reorderable((GtkCList*) (t),(r))
+</MACRO>
+<MACRO>
+<NAME>gtk_style_apply_default_pixmap</NAME>
+#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS</NAME>
+#define GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS 1-0-1
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_SIGNAL_INIT</NAME>
+#define GTK_HAVE_SIGNAL_INIT 1-0-2
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_0</NAME>
+#define GTK_HAVE_FEATURES_1_1_0 1-1-0
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_2</NAME>
+#define GTK_HAVE_FEATURES_1_1_2 1-1-2
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_4</NAME>
+#define GTK_HAVE_FEATURES_1_1_4 1-1-4
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_5</NAME>
+#define GTK_HAVE_FEATURES_1_1_5 1-1-5
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_6</NAME>
+#define GTK_HAVE_FEATURES_1_1_6 1-1-6
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_7</NAME>
+#define GTK_HAVE_FEATURES_1_1_7 1-1-7
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_8</NAME>
+#define GTK_HAVE_FEATURES_1_1_8 1-1-8
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_9</NAME>
+#define GTK_HAVE_FEATURES_1_1_9 1-1-9
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_10</NAME>
+#define GTK_HAVE_FEATURES_1_1_10 1-1-10
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_11</NAME>
+#define GTK_HAVE_FEATURES_1_1_11 1-1-11
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_12</NAME>
+#define GTK_HAVE_FEATURES_1_1_12 1-1-12
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_13</NAME>
+#define GTK_HAVE_FEATURES_1_1_13 1-1-13
+</MACRO>
+<MACRO>
+<NAME>GTK_HAVE_FEATURES_1_1_14</NAME>
+#define GTK_HAVE_FEATURES_1_1_14 1-1-14
+</MACRO>
+<MACRO>
+<NAME>gtk_signal_default_marshaller</NAME>
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_BOOL__NONE</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_BOOL__POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_BOOL__POINTER_POINTER_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_BOOL__POINTER_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_BOOL__POINTER_INT_INT_UINT</NAME>
+#define gtk_marshal_BOOL__POINTER_INT_INT_UINT gtk_marshal_BOOL__POINTER_INT_INT_INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_BOOL__POINTER_INT_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER</NAME>
+#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_ENUM__ENUM</NAME>
+#define gtk_marshal_ENUM__ENUM gtk_marshal_INT__INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_INT__INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_INT__POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_INT__POINTER_CHAR_CHAR</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_INT__OBJECT_BOXED_POINTER</NAME>
+#define gtk_marshal_INT__OBJECT_BOXED_POINTER gtk_marshal_INT__POINTER_POINTER_POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_INT__POINTER_POINTER_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__BOOL</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__BOXED</NAME>
+#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__ENUM</NAME>
+#define gtk_marshal_NONE__ENUM gtk_marshal_NONE__INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__ENUM_FLOAT</NAME>
+#define gtk_marshal_NONE__ENUM_FLOAT gtk_marshal_NONE__INT_FLOAT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_FLOAT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__ENUM_FLOAT_BOOL</NAME>
+#define gtk_marshal_NONE__ENUM_FLOAT_BOOL gtk_marshal_NONE__INT_FLOAT_BOOL
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_FLOAT_BOOL</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_INT_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__NONE</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__OBJECT</NAME>
+#define gtk_marshal_NONE__OBJECT gtk_marshal_NONE__POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_POINTER_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__POINTER_STRING_STRING</NAME>
+#define gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
+</MACRO>
+<MACRO>
+<NAME>gtk_marshal_NONE__POINTER_UINT</NAME>
+#define gtk_marshal_NONE__POINTER_UINT gtk_marshal_NONE__POINTER_INT
+</MACRO>
+<MACRO>
+<NAME>gtk_marshal_NONE__POINTER_UINT_ENUM</NAME>
+#define gtk_marshal_NONE__POINTER_UINT_ENUM gtk_marshal_NONE__POINTER_INT_INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__POINTER_POINTER_UINT_UINT</NAME>
+#define gtk_marshal_NONE__POINTER_POINTER_UINT_UINT gtk_marshal_NONE__POINTER_POINTER_INT_INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_POINTER_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT</NAME>
+#define gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__POINTER_UINT_UINT</NAME>
+#define gtk_marshal_NONE__POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT
+</MACRO>
+<MACRO>
+<NAME>gtk_marshal_NONE__STRING</NAME>
+#define gtk_marshal_NONE__STRING gtk_marshal_NONE__POINTER
+</MACRO>
+<MACRO>
+<NAME>gtk_marshal_NONE__STRING_INT_POINTER</NAME>
+#define gtk_marshal_NONE__STRING_INT_POINTER gtk_marshal_NONE__POINTER_INT_POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_INT_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__STRING_POINTER</NAME>
+#define gtk_marshal_NONE__STRING_POINTER gtk_marshal_NONE__POINTER_POINTER
+</MACRO>
+<MACRO>
+<NAME>gtk_marshal_NONE__UINT</NAME>
+#define gtk_marshal_NONE__UINT gtk_marshal_NONE__INT
+</MACRO>
+<MACRO>
+<NAME>gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER</NAME>
+#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM</NAME>
+#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM gtk_marshal_NONE__INT_POINTER_INT_INT_INT
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_POINTER_INT_INT_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
+<MACRO>
+<NAME>gtk_marshal_NONE__UINT_STRING</NAME>
+#define gtk_marshal_NONE__UINT_STRING gtk_marshal_NONE__INT_POINTER
+</MACRO>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__INT_POINTER</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data, GtkArg * args
+</FUNCTION>
+<FUNCTION>
+<NAME>gtk_marshal_NONE__POINTER_POINTER_INT</NAME>
+<RETURNS>void </RETURNS>
+GtkObject * object,GtkSignalFunc func,gpointer func_data,GtkArg * args
+</FUNCTION>
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 6042de191..01f2a698a 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -40,6 +40,8 @@
<!entity GtkHScrollbar SYSTEM "sgml/gtkhscrollbar.sgml">
<!entity GtkHSeparator SYSTEM "sgml/gtkhseparator.sgml">
<!entity GtkImage SYSTEM "sgml/gtkimage.sgml">
+<!entity GtkIMContext SYSTEM "sgml/gtkimcontext.sgml">
+<!entity GtkIMMulticontext SYSTEM "sgml/gtkimmulticontext.sgml">
<!entity GtkInputDialog SYSTEM "sgml/gtkinputdialog.sgml">
<!entity GtkInvisible SYSTEM "sgml/gtkinvisible.sgml">
<!entity GtkItem SYSTEM "sgml/gtkitem.sgml">
@@ -77,6 +79,12 @@
<!entity GtkTable SYSTEM "sgml/gtktable.sgml">
<!entity GtkTearoffMenuItem SYSTEM "sgml/gtktearoffmenuitem.sgml">
<!entity GtkText SYSTEM "sgml/gtktext.sgml">
+<!entity GtkTextBuffer SYSTEM "sgml/gtktextbuffer.sgml">
+<!entity gtk-GtkTextIter SYSTEM "sgml/gtktextiter.sgml">
+<!entity gtk-GtkTextMark SYSTEM "sgml/gtktextmark.sgml">
+<!entity GtkTextTag SYSTEM "sgml/gtktexttag.sgml">
+<!entity GtkTextTagTable SYSTEM "sgml/gtktexttagtable.sgml">
+<!entity GtkTextView SYSTEM "sgml/gtktextview.sgml">
<!entity GtkTipsQuery SYSTEM "sgml/gtktipsquery.sgml">
<!entity GtkToggleButton SYSTEM "sgml/gtktogglebutton.sgml">
<!entity GtkToolbar SYSTEM "sgml/gtktoolbar.sgml">
@@ -108,7 +116,6 @@
<!entity gtk-Types SYSTEM "sgml/gtktypeutils.sgml">
<!entity gtk-Bindings SYSTEM "sgml/gtkbindings.sgml">
<!entity gtk-Standard-Enumerations SYSTEM "sgml/gtkenums.sgml">
-<!entity gtk-Private-Information SYSTEM "sgml/gtkprivate.sgml">
<!entity index-Object-Tree SYSTEM "sgml/tree_index.sgml">
@@ -181,7 +188,6 @@ An advanced widget set.
&gtk-Types;
&gtk-Bindings;
&gtk-Standard-Enumerations;
- &gtk-Private-Information;
</chapter>
<chapter id="gtkobjects" role="no-toc">
@@ -228,6 +234,8 @@ An advanced widget set.
&GtkHScrollbar;
&GtkHSeparator;
&GtkImage;
+ &GtkIMContext;
+ &GtkIMMulticontext;
&GtkInputDialog;
&GtkInvisible;
&GtkItem;
@@ -265,6 +273,12 @@ An advanced widget set.
&GtkTable;
&GtkTearoffMenuItem;
&GtkText;
+ &GtkTextBuffer;
+ &gtk-GtkTextIter;
+ &gtk-GtkTextMark;
+ &GtkTextTag;
+ &GtkTextTagTable;
+ &GtkTextView;
&GtkTipsQuery;
&GtkToggleButton;
&GtkToolbar;
diff --git a/docs/reference/gtk/gtk-overrides.txt b/docs/reference/gtk/gtk-overrides.txt
index 485996d6e..0d283eae0 100644
--- a/docs/reference/gtk/gtk-overrides.txt
+++ b/docs/reference/gtk/gtk-overrides.txt
@@ -17,3 +17,16 @@ GtkObject *object,
GtkArg *arg,
guint arg_id
</USER_FUNCTION>
+
+# GtkAllocation is the same as GtkRectangle
+
+<STRUCT>
+<NAME>GtkAllocation</NAME>
+struct GtkAllocation
+{
+ gint x;
+ gint y;
+ gint width;
+ gint height;
+};
+</STRUCT>
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index aa0908cd7..430e442de 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -16,6 +16,7 @@ GTK_TYPE_ACCEL_LABEL
gtk_accel_label_get_type
GTK_ACCEL_LABEL_CLASS
GTK_IS_ACCEL_LABEL_CLASS
+GTK_ACCEL_LABEL_GET_CLASS
<SUBSECTION Private>
gtk_accel_label_accelerator_width
</SECTION>
@@ -36,6 +37,7 @@ GTK_TYPE_ADJUSTMENT
gtk_adjustment_get_type
GTK_ADJUSTMENT_CLASS
GTK_IS_ADJUSTMENT_CLASS
+GTK_ADJUSTMENT_GET_CLASS
</SECTION>
<SECTION>
@@ -51,6 +53,7 @@ GTK_TYPE_ALIGNMENT
gtk_alignment_get_type
GTK_ALIGNMENT_CLASS
GTK_IS_ALIGNMENT_CLASS
+GTK_ALIGNMENT_GET_CLASS
</SECTION>
<SECTION>
@@ -66,6 +69,7 @@ GTK_TYPE_ARROW
gtk_arrow_get_type
GTK_ARROW_CLASS
GTK_IS_ARROW_CLASS
+GTK_ARROW_GET_CLASS
</SECTION>
<SECTION>
@@ -81,6 +85,7 @@ GTK_TYPE_ASPECT_FRAME
gtk_aspect_frame_get_type
GTK_ASPECT_FRAME_CLASS
GTK_IS_ASPECT_FRAME_CLASS
+GTK_ASPECT_FRAME_GET_CLASS
</SECTION>
<SECTION>
@@ -108,6 +113,7 @@ GTK_TYPE_BUTTON_BOX
gtk_button_box_get_type
GTK_BUTTON_BOX_CLASS
GTK_IS_BUTTON_BOX_CLASS
+GTK_BUTTON_BOX_GET_CLASS
</SECTION>
<SECTION>
@@ -121,6 +127,7 @@ GTK_TYPE_BIN
gtk_bin_get_type
GTK_BIN_CLASS
GTK_IS_BIN_CLASS
+GTK_BIN_GET_CLASS
</SECTION>
<SECTION>
@@ -144,6 +151,7 @@ GTK_TYPE_BOX
gtk_box_get_type
GTK_BOX_CLASS
GTK_IS_BOX_CLASS
+GTK_BOX_GET_CLASS
</SECTION>
<SECTION>
@@ -166,6 +174,7 @@ GTK_TYPE_BUTTON
gtk_button_get_type
GTK_BUTTON_CLASS
GTK_IS_BUTTON_CLASS
+GTK_BUTTON_GET_CLASS
</SECTION>
<SECTION>
@@ -190,6 +199,7 @@ GTK_TYPE_CALENDAR
gtk_calendar_get_type
GTK_CALENDAR_CLASS
GTK_IS_CALENDAR_CLASS
+GTK_CALENDAR_GET_CLASS
</SECTION>
<SECTION>
@@ -205,6 +215,7 @@ GTK_TYPE_CHECK_BUTTON
gtk_check_button_get_type
GTK_CHECK_BUTTON_CLASS
GTK_IS_CHECK_BUTTON_CLASS
+GTK_CHECK_BUTTON_GET_CLASS
</SECTION>
<SECTION>
@@ -224,6 +235,7 @@ GTK_TYPE_CHECK_MENU_ITEM
gtk_check_menu_item_get_type
GTK_CHECK_MENU_ITEM_CLASS
GTK_IS_CHECK_MENU_ITEM_CLASS
+GTK_CHECK_MENU_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -343,6 +355,7 @@ GTK_TYPE_CLIST
gtk_clist_get_type
GTK_CLIST_CLASS
GTK_IS_CLIST_CLASS
+GTK_CLIST_GET_CLASS
</SECTION>
<SECTION>
@@ -351,14 +364,26 @@ GtkColorSelection
<TITLE>GtkColorSelection</TITLE>
gtk_color_selection_new
gtk_color_selection_set_update_policy
-gtk_color_selection_set_opacity
+gtk_color_selection_set_use_opacity
+gtk_color_selection_get_use_opacity
+gtk_color_selection_set_use_palette
+gtk_color_selection_get_use_palette
gtk_color_selection_set_color
gtk_color_selection_get_color
+gtk_color_selection_set_old_color
+gtk_color_selection_get_old_color
+gtk_color_selection_set_palette_color
+gtk_color_selection_get_palette_color
+gtk_color_selection_unset_palette_color
+gtk_color_selection_is_adjusting
<SUBSECTION Standard>
GTK_COLOR_SELECTION
GTK_IS_COLOR_SELECTION
+GTK_TYPE_COLOR_SELECTION
gtk_color_selection_get_type
GTK_COLOR_SELECTION_CLASS
+GTK_IS_COLOR_SELECTION_CLASS
+GTK_COLOR_SELECTION_GET_CLASS
</SECTION>
<SECTION>
@@ -369,8 +394,11 @@ gtk_color_selection_dialog_new
<SUBSECTION Standard>
GTK_COLOR_SELECTION_DIALOG
GTK_IS_COLOR_SELECTION_DIALOG
+GTK_TYPE_COLOR_SELECTION_DIALOG
gtk_color_selection_dialog_get_type
GTK_COLOR_SELECTION_DIALOG_CLASS
+GTK_IS_COLOR_SELECTION_DIALOG_CLASS
+GTK_COLOR_SELECTION_DIALOG_GET_CLASS
</SECTION>
<SECTION>
@@ -388,8 +416,11 @@ gtk_combo_disable_activate
<SUBSECTION Standard>
GTK_COMBO
GTK_IS_COMBO
+GTK_TYPE_COMBO
gtk_combo_get_type
GTK_COMBO_CLASS
+GTK_IS_COMBO_CLASS
+GTK_COMBO_GET_CLASS
</SECTION>
<SECTION>
@@ -406,11 +437,10 @@ gtk_container_foreach
gtk_container_foreach_full
gtk_container_children
gtk_container_focus
+gtk_container_set_reallocate_redraws
gtk_container_set_focus_child
gtk_container_set_focus_vadjustment
gtk_container_set_focus_hadjustment
-gtk_container_register_toplevel
-gtk_container_unregister_toplevel
gtk_container_resize_children
gtk_container_child_type
gtk_container_add_child_arg_type
@@ -428,8 +458,8 @@ gtk_container_child_args_collect
gtk_container_child_arg_get_info
gtk_container_forall
gtk_container_child_composite_name
-gtk_container_get_toplevels
gtk_container_set_border_width
+gtk_container_dequeue_resize_handler
<SUBSECTION Standard>
GTK_CONTAINER
GTK_IS_CONTAINER
@@ -437,6 +467,7 @@ GTK_TYPE_CONTAINER
gtk_container_get_type
GTK_CONTAINER_CLASS
GTK_IS_CONTAINER_CLASS
+GTK_CONTAINER_GET_CLASS
</SECTION>
<SECTION>
@@ -532,6 +563,7 @@ GTK_TYPE_CTREE
gtk_ctree_get_type
GTK_CTREE_CLASS
GTK_IS_CTREE_CLASS
+GTK_CTREE_GET_CLASS
</SECTION>
<SECTION>
@@ -552,6 +584,7 @@ GTK_TYPE_CURVE
gtk_curve_get_type
GTK_CURVE_CLASS
GTK_IS_CURVE_CLASS
+GTK_CURVE_GET_CLASS
</SECTION>
<SECTION>
@@ -565,6 +598,7 @@ GTK_TYPE_DATA
gtk_data_get_type
GTK_DATA_CLASS
GTK_IS_DATA_CLASS
+GTK_DATA_GET_CLASS
</SECTION>
<SECTION>
@@ -580,6 +614,7 @@ GTK_TYPE_DIALOG
gtk_dialog_get_type
GTK_DIALOG_CLASS
GTK_IS_DIALOG_CLASS
+GTK_DIALOG_GET_CLASS
</SECTION>
<SECTION>
@@ -591,8 +626,11 @@ gtk_drawing_area_size
<SUBSECTION Standard>
GTK_DRAWING_AREA
GTK_IS_DRAWING_AREA
+GTK_TYPE_DRAWING_AREA
gtk_drawing_area_get_type
GTK_DRAWING_AREA_CLASS
+GTK_IS_DRAWING_AREA_CLASS
+GTK_DRAWING_AREA_GET_CLASS
</SECTION>
<SECTION>
@@ -620,6 +658,7 @@ GTK_TYPE_EDITABLE
gtk_editable_get_type
GTK_EDITABLE_CLASS
GTK_IS_EDITABLE_CLASS
+GTK_EDITABLE_GET_CLASS
</SECTION>
<SECTION>
@@ -644,6 +683,7 @@ GTK_TYPE_ENTRY
gtk_entry_get_type
GTK_ENTRY_CLASS
GTK_IS_ENTRY_CLASS
+GTK_ENTRY_GET_CLASS
</SECTION>
<SECTION>
@@ -658,6 +698,7 @@ GTK_TYPE_EVENT_BOX
gtk_event_box_get_type
GTK_EVENT_BOX_CLASS
GTK_IS_EVENT_BOX_CLASS
+GTK_EVENT_BOX_GET_CLASS
</SECTION>
<SECTION>
@@ -677,6 +718,7 @@ GTK_TYPE_FILE_SELECTION
gtk_file_selection_get_type
GTK_FILE_SELECTION_CLASS
GTK_IS_FILE_SELECTION_CLASS
+GTK_FILE_SELECTION_GET_CLASS
</SECTION>
<SECTION>
@@ -694,6 +736,7 @@ GTK_TYPE_FIXED
gtk_fixed_get_type
GTK_FIXED_CLASS
GTK_IS_FIXED_CLASS
+GTK_FIXED_GET_CLASS
</SECTION>
<SECTION>
@@ -706,7 +749,6 @@ gtk_font_selection_get_font_name
gtk_font_selection_set_font_name
gtk_font_selection_get_preview_text
gtk_font_selection_set_preview_text
-gtk_font_selection_set_filter
<SUBSECTION Standard>
GTK_FONT_SELECTION
@@ -715,12 +757,7 @@ GTK_TYPE_FONT_SELECTION
gtk_font_selection_get_type
GTK_FONT_SELECTION_CLASS
GTK_IS_FONT_SELECTION_CLASS
-<SUBSECTION Private>
-GTK_NUM_FONT_PROPERTIES
-GTK_NUM_STYLE_PROPERTIES
-GTK_NUM_FONT_FILTERS
-GtkFontMetricType
-GtkFontFilter
+GTK_FONT_SELECTION_GET_CLASS
</SECTION>
<SECTION>
@@ -733,9 +770,6 @@ gtk_font_selection_dialog_get_font_name
gtk_font_selection_dialog_set_font_name
gtk_font_selection_dialog_get_preview_text
gtk_font_selection_dialog_set_preview_text
-gtk_font_selection_dialog_set_filter
-GtkFontType
-GtkFontFilterType
<SUBSECTION Standard>
GTK_FONT_SELECTION_DIALOG
@@ -744,6 +778,7 @@ GTK_TYPE_FONT_SELECTION_DIALOG
gtk_font_selection_dialog_get_type
GTK_FONT_SELECTION_DIALOG_CLASS
GTK_IS_FONT_SELECTION_DIALOG_CLASS
+GTK_FONT_SELECTION_DIALOG_GET_CLASS
</SECTION>
<SECTION>
@@ -752,6 +787,7 @@ GTK_IS_FONT_SELECTION_DIALOG_CLASS
GtkFrame
gtk_frame_new
gtk_frame_set_label
+gtk_frame_set_label_widget
gtk_frame_set_label_align
gtk_frame_set_shadow_type
<SUBSECTION Standard>
@@ -761,6 +797,7 @@ GTK_TYPE_FRAME
gtk_frame_get_type
GTK_FRAME_CLASS
GTK_IS_FRAME_CLASS
+GTK_FRAME_GET_CLASS
</SECTION>
<SECTION>
@@ -771,8 +808,11 @@ gtk_gamma_curve_new
<SUBSECTION Standard>
GTK_GAMMA_CURVE
GTK_IS_GAMMA_CURVE
+GTK_TYPE_GAMMA_CURVE
gtk_gamma_curve_get_type
GTK_GAMMA_CURVE_CLASS
+GTK_IS_GAMMA_CURVE_CLASS
+GTK_GAMMA_CURVE_GET_CLASS
</SECTION>
<SECTION>
@@ -786,8 +826,11 @@ gtk_handle_box_set_snap_edge
<SUBSECTION Standard>
GTK_HANDLE_BOX
GTK_IS_HANDLE_BOX
+GTK_TYPE_HANDLE_BOX
gtk_handle_box_get_type
GTK_HANDLE_BOX_CLASS
+GTK_IS_HANDLE_BOX_CLASS
+GTK_HANDLE_BOX_GET_CLASS
</SECTION>
<SECTION>
@@ -802,8 +845,11 @@ gtk_hbutton_box_set_layout_default
<SUBSECTION Standard>
GTK_HBUTTON_BOX
GTK_IS_HBUTTON_BOX
+GTK_TYPE_HBUTTON_BOX
gtk_hbutton_box_get_type
GTK_HBUTTON_BOX_CLASS
+GTK_IS_HBUTTON_BOX_CLASS
+GTK_HBUTTON_BOX_GET_CLASS
</SECTION>
<SECTION>
@@ -818,6 +864,7 @@ GTK_TYPE_HBOX
gtk_hbox_get_type
GTK_HBOX_CLASS
GTK_IS_HBOX_CLASS
+GTK_HBOX_GET_CLASS
</SECTION>
<SECTION>
@@ -828,8 +875,11 @@ gtk_hpaned_new
<SUBSECTION Standard>
GTK_HPANED
GTK_IS_HPANED
+GTK_TYPE_HPANED
gtk_hpaned_get_type
GTK_HPANED_CLASS
+GTK_IS_HPANED_CLASS
+GTK_HPANED_GET_CLASS
</SECTION>
<SECTION>
@@ -840,8 +890,11 @@ gtk_hruler_new
<SUBSECTION Standard>
GTK_HRULER
GTK_IS_HRULER
+GTK_TYPE_HRULER
gtk_hruler_get_type
GTK_HRULER_CLASS
+GTK_IS_HRULER_CLASS
+GTK_HRULER_GET_CLASS
</SECTION>
<SECTION>
@@ -851,11 +904,12 @@ GtkHScale
gtk_hscale_new
<SUBSECTION Standard>
GTK_HSCALE
-GTK_TYPE_HSCALE
GTK_IS_HSCALE
-GTK_IS_HSCALE_CLASS
+GTK_TYPE_HSCALE
gtk_hscale_get_type
GTK_HSCALE_CLASS
+GTK_IS_HSCALE_CLASS
+GTK_HSCALE_GET_CLASS
</SECTION>
<SECTION>
@@ -865,11 +919,12 @@ GtkHScrollbar
gtk_hscrollbar_new
<SUBSECTION Standard>
GTK_HSCROLLBAR
-GTK_TYPE_HSCROLLBAR
GTK_IS_HSCROLLBAR
-GTK_IS_HSCROLLBAR_CLASS
+GTK_TYPE_HSCROLLBAR
gtk_hscrollbar_get_type
GTK_HSCROLLBAR_CLASS
+GTK_IS_HSCROLLBAR_CLASS
+GTK_HSCROLLBAR_GET_CLASS
</SECTION>
<SECTION>
@@ -884,6 +939,7 @@ GTK_TYPE_HSEPARATOR
gtk_hseparator_get_type
GTK_HSEPARATOR_CLASS
GTK_IS_HSEPARATOR_CLASS
+GTK_HSEPARATOR_GET_CLASS
</SECTION>
<SECTION>
@@ -895,11 +951,46 @@ gtk_image_set
gtk_image_get
<SUBSECTION Standard>
GTK_IMAGE
-GTK_TYPE_IMAGE
GTK_IS_IMAGE
-GTK_IS_IMAGE_CLASS
+GTK_TYPE_IMAGE
gtk_image_get_type
GTK_IMAGE_CLASS
+GTK_IS_IMAGE_CLASS
+GTK_IMAGE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtkimcontext</FILE>
+<TITLE>GtkIMContext</TITLE>
+GtkIMContext
+gtk_im_context_set_client_window
+gtk_im_context_get_preedit_string
+gtk_im_context_filter_keypress
+gtk_im_context_focus_in
+gtk_im_context_focus_out
+<SUBSECTION Standard>
+GTK_IM_CONTEXT
+GTK_IS_IM_CONTEXT
+GTK_TYPE_IM_CONTEXT
+gtk_im_context_get_type
+GTK_IM_CONTEXT_CLASS
+GTK_IS_IM_CONTEXT_CLASS
+GTK_IM_CONTEXT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtkimmulticontext</FILE>
+<TITLE>GtkIMMulticontext</TITLE>
+GtkIMMulticontext
+gtk_im_multicontext_new
+<SUBSECTION Standard>
+GTK_IM_MULTICONTEXT
+GTK_IS_IM_MULTICONTEXT
+GTK_TYPE_IM_MULTICONTEXT
+gtk_im_multicontext_get_type
+GTK_IM_MULTICONTEXT_CLASS
+GTK_IS_IM_MULTICONTEXT_CLASS
+GTK_IM_MULTICONTEXT_GET_CLASS
</SECTION>
<SECTION>
@@ -909,11 +1000,12 @@ GtkInputDialog
gtk_input_dialog_new
<SUBSECTION Standard>
GTK_INPUT_DIALOG
-GTK_TYPE_INPUT_DIALOG
GTK_IS_INPUT_DIALOG
-GTK_IS_INPUT_DIALOG_CLASS
+GTK_TYPE_INPUT_DIALOG
gtk_input_dialog_get_type
GTK_INPUT_DIALOG_CLASS
+GTK_IS_INPUT_DIALOG_CLASS
+GTK_INPUT_DIALOG_GET_CLASS
</SECTION>
<SECTION>
@@ -928,6 +1020,7 @@ GTK_TYPE_INVISIBLE
gtk_invisible_get_type
GTK_INVISIBLE_CLASS
GTK_IS_INVISIBLE_CLASS
+GTK_INVISIBLE_GET_CLASS
</SECTION>
<SECTION>
@@ -944,6 +1037,7 @@ GTK_TYPE_ITEM
gtk_item_get_type
GTK_ITEM_CLASS
GTK_IS_ITEM_CLASS
+GTK_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -962,10 +1056,13 @@ gtk_item_factory_construct
gtk_item_factory_parse_rc
gtk_item_factory_parse_rc_string
gtk_item_factory_parse_rc_scanner
+gtk_item_factory_add_foreign
gtk_item_factory_from_widget
gtk_item_factory_path_from_widget
+gtk_item_factory_get_item
gtk_item_factory_get_widget
gtk_item_factory_get_widget_by_action
+gtk_item_factory_get_item_by_action
gtk_item_factory_dump_items
gtk_item_factory_dump_rc
gtk_item_factory_print_func
@@ -990,6 +1087,7 @@ GTK_TYPE_ITEM_FACTORY
gtk_item_factory_get_type
GTK_ITEM_FACTORY_CLASS
GTK_IS_ITEM_FACTORY_CLASS
+GTK_ITEM_FACTORY_GET_CLASS
</SECTION>
<SECTION>
@@ -1012,6 +1110,7 @@ GTK_TYPE_LABEL
gtk_label_get_type
GTK_LABEL_CLASS
GTK_IS_LABEL_CLASS
+GTK_LABEL_GET_CLASS
</SECTION>
<SECTION>
@@ -1035,6 +1134,7 @@ GTK_TYPE_LAYOUT
gtk_layout_get_type
GTK_LAYOUT_CLASS
GTK_IS_LAYOUT_CLASS
+GTK_LAYOUT_GET_CLASS
</SECTION>
<SECTION>
@@ -1073,6 +1173,7 @@ GTK_TYPE_LIST
gtk_list_get_type
GTK_LIST_CLASS
GTK_IS_LIST_CLASS
+GTK_LIST_GET_CLASS
</SECTION>
<SECTION>
@@ -1090,6 +1191,7 @@ GTK_TYPE_LIST_ITEM
gtk_list_item_get_type
GTK_LIST_ITEM_CLASS
GTK_IS_LIST_ITEM_CLASS
+GTK_LIST_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -1103,6 +1205,9 @@ gtk_menu_insert
gtk_menu_reorder_child
gtk_menu_popup
gtk_menu_set_accel_group
+gtk_menu_get_accel_group
+gtk_menu_get_uline_accel_group
+gtk_menu_ensure_uline_accel_group
gtk_menu_set_title
<SUBSECTION>
gtk_menu_popdown
@@ -1122,6 +1227,7 @@ GTK_TYPE_MENU
gtk_menu_get_type
GTK_MENU_CLASS
GTK_IS_MENU_CLASS
+GTK_MENU_GET_CLASS
</SECTION>
<SECTION>
@@ -1140,6 +1246,7 @@ GTK_TYPE_MENU_BAR
gtk_menu_bar_get_type
GTK_MENU_BAR_CLASS
GTK_IS_MENU_BAR_CLASS
+GTK_MENU_BAR_GET_CLASS
</SECTION>
<SECTION>
@@ -1163,6 +1270,7 @@ GTK_TYPE_MENU_ITEM
gtk_menu_item_get_type
GTK_MENU_ITEM_CLASS
GTK_IS_MENU_ITEM_CLASS
+GTK_MENU_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -1174,6 +1282,7 @@ gtk_menu_shell_prepend
gtk_menu_shell_insert
gtk_menu_shell_deactivate
gtk_menu_shell_select_item
+gtk_menu_shell_deselect
gtk_menu_shell_activate_item
GtkMenuDirectionType
<SUBSECTION Standard>
@@ -1183,6 +1292,7 @@ GTK_TYPE_MENU_SHELL
gtk_menu_shell_get_type
GTK_MENU_SHELL_CLASS
GTK_IS_MENU_SHELL_CLASS
+GTK_MENU_SHELL_GET_CLASS
</SECTION>
<SECTION>
@@ -1198,6 +1308,7 @@ GTK_TYPE_MISC
gtk_misc_get_type
GTK_MISC_CLASS
GTK_IS_MISC_CLASS
+GTK_MISC_GET_CLASS
</SECTION>
<SECTION>
@@ -1247,14 +1358,14 @@ GTK_TYPE_NOTEBOOK
gtk_notebook_get_type
GTK_NOTEBOOK_CLASS
GTK_IS_NOTEBOOK_CLASS
+GTK_NOTEBOOK_GET_CLASS
</SECTION>
<SECTION>
<FILE>gtkobject</FILE>
GtkObject
GTK_OBJECT_TYPE
-GTK_OBJECT_SIGNALS
-GTK_OBJECT_NSIGNALS
+GTK_OBJECT_TYPE_NAME
GtkObjectFlags
GTK_OBJECT_FLAGS
GTK_OBJECT_DESTROYED
@@ -1277,6 +1388,7 @@ gtk_object_unref
gtk_object_weakref
gtk_object_weakunref
gtk_object_destroy
+gtk_object_get
gtk_object_getv
gtk_object_set
gtk_object_setv
@@ -1301,13 +1413,14 @@ gtk_object_arg_set
gtk_object_arg_get
gtk_object_args_collect
gtk_object_arg_get_info
-gtk_trace_referencing
<SUBSECTION Standard>
GTK_OBJECT
GTK_IS_OBJECT
+GTK_TYPE_OBJECT
gtk_object_get_type
GTK_OBJECT_CLASS
GTK_IS_OBJECT_CLASS
+GTK_OBJECT_GET_CLASS
</SECTION>
<SECTION>
@@ -1319,6 +1432,7 @@ gtk_option_menu_get_menu
gtk_option_menu_set_menu
gtk_option_menu_remove_menu
gtk_option_menu_set_history
+gtk_option_menu_get_history
<SUBSECTION Standard>
GTK_OPTION_MENU
GTK_IS_OPTION_MENU
@@ -1326,6 +1440,7 @@ GTK_TYPE_OPTION_MENU
gtk_option_menu_get_type
GTK_OPTION_MENU_CLASS
GTK_IS_OPTION_MENU_CLASS
+GTK_OPTION_MENU_GET_CLASS
</SECTION>
<SECTION>
@@ -1353,6 +1468,7 @@ GTK_TYPE_PACKER
gtk_packer_get_type
GTK_PACKER_CLASS
GTK_IS_PACKER_CLASS
+GTK_PACKER_GET_CLASS
</SECTION>
<SECTION>
@@ -1363,12 +1479,12 @@ gtk_paned_add1
gtk_paned_add2
gtk_paned_handle_size
gtk_paned_gutter_size
-gtk_paned_compute_position
gtk_paned_pack1
gtk_paned_pack2
gtk_paned_set_gutter_size
gtk_paned_set_handle_size
gtk_paned_set_position
+gtk_paned_get_position
<SUBSECTION Standard>
GTK_PANED
GTK_IS_PANED
@@ -1376,6 +1492,10 @@ GTK_TYPE_PANED
gtk_paned_get_type
GTK_PANED_CLASS
GTK_IS_PANED_CLASS
+GTK_PANED_GET_CLASS
+
+<SUBSECTION Private>
+gtk_paned_compute_position
</SECTION>
<SECTION>
@@ -1393,6 +1513,7 @@ GTK_TYPE_PIXMAP
gtk_pixmap_get_type
GTK_PIXMAP_CLASS
GTK_IS_PIXMAP_CLASS
+GTK_PIXMAP_GET_CLASS
</SECTION>
<SECTION>
@@ -1404,8 +1525,11 @@ gtk_plug_new
<SUBSECTION Standard>
GTK_PLUG
GTK_IS_PLUG
+GTK_TYPE_PLUG
gtk_plug_get_type
GTK_PLUG_CLASS
+GTK_IS_PLUG_CLASS
+GTK_PLUG_GET_CLASS
</SECTION>
<SECTION>
@@ -1432,8 +1556,11 @@ gtk_preview_reset
<SUBSECTION Standard>
GTK_PREVIEW
GTK_IS_PREVIEW
+GTK_TYPE_PREVIEW
gtk_preview_get_type
GTK_PREVIEW_CLASS
+GTK_IS_PREVIEW_CLASS
+GTK_PREVIEW_GET_CLASS
</SECTION>
<SECTION>
@@ -1455,11 +1582,12 @@ gtk_progress_get_percentage_from_value
gtk_progress_configure
<SUBSECTION Standard>
GTK_PROGRESS
-GTK_TYPE_PROGRESS
GTK_IS_PROGRESS
+GTK_TYPE_PROGRESS
gtk_progress_get_type
GTK_PROGRESS_CLASS
GTK_IS_PROGRESS_CLASS
+GTK_PROGRESS_GET_CLASS
</SECTION>
<SECTION>
@@ -1469,6 +1597,10 @@ GtkProgressBarStyle
GtkProgressBarOrientation
<TITLE>GtkProgressBar</TITLE>
gtk_progress_bar_new
+gtk_progress_bar_pulse
+gtk_progress_bar_set_text
+gtk_progress_bar_set_fraction
+gtk_progress_bar_set_pulse_step
gtk_progress_bar_new_with_adjustment
gtk_progress_bar_set_bar_style
gtk_progress_bar_set_discrete_blocks
@@ -1478,11 +1610,12 @@ gtk_progress_bar_set_orientation
gtk_progress_bar_update
<SUBSECTION Standard>
GTK_PROGRESS_BAR
-GTK_TYPE_PROGRESS_BAR
GTK_IS_PROGRESS_BAR
-GTK_IS_PROGRESS_BAR_CLASS
+GTK_TYPE_PROGRESS_BAR
gtk_progress_bar_get_type
GTK_PROGRESS_BAR_CLASS
+GTK_IS_PROGRESS_BAR_CLASS
+GTK_PROGRESS_BAR_GET_CLASS
</SECTION>
<SECTION>
@@ -1502,6 +1635,7 @@ GTK_TYPE_RADIO_BUTTON
gtk_radio_button_get_type
GTK_RADIO_BUTTON_CLASS
GTK_IS_RADIO_BUTTON_CLASS
+GTK_RADIO_BUTTON_GET_CLASS
</SECTION>
<SECTION>
@@ -1519,6 +1653,7 @@ GTK_TYPE_RADIO_MENU_ITEM
gtk_radio_menu_item_get_type
GTK_RADIO_MENU_ITEM_CLASS
GTK_IS_RADIO_MENU_ITEM_CLASS
+GTK_RADIO_MENU_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -1544,11 +1679,12 @@ gtk_range_default_vmotion
gtk_range_clear_background
<SUBSECTION Standard>
GTK_RANGE
-GTK_TYPE_RANGE
GTK_IS_RANGE
+GTK_TYPE_RANGE
gtk_range_get_type
GTK_RANGE_CLASS
GTK_IS_RANGE_CLASS
+GTK_RANGE_GET_CLASS
</SECTION>
<SECTION>
@@ -1561,8 +1697,12 @@ gtk_ruler_set_range
<SUBSECTION Standard>
GTK_RULER
GTK_IS_RULER
+GTK_TYPE_RULER
gtk_ruler_get_type
GTK_RULER_CLASS
+GTK_IS_RULER_CLASS
+GTK_RULER_GET_CLASS
+
<SUBSECTION Private>
gtk_ruler_draw_ticks
gtk_ruler_draw_pos
@@ -1578,13 +1718,15 @@ gtk_scale_set_value_pos
gtk_scale_get_value_width
<SUBSECTION Standard>
GTK_SCALE
-GTK_TYPE_SCALE
GTK_IS_SCALE
+GTK_TYPE_SCALE
gtk_scale_get_type
GTK_SCALE_CLASS
GTK_IS_SCALE_CLASS
+GTK_SCALE_GET_CLASS
<SUBSECTION Private>
gtk_scale_value_width
+gtk_scale_get_value_size
gtk_scale_draw_value
</SECTION>
@@ -1594,11 +1736,12 @@ gtk_scale_draw_value
GtkScrollbar
<SUBSECTION Standard>
GTK_SCROLLBAR
-GTK_TYPE_SCROLLBAR
GTK_IS_SCROLLBAR
+GTK_TYPE_SCROLLBAR
gtk_scrollbar_get_type
GTK_SCROLLBAR_CLASS
GTK_IS_SCROLLBAR_CLASS
+GTK_SCROLLBAR_GET_CLASS
</SECTION>
<SECTION>
@@ -1610,8 +1753,9 @@ gtk_scrolled_window_get_hadjustment
gtk_scrolled_window_get_vadjustment
gtk_scrolled_window_set_policy
gtk_scrolled_window_add_with_viewport
-gtk_scrolled_window_set_hadjustment
gtk_scrolled_window_set_placement
+gtk_scrolled_window_set_shadow_type
+gtk_scrolled_window_set_hadjustment
gtk_scrolled_window_set_vadjustment
<SUBSECTION Standard>
GTK_SCROLLED_WINDOW
@@ -1620,6 +1764,7 @@ GTK_TYPE_SCROLLED_WINDOW
gtk_scrolled_window_get_type
GTK_SCROLLED_WINDOW_CLASS
GTK_IS_SCROLLED_WINDOW_CLASS
+GTK_SCROLLED_WINDOW_GET_CLASS
</SECTION>
<SECTION>
@@ -1633,6 +1778,7 @@ GTK_TYPE_SEPARATOR
gtk_separator_get_type
GTK_SEPARATOR_CLASS
GTK_IS_SEPARATOR_CLASS
+GTK_SEPARATOR_GET_CLASS
</SECTION>
<SECTION>
@@ -1644,8 +1790,11 @@ gtk_socket_steal
<SUBSECTION Standard>
GTK_SOCKET
GTK_IS_SOCKET
+GTK_TYPE_SOCKET
gtk_socket_get_type
GTK_SOCKET_CLASS
+GTK_IS_SOCKET_CLASS
+GTK_SOCKET_GET_CLASS
</SECTION>
<SECTION>
@@ -1669,6 +1818,7 @@ gtk_spin_button_set_wrap
gtk_spin_button_set_shadow_type
gtk_spin_button_set_snap_to_ticks
gtk_spin_button_update
+GTK_INPUT_ERROR
<SUBSECTION Standard>
GTK_SPIN_BUTTON
GTK_IS_SPIN_BUTTON
@@ -1676,6 +1826,7 @@ GTK_TYPE_SPIN_BUTTON
gtk_spin_button_get_type
GTK_SPIN_BUTTON_CLASS
GTK_IS_SPIN_BUTTON_CLASS
+GTK_SPIN_BUTTON_GET_CLASS
</SECTION>
<SECTION>
@@ -1691,8 +1842,11 @@ gtk_statusbar_remove
<SUBSECTION Standard>
GTK_STATUSBAR
GTK_IS_STATUSBAR
+GTK_TYPE_STATUSBAR
gtk_statusbar_get_type
GTK_STATUSBAR_CLASS
+GTK_IS_STATUSBAR_CLASS
+GTK_STATUSBAR_GET_CLASS
</SECTION>
<SECTION>
@@ -1717,6 +1871,7 @@ GTK_TYPE_TABLE
gtk_table_get_type
GTK_TABLE_CLASS
GTK_IS_TABLE_CLASS
+GTK_TABLE_GET_CLASS
</SECTION>
<SECTION>
@@ -1731,6 +1886,7 @@ GTK_TYPE_TEAROFF_MENU_ITEM
gtk_tearoff_menu_item_get_type
GTK_TEAROFF_MENU_ITEM_CLASS
GTK_IS_TEAROFF_MENU_ITEM_CLASS
+GTK_TEAROFF_MENU_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -1760,6 +1916,225 @@ GTK_TYPE_TEXT
gtk_text_get_type
GTK_TEXT_CLASS
GTK_IS_TEXT_CLASS
+GTK_TEXT_GET_CLASS
+<SUBSECTION Standard>
+GTK_TEXT
+GTK_IS_TEXT
+GTK_TYPE_TEXT
+gtk_text_get_type
+GTK_TEXT_CLASS
+GTK_IS_TEXT_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtktextbuffer</FILE>
+GtkTextBTree
+<TITLE>GtkTextBuffer</TITLE>
+gtk_text_buffer_new
+gtk_text_buffer_get_line_count
+gtk_text_buffer_get_char_count
+gtk_text_buffer_get_tag_table
+gtk_text_buffer_insert
+gtk_text_buffer_insert_at_cursor
+gtk_text_buffer_insert_interactive
+gtk_text_buffer_insert_interactive_at_cursor
+gtk_text_buffer_delete
+gtk_text_buffer_delete_interactive
+gtk_text_buffer_get_text
+gtk_text_buffer_get_slice
+gtk_text_buffer_insert_pixmap
+gtk_text_buffer_create_mark
+gtk_text_buffer_move_mark
+gtk_text_buffer_delete_mark
+gtk_text_buffer_get_mark
+gtk_text_buffer_place_cursor
+gtk_text_buffer_apply_tag
+gtk_text_buffer_remove_tag
+gtk_text_buffer_apply_tag_by_name
+gtk_text_buffer_remove_tag_by_name
+gtk_text_buffer_create_tag
+gtk_text_buffer_get_iter_at_line_offset
+gtk_text_buffer_get_iter_at_offset
+gtk_text_buffer_get_iter_at_line
+gtk_text_buffer_get_last_iter
+gtk_text_buffer_get_bounds
+gtk_text_buffer_get_iter_at_mark
+gtk_text_buffer_get_tags
+gtk_text_buffer_modified
+gtk_text_buffer_set_modified
+gtk_text_buffer_set_clipboard_contents
+gtk_text_buffer_get_clipboard_contents
+gtk_text_buffer_paste_primary_selection
+gtk_text_buffer_delete_selection
+gtk_text_buffer_cut
+gtk_text_buffer_copy
+gtk_text_buffer_paste_clipboard
+gtk_text_buffer_get_selection_bounds
+gtk_text_buffer_find_string
+gtk_text_buffer_find_regexp
+gtk_text_buffer_spew
+<SUBSECTION Standard>
+GTK_TEXT_BUFFER
+GTK_IS_TEXT_BUFFER
+GTK_TYPE_TEXT_BUFFER
+gtk_text_buffer_get_type
+GTK_TEXT_BUFFER_CLASS
+GTK_IS_TEXT_BUFFER_CLASS
+GTK_TEXT_BUFFER_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtktextiter</FILE>
+<TITLE>GtkTextIter</TITLE>
+GtkTextBuffer
+GtkTextIter
+gtk_text_iter_get_buffer
+gtk_text_iter_copy
+gtk_text_iter_free
+gtk_text_iter_get_offset
+gtk_text_iter_get_line
+gtk_text_iter_get_line_offset
+gtk_text_iter_get_line_index
+gtk_text_iter_get_char
+gtk_text_iter_get_slice
+gtk_text_iter_get_text
+gtk_text_iter_get_visible_slice
+gtk_text_iter_get_visible_text
+gtk_text_iter_get_pixmap
+gtk_text_iter_get_marks
+gtk_text_iter_get_toggled_tags
+gtk_text_iter_begins_tag
+gtk_text_iter_ends_tag
+gtk_text_iter_toggles_tag
+gtk_text_iter_has_tag
+gtk_text_iter_editable
+gtk_text_iter_starts_line
+gtk_text_iter_ends_line
+gtk_text_iter_get_chars_in_line
+gtk_text_iter_get_attributes
+gtk_text_iter_is_last
+gtk_text_iter_is_first
+gtk_text_iter_next_char
+gtk_text_iter_prev_char
+gtk_text_iter_forward_chars
+gtk_text_iter_backward_chars
+gtk_text_iter_forward_line
+gtk_text_iter_backward_line
+gtk_text_iter_forward_lines
+gtk_text_iter_backward_lines
+gtk_text_iter_forward_word_ends
+gtk_text_iter_backward_word_starts
+gtk_text_iter_forward_word_end
+gtk_text_iter_backward_word_start
+gtk_text_iter_set_offset
+gtk_text_iter_set_line
+gtk_text_iter_set_line_offset
+gtk_text_iter_forward_to_end
+gtk_text_iter_forward_to_newline
+gtk_text_iter_forward_to_tag_toggle
+gtk_text_iter_backward_to_tag_toggle
+GtkTextCharPredicate
+gtk_text_iter_forward_find_char
+gtk_text_iter_backward_find_char
+gtk_text_iter_forward_search
+gtk_text_iter_backward_search
+gtk_text_iter_equal
+gtk_text_iter_compare
+gtk_text_iter_in_region
+gtk_text_iter_reorder
+gtk_text_iter_spew
+</SECTION>
+
+<SECTION>
+<FILE>gtktextmark</FILE>
+<TITLE>GtkTextMark</TITLE>
+GtkTextMark
+gtk_text_mark_set_visible
+gtk_text_mark_is_visible
+gtk_text_mark_ref
+gtk_text_mark_unref
+gtk_text_mark_deleted
+</SECTION>
+
+<SECTION>
+<FILE>gtktexttag</FILE>
+GtkTextTag
+GtkTextBTreeNode
+GtkTextTagTable
+GtkTextTabArray
+GtkWrapMode
+GtkTextAttributes
+<TITLE>GtkTextTag</TITLE>
+gtk_text_tag_new
+gtk_text_tag_get_priority
+gtk_text_tag_set_priority
+gtk_text_tag_event
+GtkTextAppearance
+gtk_text_attributes_new
+gtk_text_attributes_copy
+gtk_text_attributes_unref
+gtk_text_attributes_ref
+<SUBSECTION Standard>
+GTK_TEXT_TAG
+GTK_IS_TEXT_TAG
+GTK_TYPE_TEXT_TAG
+gtk_text_tag_get_type
+GTK_TEXT_TAG_CLASS
+GTK_IS_TEXT_TAG_CLASS
+GTK_TEXT_TAG_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtktexttagtable</FILE>
+GtkTextTagTableForeach
+<TITLE>GtkTextTagTable</TITLE>
+gtk_text_tag_table_new
+gtk_text_tag_table_add
+gtk_text_tag_table_remove
+gtk_text_tag_table_lookup
+gtk_text_tag_table_foreach
+gtk_text_tag_table_size
+<SUBSECTION Standard>
+GTK_TEXT_TAG_TABLE
+GTK_IS_TEXT_TAG_TABLE
+GTK_TYPE_TEXT_TAG_TABLE
+gtk_text_tag_table_get_type
+GTK_TEXT_TAG_TABLE_CLASS
+GTK_IS_TEXT_TAG_TABLE_CLASS
+GTK_TEXT_TAG_TABLE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gtktextview</FILE>
+GtkTextView
+GtkTextViewMovementStep
+GtkTextViewScrollType
+GtkTextViewDeleteType
+<TITLE>GtkTextView</TITLE>
+gtk_text_view_new
+gtk_text_view_new_with_buffer
+gtk_text_view_set_buffer
+gtk_text_view_get_buffer
+gtk_text_view_get_iter_at_pixel
+gtk_text_view_scroll_to_mark
+gtk_text_view_move_mark_onscreen
+gtk_text_view_place_cursor_onscreen
+gtk_text_view_get_visible_rect
+gtk_text_view_set_wrap_mode
+gtk_text_view_get_wrap_mode
+gtk_text_view_set_editable
+gtk_text_view_get_editable
+gtk_text_view_set_cursor_visible
+gtk_text_view_get_cursor_visible
+gtk_text_view_get_iter_location
+<SUBSECTION Standard>
+GTK_TEXT_VIEW
+GTK_IS_TEXT_VIEW
+GTK_TYPE_TEXT_VIEW
+gtk_text_view_get_type
+GTK_TEXT_VIEW_CLASS
+GTK_IS_TEXT_VIEW_CLASS
+GTK_TEXT_VIEW_GET_CLASS
</SECTION>
<SECTION>
@@ -1771,13 +2146,13 @@ gtk_tips_query_start_query
gtk_tips_query_stop_query
gtk_tips_query_set_caller
gtk_tips_query_set_labels
-<SUBSECTION Standard>
GTK_TIPS_QUERY
GTK_IS_TIPS_QUERY
GTK_TYPE_TIPS_QUERY
gtk_tips_query_get_type
GTK_TIPS_QUERY_CLASS
GTK_IS_TIPS_QUERY_CLASS
+GTK_TIPS_QUERY_GET_CLASS
</SECTION>
<SECTION>
@@ -1798,6 +2173,7 @@ GTK_TYPE_TOGGLE_BUTTON
gtk_toggle_button_get_type
GTK_TOGGLE_BUTTON_CLASS
GTK_IS_TOGGLE_BUTTON_CLASS
+GTK_TOGGLE_BUTTON_GET_CLASS
</SECTION>
<SECTION>
@@ -1830,8 +2206,11 @@ gtk_toolbar_get_button_relief
<SUBSECTION Standard>
GTK_TOOLBAR
GTK_IS_TOOLBAR
+GTK_TYPE_TOOLBAR
gtk_toolbar_get_type
GTK_TOOLBAR_CLASS
+GTK_IS_TOOLBAR_CLASS
+GTK_TOOLBAR_GET_CLASS
</SECTION>
<SECTION>
@@ -1854,6 +2233,7 @@ GTK_TYPE_TOOLTIPS
gtk_tooltips_get_type
GTK_TOOLTIPS_CLASS
GTK_IS_TOOLTIPS_CLASS
+GTK_TOOLTIPS_GET_CLASS
</SECTION>
<SECTION>
@@ -1886,6 +2266,7 @@ GTK_TYPE_TREE
gtk_tree_get_type
GTK_TREE_CLASS
GTK_IS_TREE_CLASS
+GTK_TREE_GET_CLASS
</SECTION>
<SECTION>
@@ -1908,6 +2289,7 @@ GTK_TYPE_TREE_ITEM
gtk_tree_item_get_type
GTK_TREE_ITEM_CLASS
GTK_IS_TREE_ITEM_CLASS
+GTK_TREE_ITEM_GET_CLASS
</SECTION>
<SECTION>
@@ -1922,8 +2304,11 @@ gtk_vbutton_box_set_layout_default
<SUBSECTION Standard>
GTK_VBUTTON_BOX
GTK_IS_VBUTTON_BOX
+GTK_TYPE_VBUTTON_BOX
gtk_vbutton_box_get_type
GTK_VBUTTON_BOX_CLASS
+GTK_IS_VBUTTON_BOX_CLASS
+GTK_VBUTTON_BOX_GET_CLASS
</SECTION>
<SECTION>
@@ -1938,6 +2323,7 @@ GTK_TYPE_VBOX
gtk_vbox_get_type
GTK_VBOX_CLASS
GTK_IS_VBOX_CLASS
+GTK_VBOX_GET_CLASS
</SECTION>
<SECTION>
@@ -1957,6 +2343,7 @@ GTK_TYPE_VIEWPORT
gtk_viewport_get_type
GTK_VIEWPORT_CLASS
GTK_IS_VIEWPORT_CLASS
+GTK_VIEWPORT_GET_CLASS
</SECTION>
<SECTION>
@@ -1967,8 +2354,11 @@ gtk_vpaned_new
<SUBSECTION Standard>
GTK_VPANED
GTK_IS_VPANED
+GTK_TYPE_VPANED
gtk_vpaned_get_type
GTK_VPANED_CLASS
+GTK_IS_VPANED_CLASS
+GTK_VPANED_GET_CLASS
</SECTION>
<SECTION>
@@ -1979,8 +2369,11 @@ gtk_vruler_new
<SUBSECTION Standard>
GTK_VRULER
GTK_IS_VRULER
+GTK_TYPE_VRULER
gtk_vruler_get_type
GTK_VRULER_CLASS
+GTK_IS_VRULER_CLASS
+GTK_VRULER_GET_CLASS
</SECTION>
<SECTION>
@@ -1990,11 +2383,12 @@ GtkVScale
gtk_vscale_new
<SUBSECTION Standard>
GTK_VSCALE
-GTK_TYPE_VSCALE
GTK_IS_VSCALE
+GTK_TYPE_VSCALE
gtk_vscale_get_type
GTK_VSCALE_CLASS
GTK_IS_VSCALE_CLASS
+GTK_VSCALE_GET_CLASS
</SECTION>
<SECTION>
@@ -2004,11 +2398,12 @@ GtkVScrollbar
gtk_vscrollbar_new
<SUBSECTION Standard>
GTK_VSCROLLBAR
-GTK_TYPE_VSCROLLBAR
GTK_IS_VSCROLLBAR
+GTK_TYPE_VSCROLLBAR
gtk_vscrollbar_get_type
GTK_VSCROLLBAR_CLASS
GTK_IS_VSCROLLBAR_CLASS
+GTK_VSCROLLBAR_GET_CLASS
</SECTION>
<SECTION>
@@ -2023,6 +2418,7 @@ GTK_TYPE_VSEPARATOR
gtk_vseparator_get_type
GTK_VSEPARATOR_CLASS
GTK_IS_VSEPARATOR_CLASS
+GTK_VSEPARATOR_GET_CLASS
</SECTION>
<SECTION>
@@ -2051,6 +2447,7 @@ GTK_WIDGET_HAS_GRAB
GTK_WIDGET_RC_STYLE
GTK_WIDGET_COMPOSITE_CHILD
GTK_WIDGET_APP_PAINTABLE
+GTK_WIDGET_DOUBLE_BUFFERED
GTK_WIDGET_SET_FLAGS
GTK_WIDGET_UNSET_FLAGS
GtkCallback
@@ -2136,16 +2533,30 @@ gtk_widget_pop_colormap
gtk_widget_pop_visual
gtk_widget_set_default_style
gtk_widget_set_default_colormap
-gtk_widget_set_default_visual
gtk_widget_get_default_style
+gtk_widget_set_default_visual
gtk_widget_get_default_colormap
gtk_widget_get_default_visual
+gtk_widget_set_direction
+GtkTextDirection
+gtk_widget_get_direction
+gtk_widget_set_default_direction
+gtk_widget_get_default_direction
gtk_widget_shape_combine_mask
gtk_widget_path
gtk_widget_class_path
gtk_widget_get_composite_name
gtk_widget_lock_accelerators
gtk_widget_modify_style
+gtk_widget_get_modifier_style
+gtk_widget_modify_fg
+gtk_widget_modify_bg
+gtk_widget_modify_text
+gtk_widget_modify_base
+gtk_widget_modify_font
+gtk_widget_create_pango_context
+gtk_widget_get_pango_context
+gtk_widget_create_pango_layout
gtk_widget_pop_composite_child
gtk_widget_push_composite_child
gtk_widget_queue_clear
@@ -2153,9 +2564,11 @@ gtk_widget_queue_clear_area
gtk_widget_queue_draw_area
gtk_widget_reset_shapes
gtk_widget_set_app_paintable
+gtk_widget_set_double_buffered
gtk_widget_set_composite_name
gtk_widget_set_scroll_adjustments
gtk_widget_unlock_accelerators
+gtk_widget_accelerators_locked
<SUBSECTION Standard>
GTK_WIDGET
GTK_IS_WIDGET
@@ -2163,6 +2576,7 @@ GTK_TYPE_WIDGET
gtk_widget_get_type
GTK_WIDGET_CLASS
GTK_IS_WIDGET_CLASS
+GTK_WIDGET_GET_CLASS
</SECTION>
<SECTION>
@@ -2172,8 +2586,6 @@ GtkWindow
gtk_window_new
gtk_window_set_title
gtk_window_set_wmclass
-gtk_window_set_focus
-gtk_window_set_default
gtk_window_set_policy
gtk_window_add_accel_group
gtk_window_remove_accel_group
@@ -2181,12 +2593,11 @@ gtk_window_position
gtk_window_activate_focus
gtk_window_activate_default
gtk_window_set_modal
-gtk_window_add_embedded_xid
-gtk_window_remove_embedded_xid
gtk_window_set_default_size
gtk_window_set_geometry_hints
gtk_window_set_position
gtk_window_set_transient_for
+gtk_window_list_toplevels
<SUBSECTION Standard>
GTK_WINDOW
GTK_IS_WINDOW
@@ -2194,6 +2605,14 @@ GTK_TYPE_WINDOW
gtk_window_get_type
GTK_WINDOW_CLASS
GTK_IS_WINDOW_CLASS
+GTK_WINDOW_GET_CLASS
+
+<SUBSECTION Private>
+gtk_window_set_focus
+gtk_window_set_default
+gtk_window_remove_embedded_xid
+gtk_window_add_embedded_xid
+gtk_window_reposition
</SECTION>
@@ -2201,6 +2620,7 @@ GTK_IS_WINDOW_CLASS
<FILE>gtkmain</FILE>
<TITLE>General</TITLE>
gtk_set_locale
+gtk_get_default_language
gtk_init
gtk_init_check
gtk_exit
@@ -2264,6 +2684,13 @@ gtk_key_snooper_remove
gtk_get_current_event
gtk_get_event_widget
gtk_propagate_event
+
+<SUBSECTION Private>
+gtk_init_abi_check
+gtk_init_check_abi_check
+gtk_win32_get_installation_directory
+GTKMAIN_C_VAR
+GTKTYPEUTILS_VAR
</SECTION>
@@ -2276,12 +2703,15 @@ gtk_micro_version
gtk_binary_age
gtk_interface_age
gtk_check_version
-<SUBSECTION Private>
+
+<SUBSECTION>
GTK_MAJOR_VERSION
GTK_MINOR_VERSION
GTK_MICRO_VERSION
GTK_BINARY_AGE
GTK_INTERFACE_AGE
+GTK_CHECK_VERSION
+<SUBSECTION Private>
GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS
GTK_HAVE_SIGNAL_INIT
GTK_HAVE_FEATURES_1_1_0
@@ -2365,6 +2795,15 @@ gtk_paint_slider
gtk_paint_string
gtk_paint_tab
gtk_paint_vline
+
+<SUBSECTION Standard>
+GTK_STYLE
+GTK_IS_STYLE
+GTK_TYPE_STYLE
+gtk_style_get_type
+GTK_STYLE_CLASS
+GTK_IS_STYLE_CLASS
+GTK_STYLE_GET_CLASS
</SECTION>
<SECTION>
@@ -2374,14 +2813,15 @@ GtkThemeEngine
gtk_theme_engine_get
gtk_theme_engine_ref
gtk_theme_engine_unref
-gtk_themes_init
-gtk_themes_exit
+gtk_theme_engine_create_rc_style
+gtk_theme_engine_register_type
</SECTION>
<SECTION>
<FILE>gtkrc</FILE>
<TITLE>Resource Files</TITLE>
GtkRcStyle
+GtkRcStyleClass
GtkRcFlags
GtkImageLoader
GtkRcTokenType
@@ -2405,9 +2845,20 @@ gtk_rc_get_theme_dir
gtk_rc_set_image_loader
gtk_rc_load_image
gtk_rc_style_new
+gtk_rc_style_copy
gtk_rc_style_ref
gtk_rc_style_unref
-<SUBSECTION Internals>
+
+<SUBSECTION Standard>
+GTK_RC_STYLE
+GTK_IS_RC_STYLE
+GTK_TYPE_RC_STYLE
+gtk_rc_style_get_type
+GTK_RC_STYLE_CLASS
+GTK_IS_RC_STYLE_CLASS
+GTK_RC_STYLE_GET_CLASS
+
+<SUBSECTION Private>
gtk_rc_init
</SECTION>
@@ -2435,8 +2886,6 @@ gtk_accel_group_handle_add
gtk_accel_group_handle_remove
gtk_accel_group_create_add
gtk_accel_group_create_remove
-gtk_accel_group_marshal_add
-gtk_accel_group_marshal_remove
gtk_accel_groups_from_object
gtk_accel_group_entries_from_object
gtk_accelerator_valid
@@ -2589,8 +3038,6 @@ gtk_marshal_INT__INT
gtk_marshal_INT__POINTER
gtk_marshal_INT__POINTER_CHAR_CHAR
gtk_marshal_NONE__BOOL
-gtk_marshal_NONE__C_CALLBACK
-gtk_marshal_NONE__C_CALLBACK_C_CALLBACK
gtk_marshal_NONE__INT
gtk_marshal_NONE__INT_FLOAT
gtk_marshal_NONE__INT_FLOAT_BOOL
@@ -2608,6 +3055,11 @@ gtk_marshal_NONE__POINTER_INT_POINTER
gtk_marshal_NONE__POINTER_POINTER
gtk_marshal_NONE__POINTER_POINTER_INT_INT
gtk_marshal_NONE__POINTER_POINTER_POINTER
+gtk_marshal_INT__OBJECT_BOXED_POINTER
+gtk_marshal_INT__POINTER_POINTER_POINTER
+gtk_marshal_NONE__POINTER_POINTER_INT
+gtk_marshal_NONE__STRING_POINTER
+gtk_marshal_NONE__INT_INT_INT
</SECTION>
<SECTION>
@@ -2617,6 +3069,8 @@ GtkArgInfo
gtk_arg_new
gtk_arg_copy
gtk_arg_free
+gtk_arg_reset
+gtk_arg_values_equal
gtk_args_collect
gtk_args_collect_cleanup
gtk_arg_get_info
@@ -2625,6 +3079,7 @@ gtk_args_query
gtk_arg_name_strip_type
gtk_arg_info_equal
gtk_arg_info_hash
+gtk_arg_to_valueloc
</SECTION>
<SECTION>
@@ -2632,11 +3087,9 @@ gtk_arg_info_hash
<TITLE>Types</TITLE>
GtkType
GtkFundamentalType
-GTK_TYPE_NUM_BUILTINS
-GTK_TYPE_FLAT_FIRST
-GTK_TYPE_FLAT_LAST
-GTK_TYPE_STRUCTURED_FIRST
-GTK_TYPE_STRUCTURED_LAST
+GTK_CLASS_NAME
+GTK_CLASS_TYPE
+GTK_TYPE_IS_OBJECT
GTK_TYPE_FUNDAMENTAL_LAST
GTK_TYPE_FUNDAMENTAL_MAX
GTK_STRUCT_OFFSET
@@ -2644,11 +3097,8 @@ GTK_CHECK_CAST
GTK_CHECK_CLASS_CAST
GTK_CHECK_TYPE
GTK_CHECK_CLASS_TYPE
-GTK_TYPE_IDENTIFIER
-gtk_identifier_get_type
-GTK_TYPE_MAKE
+GTK_CHECK_GET_CLASS
GTK_FUNDAMENTAL_TYPE
-GTK_TYPE_SEQNO
GTK_SIGNAL_FUNC
GtkClassInitFunc
GtkObjectInitFunc
@@ -2677,10 +3127,6 @@ GTK_VALUE_BOXED
GTK_VALUE_POINTER
GTK_VALUE_OBJECT
GTK_VALUE_SIGNAL
-GTK_VALUE_ARGS
-GTK_VALUE_CALLBACK
-GTK_VALUE_C_CALLBACK
-GTK_VALUE_FOREIGN
GTK_RETLOC_CHAR
GTK_RETLOC_UCHAR
GTK_RETLOC_BOOL
@@ -2697,156 +3143,23 @@ GTK_RETLOC_BOXED
GTK_RETLOC_POINTER
GTK_RETLOC_OBJECT
GtkTypeInfo
-GtkTypeQuery
GtkTypeClass
GtkEnumValue
+GtkFlagValue
gtk_type_init
gtk_type_unique
-gtk_type_set_chunk_alloc
gtk_type_name
gtk_type_from_name
gtk_type_parent
gtk_type_class
-gtk_type_parent_class
-gtk_type_children_types
gtk_type_new
-gtk_type_free
-gtk_type_describe_heritage
-gtk_type_describe_tree
gtk_type_is_a
-gtk_type_check_object_cast
-gtk_type_check_class_cast
-gtk_type_register_enum
-gtk_type_register_flags
gtk_type_enum_get_values
gtk_type_flags_get_values
gtk_type_enum_find_value
gtk_type_flags_find_value
-gtk_type_set_varargs_type
-gtk_type_get_varargs_type
-gtk_type_query
<SUBSECTION Private>
-GTK_TYPE_ACCEL_FLAGS
-GTK_TYPE_CALENDAR_DISPLAY_OPTIONS
-GTK_TYPE_CELL_TYPE
-GTK_TYPE_CLIST_DRAG_POS
-GTK_TYPE_BUTTON_ACTION
-GTK_TYPE_CTREE_POS
-GTK_TYPE_CTREE_LINE_STYLE
-GTK_TYPE_CTREE_EXPANDER_STYLE
-GTK_TYPE_CTREE_EXPANSION_TYPE
-GTK_TYPE_DEBUG_FLAG
-GTK_TYPE_DEST_DEFAULTS
-GTK_TYPE_TARGET_FLAGS
-GTK_TYPE_ARROW_TYPE
-GTK_TYPE_ATTACH_OPTIONS
-GTK_TYPE_BUTTON_BOX_STYLE
-GTK_TYPE_CURVE_TYPE
-GTK_TYPE_DIRECTION_TYPE
-GTK_TYPE_JUSTIFICATION
-GTK_TYPE_MATCH_TYPE
-GTK_TYPE_MENU_DIRECTION_TYPE
-GTK_TYPE_MENU_FACTORY_TYPE
-GTK_TYPE_METRIC_TYPE
-GTK_TYPE_ORIENTATION
-GTK_TYPE_CORNER_TYPE
-GTK_TYPE_PACK_TYPE
-GTK_TYPE_PATH_PRIORITY_TYPE
-GTK_TYPE_PATH_TYPE
-GTK_TYPE_POLICY_TYPE
-GTK_TYPE_POSITION_TYPE
-GTK_TYPE_PREVIEW_TYPE
-GTK_TYPE_RELIEF_STYLE
-GTK_TYPE_RESIZE_MODE
-GTK_TYPE_SIGNAL_RUN_TYPE
-GTK_TYPE_SCROLL_TYPE
-GTK_TYPE_SELECTION_MODE
-GTK_TYPE_SHADOW_TYPE
-GTK_TYPE_STATE_TYPE
-GTK_TYPE_SUBMENU_DIRECTION
-GTK_TYPE_SUBMENU_PLACEMENT
-GTK_TYPE_TOOLBAR_STYLE
-GTK_TYPE_TROUGH_TYPE
-GTK_TYPE_UPDATE_TYPE
-GTK_TYPE_VISIBILITY
-GTK_TYPE_WINDOW_POSITION
-GTK_TYPE_WINDOW_TYPE
-GTK_TYPE_SORT_TYPE
-GTK_TYPE_FONT_METRIC_TYPE
-GTK_TYPE_FONT_TYPE
-GTK_TYPE_FONT_FILTER_TYPE
-GTK_TYPE_OBJECT_FLAGS
-GTK_TYPE_ARG_FLAGS
-GTK_TYPE_PACKER_OPTIONS
-GTK_TYPE_SIDE_TYPE
-GTK_TYPE_ANCHOR_TYPE
-GTK_TYPE_PRIVATE_FLAGS
-GTK_TYPE_PROGRESS_BAR_STYLE
-GTK_TYPE_PROGRESS_BAR_ORIENTATION
-GTK_TYPE_RC_FLAGS
-GTK_TYPE_RC_TOKEN_TYPE
-GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY
-GTK_TYPE_SPIN_TYPE
-GTK_TYPE_TOOLBAR_CHILD_TYPE
-GTK_TYPE_TOOLBAR_SPACE_STYLE
-GTK_TYPE_TREE_VIEW_MODE
-GTK_TYPE_FUNDAMENTAL_TYPE
-GTK_TYPE_WIDGET_FLAGS
-GTK_TYPE_GDK_WINDOW_TYPE
-GTK_TYPE_GDK_WINDOW_CLASS
-GTK_TYPE_GDK_IMAGE_TYPE
-GTK_TYPE_GDK_VISUAL_TYPE
-GTK_TYPE_GDK_FONT_TYPE
-GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE
-GTK_TYPE_GDK_WINDOW_HINTS
-GTK_TYPE_GDK_FUNCTION
-GTK_TYPE_GDK_FILL
-GTK_TYPE_GDK_FILL_RULE
-GTK_TYPE_GDK_LINE_STYLE
-GTK_TYPE_GDK_CAP_STYLE
-GTK_TYPE_GDK_JOIN_STYLE
-GTK_TYPE_GDK_CURSOR_TYPE
-GTK_TYPE_GDK_FILTER_RETURN
-GTK_TYPE_GDK_VISIBILITY_STATE
-GTK_TYPE_GDK_EVENT_TYPE
-GTK_TYPE_GDK_EVENT_MASK
-GTK_TYPE_GDK_NOTIFY_TYPE
-GTK_TYPE_GDK_CROSSING_MODE
-GTK_TYPE_GDK_MODIFIER_TYPE
-GTK_TYPE_GDK_SUBWINDOW_MODE
-GTK_TYPE_GDK_INPUT_CONDITION
-GTK_TYPE_GDK_STATUS
-GTK_TYPE_GDK_BYTE_ORDER
-GTK_TYPE_GDK_GC_VALUES_MASK
-GTK_TYPE_GDK_SELECTION
-GTK_TYPE_GDK_PROPERTY_STATE
-GTK_TYPE_GDK_PROP_MODE
-GTK_TYPE_GDK_INPUT_SOURCE
-GTK_TYPE_GDK_INPUT_MODE
-GTK_TYPE_GDK_AXIS_USE
-GTK_TYPE_GDK_TARGET
-GTK_TYPE_GDK_SELECTION_TYPE
-GTK_TYPE_GDK_EXTENSION_MODE
-GTK_TYPE_GDK_IM_STYLE
-GTK_TYPE_GDK_IC_ATTRIBUTES_TYPE
-GTK_TYPE_GDK_WM_DECORATION
-GTK_TYPE_GDK_WM_FUNCTION
-GTK_TYPE_GDK_COLOR_CONTEXT_MODE
-GTK_TYPE_GDK_OVERLAP_TYPE
-GTK_TYPE_GDK_DRAG_ACTION
-GTK_TYPE_GDK_DRAG_PROTOCOL
-GTK_TYPE_GDK_RGB_DITHER
-GTK_TYPE_ACCEL_GROUP
-GTK_TYPE_SELECTION_DATA
-GTK_TYPE_STYLE
-GTK_TYPE_CTREE_NODE
-GTK_TYPE_GDK_COLORMAP
-GTK_TYPE_GDK_VISUAL
-GTK_TYPE_GDK_FONT
-GTK_TYPE_GDK_WINDOW
-GTK_TYPE_GDK_DRAG_CONTEXT
-GTK_TYPE_GDK_EVENT
-GTK_TYPE_GDK_COLOR
+GTK_TYPE_IDENTIFIER
</SECTION>
<SECTION>
@@ -2911,24 +3224,6 @@ GtkVisibility
GtkWindowPosition
GtkWindowType
GtkSortType
-</SECTION>
-
-<SECTION>
-<FILE>gtkprivate</FILE>
-<TITLE>Private Information</TITLE>
-<INCLUDE>gtk/gtkprivate.h</INCLUDE>
-GtkPrivateFlags
-GTK_PRIVATE_FLAGS
-GTK_WIDGET_USER_STYLE
-GTK_WIDGET_REDRAW_PENDING
-GTK_CONTAINER_RESIZE_PENDING
-GTK_WIDGET_RESIZE_NEEDED
-GTK_WIDGET_LEAVE_PENDING
-GTK_WIDGET_HAS_SHAPE_MASK
-GTK_WIDGET_IN_REPARENT
-GTK_WIDGET_IS_OFFSCREEN
-GTK_PRIVATE_SET_FLAG
-GTK_PRIVATE_UNSET_FLAG
<SUBSECTION Private>
GtkMenuCallback
@@ -2944,9 +3239,5 @@ gtk_menu_factory_remove_paths
gtk_menu_factory_remove_entries
gtk_menu_factory_remove_subfactory
gtk_menu_factory_find
-
-GtkDebugFlag
-gtk_debug_flags
-GTK_NOTE
</SECTION>
diff --git a/docs/reference/gtk/gtk.args b/docs/reference/gtk/gtk.args
index 56aaf5625..c9679ebbd 100644
--- a/docs/reference/gtk/gtk.args
+++ b/docs/reference/gtk/gtk.args
@@ -41,6 +41,30 @@
</ARG>
<ARG>
+<NAME>GtkAspectFrame::xalign</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkAspectFrame::yalign</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkAspectFrame::ratio</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkAspectFrame::obey_child</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkBox::spacing</NAME>
<TYPE>gint</TYPE>
<FLAGS>rw</FLAGS>
@@ -54,7 +78,7 @@
<ARG>
<NAME>GtkButton::label</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
@@ -107,6 +131,12 @@
</ARG>
<ARG>
+<NAME>GtkCList::sort_type</NAME>
+<TYPE>GtkSortType</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkContainer::border_width</NAME>
<TYPE>gulong</TYPE>
<FLAGS>rw</FLAGS>
@@ -125,6 +155,12 @@
</ARG>
<ARG>
+<NAME>GtkContainer::reallocate_redraws</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkCTree::n_columns</NAME>
<TYPE>guint</TYPE>
<FLAGS>rwX</FLAGS>
@@ -167,6 +203,36 @@
</ARG>
<ARG>
+<NAME>GtkCurve::curve_type</NAME>
+<TYPE>GtkCurveType</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkCurve::min_x</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkCurve::max_x</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkCurve::min_y</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkCurve::max_y</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkEditable::text_position</NAME>
<TYPE>gint</TYPE>
<FLAGS>rw</FLAGS>
@@ -192,7 +258,7 @@
<ARG>
<NAME>GtkFrame::label</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
@@ -221,26 +287,38 @@
</ARG>
<ARG>
+<NAME>GtkHandleBox::handle_position</NAME>
+<TYPE>GtkPositionType</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkHandleBox::snap_edge</NAME>
+<TYPE>GtkPositionType</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkHScale::adjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkHScrollbar::adjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkLabel::label</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkLabel::pattern</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
@@ -251,6 +329,18 @@
</ARG>
<ARG>
+<NAME>GtkLabel::wrap</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkList::selection_mode</NAME>
+<TYPE>GtkSelectionMode</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkMenuBar::shadow</NAME>
<TYPE>GtkShadowType</TYPE>
<FLAGS>rw</FLAGS>
@@ -335,6 +425,12 @@
</ARG>
<ARG>
+<NAME>GtkNotebook::homogeneous</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkObject::user_data</NAME>
<TYPE>gpointer</TYPE>
<FLAGS>rw</FLAGS>
@@ -401,6 +497,18 @@
</ARG>
<ARG>
+<NAME>GtkPaned::handle_size</NAME>
+<TYPE>guint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkPreview::expand</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkProgress::activity_mode</NAME>
<TYPE>gboolean</TYPE>
<FLAGS>rw</FLAGS>
@@ -427,7 +535,7 @@
<ARG>
<NAME>GtkProgressBar::adjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
@@ -461,6 +569,18 @@
</ARG>
<ARG>
+<NAME>GtkProgressBar::fraction</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkProgressBar::pulse_step</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkRadioButton::group</NAME>
<TYPE>GtkRadioButton</TYPE>
<FLAGS>w</FLAGS>
@@ -473,6 +593,30 @@
</ARG>
<ARG>
+<NAME>GtkRuler::lower</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkRuler::upper</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkRuler::position</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkRuler::max_size</NAME>
+<TYPE>gfloat</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkScale::digits</NAME>
<TYPE>gint</TYPE>
<FLAGS>rw</FLAGS>
@@ -521,6 +665,12 @@
</ARG>
<ARG>
+<NAME>GtkScrolledWindow::shadow</NAME>
+<TYPE>GtkShadowType</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkSpinButton::adjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
<FLAGS>rw</FLAGS>
@@ -607,13 +757,13 @@
<ARG>
<NAME>GtkText::hadjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkText::vadjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
@@ -629,6 +779,318 @@
</ARG>
<ARG>
+<NAME>GtkTextTag::name</NAME>
+<TYPE>gstring</TYPE>
+<FLAGS>rwX</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background</NAME>
+<TYPE>gstring</TYPE>
+<FLAGS>w</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_gdk</NAME>
+<TYPE>GdkColor</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_full_height</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_stipple</NAME>
+<TYPE>GdkPixmap</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::direction</NAME>
+<TYPE>GEnum</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::editable</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::font</NAME>
+<TYPE>gstring</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::font_desc</NAME>
+<TYPE>GtkBoxed</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::foreground</NAME>
+<TYPE>gstring</TYPE>
+<FLAGS>w</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::foreground_gdk</NAME>
+<TYPE>GdkColor</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::foreground_stipple</NAME>
+<TYPE>GdkPixmap</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::justify</NAME>
+<TYPE>GEnum</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::language</NAME>
+<TYPE>gstring</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::left_margin</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::left_wrapped_line_margin</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::offset</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::overstrike</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::pixels_above_lines</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::pixels_below_lines</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::pixels_inside_wrap</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::right_margin</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::underline</NAME>
+<TYPE>GEnum</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::wrap_mode</NAME>
+<TYPE>GEnum</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_full_height_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_gdk_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::background_stipple_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::editable_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::font_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::foreground_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::foreground_gdk_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::foreground_stipple_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::justify_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::language_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::left_margin_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::left_wrapped_line_margin_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::offset_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::overstrike_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::pixels_above_lines_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::pixels_below_lines_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::pixels_inside_wrap_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::right_margin_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::underline_set</NAME>
+<TYPE>GEnum</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextTag::wrap_mode_set</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::height_lines</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::width_columns</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::pixels_above_lines</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::pixels_below_lines</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::pixels_inside_wrap</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::editable</NAME>
+<TYPE>gboolean</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkTextView::wrap_mode</NAME>
+<TYPE>GEnum</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkTipsQuery::emit_always</NAME>
<TYPE>gboolean</TYPE>
<FLAGS>rw</FLAGS>
@@ -642,13 +1104,13 @@
<ARG>
<NAME>GtkTipsQuery::label_inactive</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkTipsQuery::label_no_tip</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
@@ -665,15 +1127,45 @@
</ARG>
<ARG>
+<NAME>GtkToolbar::orientation</NAME>
+<TYPE>GtkOrientation</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkToolbar::toolbar_style</NAME>
+<TYPE>GtkToolbarStyle</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkToolbar::space_size</NAME>
+<TYPE>guint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkToolbar::space_style</NAME>
+<TYPE>GtkToolbarSpaceStyle</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkToolbar::relief</NAME>
+<TYPE>GtkReliefStyle</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
<NAME>GtkViewport::hadjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkViewport::vadjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
@@ -685,18 +1177,18 @@
<ARG>
<NAME>GtkVScale::adjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkVScrollbar::adjustment</NAME>
<TYPE>GtkAdjustment</TYPE>
-<FLAGS>rwx</FLAGS>
+<FLAGS>rw</FLAGS>
</ARG>
<ARG>
<NAME>GtkWidget::name</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
@@ -810,7 +1302,7 @@
<ARG>
<NAME>GtkWindow::title</NAME>
-<TYPE>GtkString</TYPE>
+<TYPE>gstring</TYPE>
<FLAGS>rw</FLAGS>
</ARG>
@@ -844,3 +1336,15 @@
<FLAGS>rw</FLAGS>
</ARG>
+<ARG>
+<NAME>GtkWindow::default_width</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
+<ARG>
+<NAME>GtkWindow::default_height</NAME>
+<TYPE>gint</TYPE>
+<FLAGS>rw</FLAGS>
+</ARG>
+
diff --git a/docs/reference/gtk/gtk.hierarchy b/docs/reference/gtk/gtk.hierarchy
index dbf000ed2..9f808f4bc 100644
--- a/docs/reference/gtk/gtk.hierarchy
+++ b/docs/reference/gtk/gtk.hierarchy
@@ -25,8 +25,8 @@ GtkObject
GtkListItem
GtkTreeItem
GtkWindow
- GtkColorSelectionDialog
GtkDialog
+ GtkColorSelectionDialog
GtkInputDialog
GtkFileSelection
GtkFontSelectionDialog
@@ -41,6 +41,7 @@ GtkObject
GtkVButtonBox
GtkVBox
GtkColorSelection
+ GtkFontSelection
GtkGammaCurve
GtkHBox
GtkCombo
@@ -48,8 +49,6 @@ GtkObject
GtkCList
GtkCTree
GtkFixed
- GtkNotebook
- GtkFontSelection
GtkPaned
GtkHPaned
GtkVPaned
@@ -58,9 +57,11 @@ GtkObject
GtkMenuShell
GtkMenu
GtkMenuBar
+ GtkNotebook
GtkPacker
GtkSocket
GtkTable
+ GtkTextView
GtkToolbar
GtkTree
GtkCalendar
@@ -90,4 +91,9 @@ GtkObject
GtkData
GtkAdjustment
GtkTooltips
+ GtkIMContext
+ GtkIMMulticontext
GtkItemFactory
+ GtkTextBuffer
+ GtkTextTag
+ GtkTextTagTable
diff --git a/docs/reference/gtk/gtk.signals b/docs/reference/gtk/gtk.signals
index 336b40d73..7884bbd9f 100644
--- a/docs/reference/gtk/gtk.signals
+++ b/docs/reference/gtk/gtk.signals
@@ -212,14 +212,14 @@ GtkColorSelection *colorselection
<NAME>GtkContainer::add</NAME>
<RETURNS>void</RETURNS>
GtkContainer *container
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
<NAME>GtkContainer::remove</NAME>
<RETURNS>void</RETURNS>
GtkContainer *container
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
@@ -239,7 +239,7 @@ GtkDirectionType direction
<NAME>GtkContainer::set-focus-child</NAME>
<RETURNS>void</RETURNS>
GtkContainer *container
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
@@ -416,14 +416,39 @@ GtkEditable *editable
<NAME>GtkHandleBox::child-attached</NAME>
<RETURNS>void</RETURNS>
GtkHandleBox *handlebox
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
<NAME>GtkHandleBox::child-detached</NAME>
<RETURNS>void</RETURNS>
GtkHandleBox *handlebox
-GtkWidget *widget
+GtkWidget widget
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkIMContext::preedit-start</NAME>
+<RETURNS>void</RETURNS>
+GtkIMContext *imcontext
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkIMContext::preedit-end</NAME>
+<RETURNS>void</RETURNS>
+GtkIMContext *imcontext
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkIMContext::preedit-changed</NAME>
+<RETURNS>void</RETURNS>
+GtkIMContext *imcontext
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkIMContext::commit</NAME>
+<RETURNS>void</RETURNS>
+GtkIMContext *imcontext
+gstring arg1
</SIGNAL>
<SIGNAL>
@@ -468,14 +493,14 @@ GtkList *list
<NAME>GtkList::select-child</NAME>
<RETURNS>void</RETURNS>
GtkList *list
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
<NAME>GtkList::unselect-child</NAME>
<RETURNS>void</RETURNS>
GtkList *list
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
@@ -604,6 +629,19 @@ GtkObject *object
</SIGNAL>
<SIGNAL>
+<NAME>GtkSpinButton::input</NAME>
+<RETURNS>gint</RETURNS>
+GtkSpinButton *spinbutton
+gpointer arg1
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkSpinButton::output</NAME>
+<RETURNS>gboolean</RETURNS>
+GtkSpinButton *spinbutton
+</SIGNAL>
+
+<SIGNAL>
<NAME>GtkStatusbar::text-pushed</NAME>
<RETURNS>void</RETURNS>
GtkStatusbar *statusbar
@@ -620,6 +658,163 @@ gchar *text
</SIGNAL>
<SIGNAL>
+<NAME>GtkTextBuffer::insert-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+gpointer arg1
+gpointer arg2
+gint arg3
+gboolean arg4
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::delete-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+gpointer arg1
+gpointer arg2
+gboolean arg3
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::changed</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::modified-changed</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::mark-set</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+gpointer arg1
+gpointer arg2
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::mark-deleted</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+gpointer arg1
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::apply-tag</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+gpointer arg1
+gpointer arg2
+gpointer arg3
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextBuffer::remove-tag</NAME>
+<RETURNS>void</RETURNS>
+GtkTextBuffer *textbuffer
+gpointer arg1
+gpointer arg2
+gpointer arg3
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextTag::event</NAME>
+<RETURNS>gint</RETURNS>
+GtkTextTag *texttag
+GtkObject arg1
+GdkEvent *event
+gpointer arg2
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextTagTable::tag-changed</NAME>
+<RETURNS>void</RETURNS>
+GtkTextTagTable *texttagtable
+GtkObject arg1
+gboolean arg2
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextTagTable::tag-added</NAME>
+<RETURNS>void</RETURNS>
+GtkTextTagTable *texttagtable
+GtkObject arg1
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextTagTable::tag-removed</NAME>
+<RETURNS>void</RETURNS>
+GtkTextTagTable *texttagtable
+GtkObject arg1
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::move-insert</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+GEnum arg1
+gint arg2
+gboolean arg3
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::set-anchor</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::scroll-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+GEnum arg1
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::delete-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+GEnum arg1
+gint arg2
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::cut-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::copy-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::paste-text</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::toggle-overwrite</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+</SIGNAL>
+
+<SIGNAL>
+<NAME>GtkTextView::set-scroll-adjustments</NAME>
+<RETURNS>void</RETURNS>
+GtkTextView *textview
+GtkAdjustment arg1
+GtkAdjustment arg2
+</SIGNAL>
+
+<SIGNAL>
<NAME>GtkTipsQuery::start-query</NAME>
<RETURNS>void</RETURNS>
GtkTipsQuery *tipsquery
@@ -680,14 +875,14 @@ GtkTree *tree
<NAME>GtkTree::select-child</NAME>
<RETURNS>void</RETURNS>
GtkTree *tree
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
<NAME>GtkTree::unselect-child</NAME>
<RETURNS>void</RETURNS>
GtkTree *tree
-GtkWidget *widget
+GtkWidget widget
</SIGNAL>
<SIGNAL>
@@ -793,6 +988,13 @@ GtkStyle *previous_style
</SIGNAL>
<SIGNAL>
+<NAME>GtkWidget::direction-changed</NAME>
+<RETURNS>void</RETURNS>
+GtkWidget *widget
+GtkTextDirection arg1
+</SIGNAL>
+
+<SIGNAL>
<NAME>GtkWidget::add-accelerator</NAME>
<RETURNS>void</RETURNS>
GtkWidget *widget
@@ -840,6 +1042,13 @@ GdkEventButton *event
</SIGNAL>
<SIGNAL>
+<NAME>GtkWidget::scroll-event</NAME>
+<RETURNS>gboolean</RETURNS>
+GtkWidget *widget
+GdkEvent *event
+</SIGNAL>
+
+<SIGNAL>
<NAME>GtkWidget::motion-notify-event</NAME>
<RETURNS>gboolean</RETURNS>
GtkWidget *widget
diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types
index 1bc77ae57..8ad7b8c1e 100644
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -39,8 +39,9 @@ gtk_hruler_get_type
gtk_hscale_get_type
gtk_hscrollbar_get_type
gtk_hseparator_get_type
-gtk_identifier_get_type
gtk_image_get_type
+gtk_im_context_get_type
+gtk_im_multicontext_get_type
gtk_input_dialog_get_type
gtk_invisible_get_type
gtk_item_get_type
@@ -78,6 +79,10 @@ gtk_statusbar_get_type
gtk_table_get_type
gtk_tearoff_menu_item_get_type
gtk_text_get_type
+gtk_text_buffer_get_type
+gtk_text_tag_get_type
+gtk_text_tag_table_get_type
+gtk_text_view_get_type
gtk_tips_query_get_type
gtk_toggle_button_get_type
gtk_toolbar_get_type
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 8cd00ccc2..ca67652dd 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1,27 +1,131 @@
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Title ##### -->
-Menu Factory
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Title ##### -->
+Debugging
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER ##### -->
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### MACRO gtk_marshal_NONE__BOXED ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### STRUCT GtkMenuFactory ##### -->
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### MACRO gtk_marshal_NONE__UINT_STRING ##### -->
<para>
</para>
-@path:
+
+<!-- ##### MACRO GTK_PRIVATE_UNSET_FLAG ##### -->
+<para>
+
+</para>
+
+@wid:
+@flag:
+
+<!-- ##### MACRO GTK_WIDGET_REDRAW_PENDING ##### -->
+<para>
+
+</para>
+
+@obj:
+
+<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_window_set_focus ##### -->
+<para>
+
+</para>
+
+@window:
+@focus:
+
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_ENUM ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_font_selection_set_filter ##### -->
+<para>
+Sets one of the two font filters, to limit the fonts shown.
+</para>
+
+@fontsel: a #GtkFontSelection.
+@filter_type: which of the two font filters to set, either
+#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter
+can be changed by the user, but the base filter is permanent.
+@font_type: the types of font to be shown. This is a bitwise combination of
+#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP,
+or #GTK_FONT_ALL to show all three font types.
+@foundries: a NULL-terminated array of strings containing foundry names which
+will be shown, or NULL to show all foundries.
+@weights: a NULL-terminated array of strings containing weight names which
+will be shown, or NULL to show all weights.
+@slants: a NULL-terminated array of strings containing slant names which
+will be shown, or NULL to show all slants.
+@setwidths: a NULL-terminated array of strings containing setwidth names which
+will be shown, or NULL to show all setwidths.
+@spacings: a NULL-terminated array of strings containing spacings which
+will be shown, or NULL to show all spacings.
+@charsets: a NULL-terminated array of strings containing charset names which
+will be shown, or NULL to show all charsets.
+
+<!-- ##### FUNCTION gtk_container_unregister_toplevel ##### -->
+<para>
+
+</para>
+
+@container:
+
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkTypeQuery ##### -->
+<para>
+A structure used to return values from @gtk_type_query.
+</para>
+
@type:
-@accel_group:
-@widget:
-@subfactories:
+@type_name:
+@object_size:
+@class_size:
+
+<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK ##### -->
+<para>
+
+</para>
+
+@object:
+@func:
+@func_data:
+@args:
<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT ##### -->
<para>
@@ -33,13 +137,24 @@ Menu Factory
@func_data:
@args:
-<!-- ##### MACRO gtk_marshal_NONE__UINT_STRING ##### -->
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### FUNCTION gtk_identifier_get_type ##### -->
+<para>
+Get the type of GtkIdentifier.
+</para>
+
+@Returns: GtkType -- the enumerated type of something.
+
+<!-- ##### MACRO gtk_marshal_BOOL__POINTER_INT_INT_UINT ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER ##### -->
<para>
</para>
@@ -49,7 +164,7 @@ Menu Factory
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT ##### -->
<para>
</para>
@@ -59,7 +174,7 @@ Menu Factory
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_INT__POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__NONE ##### -->
<para>
</para>
@@ -69,28 +184,105 @@ Menu Factory
@func_data:
@args:
-<!-- ##### FUNCTION gtk_menu_factory_find ##### -->
+<!-- ##### MACRO gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER ##### -->
<para>
</para>
-@factory:
-@path:
+
+<!-- ##### FUNCTION gtk_ruler_draw_ticks ##### -->
+<para>
+
+</para>
+
+@ruler: the gtkruler
+
+<!-- ##### FUNCTION gtk_themes_init ##### -->
+<para>
+
+</para>
+
+@argc:
+@argv:
+
+<!-- ##### FUNCTION gtk_type_register_enum ##### -->
+<para>
+Register a new set of enum @values and give them the name in
+@type_name.
+</para>
+
+@type_name: must not be null.
+@values: GtkEnumValue*
@Returns:
-<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT_BOOL ##### -->
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Title ##### -->
+Menu Factory
+
+
+<!-- ##### VARIABLE gtk_debug_flags ##### -->
<para>
</para>
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_STRING_STRING ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER ##### -->
+<!-- ##### MACRO GTK_TYPE_SEQNO ##### -->
+<para>
+Convert a gtk type into its sequence number
+</para>
+
+@type:
+
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM GtkMenuFactoryType ##### -->
+<para>
+
+</para>
+
+@GTK_MENU_FACTORY_MENU:
+@GTK_MENU_FACTORY_MENU_BAR:
+@GTK_MENU_FACTORY_OPTION_MENU:
+
+<!-- ##### MACRO gtk_marshal_NONE__STRING ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_POINTER_UINT_UINT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_WIDGET_IS_OFFSCREEN ##### -->
+<para>
+
+</para>
+
+@obj:
+
+<!-- ##### MACRO GTK_MAX_COMPOSE_LEN ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER ##### -->
<para>
</para>
@@ -100,7 +292,7 @@ Menu Factory
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_INT_INT ##### -->
<para>
</para>
@@ -110,22 +302,29 @@ Menu Factory
@func_data:
@args:
-<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER ##### -->
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:See_Also ##### -->
<para>
</para>
-<!-- ##### ENUM GtkMenuFactoryType ##### -->
+<!-- ##### MACRO GTK_CONTAINER_RESIZE_PENDING ##### -->
<para>
</para>
-@GTK_MENU_FACTORY_MENU:
-@GTK_MENU_FACTORY_MENU_BAR:
-@GTK_MENU_FACTORY_OPTION_MENU:
+@obj:
-<!-- ##### FUNCTION gtk_marshal_INT__POINTER_CHAR_CHAR ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_remove_entries ##### -->
+<para>
+
+</para>
+
+@factory:
+@entries:
+@nentries:
+
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER ##### -->
<para>
</para>
@@ -135,7 +334,7 @@ Menu Factory
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_INT__INT ##### -->
<para>
</para>
@@ -145,6 +344,16 @@ Menu Factory
@func_data:
@args:
+<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
+<para>
+Internal function used by #GtkHPaned and #GtkVPaned
+</para>
+
+@paned:
+@allocation:
+@child1_req:
+@child2_req:
+
<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT_BOOL ##### -->
<para>
@@ -155,40 +364,127 @@ Menu Factory
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_STRING_STRING ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### MACRO gtk_marshal_NONE__BOXED ##### -->
+<!-- ##### FUNCTION gtk_trace_referencing ##### -->
<para>
+Private: print debugging information while doing a gtk_object_ref() or
+a gtk_object_unref().
+</para>
+@object: object to reference or unreference.
+@func: name of caller's function to print (used within macros).
+@dummy: unused.
+@line: line number (used within macros).
+@do_ref: whether to reference or unreference.
+
+<!-- ##### MACRO GTK_VALUE_CALLBACK ##### -->
+<para>
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK
</para>
+@a:
-<!-- ##### FUNCTION gtk_menu_factory_add_entries ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT_BOOL ##### -->
<para>
</para>
-@factory:
-@entries:
-@nentries:
-<!-- ##### STRUCT GtkMenuPath ##### -->
+<!-- ##### ENUM GtkFontType ##### -->
+<para>
+A set of bit flags used to specify the type of fonts shown
+when calling gtk_font_selection_dialog_set_filter() or
+gtk_font_selection_set_filter().
+</para>
+
+@GTK_FONT_BITMAP: bitmap fonts.
+@GTK_FONT_SCALABLE: scalable fonts.
+@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
+@GTK_FONT_ALL: a bitwise combination of all of the above.
+
+<!-- ##### MACRO GTK_TYPE_STRUCTURED_LAST ##### -->
+<para>
+The last structured enumerated type value.
+</para>
+
+
+<!-- ##### MACRO GTK_OBJECT_NSIGNALS ##### -->
+<para>
+Get the number of signals defined by this object.
+</para>
+
+@obj: the object to query.
+
+<!-- ##### FUNCTION gtk_menu_factory_remove_subfactory ##### -->
<para>
</para>
+@factory:
+@subfactory:
@path:
-@widget:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT ##### -->
+<!-- ##### FUNCTION gtk_type_children_types ##### -->
+<para>
+Return the pointer to the type's children's types.
+</para>
+
+@type: GtkType
+@Returns: pointer to a GList
+
+<!-- ##### FUNCTION gtk_type_register_flags ##### -->
+<para>
+Register a new set of flags @values and give them the name in
+@type_name.
+</para>
+
+@type_name: must not be null.
+@values: GtkFlagValue*
+@Returns:
+
+<!-- ##### ENUM GtkPrivateFlags ##### -->
+<para>
+
+</para>
+
+@PRIVATE_GTK_USER_STYLE:
+@PRIVATE_GTK_RESIZE_PENDING:
+@PRIVATE_GTK_RESIZE_NEEDED:
+@PRIVATE_GTK_LEAVE_PENDING:
+@PRIVATE_GTK_HAS_SHAPE_MASK:
+@PRIVATE_GTK_IN_REPARENT:
+@PRIVATE_GTK_DIRECTION_SET:
+@PRIVATE_GTK_DIRECTION_LTR:
+
+<!-- ##### FUNCTION gtk_type_set_chunk_alloc ##### -->
+<para>
+Set the mem_chunk size so it will hold @n_chunks of the objects of that @type.
+</para>
+
+@type: There must be an unlocked TypeNode associated with this type otherwise nothing happens.
+@n_chunks:
+
+<!-- ##### MACRO GTK_TYPE_STRUCTURED_FIRST ##### -->
+<para>
+The first structured enumerated type value.
+</para>
+
+
+<!-- ##### FUNCTION gtk_type_describe_tree ##### -->
+<para>
+Given a @type, describe all of its children, and their children. Only
+show the size if @show_size is true.
+</para>
+
+@type: GtkType
+@show_size: gboolean
+
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT_INT ##### -->
<para>
</para>
@@ -198,33 +494,89 @@ Menu Factory
@func_data:
@args:
-<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM ##### -->
+<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Long_Description ##### -->
<para>
</para>
-<!-- ##### ARG GtkPreview:expand ##### -->
+<!-- ##### FUNCTION gtk_window_remove_embedded_xid ##### -->
<para>
-Determines the way that the the preview widget behaves
-when the size it is allocated is larger than the requested
-size. See gtk_preview_set_expand().
+
</para>
+@window:
+@xid:
-<!-- ##### MACRO gtk_marshal_NONE__STRING_INT_POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_FLOAT ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_UINT ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_INT_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_font_selection_dialog_set_filter ##### -->
+<para>
+Sets one of the two font filters, to limit the fonts shown.
+</para>
+
+@fsd: a #GtkFontSelectionDialog.
+@filter_type: which of the two font filters to set, either
+#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter
+can be changed by the user, but the base filter is permanent.
+@font_type: the types of font to be shown. This is a bitwise combination of
+#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP,
+or #GTK_FONT_ALL to show all three font types.
+@foundries: a NULL-terminated array of strings containing foundry names which
+will be shown, or NULL to show all foundries.
+@weights: a NULL-terminated array of strings containing weight names which
+will be shown, or NULL to show all weights.
+@slants: a NULL-terminated array of strings containing slant names which
+will be shown, or NULL to show all slants.
+@setwidths: a NULL-terminated array of strings containing setwidth names which
+will be shown, or NULL to show all setwidths.
+@spacings: a NULL-terminated array of strings containing spacings which
+will be shown, or NULL to show all spacings.
+@charsets: a NULL-terminated array of strings containing charset names which
+will be shown, or NULL to show all charsets.
+
+<!-- ##### FUNCTION gtk_container_get_toplevels ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+<!-- ##### MACRO GTK_TYPE_NUM_BUILTINS ##### -->
+<para>
+No idea.
+</para>
+
+
+<!-- ##### MACRO GTK_TYPE_MAKE ##### -->
+<para>
+Combine a fundemantal type and a sequence number to create a gtk type.
+</para>
+
+@parent_t:
+@seqno:
+
+<!-- ##### MACRO GTK_TYPE_FLAT_LAST ##### -->
+<para>
+The last "flat" (no struct) enumerated type value.
+</para>
+
+
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER ##### -->
<para>
</para>
@@ -234,7 +586,7 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_POINTER ##### -->
<para>
</para>
@@ -244,37 +596,64 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Short_Description ##### -->
+<!-- ##### FUNCTION gtk_type_get_varargs_type ##### -->
+<para>
+Get the varargs type associated with @foreign_type
+</para>
+@foreign_type: GtkType
+@Returns: GtkType
+<!-- ##### STRUCT GtkMenuFactory ##### -->
+<para>
-<!-- ##### MACRO gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER ##### -->
+</para>
+
+@path:
+@type:
+@accel_group:
+@widget:
+@subfactories:
+
+<!-- ##### MACRO GTK_VALUE_FOREIGN ##### -->
+<para>
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
+</para>
+
+@a:
+
+<!-- ##### MACRO GTK_PRIVATE_SET_FLAG ##### -->
<para>
</para>
+@wid:
+@flag:
-<!-- ##### MACRO gtk_marshal_NONE__ENUM_FLOAT ##### -->
+<!-- ##### FUNCTION gtk_ruler_draw_pos ##### -->
<para>
</para>
+@ruler: the gtkruler
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT ##### -->
+<!-- ##### MACRO GTK_WIDGET_USER_STYLE ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@obj:
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_POINTER_UINT_UINT ##### -->
+<!-- ##### ENUM GtkDebugFlag ##### -->
<para>
</para>
+@GTK_DEBUG_OBJECTS:
+@GTK_DEBUG_MISC:
+@GTK_DEBUG_SIGNALS:
+@GTK_DEBUG_DND:
+@GTK_DEBUG_PLUGSOCKET:
<!-- ##### FUNCTION gtk_menu_factory_remove_paths ##### -->
<para>
@@ -285,20 +664,27 @@ size. See gtk_preview_set_expand().
@paths:
@npaths:
-<!-- ##### FUNCTION gtk_menu_factory_destroy ##### -->
+<!-- ##### FUNCTION gtk_type_query ##### -->
<para>
-
+Given a type, return various interesting parameters of the type.
</para>
-@factory:
+@type: GtkType
+@Returns: GtkTypeQuery*
-<!-- ##### MACRO gtk_marshal_BOOL__POINTER_INT_INT_UINT ##### -->
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Long_Description ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER ##### -->
+<!-- ##### MACRO GTK_TYPE_IDENTIFIER ##### -->
+<para>
+Hide the name of gtk_identifier_get_type
+</para>
+
+
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT ##### -->
<para>
</para>
@@ -308,23 +694,20 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_INT__INT ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__ENUM ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
-<!-- ##### MACRO gtk_marshal_ENUM__ENUM ##### -->
+<!-- ##### MACRO GTK_PRIVATE_FLAGS ##### -->
<para>
</para>
+@wid:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER_INT_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__NONE ##### -->
<para>
</para>
@@ -334,15 +717,19 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
-<!-- ##### MACRO GTK_NOTE ##### -->
+<!-- ##### FUNCTION gtk_type_free ##### -->
<para>
-
+Given the type of an object and a pointer to it, the object is freed.
</para>
-@type:
-@action:
+@type: GtkType
+@mem: gpointer to the object
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT ##### -->
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_POINTER ##### -->
<para>
</para>
@@ -352,39 +739,53 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
+<!-- ##### STRUCT GtkMenuPath ##### -->
+<para>
+
+</para>
+
+@path:
+@widget:
+
<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT ##### -->
<para>
</para>
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_POINTER ##### -->
+<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Title ##### -->
+Private Information
+
+
+<!-- ##### FUNCTION gtk_menu_factory_find ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@factory:
+@path:
+@Returns:
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:See_Also ##### -->
+<!-- ##### STRUCT GtkMenuEntry ##### -->
<para>
</para>
+@path:
+@accelerator:
+@callback:
+@callback_data:
+@widget:
-<!-- ##### FUNCTION gtk_marshal_NONE__BOOL ##### -->
+<!-- ##### FUNCTION gtk_window_add_embedded_xid ##### -->
<para>
</para>
-@object:
-@func:
-@func_data:
-@args:
+@window:
+@xid:
-<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_POINTER_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__BOOL ##### -->
<para>
</para>
@@ -394,7 +795,20 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER ##### -->
+<!-- ##### FUNCTION gtk_color_selection_set_opacity ##### -->
+<para>
+Controls whether opacity can be set with the #GtkColorSelection.
+If this functionality is enabled, the necessary additional widgets
+are added to the #GtkColorSelection and the opacity value can be
+retrieved via the fourth value in the color array returned by
+the gtk_color_selection_get_color() function.
+</para>
+
+@colorsel: a #GtkColorSelection.
+@use_opacity: a boolean indicating whether the opacity selection
+is enabled.
+
+<!-- ##### FUNCTION gtk_marshal_INT__POINTER ##### -->
<para>
</para>
@@ -404,58 +818,70 @@ size. See gtk_preview_set_expand().
@func_data:
@args:
-<!-- ##### MACRO gtk_marshal_NONE__OBJECT ##### -->
+<!-- ##### MACRO GTK_WIDGET_RESIZE_NEEDED ##### -->
<para>
</para>
+@obj:
-<!-- ##### ENUM GtkDebugFlag ##### -->
+<!-- ##### MACRO GTK_NOTE ##### -->
<para>
</para>
-@GTK_DEBUG_OBJECTS:
-@GTK_DEBUG_MISC:
-@GTK_DEBUG_SIGNALS:
-@GTK_DEBUG_DND:
-@GTK_DEBUG_PLUGSOCKET:
+@type:
+@action:
-<!-- ##### ARG GtkHandleBox:snap_edge ##### -->
+<!-- ##### MACRO GTK_TYPE_FLAT_FIRST ##### -->
<para>
-Determines the snap edge of a handlebox. The snap edge is
-the edge of the detached child that must be aligned
-with the corresponding edge of the "ghost" left
-behind when the child was detached to reattach
-the torn-off window. See gtk_handle_box_set_snap_edge().
+The first "flat" (no struct) enumerated type value.
</para>
-<!-- ##### ARG GtkHandleBox:handle_position ##### -->
+<!-- ##### FUNCTION gtk_menu_factory_new ##### -->
<para>
-Determines the side of the handlebox where the handle is drawn.
+
</para>
+@type:
+@Returns:
-<!-- ##### MACRO gtk_marshal_NONE__STRING ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM ##### -->
<para>
</para>
-<!-- ##### MACRO gtk_marshal_NONE__UINT ##### -->
+<!-- ##### MACRO GTK_WIDGET_HAS_SHAPE_MASK ##### -->
<para>
</para>
+@obj:
-<!-- ##### MACRO gtk_marshal_NONE__ENUM ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK_C_CALLBACK ##### -->
+<!-- ##### MACRO GTK_OBJECT_SIGNALS ##### -->
+<para>
+Get the array of signals defined for this object.
+</para>
+
+@obj: the object to fetch the signals from.
+
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:Title ##### -->
+gtkenums.sgml
+
+
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT_POINTER ##### -->
<para>
</para>
@@ -465,19 +891,32 @@ Determines the side of the handlebox where the handle is drawn.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_menu_factory_new ##### -->
+<!-- ##### FUNCTION gtk_type_check_object_cast ##### -->
+<para>
+Given a pointer to a GtkTypeObject @type_object, and a GtkType @cast_type,
+make sure that it's okay to cast @type_object into a @cast_type.
+</para>
+
+@type_object: GtkTypeObject*
+@cast_type: GtkType
+@Returns: the same GtkTypeObject* as @type_object
+
+<!-- ##### USER_FUNCTION GtkMenuCallback ##### -->
<para>
</para>
-@type:
-@Returns:
+@widget:
+@user_data:
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Short_Description ##### -->
+<!-- ##### FUNCTION gtk_themes_exit ##### -->
+<para>
+</para>
+@error_code:
-<!-- ##### FUNCTION gtk_marshal_NONE__INT_INT_POINTER ##### -->
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER ##### -->
<para>
</para>
@@ -487,7 +926,45 @@ Determines the side of the handlebox where the handle is drawn.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__OBJECT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_type_set_varargs_type ##### -->
+<para>
+Set the varargs type for a fundamental type @foreign_type.
+</para>
+
+@foreign_type: Must be a GtkType with a sequence number of zero. Must not be a
+fundamental type.
+@varargs_type: Must be a GtkType which is either structured or flag, or NONE.
+
+<!-- ##### FUNCTION gtk_type_check_class_cast ##### -->
+<para>
+Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make
+sure that it's okay to cast something of that @klass into a @cast_type.
+</para>
+
+@klass: GtkTypeClass*
+@cast_type: GtkType
+@Returns: Always return @klass.
+
+<!-- ##### FUNCTION gtk_menu_factory_destroy ##### -->
+<para>
+
+</para>
+
+@factory:
+
+<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK_C_CALLBACK ##### -->
<para>
</para>
@@ -497,7 +974,7 @@ Determines the side of the handlebox where the handle is drawn.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_INT_INT ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT_POINTER_INT_INT ##### -->
<para>
</para>
@@ -507,7 +984,14 @@ Determines the side of the handlebox where the handle is drawn.
@func_data:
@args:
-<!-- ##### FUNCTION gtk_menu_factory_remove_entries ##### -->
+<!-- ##### MACRO GTK_VALUE_ARGS ##### -->
+<para>
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS
+</para>
+
+@a:
+
+<!-- ##### FUNCTION gtk_menu_factory_add_entries ##### -->
<para>
</para>
@@ -516,65 +1000,99 @@ Determines the side of the handlebox where the handle is drawn.
@entries:
@nentries:
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Long_Description ##### -->
+<!-- ##### FUNCTION gtk_im_context_simple_new ##### -->
<para>
</para>
+@Returns:
-<!-- ##### USER_FUNCTION GtkMenuCallback ##### -->
+<!-- ##### FUNCTION gtk_type_describe_heritage ##### -->
<para>
+Print the types @type inherits from.
+</para>
+@type: GtkType
+
+<!-- ##### ENUM GtkFontFilterType ##### -->
+<para>
+A set of bit flags used to specify the filter being set
+when calling gtk_font_selection_dialog_set_filter() or
+gtk_font_selection_set_filter().
</para>
-@widget:
-@user_data:
+@GTK_FONT_FILTER_BASE: the base filter, which can't be changed by the user.
+@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the
+'Filter' page of the #GtkFontSelection widget.
-<!-- ##### VARIABLE gtk_debug_flags ##### -->
+<!-- ##### FUNCTION gtk_type_parent_class ##### -->
+<para>
+Return the class of the parent. Initialize the class if necessary.
+Return NULL if anything goes wrong.
+</para>
+
+@type: GtkType
+@Returns: gpointer to the klass.
+
+<!-- ##### FUNCTION gtk_window_set_default ##### -->
<para>
</para>
+@window:
+@defaultw:
-<!-- ##### FUNCTION gtk_menu_factory_remove_subfactory ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT ##### -->
<para>
</para>
-@factory:
-@subfactory:
-@path:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:Title ##### -->
-Debugging
+<!-- ##### MACRO GTK_WIDGET_LEAVE_PENDING ##### -->
+<para>
+</para>
-<!-- ##### FUNCTION gtk_ruler_draw_pos ##### -->
+@obj:
+
+<!-- ##### MACRO gtk_marshal_NONE__UINT ##### -->
<para>
</para>
-@ruler: the gtkruler
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_UINT ##### -->
+<!-- ##### FUNCTION gtk_accel_group_marshal_add ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### SECTION ./tmpl/gtkdebug.sgml:See_Also ##### -->
+<!-- ##### MACRO GTK_WIDGET_IN_REPARENT ##### -->
<para>
</para>
+@obj:
-<!-- ##### MACRO gtk_marshal_NONE__POINTER_UINT_ENUM ##### -->
+<!-- ##### FUNCTION gtk_marshal_INT__POINTER_CHAR_CHAR ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_marshal_NONE__NONE ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__POINTER_INT_INT ##### -->
<para>
</para>
@@ -584,7 +1102,7 @@ Debugging
@func_data:
@args:
-<!-- ##### FUNCTION gtk_marshal_BOOL__NONE ##### -->
+<!-- ##### FUNCTION gtk_accel_group_marshal_remove ##### -->
<para>
</para>
@@ -594,36 +1112,86 @@ Debugging
@func_data:
@args:
-<!-- ##### FUNCTION gtk_menu_factory_add_subfactory ##### -->
+<!-- ##### MACRO gtk_marshal_NONE__STRING_INT_POINTER ##### -->
<para>
</para>
-@factory:
-@subfactory:
-@path:
-<!-- ##### STRUCT GtkMenuEntry ##### -->
+<!-- ##### FUNCTION gtk_marshal_NONE__INT_POINTER ##### -->
<para>
</para>
-@path:
-@accelerator:
-@callback:
-@callback_data:
-@widget:
+@object:
+@func:
+@func_data:
+@args:
-<!-- ##### FUNCTION gtk_ruler_draw_ticks ##### -->
+<!-- ##### FUNCTION gtk_rc_init ##### -->
+<para>
+Internal function.
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkenums.sgml.sgml:See_Also ##### -->
<para>
</para>
-@ruler: the gtkruler
-<!-- ##### SECTION ./tmpl/gtkmenufactory.sgml:Long_Description ##### -->
+<!-- ##### FUNCTION gtk_container_register_toplevel ##### -->
+<para>
+
+</para>
+
+@container:
+
+<!-- ##### MACRO gtk_marshal_ENUM__ENUM ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Title ##### -->
+GtkIMContextSimple
+
+
+<!-- ##### MACRO gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GTK_VALUE_C_CALLBACK ##### -->
+<para>
+Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
+</para>
+
+@a:
+
+<!-- ##### FUNCTION gtk_marshal_BOOL__POINTER_POINTER_INT_INT ##### -->
<para>
</para>
+@object:
+@func:
+@func_data:
+@args:
+
+<!-- ##### SECTION ./tmpl/gtkimcontextsimple.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_menu_factory_add_subfactory ##### -->
+<para>
+
+</para>
+
+@factory:
+@subfactory:
+@path:
diff --git a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
index ccf0ce427..2649b4327 100644
--- a/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccelgroup.sgml
@@ -226,28 +226,6 @@ Keyboard Accelerators
@Returns:
-<!-- ##### FUNCTION gtk_accel_group_marshal_add ##### -->
-<para>
-
-</para>
-
-@object:
-@func:
-@func_data:
-@args:
-
-
-<!-- ##### FUNCTION gtk_accel_group_marshal_remove ##### -->
-<para>
-
-</para>
-
-@object:
-@func:
-@func_data:
-@args:
-
-
<!-- ##### FUNCTION gtk_accel_groups_from_object ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkarg.sgml b/docs/reference/gtk/tmpl/gtkarg.sgml
index 8e97cc2e2..a268fd805 100644
--- a/docs/reference/gtk/tmpl/gtkarg.sgml
+++ b/docs/reference/gtk/tmpl/gtkarg.sgml
@@ -93,6 +93,24 @@ Frees the argument, and optionally its contents.
@free_contents: whether to free the string, if it is a string.
+<!-- ##### FUNCTION gtk_arg_reset ##### -->
+<para>
+
+</para>
+
+@arg:
+
+
+<!-- ##### FUNCTION gtk_arg_values_equal ##### -->
+<para>
+
+</para>
+
+@arg1:
+@arg2:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_args_collect ##### -->
<para>
Private: given a hashtable of argument information it takes a vararg
@@ -200,3 +218,12 @@ A #GHashFunc for hashing #GtkArgInfos.
@Returns: a hash value for that #GtkArgInfo.
+<!-- ##### FUNCTION gtk_arg_to_valueloc ##### -->
+<para>
+
+</para>
+
+@arg:
+@value_pointer:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkaspectframe.sgml b/docs/reference/gtk/tmpl/gtkaspectframe.sgml
index 9a6960578..bac6976d5 100644
--- a/docs/reference/gtk/tmpl/gtkaspectframe.sgml
+++ b/docs/reference/gtk/tmpl/gtkaspectframe.sgml
@@ -63,3 +63,23 @@ to 1.0 (right aligned)
ratio is taken from the requistion of the child.
+<!-- ##### ARG GtkAspectFrame:xalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:yalign ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:ratio ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAspectFrame:obey_child ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkclist.sgml b/docs/reference/gtk/tmpl/gtkclist.sgml
index 12adbd8cd..35506a5c7 100644
--- a/docs/reference/gtk/tmpl/gtkclist.sgml
+++ b/docs/reference/gtk/tmpl/gtkclist.sgml
@@ -114,7 +114,6 @@ A macro to test whether the CList is in "add mode."
@clist: The #GtkCList widget to check.
-
<!-- ##### MACRO GTK_CLIST_AUTO_SORT ##### -->
<para>
A macro to test whether the CList has automatic sorting
@@ -124,7 +123,6 @@ switched on.
@clist: The #GtkCList widget to check.
-
<!-- ##### MACRO GTK_CLIST_AUTO_RESIZE_BLOCKED ##### -->
<para>
A macro to check if automatic resizing of columns is blocked.
@@ -133,7 +131,6 @@ A macro to check if automatic resizing of columns is blocked.
@clist: The #GtkCList widget to check.
-
<!-- ##### MACRO GTK_CLIST_REORDERABLE ##### -->
<para>
A macro to test if the CList's columns are re-orderable
@@ -142,7 +139,6 @@ A macro to test if the CList's columns are re-orderable
@clist: The #GtkCList widget to check.
-
<!-- ##### MACRO GTK_CLIST_USE_DRAG_ICONS ##### -->
<para>
A macro to check if the USE_DRAG_ICONS property is enabled.
@@ -151,7 +147,6 @@ A macro to check if the USE_DRAG_ICONS property is enabled.
@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.
@@ -160,7 +155,6 @@ A macro to check if the DRAW_DRAG_LINE property is enabled.
@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.
@@ -169,7 +163,6 @@ A macro to check if the DRAW_DRAG_RECT property is enabled.
@clist: The #GtkCList widget to check.
-
<!-- ##### MACRO GTK_CLIST_ROW ##### -->
<para>
A macro to cast a GList element to a CListRow pointer.
@@ -216,7 +209,7 @@ Function prototype for the compare function callback.
</para>
@clist: The #GtkCList that is affected.
-@ptr1: A #gconstpointer to the first node to compare.
+@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
@@ -1315,3 +1308,8 @@ A boolean value for setting whether to use icons during drag
operations.
</para>
+<!-- ##### ARG GtkCList:sort_type ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
index f3152384c..d762940ae 100644
--- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml
@@ -64,18 +64,40 @@ time.
@policy: a #GtkUpdateType value indicating the desired policy.
-<!-- ##### FUNCTION gtk_color_selection_set_opacity ##### -->
+<!-- ##### FUNCTION gtk_color_selection_set_use_opacity ##### -->
<para>
-Controls whether opacity can be set with the #GtkColorSelection.
-If this functionality is enabled, the necessary additional widgets
-are added to the #GtkColorSelection and the opacity value can be
-retrieved via the fourth value in the color array returned by
-the gtk_color_selection_get_color() function.
+
</para>
-@colorsel: a #GtkColorSelection.
-@use_opacity: a boolean indicating whether the opacity selection
-is enabled.
+@colorsel:
+@use_opacity:
+
+
+<!-- ##### FUNCTION gtk_color_selection_get_use_opacity ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_color_selection_set_use_palette ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@use_palette:
+
+
+<!-- ##### FUNCTION gtk_color_selection_get_use_palette ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@Returns:
<!-- ##### FUNCTION gtk_color_selection_set_color ##### -->
@@ -99,6 +121,66 @@ Retrieve the currently selected color value.
blue, and opacity.
+<!-- ##### FUNCTION gtk_color_selection_set_old_color ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@color:
+
+
+<!-- ##### FUNCTION gtk_color_selection_get_old_color ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@color:
+
+
+<!-- ##### FUNCTION gtk_color_selection_set_palette_color ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@x:
+@y:
+@color:
+
+
+<!-- ##### FUNCTION gtk_color_selection_get_palette_color ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@x:
+@y:
+@color:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_color_selection_unset_palette_color ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@x:
+@y:
+
+
+<!-- ##### FUNCTION gtk_color_selection_is_adjusting ##### -->
+<para>
+
+</para>
+
+@colorsel:
+@Returns:
+
+
<!-- ##### SIGNAL GtkColorSelection::color-changed ##### -->
<para>
This signal is emitted when the color changes in the #GtkColorSelection
diff --git a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
index e043e77be..f9f166475 100644
--- a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
@@ -68,3 +68,5 @@ Creates a new #GtkColorSelectionDialog.
@title: a string containing the title text for the dialog.
@Returns: a #GtkColorSelectionDialog.
+
+
diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index d6782383c..a56681856 100644
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -111,25 +111,25 @@ GtkContainer
@Returns:
-<!-- ##### FUNCTION gtk_container_set_focus_child ##### -->
+<!-- ##### FUNCTION gtk_container_set_reallocate_redraws ##### -->
<para>
</para>
@container:
-@child:
+@needs_redraws:
-<!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
+<!-- ##### FUNCTION gtk_container_set_focus_child ##### -->
<para>
</para>
@container:
-@adjustment:
+@child:
-<!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
+<!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
<para>
</para>
@@ -138,20 +138,13 @@ GtkContainer
@adjustment:
-<!-- ##### FUNCTION gtk_container_register_toplevel ##### -->
-<para>
-
-</para>
-
-@container:
-
-
-<!-- ##### FUNCTION gtk_container_unregister_toplevel ##### -->
+<!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
<para>
</para>
@container:
+@adjustment:
<!-- ##### FUNCTION gtk_container_resize_children ##### -->
@@ -330,21 +323,21 @@ GtkContainer
@Returns:
-<!-- ##### FUNCTION gtk_container_get_toplevels ##### -->
+<!-- ##### FUNCTION gtk_container_set_border_width ##### -->
<para>
</para>
-@Returns:
+@container:
+@border_width:
-<!-- ##### FUNCTION gtk_container_set_border_width ##### -->
+<!-- ##### FUNCTION gtk_container_dequeue_resize_handler ##### -->
<para>
</para>
@container:
-@border_width:
<!-- ##### SIGNAL GtkContainer::add ##### -->
@@ -402,3 +395,8 @@ GtkContainer
</para>
+<!-- ##### ARG GtkContainer:reallocate_redraws ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml
index e8ada7ac6..2c3b78e01 100644
--- a/docs/reference/gtk/tmpl/gtkcurve.sgml
+++ b/docs/reference/gtk/tmpl/gtkcurve.sgml
@@ -123,3 +123,28 @@ calling gtk_curve_reset() or gtk_curve_set_gamma().
@curve: the object which received the signal.
+<!-- ##### ARG GtkCurve:curve_type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:min_x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:max_x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:min_y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCurve:max_y ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkdebug.sgml b/docs/reference/gtk/tmpl/gtkdebug.sgml
deleted file mode 100644
index 12195b227..000000000
--- a/docs/reference/gtk/tmpl/gtkdebug.sgml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Debugging
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkDebugFlag ##### -->
-<para>
-
-</para>
-
-@GTK_DEBUG_OBJECTS:
-@GTK_DEBUG_MISC:
-@GTK_DEBUG_SIGNALS:
-@GTK_DEBUG_DND:
-@GTK_DEBUG_PLUGSOCKET:
-
-<!-- ##### VARIABLE gtk_debug_flags ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO GTK_NOTE ##### -->
-<para>
-
-</para>
-
-@type:
-@action:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml
index 2a04388bf..5c7195c77 100644
--- a/docs/reference/gtk/tmpl/gtkenums.sgml
+++ b/docs/reference/gtk/tmpl/gtkenums.sgml
@@ -142,7 +142,7 @@ Used for packing widgets into #GtkBox widgets. (See also: #GtkVBox,
#GtkHBox, and #GtkButtonBox).
</para>
-@GTK_PACK_START: The
+@GTK_PACK_START: The
@GTK_PACK_END:
<!-- ##### ENUM GtkPathPriorityType ##### -->
@@ -244,7 +244,7 @@ Used to change the appearance of an outline typically provided by a #GtkFrame.
@GTK_SHADOW_IN: The outline is bevelled inwards.
@GTK_SHADOW_OUT: The outline is bevelled outwards like a button.
@GTK_SHADOW_ETCHED_IN: The outline itself is an inward bevel, but the frame
-does
+does
@GTK_SHADOW_ETCHED_OUT:
<!-- ##### ENUM GtkStateType ##### -->
@@ -283,6 +283,7 @@ Used to customize the appearance of a #GtkToolbar.
@GTK_TOOLBAR_ICONS: Buttons should display only icons in the toolbar.
@GTK_TOOLBAR_TEXT: Buttons should display only text labels in the toolbar.
@GTK_TOOLBAR_BOTH: Buttons should display text and icons in the toolbar.
+@GTK_TOOLBAR_BOTH_HORIZ:
<!-- ##### ENUM GtkTroughType ##### -->
<para>
@@ -320,6 +321,7 @@ Window placement can be influenced using this enumeration.
@GTK_WIN_POS_NONE: No influence is made on placement.
@GTK_WIN_POS_CENTER: Windows should be placed in the center of the screen.
@GTK_WIN_POS_MOUSE: Windows should be placed at the current mouse position.
+@GTK_WIN_POS_CENTER_ALWAYS:
<!-- ##### ENUM GtkWindowType ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkfeatures.sgml b/docs/reference/gtk/tmpl/gtkfeatures.sgml
index b1d62c477..4243833b9 100644
--- a/docs/reference/gtk/tmpl/gtkfeatures.sgml
+++ b/docs/reference/gtk/tmpl/gtkfeatures.sgml
@@ -61,3 +61,48 @@ Checks that the GTK+ library in use is compatable with the given version.
a string describing the version mismatch.
+<!-- ##### MACRO GTK_MAJOR_VERSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_MINOR_VERSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_MICRO_VERSION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_BINARY_AGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_INTERFACE_AGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO GTK_CHECK_VERSION ##### -->
+<para>
+
+</para>
+
+@major:
+@minor:
+@micro:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml
index d888b18f1..660ed1cd7 100644
--- a/docs/reference/gtk/tmpl/gtkfontsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml
@@ -106,29 +106,3 @@ Sets the text displayed in the preview area.
@text: the text to display in the preview area.
-<!-- ##### FUNCTION gtk_font_selection_set_filter ##### -->
-<para>
-Sets one of the two font filters, to limit the fonts shown.
-</para>
-
-@fontsel: a #GtkFontSelection.
-@filter_type: which of the two font filters to set, either
-#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter
-can be changed by the user, but the base filter is permanent.
-@font_type: the types of font to be shown. This is a bitwise combination of
-#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP,
-or #GTK_FONT_ALL to show all three font types.
-@foundries: a NULL-terminated array of strings containing foundry names which
-will be shown, or NULL to show all foundries.
-@weights: a NULL-terminated array of strings containing weight names which
-will be shown, or NULL to show all weights.
-@slants: a NULL-terminated array of strings containing slant names which
-will be shown, or NULL to show all slants.
-@setwidths: a NULL-terminated array of strings containing setwidth names which
-will be shown, or NULL to show all setwidths.
-@spacings: a NULL-terminated array of strings containing spacings which
-will be shown, or NULL to show all spacings.
-@charsets: a NULL-terminated array of strings containing charset names which
-will be shown, or NULL to show all charsets.
-
-
diff --git a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
index a1df4d803..2102641a7 100644
--- a/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontseldlg.sgml
@@ -127,52 +127,3 @@ Sets the text displayed in the preview area.
@text: the text to display in the preview area.
-<!-- ##### FUNCTION gtk_font_selection_dialog_set_filter ##### -->
-<para>
-Sets one of the two font filters, to limit the fonts shown.
-</para>
-
-@fsd: a #GtkFontSelectionDialog.
-@filter_type: which of the two font filters to set, either
-#GTK_FONT_FILTER_BASE or #GTK_FONT_FILTER_USER. The user filter
-can be changed by the user, but the base filter is permanent.
-@font_type: the types of font to be shown. This is a bitwise combination of
-#GTK_FONT_BITMAP, #GTK_FONT_SCALABLE and #GTK_FONT_SCALABLE_BITMAP,
-or #GTK_FONT_ALL to show all three font types.
-@foundries: a NULL-terminated array of strings containing foundry names which
-will be shown, or NULL to show all foundries.
-@weights: a NULL-terminated array of strings containing weight names which
-will be shown, or NULL to show all weights.
-@slants: a NULL-terminated array of strings containing slant names which
-will be shown, or NULL to show all slants.
-@setwidths: a NULL-terminated array of strings containing setwidth names which
-will be shown, or NULL to show all setwidths.
-@spacings: a NULL-terminated array of strings containing spacings which
-will be shown, or NULL to show all spacings.
-@charsets: a NULL-terminated array of strings containing charset names which
-will be shown, or NULL to show all charsets.
-
-
-<!-- ##### ENUM GtkFontType ##### -->
-<para>
-A set of bit flags used to specify the type of fonts shown
-when calling gtk_font_selection_dialog_set_filter() or
-gtk_font_selection_set_filter().
-</para>
-
-@GTK_FONT_BITMAP: bitmap fonts.
-@GTK_FONT_SCALABLE: scalable fonts.
-@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
-@GTK_FONT_ALL: a bitwise combination of all of the above.
-
-<!-- ##### ENUM GtkFontFilterType ##### -->
-<para>
-A set of bit flags used to specify the filter being set
-when calling gtk_font_selection_dialog_set_filter() or
-gtk_font_selection_set_filter().
-</para>
-
-@GTK_FONT_FILTER_BASE: the base filter, which can't be changed by the user.
-@GTK_FONT_FILTER_USER: the user filter, which can be changed from within the
-'Filter' page of the #GtkFontSelection widget.
-
diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml
index a675fc909..0547a0ee1 100644
--- a/docs/reference/gtk/tmpl/gtkframe.sgml
+++ b/docs/reference/gtk/tmpl/gtkframe.sgml
@@ -45,6 +45,17 @@ the current label, if any, is removed.
@label:
+<!-- ##### FUNCTION gtk_frame_set_label_widget ##### -->
+<para>
+
+</para>
+
+@frame:
+@label_widget:
+<!-- # Unused Parameters # -->
+@title_widget:
+
+
<!-- ##### FUNCTION gtk_frame_set_label_align ##### -->
<para>
Set the alignment of the Frame widget's label. The
diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml
index e823a7a56..f4f15b7ce 100644
--- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml
+++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml
@@ -155,3 +155,17 @@ handlebox are detached from the main window.
Determines the shadow type for the handlebox.
</para>
+<!-- ##### ARG GtkHandleBox:handle_position ##### -->
+<para>
+Determines the side of the handlebox where the handle is drawn.
+</para>
+
+<!-- ##### ARG GtkHandleBox:snap_edge ##### -->
+<para>
+Determines the snap edge of a handlebox. The snap edge is
+the edge of the detached child that must be aligned
+with the corresponding edge of the "ghost" left
+behind when the child was detached to reattach
+the torn-off window. See gtk_handle_box_set_snap_edge().
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml
new file mode 100644
index 000000000..305f541e6
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml
@@ -0,0 +1,96 @@
+<!-- ##### SECTION Title ##### -->
+GtkIMContext
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkIMContext ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_im_context_set_client_window ##### -->
+<para>
+
+</para>
+
+@context:
+@window:
+
+
+<!-- ##### FUNCTION gtk_im_context_get_preedit_string ##### -->
+<para>
+
+</para>
+
+@context:
+@str:
+@attrs:
+
+
+<!-- ##### FUNCTION gtk_im_context_filter_keypress ##### -->
+<para>
+
+</para>
+
+@context:
+@event:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_im_context_focus_in ##### -->
+<para>
+
+</para>
+
+@context:
+
+
+<!-- ##### FUNCTION gtk_im_context_focus_out ##### -->
+<para>
+
+</para>
+
+@context:
+
+
+<!-- ##### SIGNAL GtkIMContext::preedit-start ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::preedit-end ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::preedit-changed ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+
+<!-- ##### SIGNAL GtkIMContext::commit ##### -->
+<para>
+
+</para>
+
+@imcontext: the object which received the signal.
+@arg1:
+
diff --git a/docs/reference/gtk/tmpl/gtkimmulticontext.sgml b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
new file mode 100644
index 000000000..3d4505917
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtkimmulticontext.sgml
@@ -0,0 +1,30 @@
+<!-- ##### SECTION Title ##### -->
+GtkIMMulticontext
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkIMMulticontext ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_im_multicontext_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkitemfactory.sgml b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
index bbe4ac0fe..8c4dd6a9d 100644
--- a/docs/reference/gtk/tmpl/gtkitemfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
@@ -136,6 +136,18 @@ GtkItemFactory
@scanner:
+<!-- ##### FUNCTION gtk_item_factory_add_foreign ##### -->
+<para>
+
+</para>
+
+@accel_widget:
+@full_path:
+@accel_group:
+@keyval:
+@modifiers:
+
+
<!-- ##### FUNCTION gtk_item_factory_from_widget ##### -->
<para>
@@ -154,6 +166,16 @@ GtkItemFactory
@Returns:
+<!-- ##### FUNCTION gtk_item_factory_get_item ##### -->
+<para>
+
+</para>
+
+@ifactory:
+@path:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_item_factory_get_widget ##### -->
<para>
@@ -174,6 +196,16 @@ GtkItemFactory
@Returns:
+<!-- ##### FUNCTION gtk_item_factory_get_item_by_action ##### -->
+<para>
+
+</para>
+
+@ifactory:
+@action:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_item_factory_dump_items ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 5511322ca..4e13d8f2c 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -136,3 +136,8 @@ pointer, it isn't copied.
The #GtkJustification setting. See gtk_label_set_justify() for more info.
</para>
+<!-- ##### ARG GtkLabel:wrap ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtklist.sgml b/docs/reference/gtk/tmpl/gtklist.sgml
index 85d8c8a87..e66f70955 100644
--- a/docs/reference/gtk/tmpl/gtklist.sgml
+++ b/docs/reference/gtk/tmpl/gtklist.sgml
@@ -34,21 +34,6 @@ type.</para></listitem>
</para>
-@container: the parent class object
-@children: a GList with the children of the list; belonging to #GtkListitem
-@selection: a GList with selected items of the list
-@undo_selection:
-@undo_unselection:
-@last_focus_child:
-@undo_focus_child:
-@htimer:
-@vtimer:
-@anchor:
-@drag_pos:
-@anchor_state:
-@selection_mode: the selection mode of the list
-@drag_selection:
-@add_mode:
<!-- ##### FUNCTION gtk_list_new ##### -->
<para>
@@ -370,3 +355,8 @@ The child @widget has just been unselected.
@list: the object which received the signal.
@widget: the newly unselected child.
+<!-- ##### ARG GtkList:selection_mode ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index 542ffb6a0..64ca0090d 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -60,7 +60,15 @@ You should call this function before <function>gtk_init</function> to
support internationalization of your GTK+ applications.
</para>
-@Returns: A string corresponding to the locale set.
+@Returns: A string corresponding to the locale set.
+
+
+<!-- ##### FUNCTION gtk_get_default_language ##### -->
+<para>
+
+</para>
+
+@Returns:
<!-- ##### FUNCTION gtk_init ##### -->
@@ -247,7 +255,7 @@ the event:
After finishing the delivery the event is popped from the event stack.
</para></listitem>
</orderedlist>
-
+
@event: An event to process (normally) passed by Gdk.
@@ -259,7 +267,7 @@ cleaned from any arguments that GTK+ handles itself.
</para>
@argc: Pointer to the number of arguments remaining after gtk_init.
-@argv: Points to the argument vector.
+@argv: Points to the argument vector.
<!-- ##### FUNCTION gtk_true ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml
index 8e3a4a48a..b113b1367 100644
--- a/docs/reference/gtk/tmpl/gtkmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenu.sgml
@@ -159,6 +159,33 @@ Set the #GtkAccelGroup which holds global accelerators for the menu.
@accel_group: the #GtkAccelGroup to be associated with the menu.
+<!-- ##### FUNCTION gtk_menu_get_accel_group ##### -->
+<para>
+
+</para>
+
+@menu:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_menu_get_uline_accel_group ##### -->
+<para>
+
+</para>
+
+@menu:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_menu_ensure_uline_accel_group ##### -->
+<para>
+
+</para>
+
+@menu:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_menu_set_title ##### -->
<para>
Sets the title string for the menu. The title is displayed when the menu
diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index 3dd96a4cf..16cb5bca3 100644
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -38,8 +38,6 @@ only a few are really useful.
</para>
-@item: the parent class object
-@submenu: the submenu attached to this item; read only
<!-- ##### FUNCTION gtk_menu_item_new ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml
index 4c00a7a7a..5982ff836 100644
--- a/docs/reference/gtk/tmpl/gtkmenushell.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml
@@ -89,6 +89,14 @@ Selects the menu item from the menu shell.
@menu_item: The #GtkMenuItem to select.
+<!-- ##### FUNCTION gtk_menu_shell_deselect ##### -->
+<para>
+
+</para>
+
+@menu_shell:
+
+
<!-- ##### FUNCTION gtk_menu_shell_activate_item ##### -->
<para>
Activates the menu item within the menu shell.
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index bc8cb99e2..4b73f7b5d 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -27,28 +27,6 @@ place. <!-- TODO: talk about the menu -->
</para>
-@container: the parent class object
-@cur_page: the currently displayed page
-@children: a GList with the children of the notebook; belonging to
-#GtkNotebookPage
-@first_tab:
-@focus_tab:
-@menu:
-@panel:
-@timer:
-@tab_hborder:
-@tab_vborder:
-@show_tabs:
-@homogeneous:
-@show_border:
-@tab_pos:
-@scrollable:
-@in_child:
-@click_child:
-@button:
-@need_timer:
-@child_has_focus:
-@have_visible_child:
<!-- ##### MACRO GTK_NOTEBOOK_PAGE ##### -->
<para>
@@ -153,7 +131,7 @@ bounds, it is assumed to be the current number of pages.
</para>
@notebook: the notebook widget
-@child: the content of the new page
+@child: the content of the new page
@tab_label: the bookmark of the page
@menu_label: the menu label of the page
@position: the position to insert the page
@@ -273,24 +251,6 @@ Sets whether there should be a border around the bookmarks or not.
@border_width: a boolean value
-<!-- ##### FUNCTION gtk_notebook_set_tab_hborder ##### -->
-<para>
-Sets whether the tabs should have a horizontal border.
-</para>
-
-@notebook: the notebook widget
-@tab_hborder: a boolean value
-
-
-<!-- ##### FUNCTION gtk_notebook_set_tab_vborder ##### -->
-<para>
-Sets whether the tabs should have a vertical border.
-</para>
-
-@notebook: the notebook widget
-@tab_vborder: a boolean value
-
-
<!-- ##### FUNCTION gtk_notebook_popup_enable ##### -->
<para>
Enables the popup menu: if the user clicks with the right mouse button on
@@ -357,7 +317,7 @@ Looks for the packing attributes of the bookmarks of @child.
@notebook: the notebook widget
@child: the page
-@expand: a pointer to return the expand value (or NULL)
+@expand: a pointer to return the expand value (or NULL)
@fill: a pointer to return the fill value (or NULL)
@pack_type: a pointer to return the pack_type (or NULL)
@@ -392,6 +352,15 @@ Creates a new label and sets it as the menu label of @child.
@menu_text: the label text
+<!-- ##### FUNCTION gtk_notebook_set_tab_hborder ##### -->
+<para>
+Sets whether the tabs should have a horizontal border.
+</para>
+
+@notebook: the notebook widget
+@tab_hborder: a boolean value
+
+
<!-- ##### FUNCTION gtk_notebook_set_tab_label ##### -->
<para>
Changes the bookmark label of @child. Nothing happens if @child is not in
@@ -426,6 +395,15 @@ Creates a new label and sets it as the bookmark label of @child.
@tab_text: the label text
+<!-- ##### FUNCTION gtk_notebook_set_tab_vborder ##### -->
+<para>
+Sets whether the tabs should have a vertical border.
+</para>
+
+@notebook: the notebook widget
+@tab_vborder: a boolean value
+
+
<!-- ##### SIGNAL GtkNotebook::switch-page ##### -->
<para>
Emitted when the user or a function changes the current page.
@@ -480,3 +458,8 @@ Whether the bookmarks should be scrollable or not
Whether the popup menu is enabled or not
</para>
+<!-- ##### ARG GtkNotebook:homogeneous ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml
index 43a2acffa..4d346e203 100644
--- a/docs/reference/gtk/tmpl/gtkobject.sgml
+++ b/docs/reference/gtk/tmpl/gtkobject.sgml
@@ -178,39 +178,23 @@ The object itself. You should never use these members directly-
instead you the accessing macros.
</para>
-@klass: a pointer to the GtkObjectClass (or deriver) which contains
-the methods defined by this object.
-@flags: the state of the object: whether it has been constructed
-or destroyed, for example.
-@ref_count: a reference count. It is incremented when new
-pointers to this object are made, and decremented when the
-pointers are deleted. When the reference count
-returns to 0, the object is deleted. By default, objects
-have reference count 0 when created.
-@object_data:
<!-- ##### MACRO GTK_OBJECT_TYPE ##### -->
<para>
Get the type of an object.
</para>
+@object:
+<!-- # Unused Parameters # -->
@obj: the object whose type we wish to get.
-<!-- ##### MACRO GTK_OBJECT_SIGNALS ##### -->
+<!-- ##### MACRO GTK_OBJECT_TYPE_NAME ##### -->
<para>
-Get the array of signals defined for this object.
-</para>
-
-@obj: the object to fetch the signals from.
-
-<!-- ##### MACRO GTK_OBJECT_NSIGNALS ##### -->
-<para>
-Get the number of signals defined by this object.
</para>
-@obj: the object to query.
+@object:
<!-- ##### ENUM GtkObjectFlags ##### -->
@@ -226,6 +210,7 @@ there own references, if they believe they are nearly primary
ownership of the object.
GTK_CONNECTED: refers to whether are signals are connected to this
object.
+@GTK_CONNECTED:
@GTK_CONSTRUCTED: refers to whether the arguments for this object are
ready.
@@ -452,6 +437,7 @@ Increase the reference count of the object.
</para>
@object: the object to reference.
+@Returns:
<!-- ##### FUNCTION gtk_object_unref ##### -->
@@ -509,6 +495,16 @@ See gtk_object_unref().
@object: the object to destroy.
+<!-- ##### FUNCTION gtk_object_get ##### -->
+<para>
+
+</para>
+
+@object:
+@first_arg_name:
+@Varargs:
+
+
<!-- ##### FUNCTION gtk_object_getv ##### -->
<para>
Gets an array of argument values from an object.
@@ -540,12 +536,12 @@ void set_box_properties(GtkBox* box)
</informalexample>
</para>
-
@object: the object whose arguments should be set.
@first_arg_name: the name of the first argument to set.
@Varargs: the value of the first argument, followed optionally
by more name/value pairs, followed by NULL.
+
<!-- ##### FUNCTION gtk_object_setv ##### -->
<para>
Set an array of arguments.
@@ -614,7 +610,6 @@ 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.
@@ -775,6 +770,8 @@ to get an id from a string.
</para>
@object: object containing the associations.
+@key_id:
+<!-- # Unused Parameters # -->
@data_id: quark of the key.
@@ -852,19 +849,6 @@ Query information about an argument type.
It is the caller's responsibility to call g_free() in the event of error.
-<!-- ##### FUNCTION gtk_trace_referencing ##### -->
-<para>
-Private: print debugging information while doing a gtk_object_ref() or
-a gtk_object_unref().
-</para>
-
-@object: object to reference or unreference.
-@func: name of caller's function to print (used within macros).
-@dummy: unused.
-@line: line number (used within macros).
-@do_ref: whether to reference or unreference.
-
-
<!-- ##### SIGNAL GtkObject::destroy ##### -->
<para>
Indicates that an object is being destroyed.
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 9bc5aab88..c65944894 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -69,3 +69,12 @@ selected value for the option menu.
0 to n-1.
+<!-- ##### FUNCTION gtk_option_menu_get_history ##### -->
+<para>
+
+</para>
+
+@option_menu:
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml
index db7f80bd3..59a5511b7 100644
--- a/docs/reference/gtk/tmpl/gtkpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkpaned.sgml
@@ -73,7 +73,6 @@ gtk_widget_set_usize (frame1, 50, -1);
</para>
@handle_size:
-@gutter_size:
<!-- ##### FUNCTION gtk_paned_add1 ##### -->
<para>
@@ -114,17 +113,8 @@ Old name for gtk_paned_set_handle_size()
Old name for gtk_paned_set_gutter_size()
</para>
-
-
-<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
-<para>
-Internal function used by #GtkHPaned and #GtkVPaned
-</para>
-
-@paned:
-@allocation:
-@child1_req:
-@child2_req:
+@p:
+@s:
<!-- ##### FUNCTION gtk_paned_pack1 ##### -->
@@ -149,11 +139,14 @@ Add a child to the bottom or right pane.
@shrink: can this child be made smaller than its requsition.
-<!-- ##### FUNCTION gtk_paned_set_gutter_size ##### -->
+<!-- ##### MACRO gtk_paned_set_gutter_size ##### -->
<para>
Set the width of the gutter. (The area between the two panes).
</para>
+@p:
+@s:
+<!-- # Unused Parameters # -->
@paned: a paned widget
@size: the width of the widget in pixels
@@ -169,13 +162,24 @@ Set the the handle size to @size x @size pixels.
<!-- ##### FUNCTION gtk_paned_set_position ##### -->
<para>
-Set the position of the separator, as if set by the user.
-If position is negative, the remembered position is
-forgotten, and the division is recomputed from the
-the requisitions of the children.
+
</para>
-@paned: a paned widget
-@position: the new position of the separator.
+@paned:
+@position:
+
+<!-- ##### FUNCTION gtk_paned_get_position ##### -->
+<para>
+
+</para>
+
+@paned:
+@Returns:
+
+
+<!-- ##### ARG GtkPaned:handle_size ##### -->
+<para>
+
+</para>
diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml
index 8ab4dbb3d..7fa78ca6b 100644
--- a/docs/reference/gtk/tmpl/gtkpreview.sgml
+++ b/docs/reference/gtk/tmpl/gtkpreview.sgml
@@ -254,3 +254,10 @@ once used for changing the colormap and visual on the fly.
+<!-- ##### ARG GtkPreview:expand ##### -->
+<para>
+Determines the way that the the preview widget behaves
+when the size it is allocated is larger than the requested
+size. See gtk_preview_set_expand().
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkprivate.sgml b/docs/reference/gtk/tmpl/gtkprivate.sgml
deleted file mode 100644
index 3be551b99..000000000
--- a/docs/reference/gtk/tmpl/gtkprivate.sgml
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Private Information
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkPrivateFlags ##### -->
-<para>
-
-</para>
-
-@PRIVATE_GTK_USER_STYLE:
-@PRIVATE_GTK_REDRAW_PENDING:
-@PRIVATE_GTK_RESIZE_PENDING:
-@PRIVATE_GTK_RESIZE_NEEDED:
-@PRIVATE_GTK_LEAVE_PENDING:
-@PRIVATE_GTK_HAS_SHAPE_MASK:
-@PRIVATE_GTK_IN_REPARENT:
-@PRIVATE_GTK_IS_OFFSCREEN:
-
-<!-- ##### MACRO GTK_PRIVATE_FLAGS ##### -->
-<para>
-
-</para>
-
-@wid:
-
-
-<!-- ##### MACRO GTK_WIDGET_USER_STYLE ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_WIDGET_REDRAW_PENDING ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_CONTAINER_RESIZE_PENDING ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_WIDGET_RESIZE_NEEDED ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_WIDGET_LEAVE_PENDING ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_WIDGET_HAS_SHAPE_MASK ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_WIDGET_IN_REPARENT ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_WIDGET_IS_OFFSCREEN ##### -->
-<para>
-
-</para>
-
-@obj:
-
-
-<!-- ##### MACRO GTK_PRIVATE_SET_FLAG ##### -->
-<para>
-
-</para>
-
-@wid:
-@flag:
-
-
-<!-- ##### MACRO GTK_PRIVATE_UNSET_FLAG ##### -->
-<para>
-
-</para>
-
-@wid:
-@flag:
-
-
diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml
index c88349845..f67d36e6e 100644
--- a/docs/reference/gtk/tmpl/gtkprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogress.sgml
@@ -10,6 +10,7 @@ A #GtkProgress is the abstract base class used to derive
a #GtkProgressBar which provides a visual representation of
the progress of a long running operation.
</para>
+
<!-- ##### SECTION See_Also ##### -->
<para>
@@ -21,6 +22,7 @@ The #GtkProgress-struct struct contains private data only.
and should be accessed using the functions below.
</para>
+
<!-- ##### FUNCTION gtk_progress_set_show_text ##### -->
<para>
Controls whether progress text is shown.
@@ -30,6 +32,7 @@ Controls whether progress text is shown.
@show_text: a boolean indicating whether the progress text
is shown.
+
<!-- ##### FUNCTION gtk_progress_set_text_alignment ##### -->
<para>
Controls the alignment of the text within the progress bar area.
@@ -202,3 +205,4 @@ A number between 0.0 and 1.0 specifying the horizontal alignment.
<para>
A number between 0.0 and 1.0 specifying the vertical alignment.
</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
index 8fa367b82..3e44bb019 100644
--- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
@@ -69,6 +69,9 @@ An enumeration representing the styles for drawing the progress bar.
</tbody></tgroup></informaltable>
</para>
+@GTK_PROGRESS_CONTINUOUS:
+@GTK_PROGRESS_DISCRETE:
+
<!-- ##### ENUM GtkProgressBarOrientation ##### -->
<para>
An enumeration representing possible orientations and growth
@@ -101,6 +104,11 @@ directions for the visible progress bar.
</tbody></tgroup></informaltable>
</para>
+@GTK_PROGRESS_LEFT_TO_RIGHT:
+@GTK_PROGRESS_RIGHT_TO_LEFT:
+@GTK_PROGRESS_BOTTOM_TO_TOP:
+@GTK_PROGRESS_TOP_TO_BOTTOM:
+
<!-- ##### FUNCTION gtk_progress_bar_new ##### -->
<para>
Creates a new #GtkProgressBar.
@@ -109,6 +117,41 @@ Creates a new #GtkProgressBar.
@Returns: a #GtkProgressBar.
+<!-- ##### FUNCTION gtk_progress_bar_pulse ##### -->
+<para>
+
+</para>
+
+@pbar:
+
+
+<!-- ##### FUNCTION gtk_progress_bar_set_text ##### -->
+<para>
+
+</para>
+
+@pbar:
+@text:
+
+
+<!-- ##### FUNCTION gtk_progress_bar_set_fraction ##### -->
+<para>
+
+</para>
+
+@pbar:
+@fraction:
+
+
+<!-- ##### FUNCTION gtk_progress_bar_set_pulse_step ##### -->
+<para>
+
+</para>
+
+@pbar:
+@fraction:
+
+
<!-- ##### FUNCTION gtk_progress_bar_new_with_adjustment ##### -->
<para>
Creates a new #GtkProgressBar with an associated #GtkAdjustment.
@@ -216,3 +259,13 @@ The number of blocks which which make up progress bar
when it is shown in %GTK_PROGRESS_DISCRETE style.
</para>
+<!-- ##### ARG GtkProgressBar:fraction ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkProgressBar:pulse_step ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
index 3e9f1f666..56a293cdd 100644
--- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
@@ -13,7 +13,6 @@ instant exactly one of the radio menu items from a group is selected.
The correct way to create a group of radio menu items is aproximativly
this:
</para>
-<para>
<example>
<title>How to create a group of radio menu items.</title>
<programlisting>
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 17281a0bc..df392bf6f 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -424,18 +424,23 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle.
</para>
+@parent_instance:
@name:
-@font_name:
-@fontset_name:
@bg_pixmap_name:
+@font_desc:
@color_flags:
@fg:
@bg:
@text:
@base:
-@engine:
-@engine_data:
-@ref_count:
+@xthickness:
+@ythickness:
+
+<!-- ##### STRUCT GtkRcStyleClass ##### -->
+<para>
+
+</para>
+
<!-- ##### ENUM GtkRcFlags ##### -->
<para>
@@ -510,10 +515,13 @@ specific portions of a RC file.
@GTK_RC_TOKEN_INSENSITIVE:
@GTK_RC_TOKEN_FG:
@GTK_RC_TOKEN_BG:
-@GTK_RC_TOKEN_BASE:
@GTK_RC_TOKEN_TEXT:
+@GTK_RC_TOKEN_BASE:
+@GTK_RC_TOKEN_XTHICKNESS:
+@GTK_RC_TOKEN_YTHICKNESS:
@GTK_RC_TOKEN_FONT:
@GTK_RC_TOKEN_FONTSET:
+@GTK_RC_TOKEN_FONT_NAME:
@GTK_RC_TOKEN_BG_PIXMAP:
@GTK_RC_TOKEN_PIXMAP_PATH:
@GTK_RC_TOKEN_STYLE:
@@ -756,6 +764,15 @@ a reference count of 1.
@Returns: the newly create #GtkRcStyle
+<!-- ##### FUNCTION gtk_rc_style_copy ##### -->
+<para>
+
+</para>
+
+@orig:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_rc_style_ref ##### -->
<para>
Increment the reference count of a #GtkRcStyle.
@@ -773,10 +790,3 @@ free if the result is 0.
@rc_style: a #GtkRcStyle
-<!-- ##### FUNCTION gtk_rc_init ##### -->
-<para>
-Internal function.
-</para>
-
-
-
diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml
index 7f9330de3..1e73d3956 100644
--- a/docs/reference/gtk/tmpl/gtkruler.sgml
+++ b/docs/reference/gtk/tmpl/gtkruler.sgml
@@ -60,3 +60,23 @@ This sets the range of the ruler using gfloat lower, gfloat upper, gfloat positi
@max_size: the maximum size of the ruler
+<!-- ##### ARG GtkRuler:lower ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRuler:upper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRuler:position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRuler:max_size ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
index 92c6db77f..5a0e96b4f 100644
--- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml
@@ -130,15 +130,6 @@ i.e. has been filled in with a valid signal identifier.
@child: Widget you want to scroll.
-<!-- ##### FUNCTION gtk_scrolled_window_set_hadjustment ##### -->
-<para>
-Sets the #GtkAdjustment for the horizontal scrollbar.
-</para>
-
-@scrolled_window: A #GtkScrolledWindow.
-@hadjustment: Horizontal scroll adjustment.
-
-
<!-- ##### FUNCTION gtk_scrolled_window_set_placement ##### -->
<para>
Determines the location of the child widget with respect to the
@@ -152,6 +143,24 @@ Other values in #GtkCornerType are %GTK_CORNER_TOP_RIGHT,
@window_placement: Position of the child window.
+<!-- ##### FUNCTION gtk_scrolled_window_set_shadow_type ##### -->
+<para>
+
+</para>
+
+@scrolled_window:
+@type:
+
+
+<!-- ##### FUNCTION gtk_scrolled_window_set_hadjustment ##### -->
+<para>
+Sets the #GtkAdjustment for the horizontal scrollbar.
+</para>
+
+@scrolled_window: A #GtkScrolledWindow.
+@hadjustment: Horizontal scroll adjustment.
+
+
<!-- ##### FUNCTION gtk_scrolled_window_set_vadjustment ##### -->
<para>
Sets the #GtkAdjustment for the vertical scrollbar.
@@ -189,3 +198,8 @@ Position of child window with respect to scrollbars; top left, top
right, bottom left, bottom right.
</para>
+<!-- ##### ARG GtkScrolledWindow:shadow ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
index 6bed4c17f..916372fbc 100644
--- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
@@ -320,6 +320,30 @@ Refreshes a spin button. The behaviour of the update is determined by gtk_spin_b
@spin_button: a #GtkSpinButton.
+<!-- ##### MACRO GTK_INPUT_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### SIGNAL GtkSpinButton::input ##### -->
+<para>
+
+</para>
+
+@spinbutton: the object which received the signal.
+@arg1:
+@Returns:
+
+<!-- ##### SIGNAL GtkSpinButton::output ##### -->
+<para>
+
+</para>
+
+@spinbutton: the object which received the signal.
+@Returns:
+
<!-- ##### ARG GtkSpinButton:adjustment ##### -->
<para>
the #GtkAdjustment that defines a spin button's main properties.
diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index 0fbac43c7..86d41005a 100644
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -34,7 +34,7 @@ Styles
</para>
-@klass:
+@parent_instance:
@fg:
@bg:
@light:
@@ -45,6 +45,9 @@ Styles
@black:
@white:
@font:
+@font_desc:
+@xthickness:
+@ythickness:
@fg_gc:
@bg_gc:
@light_gc:
@@ -55,22 +58,19 @@ Styles
@black_gc:
@white_gc:
@bg_pixmap:
-@ref_count:
-@attach_count:
-@depth:
-@colormap:
-@engine:
-@engine_data:
-@rc_style:
-@styles:
<!-- ##### STRUCT GtkStyleClass ##### -->
<para>
</para>
-@xthickness:
-@ythickness:
+@parent_class:
+@realize:
+@unrealize:
+@copy:
+@clone:
+@init_from_rc:
+@set_background:
@draw_hline:
@draw_vline:
@draw_shadow:
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
new file mode 100644
index 000000000..8048a7fee
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -0,0 +1,550 @@
+<!-- ##### SECTION Title ##### -->
+GtkTextBuffer
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkTextBTree ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_text_buffer_new ##### -->
+<para>
+
+</para>
+
+@table:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_line_count ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_char_count ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_tag_table ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@text:
+@len:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert_at_cursor ##### -->
+<para>
+
+</para>
+
+@buffer:
+@text:
+@len:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert_interactive ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@text:
+@len:
+@default_editable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert_interactive_at_cursor ##### -->
+<para>
+
+</para>
+
+@buffer:
+@text:
+@len:
+@default_editable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_delete ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start:
+@end:
+<!-- # Unused Parameters # -->
+@start_iter:
+@end_iter:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_delete_interactive ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start_iter:
+@end_iter:
+@default_editable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_text ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start:
+@end:
+@include_hidden_chars:
+@Returns:
+<!-- # Unused Parameters # -->
+@start_iter:
+@end_iter:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_slice ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start:
+@end:
+@include_hidden_chars:
+@Returns:
+<!-- # Unused Parameters # -->
+@start_iter:
+@end_iter:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_insert_pixmap ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@pixmap:
+@mask:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_create_mark ##### -->
+<para>
+
+</para>
+
+@buffer:
+@mark_name:
+@where:
+@left_gravity:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_move_mark ##### -->
+<para>
+
+</para>
+
+@buffer:
+@mark:
+@where:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_delete_mark ##### -->
+<para>
+
+</para>
+
+@buffer:
+@mark:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_mark ##### -->
+<para>
+
+</para>
+
+@buffer:
+@name:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_place_cursor ##### -->
+<para>
+
+</para>
+
+@buffer:
+@where:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_apply_tag ##### -->
+<para>
+
+</para>
+
+@buffer:
+@tag:
+@start_index:
+@end_index:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_remove_tag ##### -->
+<para>
+
+</para>
+
+@buffer:
+@tag:
+@start_index:
+@end_index:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_apply_tag_by_name ##### -->
+<para>
+
+</para>
+
+@buffer:
+@name:
+@start_index:
+@end_index:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_remove_tag_by_name ##### -->
+<para>
+
+</para>
+
+@buffer:
+@name:
+@start_index:
+@end_index:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_create_tag ##### -->
+<para>
+
+</para>
+
+@buffer:
+@tag_name:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_line_offset ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@line_number:
+@char_offset:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_offset ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@char_offset:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_line ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@line_number:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_last_iter ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_bounds ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start:
+@end:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_iter_at_mark ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@mark:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_tags ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_modified ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_set_modified ##### -->
+<para>
+
+</para>
+
+@buffer:
+@setting:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_set_clipboard_contents ##### -->
+<para>
+
+</para>
+
+@buffer:
+@text:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_clipboard_contents ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_paste_primary_selection ##### -->
+<para>
+
+</para>
+
+@buffer:
+@override_location:
+@time:
+@interactive:
+@default_editable:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_delete_selection ##### -->
+<para>
+
+</para>
+
+@buffer:
+@interactive:
+@default_editable:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_cut ##### -->
+<para>
+
+</para>
+
+@buffer:
+@time:
+@interactive:
+@default_editable:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_copy ##### -->
+<para>
+
+</para>
+
+@buffer:
+@time:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_paste_clipboard ##### -->
+<para>
+
+</para>
+
+@buffer:
+@time:
+@interactive:
+@default_editable:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_get_selection_bounds ##### -->
+<para>
+
+</para>
+
+@buffer:
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_find_string ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@str:
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_find_regexp ##### -->
+<para>
+
+</para>
+
+@buffer:
+@regexp:
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_buffer_spew ##### -->
+<para>
+
+</para>
+
+@buffer:
+
+
+<!-- ##### SIGNAL GtkTextBuffer::insert-text ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+@arg4:
+
+<!-- ##### SIGNAL GtkTextBuffer::delete-text ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+
+<!-- ##### SIGNAL GtkTextBuffer::changed ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextBuffer::modified-changed ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextBuffer::mark-set ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### SIGNAL GtkTextBuffer::mark-deleted ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL GtkTextBuffer::apply-tag ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+
+<!-- ##### SIGNAL GtkTextBuffer::remove-tag ##### -->
+<para>
+
+</para>
+
+@textbuffer: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+
diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml
new file mode 100644
index 000000000..016495862
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktextiter.sgml
@@ -0,0 +1,570 @@
+<!-- ##### SECTION Title ##### -->
+gtktextiter
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkTextBuffer ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkTextIter ##### -->
+<para>
+
+</para>
+
+@dummy1:
+@dummy2:
+@dummy3:
+@dummy4:
+@dummy10:
+@dummy11:
+@dummy5:
+@dummy6:
+@dummy7:
+@dummy8:
+@dummy9:
+@pad1:
+@pad2:
+
+<!-- ##### FUNCTION gtk_text_iter_get_buffer ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_copy ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_free ##### -->
+<para>
+
+</para>
+
+@iter:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_offset ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_line_offset ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_line_index ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_char ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_slice ##### -->
+<para>
+
+</para>
+
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_text ##### -->
+<para>
+
+</para>
+
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_visible_slice ##### -->
+<para>
+
+</para>
+
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_visible_text ##### -->
+<para>
+
+</para>
+
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_pixmap ##### -->
+<para>
+
+</para>
+
+@iter:
+@pixmap:
+@mask:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_marks ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_toggled_tags ##### -->
+<para>
+
+</para>
+
+@iter:
+@toggled_on:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_begins_tag ##### -->
+<para>
+
+</para>
+
+@iter:
+@tag:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_ends_tag ##### -->
+<para>
+
+</para>
+
+@iter:
+@tag:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_toggles_tag ##### -->
+<para>
+
+</para>
+
+@iter:
+@tag:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_has_tag ##### -->
+<para>
+
+</para>
+
+@iter:
+@tag:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_editable ##### -->
+<para>
+
+</para>
+
+@iter:
+@default_setting:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_starts_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_ends_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_chars_in_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_get_attributes ##### -->
+<para>
+
+</para>
+
+@iter:
+@values:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_is_last ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_is_first ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_next_char ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_prev_char ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_chars ##### -->
+<para>
+
+</para>
+
+@iter:
+@count:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_chars ##### -->
+<para>
+
+</para>
+
+@iter:
+@count:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_lines ##### -->
+<para>
+
+</para>
+
+@iter:
+@count:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_lines ##### -->
+<para>
+
+</para>
+
+@iter:
+@count:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_word_ends ##### -->
+<para>
+
+</para>
+
+@iter:
+@count:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_word_starts ##### -->
+<para>
+
+</para>
+
+@iter:
+@count:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_word_end ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_word_start ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_set_offset ##### -->
+<para>
+
+</para>
+
+@iter:
+@char_offset:
+
+
+<!-- ##### FUNCTION gtk_text_iter_set_line ##### -->
+<para>
+
+</para>
+
+@iter:
+@line_number:
+
+
+<!-- ##### FUNCTION gtk_text_iter_set_line_offset ##### -->
+<para>
+
+</para>
+
+@iter:
+@char_on_line:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_to_end ##### -->
+<para>
+
+</para>
+
+@iter:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_to_newline ##### -->
+<para>
+
+</para>
+
+@iter:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_to_tag_toggle ##### -->
+<para>
+
+</para>
+
+@iter:
+@tag:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_to_tag_toggle ##### -->
+<para>
+
+</para>
+
+@iter:
+@tag:
+@Returns:
+
+
+<!-- ##### USER_FUNCTION GtkTextCharPredicate ##### -->
+<para>
+
+</para>
+
+@ch:
+@user_data:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_find_char ##### -->
+<para>
+
+</para>
+
+@iter:
+@pred:
+@user_data:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_find_char ##### -->
+<para>
+
+</para>
+
+@iter:
+@pred:
+@user_data:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_forward_search ##### -->
+<para>
+
+</para>
+
+@iter:
+@str:
+@visible_only:
+@slice:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_backward_search ##### -->
+<para>
+
+</para>
+
+@iter:
+@str:
+@visible_only:
+@slice:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_equal ##### -->
+<para>
+
+</para>
+
+@lhs:
+@rhs:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_compare ##### -->
+<para>
+
+</para>
+
+@lhs:
+@rhs:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_in_region ##### -->
+<para>
+
+</para>
+
+@iter:
+@start:
+@end:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_iter_reorder ##### -->
+<para>
+
+</para>
+
+@first:
+@second:
+
+
+<!-- ##### FUNCTION gtk_text_iter_spew ##### -->
+<para>
+
+</para>
+
+@iter:
+@desc:
+
+
diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml
new file mode 100644
index 000000000..3bfdbc0df
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktextmark.sgml
@@ -0,0 +1,66 @@
+<!-- ##### SECTION Title ##### -->
+gtktextmark
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkTextMark ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_text_mark_set_visible ##### -->
+<para>
+
+</para>
+
+@mark:
+@setting:
+
+
+<!-- ##### FUNCTION gtk_text_mark_is_visible ##### -->
+<para>
+
+</para>
+
+@mark:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_mark_ref ##### -->
+<para>
+
+</para>
+
+@mark:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_mark_unref ##### -->
+<para>
+
+</para>
+
+@mark:
+
+
+<!-- ##### FUNCTION gtk_text_mark_deleted ##### -->
+<para>
+
+</para>
+
+@mark:
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml
new file mode 100644
index 000000000..87c937a47
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktexttag.sgml
@@ -0,0 +1,402 @@
+<!-- ##### SECTION Title ##### -->
+GtkTextTag
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkTextTag ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkTextBTreeNode ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkTextTagTable ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GtkTextTabArray ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM GtkWrapMode ##### -->
+<para>
+
+</para>
+
+@GTK_WRAPMODE_NONE:
+@GTK_WRAPMODE_CHAR:
+@GTK_WRAPMODE_WORD:
+
+<!-- ##### STRUCT GtkTextAttributes ##### -->
+<para>
+
+</para>
+
+@refcount:
+@appearance:
+@border_width:
+@relief:
+@justify:
+@direction:
+@font_desc:
+@left_margin:
+@left_wrapped_line_margin:
+@offset:
+@right_margin:
+@pixels_above_lines:
+@pixels_below_lines:
+@pixels_inside_wrap:
+@tab_array:
+@wrap_mode:
+@language:
+@invisible:
+@bg_full_height:
+@editable:
+@realized:
+@pad1:
+@pad2:
+@pad3:
+@pad4:
+
+<!-- ##### FUNCTION gtk_text_tag_new ##### -->
+<para>
+
+</para>
+
+@name:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_tag_get_priority ##### -->
+<para>
+
+</para>
+
+@tag:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_tag_set_priority ##### -->
+<para>
+
+</para>
+
+@tag:
+@priority:
+
+
+<!-- ##### FUNCTION gtk_text_tag_event ##### -->
+<para>
+
+</para>
+
+@tag:
+@event_object:
+@event:
+@iter:
+@Returns:
+
+
+<!-- ##### STRUCT GtkTextAppearance ##### -->
+<para>
+
+</para>
+
+@bg_color:
+@fg_color:
+@bg_stipple:
+@fg_stipple:
+@underline:
+@overstrike:
+@draw_bg:
+@inside_selection:
+
+<!-- ##### FUNCTION gtk_text_attributes_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_attributes_copy ##### -->
+<para>
+
+</para>
+
+@src:
+@dest:
+
+
+<!-- ##### FUNCTION gtk_text_attributes_unref ##### -->
+<para>
+
+</para>
+
+@values:
+
+
+<!-- ##### FUNCTION gtk_text_attributes_ref ##### -->
+<para>
+
+</para>
+
+@values:
+
+
+<!-- ##### SIGNAL GtkTextTag::event ##### -->
+<para>
+
+</para>
+
+@texttag: the object which received the signal.
+@arg1:
+@event:
+@arg2:
+@Returns:
+
+<!-- ##### ARG GtkTextTag:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_gdk ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_full_height ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_stipple ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:direction ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:editable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:font ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:font_desc ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:foreground ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:foreground_gdk ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:foreground_stipple ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:justify ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:language ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:left_margin ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:left_wrapped_line_margin ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:offset ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:overstrike ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels_above_lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels_below_lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels_inside_wrap ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:right_margin ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:underline ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:wrap_mode ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_full_height_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_gdk_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:background_stipple_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:editable_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:font_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:foreground_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:foreground_gdk_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:foreground_stipple_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:justify_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:language_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:left_margin_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:left_wrapped_line_margin_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:offset_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:overstrike_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels_above_lines_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels_below_lines_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:pixels_inside_wrap_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:right_margin_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:underline_set ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextTag:wrap_mode_set ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktexttagtable.sgml b/docs/reference/gtk/tmpl/gtktexttagtable.sgml
new file mode 100644
index 000000000..26f7ce2e3
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktexttagtable.sgml
@@ -0,0 +1,105 @@
+<!-- ##### SECTION Title ##### -->
+GtkTextTagTable
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### USER_FUNCTION GtkTextTagTableForeach ##### -->
+<para>
+
+</para>
+
+@tag:
+@data:
+
+
+<!-- ##### FUNCTION gtk_text_tag_table_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_tag_table_add ##### -->
+<para>
+
+</para>
+
+@table:
+@tag:
+
+
+<!-- ##### FUNCTION gtk_text_tag_table_remove ##### -->
+<para>
+
+</para>
+
+@table:
+@tag:
+
+
+<!-- ##### FUNCTION gtk_text_tag_table_lookup ##### -->
+<para>
+
+</para>
+
+@table:
+@name:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_tag_table_foreach ##### -->
+<para>
+
+</para>
+
+@table:
+@func:
+@data:
+
+
+<!-- ##### FUNCTION gtk_text_tag_table_size ##### -->
+<para>
+
+</para>
+
+@table:
+@Returns:
+
+
+<!-- ##### SIGNAL GtkTextTagTable::tag-changed ##### -->
+<para>
+
+</para>
+
+@texttagtable: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### SIGNAL GtkTextTagTable::tag-added ##### -->
+<para>
+
+</para>
+
+@texttagtable: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL GtkTextTagTable::tag-removed ##### -->
+<para>
+
+</para>
+
+@texttagtable: the object which received the signal.
+@arg1:
+
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
new file mode 100644
index 000000000..2ab94d5ba
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -0,0 +1,315 @@
+<!-- ##### SECTION Title ##### -->
+GtkTextView
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkTextView ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM GtkTextViewMovementStep ##### -->
+<para>
+
+</para>
+
+@GTK_TEXT_MOVEMENT_CHAR:
+@GTK_TEXT_MOVEMENT_POSITIONS:
+@GTK_TEXT_MOVEMENT_WORD:
+@GTK_TEXT_MOVEMENT_WRAPPED_LINE:
+@GTK_TEXT_MOVEMENT_LINE:
+@GTK_TEXT_MOVEMENT_LINE_ENDS:
+@GTK_TEXT_MOVEMENT_BUFFER_ENDS:
+
+<!-- ##### ENUM GtkTextViewScrollType ##### -->
+<para>
+
+</para>
+
+@GTK_TEXT_SCROLL_TO_TOP:
+@GTK_TEXT_SCROLL_TO_BOTTOM:
+@GTK_TEXT_SCROLL_PAGE_DOWN:
+@GTK_TEXT_SCROLL_PAGE_UP:
+
+<!-- ##### ENUM GtkTextViewDeleteType ##### -->
+<para>
+
+</para>
+
+@GTK_TEXT_DELETE_CHAR:
+@GTK_TEXT_DELETE_HALF_WORD:
+@GTK_TEXT_DELETE_WHOLE_WORD:
+@GTK_TEXT_DELETE_HALF_WRAPPED_LINE:
+@GTK_TEXT_DELETE_WHOLE_WRAPPED_LINE:
+@GTK_TEXT_DELETE_HALF_LINE:
+@GTK_TEXT_DELETE_WHOLE_LINE:
+@GTK_TEXT_DELETE_WHITESPACE:
+@GTK_TEXT_DELETE_WHITESPACE_LEAVE_ONE:
+
+<!-- ##### FUNCTION gtk_text_view_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_new_with_buffer ##### -->
+<para>
+
+</para>
+
+@buffer:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_set_buffer ##### -->
+<para>
+
+</para>
+
+@text_view:
+@buffer:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_buffer ##### -->
+<para>
+
+</para>
+
+@text_view:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_iter_at_pixel ##### -->
+<para>
+
+</para>
+
+@text_view:
+@iter:
+@x:
+@y:
+
+
+<!-- ##### FUNCTION gtk_text_view_scroll_to_mark ##### -->
+<para>
+
+</para>
+
+@text_view:
+@mark:
+@mark_within_margin:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_move_mark_onscreen ##### -->
+<para>
+
+</para>
+
+@text_view:
+@mark:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_place_cursor_onscreen ##### -->
+<para>
+
+</para>
+
+@text_view:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_visible_rect ##### -->
+<para>
+
+</para>
+
+@text_view:
+@visible_rect:
+
+
+<!-- ##### FUNCTION gtk_text_view_set_wrap_mode ##### -->
+<para>
+
+</para>
+
+@text_view:
+@wrap_mode:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_wrap_mode ##### -->
+<para>
+
+</para>
+
+@text_view:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_set_editable ##### -->
+<para>
+
+</para>
+
+@text_view:
+@setting:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_editable ##### -->
+<para>
+
+</para>
+
+@text_view:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_set_cursor_visible ##### -->
+<para>
+
+</para>
+
+@text_view:
+@setting:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_cursor_visible ##### -->
+<para>
+
+</para>
+
+@text_view:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_text_view_get_iter_location ##### -->
+<para>
+
+</para>
+
+@text_view:
+@iter:
+@location:
+
+
+<!-- ##### SIGNAL GtkTextView::move-insert ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+@arg1:
+@arg2:
+@arg3:
+
+<!-- ##### SIGNAL GtkTextView::set-anchor ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextView::scroll-text ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+@arg1:
+
+<!-- ##### SIGNAL GtkTextView::delete-text ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### SIGNAL GtkTextView::cut-text ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextView::copy-text ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextView::paste-text ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextView::toggle-overwrite ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+
+<!-- ##### SIGNAL GtkTextView::set-scroll-adjustments ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### ARG GtkTextView:height_lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:width_columns ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:pixels_above_lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:pixels_below_lines ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:pixels_inside_wrap ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:editable ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTextView:wrap_mode ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkthemes.sgml b/docs/reference/gtk/tmpl/gtkthemes.sgml
index 7dd4163a7..cb26d3115 100644
--- a/docs/reference/gtk/tmpl/gtkthemes.sgml
+++ b/docs/reference/gtk/tmpl/gtkthemes.sgml
@@ -19,15 +19,6 @@ Themes
</para>
-@parse_rc_style:
-@merge_rc_style:
-@rc_style_to_style:
-@duplicate_style:
-@realize_style:
-@unrealize_style:
-@destroy_rc_style:
-@destroy_style:
-@set_background:
<!-- ##### FUNCTION gtk_theme_engine_get ##### -->
<para>
@@ -54,20 +45,24 @@ Themes
@engine:
-<!-- ##### FUNCTION gtk_themes_init ##### -->
+<!-- ##### FUNCTION gtk_theme_engine_create_rc_style ##### -->
<para>
</para>
-@argc:
-@argv:
+@engine:
+@Returns:
-<!-- ##### FUNCTION gtk_themes_exit ##### -->
+<!-- ##### FUNCTION gtk_theme_engine_register_type ##### -->
<para>
</para>
-@error_code:
+@engine:
+@parent_type:
+@type_name:
+@type_info:
+@Returns:
diff --git a/docs/reference/gtk/tmpl/gtktipsquery.sgml b/docs/reference/gtk/tmpl/gtktipsquery.sgml
index 7f7949a1d..820526f24 100644
--- a/docs/reference/gtk/tmpl/gtktipsquery.sgml
+++ b/docs/reference/gtk/tmpl/gtktipsquery.sgml
@@ -97,6 +97,61 @@ the pointer has no tooltip.
beneath the pointer has no tooltip.
+<!-- ##### MACRO GTK_TIPS_QUERY ##### -->
+<para>
+
+</para>
+
+@obj:
+
+
+<!-- ##### MACRO GTK_IS_TIPS_QUERY ##### -->
+<para>
+
+</para>
+
+@obj:
+
+
+<!-- ##### MACRO GTK_TYPE_TIPS_QUERY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION gtk_tips_query_get_type ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
+<!-- ##### MACRO GTK_TIPS_QUERY_CLASS ##### -->
+<para>
+
+</para>
+
+@klass:
+
+
+<!-- ##### MACRO GTK_IS_TIPS_QUERY_CLASS ##### -->
+<para>
+
+</para>
+
+@klass:
+
+
+<!-- ##### MACRO GTK_TIPS_QUERY_GET_CLASS ##### -->
+<para>
+
+</para>
+
+@obj:
+
+
<!-- ##### SIGNAL GtkTipsQuery::start-query ##### -->
<para>
Emitted when the query is started.
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 3ed9166ad..3fe21b821 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -319,3 +319,28 @@ should be used if you wish to perform an action when ever the style of a toolbar
@toolbar: the object which received the signal.
@style: the new #GtkToolbarStyle of @toolbar.
+<!-- ##### ARG GtkToolbar:orientation ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:toolbar_style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:space_size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:space_style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:relief ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktooltips.sgml b/docs/reference/gtk/tmpl/gtktooltips.sgml
index b6349b70b..597de4d2f 100644
--- a/docs/reference/gtk/tmpl/gtktooltips.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltips.sgml
@@ -98,9 +98,6 @@ Information about the tooltip (if any) associated with an arbitrary widget can b
@widget:
@tip_text:
@tip_private:
-@font:
-@width:
-@row:
<!-- ##### FUNCTION gtk_tooltips_new ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml
index 792223a84..e523ced24 100644
--- a/docs/reference/gtk/tmpl/gtktypeutils.sgml
+++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml
@@ -31,6 +31,8 @@ fundamental types (e.g. char, uchar, int, long, float, etc).
@GTK_TYPE_INVALID:
@GTK_TYPE_NONE:
+@GTK_TYPE_ENUM:
+@GTK_TYPE_FLAGS:
@GTK_TYPE_CHAR:
@GTK_TYPE_UCHAR:
@GTK_TYPE_BOOL:
@@ -41,50 +43,32 @@ fundamental types (e.g. char, uchar, int, long, float, etc).
@GTK_TYPE_FLOAT:
@GTK_TYPE_DOUBLE:
@GTK_TYPE_STRING:
-@GTK_TYPE_ENUM:
-@GTK_TYPE_FLAGS:
@GTK_TYPE_BOXED:
@GTK_TYPE_POINTER:
@GTK_TYPE_SIGNAL:
-@GTK_TYPE_ARGS:
-@GTK_TYPE_CALLBACK:
-@GTK_TYPE_C_CALLBACK:
-@GTK_TYPE_FOREIGN:
-@GTK_TYPE_OBJECT:
-<!-- ##### MACRO GTK_TYPE_NUM_BUILTINS ##### -->
+<!-- ##### MACRO GTK_CLASS_NAME ##### -->
<para>
-No idea.
-</para>
-
-
-<!-- ##### MACRO GTK_TYPE_FLAT_FIRST ##### -->
-<para>
-The first "flat" (no struct) enumerated type value.
</para>
+@class:
-<!-- ##### MACRO GTK_TYPE_FLAT_LAST ##### -->
+<!-- ##### MACRO GTK_CLASS_TYPE ##### -->
<para>
-The last "flat" (no struct) enumerated type value.
-</para>
-
-
-<!-- ##### MACRO GTK_TYPE_STRUCTURED_FIRST ##### -->
-<para>
-The first structured enumerated type value.
</para>
+@class:
-<!-- ##### MACRO GTK_TYPE_STRUCTURED_LAST ##### -->
+<!-- ##### MACRO GTK_TYPE_IS_OBJECT ##### -->
<para>
-The last structured enumerated type value.
+
</para>
+@type:
<!-- ##### MACRO GTK_TYPE_FUNDAMENTAL_LAST ##### -->
@@ -106,6 +90,7 @@ The highest maximum fundamental enumerated type value.
Use in place of offsetof(), which is used if it exists.
</para>
+<!-- # Unused Parameters # -->
@struct: The type of the structure.
@field: The field within the structure.
@@ -117,6 +102,7 @@ defined, just cast it. Otherwise, check to see if we can cast @tobj
into a @cast.
</para>
+<!-- # Unused Parameters # -->
@tobj: a pointer to a GtkObject.
@cast_type: a Gtk type.
@cast: a C type
@@ -129,6 +115,7 @@ defined, just cast it. Otherwise, check to see if we can cast @tobj
into a @cast.
</para>
+<!-- # Unused Parameters # -->
@tclass: a pointer to a GtkClassInitFunc
@cast_type: a Gtk type.
@cast: a C type
@@ -139,6 +126,7 @@ into a @cast.
Determines whether @type_object is a type of @otype.
</para>
+<!-- # Unused Parameters # -->
@type_object: A GtkTypeObject object.
@otype:
@@ -148,32 +136,16 @@ Determines whether @type_object is a type of @otype.
Determines whether @type_class is a type of @otype.
</para>
+<!-- # Unused Parameters # -->
@type_class: A GtkTypeClass class.
@otype:
-<!-- ##### MACRO GTK_TYPE_IDENTIFIER ##### -->
+<!-- ##### MACRO GTK_CHECK_GET_CLASS ##### -->
<para>
-Hide the name of gtk_identifier_get_type
-</para>
-
-
-<!-- ##### FUNCTION gtk_identifier_get_type ##### -->
-<para>
-Get the type of GtkIdentifier.
</para>
-@Returns: GtkType -- the enumerated type of something.
-
-
-<!-- ##### MACRO GTK_TYPE_MAKE ##### -->
-<para>
-Combine a fundemantal type and a sequence number to create a gtk type.
-</para>
-
-@parent_t:
-@seqno:
<!-- ##### MACRO GTK_FUNDAMENTAL_TYPE ##### -->
@@ -181,14 +153,7 @@ Combine a fundemantal type and a sequence number to create a gtk type.
Convert a gtk type into a fundamental type
</para>
-@type:
-
-
-<!-- ##### MACRO GTK_TYPE_SEQNO ##### -->
-<para>
-Convert a gtk type into its sequence number
-</para>
-
+<!-- # Unused Parameters # -->
@type:
@@ -200,22 +165,17 @@ Just a macroized cast into a GtkSignalFunc
@f:
-<!-- ##### USER_FUNCTION GtkClassInitFunc ##### -->
+<!-- ##### TYPEDEF GtkClassInitFunc ##### -->
<para>
Define a function pointer.
</para>
-@klass: a gpointer
-
-<!-- ##### USER_FUNCTION GtkObjectInitFunc ##### -->
+<!-- ##### TYPEDEF GtkObjectInitFunc ##### -->
<para>
Define a function pointer.
</para>
-@object: a gpointer
-@klass: a gpointer
-
<!-- ##### USER_FUNCTION GtkSignalFunc ##### -->
<para>
@@ -283,7 +243,7 @@ Define a function pointer. Deprecated.
@arg_id:
-<!-- ##### STRUCT GtkTypeObject ##### -->
+<!-- ##### TYPEDEF GtkTypeObject ##### -->
<para>
A GtkTypeObject defines the minimum structure requirements
for type instances. Type instances returned from gtk_type_new ()
@@ -291,7 +251,6 @@ and initialized through a GtkObjectInitFunc need to directly inherit
from this structure or at least copy its fields one by one.
</para>
-@klass:
<!-- ##### STRUCT GtkArg ##### -->
<para>
@@ -429,38 +388,6 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_SIGNAL
@a:
-<!-- ##### MACRO GTK_VALUE_ARGS ##### -->
-<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_ARGS
-</para>
-
-@a:
-
-
-<!-- ##### MACRO GTK_VALUE_CALLBACK ##### -->
-<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK
-</para>
-
-@a:
-
-
-<!-- ##### MACRO GTK_VALUE_C_CALLBACK ##### -->
-<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
-</para>
-
-@a:
-
-
-<!-- ##### MACRO GTK_VALUE_FOREIGN ##### -->
-<para>
-Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN
-</para>
-
-@a:
-
-
<!-- ##### 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
@@ -600,31 +527,24 @@ GtkEnumValue to hold the enumerated values.
@reserved_2:
@base_class_init_func:
-<!-- ##### STRUCT GtkTypeQuery ##### -->
+<!-- ##### TYPEDEF GtkTypeClass ##### -->
<para>
-A structure used to return values from @gtk_type_query.
+The base structure for a Gtk Type. Every type inherits this as a base structure.
</para>
-@type:
-@type_name:
-@object_size:
-@class_size:
-<!-- ##### STRUCT GtkTypeClass ##### -->
+<!-- ##### TYPEDEF GtkEnumValue ##### -->
<para>
-The base structure for a Gtk Type. Every type inherits this as a base structure.
+A structure which contains a single enum value, and its name, and it's
+nickname.
</para>
-<!-- ##### STRUCT GtkEnumValue ##### -->
+<!-- ##### TYPEDEF GtkFlagValue ##### -->
<para>
-A structure which contains a single enum value, and its name, and it's
-nickname.
+
</para>
-@value:
-@value_name:
-@value_nick:
<!-- ##### FUNCTION gtk_type_init ##### -->
<para>
@@ -639,43 +559,39 @@ Create a new, unique type.
</para>
@parent_type: if zero, a fundamental type is created.
-@type_info: must not be null, and @type_info->type_name must also not be null.
+@gtkinfo:
@Returns: the new GtkType.
+<!-- # Unused Parameters # -->
+@type_info: must not be null, and @type_info->type_name must also not be null.
-<!-- ##### FUNCTION gtk_type_set_chunk_alloc ##### -->
-<para>
-Set the mem_chunk size so it will hold @n_chunks of the objects of that @type.
-</para>
-
-@type: There must be an unlocked TypeNode associated with this type otherwise nothing happens.
-@n_chunks:
-
-
-<!-- ##### FUNCTION gtk_type_name ##### -->
+<!-- ##### MACRO gtk_type_name ##### -->
<para>
</para>
-@type: a GtkType
@Returns: a pointer to the name of a type, or NULL if it has none.
+<!-- # Unused Parameters # -->
+@type: a GtkType
-<!-- ##### FUNCTION gtk_type_from_name ##### -->
+<!-- ##### MACRO gtk_type_from_name ##### -->
<para>
Get the internal representation of a type given its name.
</para>
-@name: the name of a gtk type
@Returns: a GtkType
+<!-- # Unused Parameters # -->
+@name: the name of a gtk type
-<!-- ##### FUNCTION gtk_type_parent ##### -->
+<!-- ##### MACRO gtk_type_parent ##### -->
<para>
</para>
-@type: a GtkType
@Returns: the GtkType of the parent
+<!-- # Unused Parameters # -->
+@type: a GtkType
<!-- ##### FUNCTION gtk_type_class ##### -->
@@ -688,25 +604,6 @@ any trouble identifying @type. Initialize the class if necessary.
@Returns: gpointer to the klass.
-<!-- ##### FUNCTION gtk_type_parent_class ##### -->
-<para>
-Return the class of the parent. Initialize the class if necessary.
-Return NULL if anything goes wrong.
-</para>
-
-@type: GtkType
-@Returns: gpointer to the klass.
-
-
-<!-- ##### FUNCTION gtk_type_children_types ##### -->
-<para>
-Return the pointer to the type's children's types.
-</para>
-
-@type: GtkType
-@Returns: pointer to a GList
-
-
<!-- ##### FUNCTION gtk_type_new ##### -->
<para>
Create a new object of a given type, and return a gpointer to it.
@@ -719,86 +616,16 @@ has all the proper initializers called.
@Returns: gpointer to a GtkTypeObject
-<!-- ##### FUNCTION gtk_type_free ##### -->
-<para>
-Given the type of an object and a pointer to it, the object is freed.
-</para>
-
-@type: GtkType
-@mem: gpointer to the object
-
-
-<!-- ##### FUNCTION gtk_type_describe_heritage ##### -->
-<para>
-Print the types @type inherits from.
-</para>
-
-@type: GtkType
-
-
-<!-- ##### FUNCTION gtk_type_describe_tree ##### -->
-<para>
-Given a @type, describe all of its children, and their children. Only
-show the size if @show_size is true.
-</para>
-
-@type: GtkType
-@show_size: gboolean
-
-
-<!-- ##### FUNCTION gtk_type_is_a ##### -->
+<!-- ##### MACRO gtk_type_is_a ##### -->
<para>
Look 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>
+@Returns:
+<!-- # Unused Parameters # -->
@type: GtkType
@is_a_type: GtkType
-@Returns:
-
-
-<!-- ##### FUNCTION gtk_type_check_object_cast ##### -->
-<para>
-Given a pointer to a GtkTypeObject @type_object, and a GtkType @cast_type,
-make sure that it's okay to cast @type_object into a @cast_type.
-</para>
-
-@type_object: GtkTypeObject*
-@cast_type: GtkType
-@Returns: the same GtkTypeObject* as @type_object
-
-
-<!-- ##### FUNCTION gtk_type_check_class_cast ##### -->
-<para>
-Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make
-sure that it's okay to cast something of that @klass into a @cast_type.
-</para>
-
-@klass: GtkTypeClass*
-@cast_type: GtkType
-@Returns: Always return @klass.
-
-
-<!-- ##### FUNCTION gtk_type_register_enum ##### -->
-<para>
-Register a new set of enum @values and give them the name in
-@type_name.
-</para>
-
-@type_name: must not be null.
-@values: GtkEnumValue*
-@Returns:
-
-
-<!-- ##### FUNCTION gtk_type_register_flags ##### -->
-<para>
-Register a new set of flags @values and give them the name in
-@type_name.
-</para>
-
-@type_name: must not be null.
-@values: GtkFlagValue*
-@Returns:
<!-- ##### FUNCTION gtk_type_enum_get_values ##### -->
@@ -834,36 +661,10 @@ Return a pointer to one of @enum_type's GtkEnumValues's whose name (or nickname)
Return a pointer to one of @flag_type's GtkFlagValue's whose name (or nickname) matches @value_name.
</para>
-@flag_type: GtkType
+@flags_type:
@value_name:
@Returns: GtkFlagValue*
-
-
-<!-- ##### FUNCTION gtk_type_set_varargs_type ##### -->
-<para>
-Set the varargs type for a fundamental type @foreign_type.
-</para>
-
-@foreign_type: Must be a GtkType with a sequence number of zero. Must not be a
-fundamental type.
-@varargs_type: Must be a GtkType which is either structured or flag, or NONE.
-
-
-<!-- ##### FUNCTION gtk_type_get_varargs_type ##### -->
-<para>
-Get the varargs type associated with @foreign_type
-</para>
-
-@foreign_type: GtkType
-@Returns: GtkType
-
-
-<!-- ##### FUNCTION gtk_type_query ##### -->
-<para>
-Given a type, return various interesting parameters of the type.
-</para>
-
-@type: GtkType
-@Returns: GtkTypeQuery*
+<!-- # Unused Parameters # -->
+@flag_type: GtkType
diff --git a/docs/reference/gtk/tmpl/gtkvbbox.sgml b/docs/reference/gtk/tmpl/gtkvbbox.sgml
index 1468ae50c..bba6c6eb0 100644
--- a/docs/reference/gtk/tmpl/gtkvbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkvbbox.sgml
@@ -52,7 +52,6 @@ gtk_vbutton_box_get_layout_default().
</para>
-@button_box: the #GtkButtonBox that this class is derived from.
<!-- ##### FUNCTION gtk_vbutton_box_new ##### -->
<para>
@@ -94,3 +93,5 @@ Sets a new layout mode that will be used by all button boxes.
</para>
@layout: a new #GtkButtonBoxStyle.
+
+
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 515a535e5..d24a46888 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -42,6 +42,7 @@ GtkWidget
@GTK_NO_REPARENT:
@GTK_APP_PAINTABLE:
@GTK_RECEIVES_DEFAULT:
+@GTK_DOUBLE_BUFFERED:
<!-- ##### MACRO GTK_WIDGET_TYPE ##### -->
<para>
@@ -219,6 +220,14 @@ GtkWidget
@wid:
+<!-- ##### MACRO GTK_WIDGET_DOUBLE_BUFFERED ##### -->
+<para>
+
+</para>
+
+@wid:
+
+
<!-- ##### MACRO GTK_WIDGET_SET_FLAGS ##### -->
<para>
@@ -323,6 +332,7 @@ GtkWidget
</para>
@widget:
+@Returns:
<!-- ##### FUNCTION gtk_widget_unref ##### -->
@@ -813,11 +823,14 @@ GtkWidget
@Returns:
-<!-- ##### FUNCTION gtk_widget_set_visual ##### -->
+<!-- ##### MACRO gtk_widget_set_visual ##### -->
<para>
</para>
+@w:
+@v:
+<!-- # Unused Parameters # -->
@widget:
@visual:
@@ -926,11 +939,13 @@ GtkWidget
@cmap:
-<!-- ##### FUNCTION gtk_widget_push_visual ##### -->
+<!-- ##### MACRO gtk_widget_push_visual ##### -->
<para>
</para>
+@v:
+<!-- # Unused Parameters # -->
@visual:
@@ -948,11 +963,12 @@ GtkWidget
-<!-- ##### FUNCTION gtk_widget_pop_visual ##### -->
+<!-- ##### MACRO gtk_widget_pop_visual ##### -->
<para>
</para>
+@v:
<!-- ##### FUNCTION gtk_widget_set_default_style ##### -->
@@ -971,20 +987,22 @@ GtkWidget
@colormap:
-<!-- ##### FUNCTION gtk_widget_set_default_visual ##### -->
+<!-- ##### FUNCTION gtk_widget_get_default_style ##### -->
<para>
</para>
-@visual:
+@Returns:
-<!-- ##### FUNCTION gtk_widget_get_default_style ##### -->
+<!-- ##### MACRO gtk_widget_set_default_visual ##### -->
<para>
</para>
-@Returns:
+@v:
+<!-- # Unused Parameters # -->
+@visual:
<!-- ##### FUNCTION gtk_widget_get_default_colormap ##### -->
@@ -1003,6 +1021,49 @@ GtkWidget
@Returns:
+<!-- ##### FUNCTION gtk_widget_set_direction ##### -->
+<para>
+
+</para>
+
+@widget:
+@dir:
+
+
+<!-- ##### ENUM GtkTextDirection ##### -->
+<para>
+
+</para>
+
+@GTK_TEXT_DIR_NONE:
+@GTK_TEXT_DIR_LTR:
+@GTK_TEXT_DIR_RTL:
+
+<!-- ##### FUNCTION gtk_widget_get_direction ##### -->
+<para>
+
+</para>
+
+@widget:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_widget_set_default_direction ##### -->
+<para>
+
+</para>
+
+@dir:
+
+
+<!-- ##### FUNCTION gtk_widget_get_default_direction ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
<!-- ##### FUNCTION gtk_widget_shape_combine_mask ##### -->
<para>
@@ -1062,6 +1123,92 @@ GtkWidget
@style:
+<!-- ##### FUNCTION gtk_widget_get_modifier_style ##### -->
+<para>
+
+</para>
+
+@widget:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_widget_modify_fg ##### -->
+<para>
+
+</para>
+
+@widget:
+@state:
+@color:
+
+
+<!-- ##### FUNCTION gtk_widget_modify_bg ##### -->
+<para>
+
+</para>
+
+@widget:
+@state:
+@color:
+
+
+<!-- ##### FUNCTION gtk_widget_modify_text ##### -->
+<para>
+
+</para>
+
+@widget:
+@state:
+@color:
+
+
+<!-- ##### FUNCTION gtk_widget_modify_base ##### -->
+<para>
+
+</para>
+
+@widget:
+@state:
+@color:
+
+
+<!-- ##### FUNCTION gtk_widget_modify_font ##### -->
+<para>
+
+</para>
+
+@widget:
+@font_desc:
+
+
+<!-- ##### FUNCTION gtk_widget_create_pango_context ##### -->
+<para>
+
+</para>
+
+@widget:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_widget_get_pango_context ##### -->
+<para>
+
+</para>
+
+@widget:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_widget_create_pango_layout ##### -->
+<para>
+
+</para>
+
+@widget:
+@text:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_widget_pop_composite_child ##### -->
<para>
@@ -1125,6 +1272,15 @@ GtkWidget
@app_paintable:
+<!-- ##### FUNCTION gtk_widget_set_double_buffered ##### -->
+<para>
+
+</para>
+
+@widget:
+@double_buffered:
+
+
<!-- ##### FUNCTION gtk_widget_set_composite_name ##### -->
<para>
@@ -1153,6 +1309,15 @@ GtkWidget
@widget:
+<!-- ##### FUNCTION gtk_widget_accelerators_locked ##### -->
+<para>
+
+</para>
+
+@widget:
+@Returns:
+
+
<!-- ##### SIGNAL GtkWidget::show ##### -->
<para>
@@ -1257,6 +1422,14 @@ GtkWidget
@widget: the object which received the signal.
@previous_style:
+<!-- ##### SIGNAL GtkWidget::direction-changed ##### -->
+<para>
+
+</para>
+
+@widget: the object which received the signal.
+@arg1:
+
<!-- ##### SIGNAL GtkWidget::add-accelerator ##### -->
<para>
@@ -1313,6 +1486,15 @@ GtkWidget
@event:
@Returns:
+<!-- ##### SIGNAL GtkWidget::scroll-event ##### -->
+<para>
+
+</para>
+
+@widget: the object which received the signal.
+@event:
+@Returns:
+
<!-- ##### SIGNAL GtkWidget::motion-notify-event ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index 3ec1f78c3..599d83348 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -48,24 +48,6 @@ GtkWindow
@wmclass_class:
-<!-- ##### FUNCTION gtk_window_set_focus ##### -->
-<para>
-
-</para>
-
-@window:
-@focus:
-
-
-<!-- ##### FUNCTION gtk_window_set_default ##### -->
-<para>
-
-</para>
-
-@window:
-@defaultw:
-
-
<!-- ##### FUNCTION gtk_window_set_policy ##### -->
<para>
Changes how a toplevel window deals with its size request and user resize
@@ -198,24 +180,6 @@ it's larger
@modal:
-<!-- ##### FUNCTION gtk_window_add_embedded_xid ##### -->
-<para>
-
-</para>
-
-@window:
-@xid:
-
-
-<!-- ##### FUNCTION gtk_window_remove_embedded_xid ##### -->
-<para>
-
-</para>
-
-@window:
-@xid:
-
-
<!-- ##### FUNCTION gtk_window_set_default_size ##### -->
<para>
@@ -255,6 +219,14 @@ it's larger
@parent:
+<!-- ##### FUNCTION gtk_window_list_toplevels ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
<!-- ##### SIGNAL GtkWindow::set-focus ##### -->
<para>
@@ -298,3 +270,13 @@ If the window is modal, i.e. it grabs all GTK+ events.
The position of the window.
</para>
+<!-- ##### ARG GtkWindow:default_width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWindow:default_height ##### -->
+<para>
+
+</para>
+