diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2002-05-28 22:23:55 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2002-05-28 22:23:55 +0000 |
| commit | 2aaf3c0e197e6c3fe0ece207fd79124f8c8b71d1 (patch) | |
| tree | ae3fb7e5052882b0bcdb61af0bc08e814b0edf9f | |
| parent | 810e488074871976be56df86aeb7f44f167de596 (diff) | |
| download | gdk-pixbuf-2aaf3c0e197e6c3fe0ece207fd79124f8c8b71d1.tar.gz | |
Markup fixes
* gtk/gtkwindow.c (gtk_window_move): Markup fixes
* gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs
for Docbook XML.
* gtk/*, gdk/*, gdk-pixbuf/*: Create XML, not SGML.
* gtk/tmpl/*: Remove property documentation which comes from the
source now.
* gtk/building.sgml: Remove traces of gxi.
79 files changed, 781 insertions, 737 deletions
@@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkwindow.c (gtk_window_move): Markup fixes + + * gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes. + + * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs + for Docbook XML. + 2002-05-27 Daniel Elstner <daniel.elstner@gmx.net> [ merge from stable ] diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbc7ab468..e0134d2a5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkwindow.c (gtk_window_move): Markup fixes + + * gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes. + + * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs + for Docbook XML. + 2002-05-27 Daniel Elstner <daniel.elstner@gmx.net> [ merge from stable ] diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bbc7ab468..e0134d2a5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkwindow.c (gtk_window_move): Markup fixes + + * gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes. + + * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs + for Docbook XML. + 2002-05-27 Daniel Elstner <daniel.elstner@gmx.net> [ merge from stable ] diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bbc7ab468..e0134d2a5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkwindow.c (gtk_window_move): Markup fixes + + * gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes. + + * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs + for Docbook XML. + 2002-05-27 Daniel Elstner <daniel.elstner@gmx.net> [ merge from stable ] diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bbc7ab468..e0134d2a5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkwindow.c (gtk_window_move): Markup fixes + + * gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes. + + * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs + for Docbook XML. + 2002-05-27 Daniel Elstner <daniel.elstner@gmx.net> [ merge from stable ] diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbc7ab468..e0134d2a5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkwindow.c (gtk_window_move): Markup fixes + + * gtk/gtkrc.c (gtk_rc_get_module_dir): Markup fixes. + + * gdk/x11/gdkcursor-x11.c (gdk_cursor_new_for_screen): Update docs + for Docbook XML. + 2002-05-27 Daniel Elstner <daniel.elstner@gmx.net> [ merge from stable ] diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 2d4729fa9..48b4f24de 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,14 @@ +2002-05-29 Matthias Clasen <maclas@gmx.de> + + * gtk/*, gdk/*, gdk-pixbuf/*: Create XML, not SGML. + +2002-05-28 Matthias Clasen <maclas@gmx.de> + + * gtk/tmpl/*: Remove property documentation which comes from the + source now. + + * gtk/building.sgml: Remove traces of gxi. + 2002-05-05 Matthias Clasen <maclas@gmx.de> * gtk/gtk-sections.txt: Add gtk_widget_class_find_style_property, diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index d93f8dffa..aa568b984 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -13,7 +13,7 @@ DOC_SOURCE_DIR=../../../gdk-pixbuf SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib --deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib +MKDB_OPTIONS=--sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS= diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml index 21886a41c..02b8b9c7a 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml @@ -1,28 +1,29 @@ -<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN"[ - -<!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"> -<!entity gdk-pixbuf-file-saving SYSTEM "sgml/file-saving.sgml"> -<!entity gdk-pixbuf-creating SYSTEM "sgml/creating.sgml"> -<!entity gdk-pixbuf-inline SYSTEM "sgml/inline.sgml"> -<!entity gdk-pixbuf-scaling SYSTEM "sgml/scaling.sgml"> -<!entity gdk-pixbuf-rendering SYSTEM "gdk-pixbuf-rendering.sgml"> -<!entity gdk-pixbuf-from-drawables SYSTEM "gdk-pixbuf-from-drawables.sgml"> -<!entity gdk-pixbuf-util SYSTEM "sgml/util.sgml"> -<!entity gdk-pixbuf-animation SYSTEM "sgml/animation.sgml"> -<!entity GdkPixbufLoader SYSTEM "sgml/gdk-pixbuf-loader.sgml"> -<!entity module-interface SYSTEM "sgml/module_interface.sgml"> -<!entity initialization-versions SYSTEM "sgml/initialization_versions.sgml"> -<!entity gdk-pixbuf-gdk-pixbuf-xlib-init SYSTEM "sgml/gdk-pixbuf-xlib-init.sgml"> -<!entity gdk-pixbuf-gdk-pixbuf-xlib-rendering SYSTEM "sgml/gdk-pixbuf-xlib-rendering.sgml"> -<!entity gdk-pixbuf-gdk-pixbuf-xlib-from-drawables SYSTEM "sgml/gdk-pixbuf-xlib-from-drawables.sgml"> -<!entity gdk-pixbuf-gdk-pixbuf-xlib-rgb SYSTEM "sgml/gdk-pixbuf-xlib-rgb.sgml"> - -<!entity Porting-From-Imlib SYSTEM "porting-from-imlib.sgml"> - -<!entity gdk-pixbuf "<application>gdk-pixbuf</application>"> -<!entity Imlib "<application>Imlib</application>"> +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ +<!ENTITY gdk-pixbuf-gdk-pixbuf SYSTEM "xml/gdk-pixbuf.xml"> +<!ENTITY gdk-pixbuf-refcounting SYSTEM "xml/refcounting.xml"> +<!ENTITY gdk-pixbuf-file-loading SYSTEM "xml/file-loading.xml"> +<!ENTITY gdk-pixbuf-file-saving SYSTEM "xml/file-saving.xml"> +<!ENTITY gdk-pixbuf-creating SYSTEM "xml/creating.xml"> +<!ENTITY gdk-pixbuf-inline SYSTEM "xml/inline.xml"> +<!ENTITY gdk-pixbuf-scaling SYSTEM "xml/scaling.xml"> +<!ENTITY gdk-pixbuf-rendering SYSTEM "gdk-pixbuf-rendering.sgml"> +<!ENTITY gdk-pixbuf-from-drawables SYSTEM "gdk-pixbuf-from-drawables.sgml"> +<!ENTITY gdk-pixbuf-util SYSTEM "xml/util.xml"> +<!ENTITY gdk-pixbuf-animation SYSTEM "xml/animation.xml"> +<!ENTITY GdkPixbufLoader SYSTEM "xml/gdk-pixbuf-loader.xml"> +<!ENTITY module-interface SYSTEM "xml/module_interface.xml"> +<!ENTITY initialization-versions SYSTEM "xml/initialization_versions.xml"> +<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-init SYSTEM "xml/gdk-pixbuf-xlib-init.xml"> +<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-rendering SYSTEM "xml/gdk-pixbuf-xlib-rendering.xml"> +<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-from-drawables SYSTEM "xml/gdk-pixbuf-xlib-from-drawables.xml"> +<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-rgb SYSTEM "xml/gdk-pixbuf-xlib-rgb.xml"> + +<!ENTITY Porting-From-Imlib SYSTEM "porting-from-imlib.sgml"> + +<!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>"> +<!ENTITY Imlib "<application>Imlib</application>"> ]> <book id="index"> diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml index 4d79cb98d..a795d09ea 100644 --- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml @@ -5,7 +5,7 @@ Animations Animated images. <!-- ##### SECTION Long_Description ##### --> - <para><anchor id="GdkPixbufAnimation"> + <para><anchor id="GdkPixbufAnimation"/> The &gdk-pixbuf; library provides a simple mechanism to load and represent animations. An animation is conceptually a series of frames to be displayed over time. Each frame is the same size. The animation may not be represented diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml index de46ffc55..6607d7253 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml @@ -6,7 +6,7 @@ Information that describes an image. <!-- ##### SECTION Long_Description ##### --> - <para><anchor id="GdkPixbuf"> + <para><anchor id="GdkPixbuf"/> The <structname>GdkPixbuf</structname> structure contains information that describes an image in memory. </para> diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index d875c5a76..296bab9e3 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -13,7 +13,7 @@ DOC_SOURCE_DIR=../../../gdk SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode +MKDB_OPTIONS=--sgml-mode --output-format=xml # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index bbbc87619..8537130e4 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -1,34 +1,34 @@ -<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [ -<!notation PNG system "PNG"> -<!entity % local.notation.class "| PNG"> - -<!entity gdk-General SYSTEM "sgml/general.sgml"> -<!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"> -<!entity gdk-Graphics-Contexts SYSTEM "sgml/gcs.sgml"> -<!entity gdk-Visuals SYSTEM "sgml/visuals.sgml"> -<!entity gdk-Windows SYSTEM "sgml/windows.sgml"> -<!entity gdk-Selections SYSTEM "sgml/selections.sgml"> -<!entity gdk-Properties-and-Atoms SYSTEM "sgml/properties.sgml"> -<!entity gdk-Pango-Interaction SYSTEM "sgml/pango_interaction.sgml"> -<!entity gdk-Points-Rectangles-and-Regions SYSTEM "sgml/regions.sgml"> -<!entity gdk-Threads SYSTEM "sgml/threads.sgml"> -<!entity gdk-Keys SYSTEM "sgml/keys.sgml"> -<!entity gdk-Input-Devices SYSTEM "sgml/input_devices.sgml"> -<!entity gdk-Events SYSTEM "sgml/events.sgml"> -<!entity gdk-Event-Structures SYSTEM "sgml/event_structs.sgml"> -<!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"> -<!entity gdk-Screen SYSTEM "sgml/gdkscreen.sgml"> -<!entity gdk-Display SYSTEM "sgml/gdkdisplay.sgml"> -<!entity gdk-Multihead SYSTEM "multihead.sgml"> +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ +<!ENTITY hash "#"> +<!ENTITY gdk-General SYSTEM "xml/general.xml"> +<!ENTITY gdk-Bitmaps-and-Pixmaps SYSTEM "xml/pixmaps.xml"> +<!ENTITY gdk-Images SYSTEM "xml/images.xml"> +<!ENTITY gdk-GdkRGB SYSTEM "xml/rgb.xml"> +<!ENTITY gdk-Pixbufs SYSTEM "xml/pixbufs.xml"> +<!ENTITY gdk-Colormaps-and-Colors SYSTEM "xml/colors.xml"> +<!ENTITY gdk-Fonts SYSTEM "xml/fonts.xml"> +<!ENTITY gdk-Drawing-Primitives SYSTEM "xml/drawing.xml"> +<!ENTITY gdk-Graphics-Contexts SYSTEM "xml/gcs.xml"> +<!ENTITY gdk-Visuals SYSTEM "xml/visuals.xml"> +<!ENTITY gdk-Windows SYSTEM "xml/windows.xml"> +<!ENTITY gdk-Selections SYSTEM "xml/selections.xml"> +<!ENTITY gdk-Properties-and-Atoms SYSTEM "xml/properties.xml"> +<!ENTITY gdk-Pango-Interaction SYSTEM "xml/pango_interaction.xml"> +<!ENTITY gdk-Points-Rectangles-and-Regions SYSTEM "xml/regions.xml"> +<!ENTITY gdk-Threads SYSTEM "xml/threads.xml"> +<!ENTITY gdk-Keys SYSTEM "xml/keys.xml"> +<!ENTITY gdk-Input-Devices SYSTEM "xml/input_devices.xml"> +<!ENTITY gdk-Events SYSTEM "xml/events.xml"> +<!ENTITY gdk-Event-Structures SYSTEM "xml/event_structs.xml"> +<!ENTITY gdk-Cursors SYSTEM "xml/cursors.xml"> +<!ENTITY gdk-Input SYSTEM "xml/input.xml"> +<!ENTITY gdk-Drag-and-Drop SYSTEM "xml/dnd.xml"> +<!ENTITY gdk-X-Window-System-Interaction SYSTEM "xml/x_interaction.xml"> +<!ENTITY gdk-Screen SYSTEM "xml/gdkscreen.xml"> +<!ENTITY gdk-Display SYSTEM "xml/gdkdisplay.xml"> +<!ENTITY gdk-Multihead SYSTEM "multihead.sgml"> ]> <book id="index"> diff --git a/docs/reference/gdk/multihead.sgml b/docs/reference/gdk/multihead.sgml index b048d3f5c..7368d8d21 100644 --- a/docs/reference/gdk/multihead.sgml +++ b/docs/reference/gdk/multihead.sgml @@ -55,7 +55,7 @@ gtk_init (&argc, &argv); display = gdk_get_default_display (); num_screen = gdk_display_get_n_screens (display); displayname = gdk_display_get_name (display); -if (num_screen <= 1) +if (num_screen <= 1) { printf ("This Xserver (%s) manages only one screen. exiting...\n", displayname); diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml index f811ea9b9..4a3fe375b 100644 --- a/docs/reference/gdk/tmpl/cursors.sgml +++ b/docs/reference/gdk/tmpl/cursors.sgml @@ -27,83 +27,83 @@ A <type>GdkCursor</type> structure represents a cursor. The standard cursors available. </para> -@GDK_X_CURSOR: <inlinegraphic format="png" fileref="X_cursor.png"></inlinegraphic> -@GDK_ARROW: <inlinegraphic format="png" fileref="arrow.png"></inlinegraphic> -@GDK_BASED_ARROW_DOWN: <inlinegraphic format="png" fileref="based_arrow_down.png"></inlinegraphic> -@GDK_BASED_ARROW_UP: <inlinegraphic format="png" fileref="based_arrow_up.png"></inlinegraphic> -@GDK_BOAT: <inlinegraphic format="png" fileref="boat.png"></inlinegraphic> -@GDK_BOGOSITY: <inlinegraphic format="png" fileref="bogosity.png"></inlinegraphic> -@GDK_BOTTOM_LEFT_CORNER: <inlinegraphic format="png" fileref="bottom_left_corner.png"></inlinegraphic> -@GDK_BOTTOM_RIGHT_CORNER: <inlinegraphic format="png" fileref="bottom_right_corner.png"></inlinegraphic> -@GDK_BOTTOM_SIDE: <inlinegraphic format="png" fileref="bottom_side.png"></inlinegraphic> -@GDK_BOTTOM_TEE: <inlinegraphic format="png" fileref="bottom_tee.png"></inlinegraphic> -@GDK_BOX_SPIRAL: <inlinegraphic format="png" fileref="box_spiral.png"></inlinegraphic> -@GDK_CENTER_PTR: <inlinegraphic format="png" fileref="center_ptr.png"></inlinegraphic> -@GDK_CIRCLE: <inlinegraphic format="png" fileref="circle.png"></inlinegraphic> -@GDK_CLOCK: <inlinegraphic format="png" fileref="clock.png"></inlinegraphic> -@GDK_COFFEE_MUG: <inlinegraphic format="png" fileref="coffee_mug.png"></inlinegraphic> -@GDK_CROSS: <inlinegraphic format="png" fileref="cross.png"></inlinegraphic> -@GDK_CROSS_REVERSE: <inlinegraphic format="png" fileref="cross_reverse.png"></inlinegraphic> -@GDK_CROSSHAIR: <inlinegraphic format="png" fileref="crosshair.png"></inlinegraphic> -@GDK_DIAMOND_CROSS: <inlinegraphic format="png" fileref="diamond_cross.png"></inlinegraphic> -@GDK_DOT: <inlinegraphic format="png" fileref="dot.png"></inlinegraphic> -@GDK_DOTBOX: <inlinegraphic format="png" fileref="dotbox.png"></inlinegraphic> -@GDK_DOUBLE_ARROW: <inlinegraphic format="png" fileref="double_arrow.png"></inlinegraphic> -@GDK_DRAFT_LARGE: <inlinegraphic format="png" fileref="draft_large.png"></inlinegraphic> -@GDK_DRAFT_SMALL: <inlinegraphic format="png" fileref="draft_small.png"></inlinegraphic> -@GDK_DRAPED_BOX: <inlinegraphic format="png" fileref="draped_box.png"></inlinegraphic> -@GDK_EXCHANGE: <inlinegraphic format="png" fileref="exchange.png"></inlinegraphic> -@GDK_FLEUR: <inlinegraphic format="png" fileref="fleur.png"></inlinegraphic> -@GDK_GOBBLER: <inlinegraphic format="png" fileref="gobbler.png"></inlinegraphic> -@GDK_GUMBY: <inlinegraphic format="png" fileref="gumby.png"></inlinegraphic> -@GDK_HAND1: <inlinegraphic format="png" fileref="hand1.png"></inlinegraphic> -@GDK_HAND2: <inlinegraphic format="png" fileref="hand2.png"></inlinegraphic> -@GDK_HEART: <inlinegraphic format="png" fileref="heart.png"></inlinegraphic> -@GDK_ICON: <inlinegraphic format="png" fileref="icon.png"></inlinegraphic> -@GDK_IRON_CROSS: <inlinegraphic format="png" fileref="iron_cross.png"></inlinegraphic> -@GDK_LEFT_PTR: <inlinegraphic format="png" fileref="left_ptr.png"></inlinegraphic> -@GDK_LEFT_SIDE: <inlinegraphic format="png" fileref="left_side.png"></inlinegraphic> -@GDK_LEFT_TEE: <inlinegraphic format="png" fileref="left_tee.png"></inlinegraphic> -@GDK_LEFTBUTTON: <inlinegraphic format="png" fileref="leftbutton.png"></inlinegraphic> -@GDK_LL_ANGLE: <inlinegraphic format="png" fileref="ll_angle.png"></inlinegraphic> -@GDK_LR_ANGLE: <inlinegraphic format="png" fileref="lr_angle.png"></inlinegraphic> -@GDK_MAN: <inlinegraphic format="png" fileref="man.png"></inlinegraphic> -@GDK_MIDDLEBUTTON: <inlinegraphic format="png" fileref="middlebutton.png"></inlinegraphic> -@GDK_MOUSE: <inlinegraphic format="png" fileref="mouse.png"></inlinegraphic> -@GDK_PENCIL: <inlinegraphic format="png" fileref="pencil.png"></inlinegraphic> -@GDK_PIRATE: <inlinegraphic format="png" fileref="pirate.png"></inlinegraphic> -@GDK_PLUS: <inlinegraphic format="png" fileref="plus.png"></inlinegraphic> -@GDK_QUESTION_ARROW: <inlinegraphic format="png" fileref="question_arrow.png"></inlinegraphic> -@GDK_RIGHT_PTR: <inlinegraphic format="png" fileref="right_ptr.png"></inlinegraphic> -@GDK_RIGHT_SIDE: <inlinegraphic format="png" fileref="right_side.png"></inlinegraphic> -@GDK_RIGHT_TEE: <inlinegraphic format="png" fileref="right_tee.png"></inlinegraphic> -@GDK_RIGHTBUTTON: <inlinegraphic format="png" fileref="rightbutton.png"></inlinegraphic> -@GDK_RTL_LOGO: <inlinegraphic format="png" fileref="rtl_logo.png"></inlinegraphic> -@GDK_SAILBOAT: <inlinegraphic format="png" fileref="sailboat.png"></inlinegraphic> -@GDK_SB_DOWN_ARROW: <inlinegraphic format="png" fileref="sb_down_arrow.png"></inlinegraphic> -@GDK_SB_H_DOUBLE_ARROW: <inlinegraphic format="png" fileref="sb_h_double_arrow.png"></inlinegraphic> -@GDK_SB_LEFT_ARROW: <inlinegraphic format="png" fileref="sb_left_arrow.png"></inlinegraphic> -@GDK_SB_RIGHT_ARROW: <inlinegraphic format="png" fileref="sb_right_arrow.png"></inlinegraphic> -@GDK_SB_UP_ARROW: <inlinegraphic format="png" fileref="sb_up_arrow.png"></inlinegraphic> -@GDK_SB_V_DOUBLE_ARROW: <inlinegraphic format="png" fileref="sb_v_double_arrow.png"></inlinegraphic> -@GDK_SHUTTLE: <inlinegraphic format="png" fileref="shuttle.png"></inlinegraphic> -@GDK_SIZING: <inlinegraphic format="png" fileref="sizing.png"></inlinegraphic> -@GDK_SPIDER: <inlinegraphic format="png" fileref="spider.png"></inlinegraphic> -@GDK_SPRAYCAN: <inlinegraphic format="png" fileref="spraycan.png"></inlinegraphic> -@GDK_STAR: <inlinegraphic format="png" fileref="star.png"></inlinegraphic> -@GDK_TARGET: <inlinegraphic format="png" fileref="target.png"></inlinegraphic> -@GDK_TCROSS: <inlinegraphic format="png" fileref="tcross.png"></inlinegraphic> -@GDK_TOP_LEFT_ARROW: <inlinegraphic format="png" fileref="top_left_arrow.png"></inlinegraphic> -@GDK_TOP_LEFT_CORNER: <inlinegraphic format="png" fileref="top_left_corner.png"></inlinegraphic> -@GDK_TOP_RIGHT_CORNER: <inlinegraphic format="png" fileref="top_right_corner.png"></inlinegraphic> -@GDK_TOP_SIDE: <inlinegraphic format="png" fileref="top_side.png"></inlinegraphic> -@GDK_TOP_TEE: <inlinegraphic format="png" fileref="top_tee.png"></inlinegraphic> -@GDK_TREK: <inlinegraphic format="png" fileref="trek.png"></inlinegraphic> -@GDK_UL_ANGLE: <inlinegraphic format="png" fileref="ul_angle.png"></inlinegraphic> -@GDK_UMBRELLA: <inlinegraphic format="png" fileref="umbrella.png"></inlinegraphic> -@GDK_UR_ANGLE: <inlinegraphic format="png" fileref="ur_angle.png"></inlinegraphic> -@GDK_WATCH: <inlinegraphic format="png" fileref="watch.png"></inlinegraphic> -@GDK_XTERM: <inlinegraphic format="png" fileref="xterm.png"></inlinegraphic> +@GDK_X_CURSOR: <inlinegraphic format="PNG" fileref="X_cursor.png"></inlinegraphic> +@GDK_ARROW: <inlinegraphic format="PNG" fileref="arrow.png"></inlinegraphic> +@GDK_BASED_ARROW_DOWN: <inlinegraphic format="PNG" fileref="based_arrow_down.png"></inlinegraphic> +@GDK_BASED_ARROW_UP: <inlinegraphic format="PNG" fileref="based_arrow_up.png"></inlinegraphic> +@GDK_BOAT: <inlinegraphic format="PNG" fileref="boat.png"></inlinegraphic> +@GDK_BOGOSITY: <inlinegraphic format="PNG" fileref="bogosity.png"></inlinegraphic> +@GDK_BOTTOM_LEFT_CORNER: <inlinegraphic format="PNG" fileref="bottom_left_corner.png"></inlinegraphic> +@GDK_BOTTOM_RIGHT_CORNER: <inlinegraphic format="PNG" fileref="bottom_right_corner.png"></inlinegraphic> +@GDK_BOTTOM_SIDE: <inlinegraphic format="PNG" fileref="bottom_side.png"></inlinegraphic> +@GDK_BOTTOM_TEE: <inlinegraphic format="PNG" fileref="bottom_tee.png"></inlinegraphic> +@GDK_BOX_SPIRAL: <inlinegraphic format="PNG" fileref="box_spiral.png"></inlinegraphic> +@GDK_CENTER_PTR: <inlinegraphic format="PNG" fileref="center_ptr.png"></inlinegraphic> +@GDK_CIRCLE: <inlinegraphic format="PNG" fileref="circle.png"></inlinegraphic> +@GDK_CLOCK: <inlinegraphic format="PNG" fileref="clock.png"></inlinegraphic> +@GDK_COFFEE_MUG: <inlinegraphic format="PNG" fileref="coffee_mug.png"></inlinegraphic> +@GDK_CROSS: <inlinegraphic format="PNG" fileref="cross.png"></inlinegraphic> +@GDK_CROSS_REVERSE: <inlinegraphic format="PNG" fileref="cross_reverse.png"></inlinegraphic> +@GDK_CROSSHAIR: <inlinegraphic format="PNG" fileref="crosshair.png"></inlinegraphic> +@GDK_DIAMOND_CROSS: <inlinegraphic format="PNG" fileref="diamond_cross.png"></inlinegraphic> +@GDK_DOT: <inlinegraphic format="PNG" fileref="dot.png"></inlinegraphic> +@GDK_DOTBOX: <inlinegraphic format="PNG" fileref="dotbox.png"></inlinegraphic> +@GDK_DOUBLE_ARROW: <inlinegraphic format="PNG" fileref="double_arrow.png"></inlinegraphic> +@GDK_DRAFT_LARGE: <inlinegraphic format="PNG" fileref="draft_large.png"></inlinegraphic> +@GDK_DRAFT_SMALL: <inlinegraphic format="PNG" fileref="draft_small.png"></inlinegraphic> +@GDK_DRAPED_BOX: <inlinegraphic format="PNG" fileref="draped_box.png"></inlinegraphic> +@GDK_EXCHANGE: <inlinegraphic format="PNG" fileref="exchange.png"></inlinegraphic> +@GDK_FLEUR: <inlinegraphic format="PNG" fileref="fleur.png"></inlinegraphic> +@GDK_GOBBLER: <inlinegraphic format="PNG" fileref="gobbler.png"></inlinegraphic> +@GDK_GUMBY: <inlinegraphic format="PNG" fileref="gumby.png"></inlinegraphic> +@GDK_HAND1: <inlinegraphic format="PNG" fileref="hand1.png"></inlinegraphic> +@GDK_HAND2: <inlinegraphic format="PNG" fileref="hand2.png"></inlinegraphic> +@GDK_HEART: <inlinegraphic format="PNG" fileref="heart.png"></inlinegraphic> +@GDK_ICON: <inlinegraphic format="PNG" fileref="icon.png"></inlinegraphic> +@GDK_IRON_CROSS: <inlinegraphic format="PNG" fileref="iron_cross.png"></inlinegraphic> +@GDK_LEFT_PTR: <inlinegraphic format="PNG" fileref="left_ptr.png"></inlinegraphic> +@GDK_LEFT_SIDE: <inlinegraphic format="PNG" fileref="left_side.png"></inlinegraphic> +@GDK_LEFT_TEE: <inlinegraphic format="PNG" fileref="left_tee.png"></inlinegraphic> +@GDK_LEFTBUTTON: <inlinegraphic format="PNG" fileref="leftbutton.png"></inlinegraphic> +@GDK_LL_ANGLE: <inlinegraphic format="PNG" fileref="ll_angle.png"></inlinegraphic> +@GDK_LR_ANGLE: <inlinegraphic format="PNG" fileref="lr_angle.png"></inlinegraphic> +@GDK_MAN: <inlinegraphic format="PNG" fileref="man.png"></inlinegraphic> +@GDK_MIDDLEBUTTON: <inlinegraphic format="PNG" fileref="middlebutton.png"></inlinegraphic> +@GDK_MOUSE: <inlinegraphic format="PNG" fileref="mouse.png"></inlinegraphic> +@GDK_PENCIL: <inlinegraphic format="PNG" fileref="pencil.png"></inlinegraphic> +@GDK_PIRATE: <inlinegraphic format="PNG" fileref="pirate.png"></inlinegraphic> +@GDK_PLUS: <inlinegraphic format="PNG" fileref="plus.png"></inlinegraphic> +@GDK_QUESTION_ARROW: <inlinegraphic format="PNG" fileref="question_arrow.png"></inlinegraphic> +@GDK_RIGHT_PTR: <inlinegraphic format="PNG" fileref="right_ptr.png"></inlinegraphic> +@GDK_RIGHT_SIDE: <inlinegraphic format="PNG" fileref="right_side.png"></inlinegraphic> +@GDK_RIGHT_TEE: <inlinegraphic format="PNG" fileref="right_tee.png"></inlinegraphic> +@GDK_RIGHTBUTTON: <inlinegraphic format="PNG" fileref="rightbutton.png"></inlinegraphic> +@GDK_RTL_LOGO: <inlinegraphic format="PNG" fileref="rtl_logo.png"></inlinegraphic> +@GDK_SAILBOAT: <inlinegraphic format="PNG" fileref="sailboat.png"></inlinegraphic> +@GDK_SB_DOWN_ARROW: <inlinegraphic format="PNG" fileref="sb_down_arrow.png"></inlinegraphic> +@GDK_SB_H_DOUBLE_ARROW: <inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"></inlinegraphic> +@GDK_SB_LEFT_ARROW: <inlinegraphic format="PNG" fileref="sb_left_arrow.png"></inlinegraphic> +@GDK_SB_RIGHT_ARROW: <inlinegraphic format="PNG" fileref="sb_right_arrow.png"></inlinegraphic> +@GDK_SB_UP_ARROW: <inlinegraphic format="PNG" fileref="sb_up_arrow.png"></inlinegraphic> +@GDK_SB_V_DOUBLE_ARROW: <inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"></inlinegraphic> +@GDK_SHUTTLE: <inlinegraphic format="PNG" fileref="shuttle.png"></inlinegraphic> +@GDK_SIZING: <inlinegraphic format="PNG" fileref="sizing.png"></inlinegraphic> +@GDK_SPIDER: <inlinegraphic format="PNG" fileref="spider.png"></inlinegraphic> +@GDK_SPRAYCAN: <inlinegraphic format="PNG" fileref="spraycan.png"></inlinegraphic> +@GDK_STAR: <inlinegraphic format="PNG" fileref="star.png"></inlinegraphic> +@GDK_TARGET: <inlinegraphic format="PNG" fileref="target.png"></inlinegraphic> +@GDK_TCROSS: <inlinegraphic format="PNG" fileref="tcross.png"></inlinegraphic> +@GDK_TOP_LEFT_ARROW: <inlinegraphic format="PNG" fileref="top_left_arrow.png"></inlinegraphic> +@GDK_TOP_LEFT_CORNER: <inlinegraphic format="PNG" fileref="top_left_corner.png"></inlinegraphic> +@GDK_TOP_RIGHT_CORNER: <inlinegraphic format="PNG" fileref="top_right_corner.png"></inlinegraphic> +@GDK_TOP_SIDE: <inlinegraphic format="PNG" fileref="top_side.png"></inlinegraphic> +@GDK_TOP_TEE: <inlinegraphic format="PNG" fileref="top_tee.png"></inlinegraphic> +@GDK_TREK: <inlinegraphic format="PNG" fileref="trek.png"></inlinegraphic> +@GDK_UL_ANGLE: <inlinegraphic format="PNG" fileref="ul_angle.png"></inlinegraphic> +@GDK_UMBRELLA: <inlinegraphic format="PNG" fileref="umbrella.png"></inlinegraphic> +@GDK_UR_ANGLE: <inlinegraphic format="PNG" fileref="ur_angle.png"></inlinegraphic> +@GDK_WATCH: <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic> +@GDK_XTERM: <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic> @GDK_LAST_CURSOR: @GDK_CURSOR_IS_PIXMAP: type of cursors constructed with gdk_cursor_new_from_pixmap(). @@ -128,8 +128,8 @@ from inline data as in the below example. <programlisting> /* This data is in X bitmap format, and can be created with the 'bitmap' utility. */ -#define cursor1_width 16 -#define cursor1_height 16 +&hash;define cursor1_width 16 +&hash;define cursor1_height 16 static unsigned char cursor1_bits[] = { 0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20, 0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10, diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml index 9604889a0..832ab862e 100644 --- a/docs/reference/gdk/tmpl/fonts.sgml +++ b/docs/reference/gdk/tmpl/fonts.sgml @@ -30,8 +30,8 @@ full description: <para> The fields in the XLFD are: -<informaltable pgwide=1 frame="none"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index d6b6b6ae1..137f7dc7b 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -860,6 +860,14 @@ they will be ignored. </para> +<!-- ##### FUNCTION gdk_screen_use_virtual_screen ##### --> +<para> + +</para> + +@screen: +@Returns: + <!-- ##### VARIABLE gdk_selection_property ##### --> <para> diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml index 057b1c1c5..ae686c31d 100644 --- a/docs/reference/gdk/tmpl/input.sgml +++ b/docs/reference/gdk/tmpl/input.sgml @@ -55,8 +55,8 @@ of this enumeration correspond to the @readfds, @writefds, and @exceptfds arguments to the <function>select</function> system call. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index ed9dc697e..1ed2c045a 100644 --- a/docs/reference/gdk/tmpl/rgb.sgml +++ b/docs/reference/gdk/tmpl/rgb.sgml @@ -37,10 +37,10 @@ in cases where a "better" visual than the default is available. <example> <title>A simple example program using GdkRGB.</title> <programlisting> -#include <gtk/gtk.h> +&hash;include <gtk/gtk.h> -#define IMAGE_WIDTH 256 -#define IMAGE_HEIGHT 256 +&hash;define IMAGE_WIDTH 256 +&hash;define IMAGE_HEIGHT 256 guchar rgbbuf[IMAGE_WIDTH * IMAGE_HEIGHT * 3]; @@ -67,9 +67,9 @@ main (int argc, char *argv[]) /* Set up the RGB buffer. */ pos = rgbbuf; - for (y = 0; y < IMAGE_HEIGHT; y++) + for (y = 0; y < IMAGE_HEIGHT; y++) { - for (x = 0; x < IMAGE_WIDTH; x++) + for (x = 0; x < IMAGE_WIDTH; x++) { *pos++ = x - x % 32; /* Red. */ *pos++ = (x / 32) * 4 + y - y % 32; /* Green. */ diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml index 0297636f0..017749677 100644 --- a/docs/reference/gdk/tmpl/threads.sgml +++ b/docs/reference/gdk/tmpl/threads.sgml @@ -46,7 +46,7 @@ a signal handler with a gdk_threads_enter()/gdk_threads_leave() pair. <para>A minimal main program for a threaded GTK+ application looks like:</para> -<para> +<informalexample> <programlisting role="C"> int main (int argc, char *argv[]) @@ -54,20 +54,20 @@ main (int argc, char *argv[]) GtkWidget *window; g_thread_init (NULL); - gdk_threads_init (); + gdk_threads_init (<!-- -->); gtk_init (&argc, &argv); - window = create_window (); + window = create_window (<!-- -->); gtk_widget_show (window); - gdk_threads_enter (); - gtk_main (); - gdk_threads_leave (); + gdk_threads_enter (<!-- -->); + gtk_main (<!-- -->); + gdk_threads_leave (<!-- -->); return 0; } </programlisting> -</para> +</informalexample> <para> Callbacks require a bit of attention. Callbacks from GTK+ signals @@ -82,7 +82,7 @@ do. illustrate how to use threads within GTK+ programs. </para> -<para> +<informalexample> <programlisting role="C"> /*------------------------------------------------------------------------- * Filename: gtk-thread.c @@ -104,16 +104,16 @@ illustrate how to use threads within GTK+ programs. * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <time.h> -#include <gtk/gtk.h> -#include <glib.h> -#include <pthread.h> +&hash;include <stdio.h> +&hash;include <stdlib.h> +&hash;include <unistd.h> +&hash;include <time.h> +&hash;include <gtk/gtk.h> +&hash;include <glib.h> +&hash;include <pthread.h> -#define YES_IT_IS (1) -#define NO_IT_IS_NOT (0) +&hash;define YES_IT_IS (1) +&hash;define NO_IT_IS_NOT (0) typedef struct { @@ -124,20 +124,20 @@ typedef struct G_LOCK_DEFINE_STATIC (yes_or_no); static volatile int yes_or_no = YES_IT_IS; -void destroy(GtkWidget *widget, gpointer data) +void destroy (GtkWidget *widget, gpointer data) { - gtk_main_quit(); + gtk_main_quit (<!-- -->); } -void *argument_thread(void *args) +void *argument_thread (void *args) { yes_or_no_args *data = (yes_or_no_args *)args; gboolean say_something; - for(;;) + for (;;) { /* sleep a while */ - sleep(rand() / (RAND_MAX / 3) + 1); + sleep(rand(<!-- -->) / (RAND_MAX / 3) + 1); /* lock the yes_or_no_variable */ G_LOCK(yes_or_no); @@ -152,28 +152,28 @@ void *argument_thread(void *args) } /* Unlock the yes_or_no variable */ - G_UNLOCK(yes_or_no); + G_UNLOCK (yes_or_no); - if(say_something) + if (say_something) { /* get GTK thread lock */ - gdk_threads_enter(); + gdk_threads_enter (<!-- -->); /* set label text */ if(data->what == YES_IT_IS) - gtk_label_set_text(GTK_LABEL(data->label), "O yes, it is!"); + gtk_label_set_text (GTK_LABEL (data->label), "O yes, it is!"); else - gtk_label_set_text(GTK_LABEL(data->label), "O no, it isn't!"); + gtk_label_set_text (GTK_LABEL (data->label), "O no, it isn't!"); /* release GTK thread lock */ - gdk_threads_leave(); + gdk_threads_leave (<!-- -->); } } - return(NULL); + return NULL; } -int main(int argc, char *argv[]) +int main (int argc, char *argv[]) { GtkWidget *window; GtkWidget *label; @@ -181,49 +181,49 @@ int main(int argc, char *argv[]) pthread_t no_tid, yes_tid; /* init threads */ - g_thread_init(NULL); - gdk_threads_init (); + g_thread_init (NULL); + gdk_threads_init (<!-- -->); /* init gtk */ gtk_init(&argc, &argv); /* init random number generator */ - srand((unsigned int)time(NULL)); + srand ((unsigned int) time (NULL)); /* create a window */ - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_signal_connect(GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC(destroy), NULL); + gtk_signal_connect (GTK_OBJECT (window), "destroy", + GTK_SIGNAL_FUNC (destroy), NULL); - gtk_container_set_border_width(GTK_CONTAINER (window), 10); + gtk_container_set_border_width (GTK_CONTAINER (window), 10); /* create a label */ - label = gtk_label_new("And now for something completely different ..."); - gtk_container_add(GTK_CONTAINER(window), label); + label = gtk_label_new ("And now for something completely different ..."); + gtk_container_add (GTK_CONTAINER (window), label); /* show everything */ - gtk_widget_show(label); + gtk_widget_show (label); gtk_widget_show (window); /* create the threads */ yes_args.label = label; yes_args.what = YES_IT_IS; - pthread_create(&yes_tid, NULL, argument_thread, &yes_args); + pthread_create (&yes_tid, NULL, argument_thread, &yes_args); no_args.label = label; no_args.what = NO_IT_IS_NOT; - pthread_create(&no_tid, NULL, argument_thread, &no_args); + pthread_create (&no_tid, NULL, argument_thread, &no_args); /* enter the GTK main loop */ - gdk_threads_enter(); - gtk_main(); - gdk_threads_leave(); + gdk_threads_enter (<!-- -->); + gtk_main (<!-- -->); + gdk_threads_leave (<!-- -->); - return(0); + return 0; } </programlisting> -</para> +</informalexample> <!-- ##### SECTION See_Also ##### --> <para> diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml index 00e4c75dd..4eb2afde4 100644 --- a/docs/reference/gdk/tmpl/visuals.sgml +++ b/docs/reference/gdk/tmpl/visuals.sgml @@ -64,9 +64,9 @@ guint pixel_from_rgb (GdkVisual *visual, guchar r, guchar b, guchar g) { - return ((r >> (16 - visual->red_prec)) << visual->red_shift) | - ((g >> (16 - visual->green_prec)) << visual->green_shift) | - ((r >> (16 - visual->blue_prec)) << visual->blue_shift); + return ((r >> (16 - visual->red_prec)) << visual->red_shift) | + ((g >> (16 - visual->green_prec)) << visual->green_shift) | + ((r >> (16 - visual->blue_prec)) << visual->blue_shift); } </programlisting> </example> @@ -93,7 +93,7 @@ pixel_from_rgb (GdkVisual *visual, <structfield>red_mask</structfield> is a contiguous sequence of <structfield>red_prec</structfield> bits starting at bit number <structfield>red_shift</structfield>. For example, - <xref linkend="rgbmask"> shows constructing a pixel value + <xref linkend="rgbmask"/> shows constructing a pixel value out of three 16 bit color values. @red_prec: See above. @green_mask: A mask giving the bits in a pixel value that diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index d2b8972ec..09056e00d 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -16,7 +16,7 @@ SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode +MKDB_OPTIONS=--sgml-mode --output-format=xml # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml index 1aeef8aa2..d315b0b88 100644 --- a/docs/reference/gtk/building.sgml +++ b/docs/reference/gtk/building.sgml @@ -288,7 +288,7 @@ How to compile GTK+ itself Looking at the last couple of hundred lines in this file will frequently make clear what went wrong. If all else fails, you can ask for help on the gtk-list mailing list. - See <xref linkend="gtk-resources"> for more information. + See <xref linkend="gtk-resources"/> for more information. </para> </refsect1> <refsect1 id="extra-configuration-options"> @@ -335,7 +335,7 @@ How to compile GTK+ itself <arg>--enable-gtk-doc</arg> </group> <group> - <arg>--with-xinput=[no|gxi|xfree]</arg> + <arg>--with-xinput=[no|yes]</arg> </group> <group> <arg>--with-gdktarget=[x11|linux-fb|win32]</arg> @@ -497,9 +497,6 @@ How to compile GTK+ itself provided by the device such as pressure and tilt information. This is only known to work well on XFree86 systems, though other systems do have this extension. - (If <systemitem>--with-xinput=gxi</systemitem> - is supplied, support for an obsolete and unsupported - way of interacting with XInput is compiled.) </para> </formalpara> <formalpara> diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 5667b90c0..8e99570d4 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -1,164 +1,163 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ -<!notation PNG system "PNG"> -<!entity % local.notation.class "| PNG"> - -<!entity hash "#"> -<!entity percent "%"> -<!entity GtkAccelLabel SYSTEM "sgml/gtkaccellabel.sgml"> -<!entity GtkAdjustment SYSTEM "sgml/gtkadjustment.sgml"> -<!entity GtkAlignment SYSTEM "sgml/gtkalignment.sgml"> -<!entity GtkArrow SYSTEM "sgml/gtkarrow.sgml"> -<!entity GtkAspectFrame SYSTEM "sgml/gtkaspectframe.sgml"> -<!entity GtkButtonBox SYSTEM "sgml/gtkbbox.sgml"> -<!entity GtkBin SYSTEM "sgml/gtkbin.sgml"> -<!entity GtkBox SYSTEM "sgml/gtkbox.sgml"> -<!entity GtkButton SYSTEM "sgml/gtkbutton.sgml"> -<!entity GtkCalendar SYSTEM "sgml/gtkcalendar.sgml"> -<!entity GtkCheckButton SYSTEM "sgml/gtkcheckbutton.sgml"> -<!entity GtkCheckMenuItem SYSTEM "sgml/gtkcheckmenuitem.sgml"> -<!entity GtkCList SYSTEM "sgml/gtkclist.sgml"> -<!entity GtkColorSelection SYSTEM "sgml/gtkcolorsel.sgml"> -<!entity GtkColorSelectionDialog SYSTEM "sgml/gtkcolorseldlg.sgml"> -<!entity GtkCombo SYSTEM "sgml/gtkcombo.sgml"> -<!entity GtkContainer SYSTEM "sgml/gtkcontainer.sgml"> -<!entity GtkCTree SYSTEM "sgml/gtkctree.sgml"> -<!entity GtkCurve SYSTEM "sgml/gtkcurve.sgml"> -<!entity GtkDialog SYSTEM "sgml/gtkdialog.sgml"> -<!entity GtkDrawingArea SYSTEM "sgml/gtkdrawingarea.sgml"> -<!entity GtkEditable SYSTEM "sgml/gtkeditable.sgml"> -<!entity GtkOldEditable SYSTEM "sgml/gtkoldeditable.sgml"> -<!entity GtkEntry SYSTEM "sgml/gtkentry.sgml"> -<!entity GtkEventBox SYSTEM "sgml/gtkeventbox.sgml"> -<!entity GtkFileSelection SYSTEM "sgml/gtkfilesel.sgml"> -<!entity GtkFixed SYSTEM "sgml/gtkfixed.sgml"> -<!entity GtkFontSelection SYSTEM "sgml/gtkfontsel.sgml"> -<!entity GtkFontSelectionDialog SYSTEM "sgml/gtkfontseldlg.sgml"> -<!entity GtkFrame SYSTEM "sgml/gtkframe.sgml"> -<!entity GtkGammaCurve SYSTEM "sgml/gtkgamma.sgml"> -<!entity GtkHandleBox SYSTEM "sgml/gtkhandlebox.sgml"> -<!entity GtkHButtonBox SYSTEM "sgml/gtkhbbox.sgml"> -<!entity GtkHBox SYSTEM "sgml/gtkhbox.sgml"> -<!entity GtkHPaned SYSTEM "sgml/gtkhpaned.sgml"> -<!entity GtkHRuler SYSTEM "sgml/gtkhruler.sgml"> -<!entity GtkHScale SYSTEM "sgml/gtkhscale.sgml"> -<!entity GtkHScrollbar SYSTEM "sgml/gtkhscrollbar.sgml"> -<!entity GtkHSeparator SYSTEM "sgml/gtkhseparator.sgml"> -<!entity GtkImage SYSTEM "sgml/gtkimage.sgml"> -<!entity GtkImageMenuItem SYSTEM "sgml/gtkimagemenuitem.sgml"> -<!entity GtkIMContext SYSTEM "sgml/gtkimcontext.sgml"> -<!entity GtkIMContextSimple SYSTEM "sgml/gtkimcontextsimple.sgml"> -<!entity GtkIMMulticontext SYSTEM "sgml/gtkimmulticontext.sgml"> -<!entity GtkInputDialog SYSTEM "sgml/gtkinputdialog.sgml"> -<!entity GtkInvisible SYSTEM "sgml/gtkinvisible.sgml"> -<!entity GtkItem SYSTEM "sgml/gtkitem.sgml"> -<!entity GtkItemFactory SYSTEM "sgml/gtkitemfactory.sgml"> -<!entity GtkLabel SYSTEM "sgml/gtklabel.sgml"> -<!entity GtkLayout SYSTEM "sgml/gtklayout.sgml"> -<!entity GtkList SYSTEM "sgml/gtklist.sgml"> -<!entity GtkListItem SYSTEM "sgml/gtklistitem.sgml"> -<!entity GtkMenu SYSTEM "sgml/gtkmenu.sgml"> -<!entity GtkMenuBar SYSTEM "sgml/gtkmenubar.sgml"> -<!entity GtkMenuItem SYSTEM "sgml/gtkmenuitem.sgml"> -<!entity GtkMenuShell SYSTEM "sgml/gtkmenushell.sgml"> -<!entity GtkMessageDialog SYSTEM "sgml/gtkmessagedialog.sgml"> -<!entity GtkMisc SYSTEM "sgml/gtkmisc.sgml"> -<!entity GtkNotebook SYSTEM "sgml/gtknotebook.sgml"> -<!entity GtkObject SYSTEM "sgml/gtkobject.sgml"> -<!entity GtkOptionMenu SYSTEM "sgml/gtkoptionmenu.sgml"> -<!entity GtkPaned SYSTEM "sgml/gtkpaned.sgml"> -<!entity GtkPixmap SYSTEM "sgml/gtkpixmap.sgml"> -<!entity GtkPlug SYSTEM "sgml/gtkplug.sgml"> -<!entity GtkPreview SYSTEM "sgml/gtkpreview.sgml"> -<!entity GtkProgress SYSTEM "sgml/gtkprogress.sgml"> -<!entity GtkProgressBar SYSTEM "sgml/gtkprogressbar.sgml"> -<!entity GtkRadioButton SYSTEM "sgml/gtkradiobutton.sgml"> -<!entity GtkRadioMenuItem SYSTEM "sgml/gtkradiomenuitem.sgml"> -<!entity GtkRange SYSTEM "sgml/gtkrange.sgml"> -<!entity GtkRuler SYSTEM "sgml/gtkruler.sgml"> -<!entity GtkScale SYSTEM "sgml/gtkscale.sgml"> -<!entity GtkScrollbar SYSTEM "sgml/gtkscrollbar.sgml"> -<!entity GtkScrolledWindow SYSTEM "sgml/gtkscrolledwindow.sgml"> -<!entity GtkSeparator SYSTEM "sgml/gtkseparator.sgml"> -<!entity GtkSeparatorMenuItem SYSTEM "sgml/gtkseparatormenuitem.sgml"> -<!entity GtkSizeGroup SYSTEM "sgml/gtksizegroup.sgml"> -<!entity GtkSocket SYSTEM "sgml/gtksocket.sgml"> -<!entity GtkSpinButton SYSTEM "sgml/gtkspinbutton.sgml"> -<!entity GtkStatusbar SYSTEM "sgml/gtkstatusbar.sgml"> -<!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 GtkTextIter SYSTEM "sgml/gtktextiter.sgml"> -<!entity 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"> -<!entity GtkTooltips SYSTEM "sgml/gtktooltips.sgml"> -<!entity GtkTree SYSTEM "sgml/gtktree.sgml"> -<!entity GtkTreeItem SYSTEM "sgml/gtktreeitem.sgml"> -<!entity GtkTreeModel SYSTEM "sgml/gtktreemodel.sgml"> -<!entity GtkTreeSortable SYSTEM "sgml/gtktreesortable.sgml"> -<!entity GtkTreeModelSort SYSTEM "sgml/gtktreemodelsort.sgml"> -<!entity GtkTreeSelection SYSTEM "sgml/gtktreeselection.sgml"> -<!entity GtkTreeStore SYSTEM "sgml/gtktreestore.sgml"> -<!entity GtkTreeViewColumn SYSTEM "sgml/gtktreeviewcolumn.sgml"> -<!entity GtkTreeView SYSTEM "sgml/gtktreeview.sgml"> -<!entity GtkCellRenderer SYSTEM "sgml/gtkcellrenderer.sgml"> -<!entity GtkCellEditable SYSTEM "sgml/gtkcelleditable.sgml"> -<!entity GtkCellRendererPixbuf SYSTEM "sgml/gtkcellrendererpixbuf.sgml"> -<!entity GtkCellRendererText SYSTEM "sgml/gtkcellrenderertext.sgml"> -<!entity GtkCellRendererToggle SYSTEM "sgml/gtkcellrenderertoggle.sgml"> -<!entity GtkListStore SYSTEM "sgml/gtkliststore.sgml"> -<!entity GtkTreeDND SYSTEM "sgml/gtktreednd.sgml"> -<!entity GtkVButtonBox SYSTEM "sgml/gtkvbbox.sgml"> -<!entity GtkVBox SYSTEM "sgml/gtkvbox.sgml"> -<!entity GtkViewport SYSTEM "sgml/gtkviewport.sgml"> -<!entity GtkVPaned SYSTEM "sgml/gtkvpaned.sgml"> -<!entity GtkVRuler SYSTEM "sgml/gtkvruler.sgml"> -<!entity GtkVScale SYSTEM "sgml/gtkvscale.sgml"> -<!entity GtkVScrollbar SYSTEM "sgml/gtkvscrollbar.sgml"> -<!entity GtkVSeparator SYSTEM "sgml/gtkvseparator.sgml"> -<!entity GtkWidget SYSTEM "sgml/gtkwidget.sgml"> -<!entity GtkWindow SYSTEM "sgml/gtkwindow.sgml"> -<!entity GtkWindowGroup SYSTEM "sgml/gtkwindowgroup.sgml"> -<!entity GtkAccessible SYSTEM "sgml/gtkaccessible.sgml"> -<!entity gtk-General SYSTEM "sgml/gtkmain.sgml"> -<!entity gtk-Feature-Test-Macros SYSTEM "sgml/gtkfeatures.sgml"> -<!entity gtk-Graphics-Contexts SYSTEM "sgml/gtkgc.sgml"> -<!entity gtk-Styles SYSTEM "sgml/gtkstyle.sgml"> -<!entity gtk-Themes SYSTEM "sgml/gtkthemes.sgml"> -<!entity gtk-Resource-Files SYSTEM "sgml/gtkrc.sgml"> -<!entity GtkAccelGroup SYSTEM "sgml/gtkaccelgroup.sgml"> -<!entity gtk-accel-map SYSTEM "sgml/gtkaccelmap.sgml"> -<!entity gtk-Selections SYSTEM "sgml/gtkselection.sgml"> -<!entity gtk-Clipboards SYSTEM "sgml/gtkclipboard.sgml"> -<!entity gtk-Drag-and-Drop SYSTEM "sgml/gtkdnd.sgml"> -<!entity gtk-Signals SYSTEM "sgml/gtksignal.sgml"> -<!entity gtk-Types SYSTEM "sgml/gtktypeutils.sgml"> -<!entity gtk-Bindings SYSTEM "sgml/gtkbindings.sgml"> -<!entity gtk-Standard-Enumerations SYSTEM "sgml/gtkenums.sgml"> -<!entity gtk-Stock-Items SYSTEM "sgml/gtkstock.sgml"> -<!entity gtk-Themeable-Stock-Images SYSTEM "sgml/gtkiconfactory.sgml"> -<!entity gtk-Settings SYSTEM "sgml/gtksettings.sgml"> - -<!entity index-Object-Tree SYSTEM "sgml/tree_index.sgml"> - -<!entity index-Objects-Grouped SYSTEM "objects_grouped.sgml"> -<!entity gtk-TextWidget SYSTEM "text_widget.sgml"> -<!entity gtk-TreeWidget SYSTEM "tree_widget.sgml"> -<!entity gtk-Compiling SYSTEM "compiling.sgml"> -<!entity gtk-Building SYSTEM "building.sgml"> -<!entity gtk-Running SYSTEM "running.sgml"> -<!entity gtk-Resources SYSTEM "resources.sgml"> -<!entity gtk-Windows SYSTEM "windows.sgml"> -<!entity gtk-Framebuffer SYSTEM "framebuffer.sgml"> -<!entity gtk-X11 SYSTEM "x11.sgml"> -<!entity gtk-Questions SYSTEM "question_index.sgml"> -<!entity gtk-Changes-1-2 SYSTEM "changes-1.2.sgml"> -<!entity gtk-Changes-2-0 SYSTEM "changes-2.0.sgml"> +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ +<!ENTITY hash "#"> +<!ENTITY percent "%"> +<!ENTITY GtkAccelLabel SYSTEM "xml/gtkaccellabel.xml"> +<!ENTITY GtkAdjustment SYSTEM "xml/gtkadjustment.xml"> +<!ENTITY GtkAlignment SYSTEM "xml/gtkalignment.xml"> +<!ENTITY GtkArrow SYSTEM "xml/gtkarrow.xml"> +<!ENTITY GtkAspectFrame SYSTEM "xml/gtkaspectframe.xml"> +<!ENTITY GtkButtonBox SYSTEM "xml/gtkbbox.xml"> +<!ENTITY GtkBin SYSTEM "xml/gtkbin.xml"> +<!ENTITY GtkBox SYSTEM "xml/gtkbox.xml"> +<!ENTITY GtkButton SYSTEM "xml/gtkbutton.xml"> +<!ENTITY GtkCalendar SYSTEM "xml/gtkcalendar.xml"> +<!ENTITY GtkCheckButton SYSTEM "xml/gtkcheckbutton.xml"> +<!ENTITY GtkCheckMenuItem SYSTEM "xml/gtkcheckmenuitem.xml"> +<!ENTITY GtkCList SYSTEM "xml/gtkclist.xml"> +<!ENTITY GtkColorSelection SYSTEM "xml/gtkcolorsel.xml"> +<!ENTITY GtkColorSelectionDialog SYSTEM "xml/gtkcolorseldlg.xml"> +<!ENTITY GtkCombo SYSTEM "xml/gtkcombo.xml"> +<!ENTITY GtkContainer SYSTEM "xml/gtkcontainer.xml"> +<!ENTITY GtkCTree SYSTEM "xml/gtkctree.xml"> +<!ENTITY GtkCurve SYSTEM "xml/gtkcurve.xml"> +<!ENTITY GtkDialog SYSTEM "xml/gtkdialog.xml"> +<!ENTITY GtkDrawingArea SYSTEM "xml/gtkdrawingarea.xml"> +<!ENTITY GtkEditable SYSTEM "xml/gtkeditable.xml"> +<!ENTITY GtkOldEditable SYSTEM "xml/gtkoldeditable.xml"> +<!ENTITY GtkEntry SYSTEM "xml/gtkentry.xml"> +<!ENTITY GtkEventBox SYSTEM "xml/gtkeventbox.xml"> +<!ENTITY GtkFileSelection SYSTEM "xml/gtkfilesel.xml"> +<!ENTITY GtkFixed SYSTEM "xml/gtkfixed.xml"> +<!ENTITY GtkFontSelection SYSTEM "xml/gtkfontsel.xml"> +<!ENTITY GtkFontSelectionDialog SYSTEM "xml/gtkfontseldlg.xml"> +<!ENTITY GtkFrame SYSTEM "xml/gtkframe.xml"> +<!ENTITY GtkGammaCurve SYSTEM "xml/gtkgamma.xml"> +<!ENTITY GtkHandleBox SYSTEM "xml/gtkhandlebox.xml"> +<!ENTITY GtkHButtonBox SYSTEM "xml/gtkhbbox.xml"> +<!ENTITY GtkHBox SYSTEM "xml/gtkhbox.xml"> +<!ENTITY GtkHPaned SYSTEM "xml/gtkhpaned.xml"> +<!ENTITY GtkHRuler SYSTEM "xml/gtkhruler.xml"> +<!ENTITY GtkHScale SYSTEM "xml/gtkhscale.xml"> +<!ENTITY GtkHScrollbar SYSTEM "xml/gtkhscrollbar.xml"> +<!ENTITY GtkHSeparator SYSTEM "xml/gtkhseparator.xml"> +<!ENTITY GtkImage SYSTEM "xml/gtkimage.xml"> +<!ENTITY GtkImageMenuItem SYSTEM "xml/gtkimagemenuitem.xml"> +<!ENTITY GtkIMContext SYSTEM "xml/gtkimcontext.xml"> +<!ENTITY GtkIMContextSimple SYSTEM "xml/gtkimcontextsimple.xml"> +<!ENTITY GtkIMMulticontext SYSTEM "xml/gtkimmulticontext.xml"> +<!ENTITY GtkInputDialog SYSTEM "xml/gtkinputdialog.xml"> +<!ENTITY GtkInvisible SYSTEM "xml/gtkinvisible.xml"> +<!ENTITY GtkItem SYSTEM "xml/gtkitem.xml"> +<!ENTITY GtkItemFactory SYSTEM "xml/gtkitemfactory.xml"> +<!ENTITY GtkLabel SYSTEM "xml/gtklabel.xml"> +<!ENTITY GtkLayout SYSTEM "xml/gtklayout.xml"> +<!ENTITY GtkList SYSTEM "xml/gtklist.xml"> +<!ENTITY GtkListItem SYSTEM "xml/gtklistitem.xml"> +<!ENTITY GtkMenu SYSTEM "xml/gtkmenu.xml"> +<!ENTITY GtkMenuBar SYSTEM "xml/gtkmenubar.xml"> +<!ENTITY GtkMenuItem SYSTEM "xml/gtkmenuitem.xml"> +<!ENTITY GtkMenuShell SYSTEM "xml/gtkmenushell.xml"> +<!ENTITY GtkMessageDialog SYSTEM "xml/gtkmessagedialog.xml"> +<!ENTITY GtkMisc SYSTEM "xml/gtkmisc.xml"> +<!ENTITY GtkNotebook SYSTEM "xml/gtknotebook.xml"> +<!ENTITY GtkObject SYSTEM "xml/gtkobject.xml"> +<!ENTITY GtkOptionMenu SYSTEM "xml/gtkoptionmenu.xml"> +<!ENTITY GtkPaned SYSTEM "xml/gtkpaned.xml"> +<!ENTITY GtkPixmap SYSTEM "xml/gtkpixmap.xml"> +<!ENTITY GtkPlug SYSTEM "xml/gtkplug.xml"> +<!ENTITY GtkPreview SYSTEM "xml/gtkpreview.xml"> +<!ENTITY GtkProgress SYSTEM "xml/gtkprogress.xml"> +<!ENTITY GtkProgressBar SYSTEM "xml/gtkprogressbar.xml"> +<!ENTITY GtkRadioButton SYSTEM "xml/gtkradiobutton.xml"> +<!ENTITY GtkRadioMenuItem SYSTEM "xml/gtkradiomenuitem.xml"> +<!ENTITY GtkRange SYSTEM "xml/gtkrange.xml"> +<!ENTITY GtkRuler SYSTEM "xml/gtkruler.xml"> +<!ENTITY GtkScale SYSTEM "xml/gtkscale.xml"> +<!ENTITY GtkScrollbar SYSTEM "xml/gtkscrollbar.xml"> +<!ENTITY GtkScrolledWindow SYSTEM "xml/gtkscrolledwindow.xml"> +<!ENTITY GtkSeparator SYSTEM "xml/gtkseparator.xml"> +<!ENTITY GtkSeparatorMenuItem SYSTEM "xml/gtkseparatormenuitem.xml"> +<!ENTITY GtkSizeGroup SYSTEM "xml/gtksizegroup.xml"> +<!ENTITY GtkSocket SYSTEM "xml/gtksocket.xml"> +<!ENTITY GtkSpinButton SYSTEM "xml/gtkspinbutton.xml"> +<!ENTITY GtkStatusbar SYSTEM "xml/gtkstatusbar.xml"> +<!ENTITY GtkTable SYSTEM "xml/gtktable.xml"> +<!ENTITY GtkTearoffMenuItem SYSTEM "xml/gtktearoffmenuitem.xml"> +<!ENTITY GtkText SYSTEM "xml/gtktext.xml"> +<!ENTITY GtkTextBuffer SYSTEM "xml/gtktextbuffer.xml"> +<!ENTITY GtkTextIter SYSTEM "xml/gtktextiter.xml"> +<!ENTITY GtkTextMark SYSTEM "xml/gtktextmark.xml"> +<!ENTITY GtkTextTag SYSTEM "xml/gtktexttag.xml"> +<!ENTITY GtkTextTagTable SYSTEM "xml/gtktexttagtable.xml"> +<!ENTITY GtkTextView SYSTEM "xml/gtktextview.xml"> +<!ENTITY GtkTipsQuery SYSTEM "xml/gtktipsquery.xml"> +<!ENTITY GtkToggleButton SYSTEM "xml/gtktogglebutton.xml"> +<!ENTITY GtkToolbar SYSTEM "xml/gtktoolbar.xml"> +<!ENTITY GtkTooltips SYSTEM "xml/gtktooltips.xml"> +<!ENTITY GtkTree SYSTEM "xml/gtktree.xml"> +<!ENTITY GtkTreeItem SYSTEM "xml/gtktreeitem.xml"> +<!ENTITY GtkTreeModel SYSTEM "xml/gtktreemodel.xml"> +<!ENTITY GtkTreeSortable SYSTEM "xml/gtktreesortable.xml"> +<!ENTITY GtkTreeModelSort SYSTEM "xml/gtktreemodelsort.xml"> +<!ENTITY GtkTreeSelection SYSTEM "xml/gtktreeselection.xml"> +<!ENTITY GtkTreeStore SYSTEM "xml/gtktreestore.xml"> +<!ENTITY GtkTreeViewColumn SYSTEM "xml/gtktreeviewcolumn.xml"> +<!ENTITY GtkTreeView SYSTEM "xml/gtktreeview.xml"> +<!ENTITY GtkCellRenderer SYSTEM "xml/gtkcellrenderer.xml"> +<!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml"> +<!ENTITY GtkCellRendererPixbuf SYSTEM "xml/gtkcellrendererpixbuf.xml"> +<!ENTITY GtkCellRendererText SYSTEM "xml/gtkcellrenderertext.xml"> +<!ENTITY GtkCellRendererToggle SYSTEM "xml/gtkcellrenderertoggle.xml"> +<!ENTITY GtkListStore SYSTEM "xml/gtkliststore.xml"> +<!ENTITY GtkTreeDND SYSTEM "xml/gtktreednd.xml"> +<!ENTITY GtkVButtonBox SYSTEM "xml/gtkvbbox.xml"> +<!ENTITY GtkVBox SYSTEM "xml/gtkvbox.xml"> +<!ENTITY GtkViewport SYSTEM "xml/gtkviewport.xml"> +<!ENTITY GtkVPaned SYSTEM "xml/gtkvpaned.xml"> +<!ENTITY GtkVRuler SYSTEM "xml/gtkvruler.xml"> +<!ENTITY GtkVScale SYSTEM "xml/gtkvscale.xml"> +<!ENTITY GtkVScrollbar SYSTEM "xml/gtkvscrollbar.xml"> +<!ENTITY GtkVSeparator SYSTEM "xml/gtkvseparator.xml"> +<!ENTITY GtkWidget SYSTEM "xml/gtkwidget.xml"> +<!ENTITY GtkWindow SYSTEM "xml/gtkwindow.xml"> +<!ENTITY GtkWindowGroup SYSTEM "xml/gtkwindowgroup.xml"> +<!ENTITY GtkAccessible SYSTEM "xml/gtkaccessible.xml"> +<!ENTITY gtk-General SYSTEM "xml/gtkmain.xml"> +<!ENTITY gtk-Feature-Test-Macros SYSTEM "xml/gtkfeatures.xml"> +<!ENTITY gtk-Graphics-Contexts SYSTEM "xml/gtkgc.xml"> +<!ENTITY gtk-Styles SYSTEM "xml/gtkstyle.xml"> +<!ENTITY gtk-Themes SYSTEM "xml/gtkthemes.xml"> +<!ENTITY gtk-Resource-Files SYSTEM "xml/gtkrc.xml"> +<!ENTITY GtkAccelGroup SYSTEM "xml/gtkaccelgroup.xml"> +<!ENTITY gtk-accel-map SYSTEM "xml/gtkaccelmap.xml"> +<!ENTITY gtk-Selections SYSTEM "xml/gtkselection.xml"> +<!ENTITY gtk-Clipboards SYSTEM "xml/gtkclipboard.xml"> +<!ENTITY gtk-Drag-and-Drop SYSTEM "xml/gtkdnd.xml"> +<!ENTITY gtk-Signals SYSTEM "xml/gtksignal.xml"> +<!ENTITY gtk-Types SYSTEM "xml/gtktypeutils.xml"> +<!ENTITY gtk-Bindings SYSTEM "xml/gtkbindings.xml"> +<!ENTITY gtk-Standard-Enumerations SYSTEM "xml/gtkenums.xml"> +<!ENTITY gtk-Stock-Items SYSTEM "xml/gtkstock.xml"> +<!ENTITY gtk-Themeable-Stock-Images SYSTEM "xml/gtkiconfactory.xml"> +<!ENTITY gtk-Settings SYSTEM "xml/gtksettings.xml"> + +<!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml"> + +<!ENTITY index-Objects-Grouped SYSTEM "objects_grouped.sgml"> +<!ENTITY gtk-TextWidget SYSTEM "text_widget.sgml"> +<!ENTITY gtk-TreeWidget SYSTEM "tree_widget.sgml"> +<!ENTITY gtk-Compiling SYSTEM "compiling.sgml"> +<!ENTITY gtk-Building SYSTEM "building.sgml"> +<!ENTITY gtk-Running SYSTEM "running.sgml"> +<!ENTITY gtk-Resources SYSTEM "resources.sgml"> +<!ENTITY gtk-Windows SYSTEM "windows.sgml"> +<!ENTITY gtk-Framebuffer SYSTEM "framebuffer.sgml"> +<!ENTITY gtk-X11 SYSTEM "x11.sgml"> +<!ENTITY gtk-Questions SYSTEM "question_index.sgml"> +<!ENTITY gtk-Changes-1-2 SYSTEM "changes-1.2.sgml"> +<!ENTITY gtk-Changes-2-0 SYSTEM "changes-2.0.sgml"> ]> <book id="index"> diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml index 599e38aca..7180ea528 100644 --- a/docs/reference/gtk/question_index.sgml +++ b/docs/reference/gtk/question_index.sgml @@ -267,7 +267,7 @@ To load an image file straight into a display widget, use <link linkend="gtk-image-new-from-file">gtk_image_new_from_file()</link> <footnote><para> If the file load fails, <link linkend="gtk-image-new-from-file">gtk_image_new_from_file()</link> -will display a "broken image" graphic &mdash to detect a failed load +will display a "broken image" graphic — to detect a failed load yourself, use <link linkend="gdk-pixbuf-new-from-file">gdk_pixbuf_new_from_file()</link> directly then <link @@ -302,7 +302,7 @@ To load an image or animation file asynchronously (without blocking), use <answer> <para> -See <link linkend="TreeWidget">tree widget overview</link> &mdash you +See <link linkend="TreeWidget">tree widget overview</link> — you should use the <link linkend="GtkTreeView">GtkTreeView</link> widget. (A list is just a tree with no branches, so the tree widget is used for lists as well.) Do not use the deprecated widgets <link @@ -321,7 +321,7 @@ less flexible and result in an inferior user interface. <answer> <para> -See <link linkend="TextWidget">text widget overview</link> &mdash you +See <link linkend="TextWidget">text widget overview</link> — you should use the <link linkend="GtkTextView">GtkTextView</link> widget. Do not use the deprecated widget <link linkend="GtkText">GtkText</link> in newly-written code, it has a diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index ca015bcd5..bb33940a8 100644 --- a/docs/reference/gtk/text_widget.sgml +++ b/docs/reference/gtk/text_widget.sgml @@ -157,7 +157,7 @@ You can change the default attributes for a given <link linkend="GtkTextView">GtkTextView</link>, and you can apply tags that change the attributes for a region of text. For text features that come from the theme — such as -font and foreground color &mdash use standard +font and foreground color — use standard <link linkend="GtkWidget">GtkWidget</link> functions such as <link linkend="gtk-widget-modify-font">gtk_widget_modify_font()</link> diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index 91249a510..e907572ef 100644 --- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml +++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml @@ -42,7 +42,7 @@ though it is almost always used to display just one accelerator key. GtkWidget *save_item; GtkAccelGroup *accel_group; - /* Create a #GtkAccelGroup and add it to the window. */ + /* Create a GtkAccelGroup and add it to the window. */ accel_group = gtk_accel_group_new (<!-- -->); gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); @@ -152,6 +152,6 @@ accelerators are added or removed from the associated widget. <!-- ##### ARG GtkAccelLabel:accel-widget ##### --> <para> -The widget whose accelerators are to be shown by the #GtkAccelLabel. + </para> diff --git a/docs/reference/gtk/tmpl/gtkadjustment.sgml b/docs/reference/gtk/tmpl/gtkadjustment.sgml index 7de75d3c3..b038e3219 100644 --- a/docs/reference/gtk/tmpl/gtkadjustment.sgml +++ b/docs/reference/gtk/tmpl/gtkadjustment.sgml @@ -32,8 +32,8 @@ after changing the value and its bounds. This results in the emission of the <para> The #GtkAdjustment-struct struct contains the following fields. -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkalignment.sgml b/docs/reference/gtk/tmpl/gtkalignment.sgml index 39338e9bb..24a6dbd75 100644 --- a/docs/reference/gtk/tmpl/gtkalignment.sgml +++ b/docs/reference/gtk/tmpl/gtkalignment.sgml @@ -74,26 +74,21 @@ unused space, from 0 to 1. The values are similar to @xscale. <!-- ##### ARG GtkAlignment:xalign ##### --> <para> -the horizontal alignment of the child widget, from 0 (left) to 1 (right). + </para> <!-- ##### ARG GtkAlignment:yalign ##### --> <para> -the vertical alignment of the child widget, from 0 (top) to 1 (bottom). + </para> <!-- ##### ARG GtkAlignment:xscale ##### --> <para> -the amount that the child widget expands horizontally to fill up -unused space, from 0 to 1. -A value of 0 indicates that the child widget should never expand. -A value of 1 indicates that the child widget will expand to fill all of the -space allocated for the #GtkAlignment. + </para> <!-- ##### ARG GtkAlignment:yscale ##### --> <para> -the amount that the child widget expands vertically to fill up -unused space, from 0 to 1. The values are similar to @xscale. + </para> diff --git a/docs/reference/gtk/tmpl/gtkarrow.sgml b/docs/reference/gtk/tmpl/gtkarrow.sgml index fc40e3dcc..89e4b7d7c 100644 --- a/docs/reference/gtk/tmpl/gtkarrow.sgml +++ b/docs/reference/gtk/tmpl/gtkarrow.sgml @@ -40,8 +40,8 @@ The #GtkArrow-struct containes the following fields. (These fields should be considered read-only. They should never be set by
an application.)
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
<tbody>
<row>
@@ -78,12 +78,12 @@ Sets the direction and style of the #GtkArrow, @arrow. <!-- ##### ARG GtkArrow:arrow-type ##### --> -<para>
-the arrow direction, one of #GtkArrowType.
+<para> + </para> <!-- ##### ARG GtkArrow:shadow-type ##### --> -<para>
-the arrow style, one of #GtkShadowType.
+<para> + </para> diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml index ceec7a091..07898918d 100644 --- a/docs/reference/gtk/tmpl/gtkbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbbox.sgml @@ -162,22 +162,22 @@ box. </para> -<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### --> +<!-- ##### ARG GtkButtonBox:child-min-width ##### --> <para> </para> -<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### --> +<!-- ##### ARG GtkButtonBox:child-min-height ##### --> <para> </para> -<!-- ##### ARG GtkButtonBox:child-min-width ##### --> +<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### --> <para> </para> -<!-- ##### ARG GtkButtonBox:child-min-height ##### --> +<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkbin.sgml b/docs/reference/gtk/tmpl/gtkbin.sgml index 5a64c10bd..837202ba3 100644 --- a/docs/reference/gtk/tmpl/gtkbin.sgml +++ b/docs/reference/gtk/tmpl/gtkbin.sgml @@ -26,8 +26,8 @@ The #GtkBin-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml index 0e4a35b93..bfdad588d 100644 --- a/docs/reference/gtk/tmpl/gtkbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbox.sgml @@ -106,8 +106,8 @@ The #GtkBox-struct describes an instance of GtkBox and contains the following fi (These fields should be considered read-only. They should never be set by
an application.)
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
<tbody>
<row>
@@ -146,8 +146,8 @@ and <structfield>pack</structfield> fields. should be considered read-only. They should never be directly set by an
application.)
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
+<informaltable pgwide="1" frame="none" role="struct">
+<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
<tbody>
<row>
@@ -371,15 +371,13 @@ in #GtkBoxChild-struct. <!-- ##### ARG GtkBox:spacing ##### --> -<para>
-the minimum amount of space to put between children. Refers to the
-<structfield>spacing</structfield> field of #GtkBox-struct.
+<para> + </para> <!-- ##### ARG GtkBox:homogeneous ##### --> -<para>
-how to allocate space for children, equally or variably. Refers to
-the <structfield>homogeneous</structfield> field of #GtkBox-struct.
+<para> + </para> <!-- ##### ARG GtkBox:expand ##### --> diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index 7b448c1a0..87becea1c 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -229,14 +229,13 @@ mouse cursor is. @button: the object which received the signal. <!-- ##### ARG GtkButton:label ##### --> -<para>
-The text within the child #GtkLabel of the #GtkButton. Only useful if
-there is actually a #GtkLabel inside of the #GtkButton.
+<para> + </para> <!-- ##### ARG GtkButton:relief ##### --> -<para>
-The #GtkReliefStyle as outlined in gtk_button_set_relief().
+<para> + </para> <!-- ##### ARG GtkButton:use-underline ##### --> @@ -249,22 +248,22 @@ The #GtkReliefStyle as outlined in gtk_button_set_relief(). </para> -<!-- ##### ARG GtkButton:default-border ##### --> +<!-- ##### ARG GtkButton:child-displacement-y ##### --> <para> </para> -<!-- ##### ARG GtkButton:default-outside-border ##### --> +<!-- ##### ARG GtkButton:child-displacement-x ##### --> <para> </para> -<!-- ##### ARG GtkButton:child-displacement-y ##### --> +<!-- ##### ARG GtkButton:default-border ##### --> <para> </para> -<!-- ##### ARG GtkButton:child-displacement-x ##### --> +<!-- ##### ARG GtkButton:default-outside-border ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml index 333cf03ae..439a42833 100644 --- a/docs/reference/gtk/tmpl/gtkcalendar.sgml +++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml @@ -67,8 +67,8 @@ are 0-11) while <structfield>selected_day</structfield> is one-based <!-- ##### ENUM GtkCalendarDisplayOptions ##### --> <para> -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 7b5e72c6a..9f985152d 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -66,12 +66,12 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: -<!-- ##### ARG GtkCheckButton:indicator-size ##### --> +<!-- ##### ARG GtkCheckButton:indicator-spacing ##### --> <para> </para> -<!-- ##### ARG GtkCheckButton:indicator-spacing ##### --> +<!-- ##### ARG GtkCheckButton:indicator-size ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index f4839373e..7fa5ba747 100644 --- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml @@ -28,8 +28,8 @@ The #GtkCheckMenuItem-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml index d08947432..3ef7f7a5c 100644 --- a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml @@ -22,8 +22,8 @@ The #GtkColorSelectionDialog-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index 59be2856f..e503adbca 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -95,8 +95,8 @@ The #GtkFixedChild-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index de1877ace..ec7ee41ed 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -353,6 +353,8 @@ Does the same as gtk_container_get_children(). @cclass: @property_name: @Returns: +<!-- # Unused Parameters # --> +@class: <!-- ##### FUNCTION gtk_container_class_install_child_property ##### --> @@ -363,6 +365,8 @@ Does the same as gtk_container_get_children(). @cclass: @property_id: @pspec: +<!-- # Unused Parameters # --> +@class: <!-- ##### FUNCTION gtk_container_class_list_child_properties ##### --> @@ -373,6 +377,8 @@ Does the same as gtk_container_get_children(). @cclass: @n_properties: @Returns: +<!-- # Unused Parameters # --> +@class: <!-- ##### SIGNAL GtkContainer::add ##### --> diff --git a/docs/reference/gtk/tmpl/gtkctree.sgml b/docs/reference/gtk/tmpl/gtkctree.sgml index 2a3b31d7d..bfa5ba39e 100644 --- a/docs/reference/gtk/tmpl/gtkctree.sgml +++ b/docs/reference/gtk/tmpl/gtkctree.sgml @@ -35,8 +35,8 @@ The #GtkCTree-struct contains the following user-accessible fields. These fields should be considered read-only; to set the values, use the methods below. -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -119,8 +119,8 @@ FIXME <para> A value specifying the position of a new node relative to an old one. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -150,8 +150,8 @@ A value specifying the position of a new node relative to an old one. <para> The appearance of the lines in the tree graphics. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -190,8 +190,8 @@ The appearance of the expander buttons, i.e. the small buttons which expand or contract parts of the tree when pressed. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -228,8 +228,8 @@ which expand or contract parts of the tree when pressed. <para> How to expand or collapse a part of a tree. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -316,8 +316,8 @@ A structure representing a single row in the tree graph. The values inside the structure should be considered read-only. This structure is derived from the #GtkCListRow structure. -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml index 8701b8517..90602ed94 100644 --- a/docs/reference/gtk/tmpl/gtkcurve.sgml +++ b/docs/reference/gtk/tmpl/gtkcurve.sgml @@ -56,8 +56,8 @@ Creates a new #GtkCurve. <!-- ##### FUNCTION gtk_curve_reset ##### --> <para> -Resets the curve to a straight line from the minimum x & y values to the -maximum x & y values (i.e. from the bottom-left to the top-right corners). +Resets the curve to a straight line from the minimum x and y values to the +maximum x and y values (i.e. from the bottom-left to the top-right corners). The curve type is not changed. </para> @@ -79,7 +79,7 @@ FIXME: Needs a more precise definition of gamma. <!-- ##### FUNCTION gtk_curve_set_range ##### --> <para> -Sets the minimum and maximum x & y values of the curve. +Sets the minimum and maximum x and y values of the curve. The curve is also reset with a call to gtk_curve_reset(). </para> diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index 6a113643a..67d4957dd 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -298,12 +298,12 @@ was clicked. </para> -<!-- ##### ARG GtkDialog:content-area-border ##### --> +<!-- ##### ARG GtkDialog:button-spacing ##### --> <para> </para> -<!-- ##### ARG GtkDialog:button-spacing ##### --> +<!-- ##### ARG GtkDialog:content-area-border ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml index 3f890d9e0..e1016e97e 100644 --- a/docs/reference/gtk/tmpl/gtkeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkeditable.sgml @@ -64,8 +64,8 @@ The #GtkEditable structure contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index a0990a19c..f00dbb568 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -356,14 +356,12 @@ use gtk_editable_set_editable() instead. <!-- ##### ARG GtkEntry:max-length ##### --> <para> -Determines the maximum allowed length of the contents -of the widget. See gtk_entry_set_max_length(). + </para> <!-- ##### ARG GtkEntry:visibility ##### --> <para> -Determines whether the contents of the entry widget -are visible or not. See gtk_entry_set_visibility(). + </para> <!-- ##### ARG GtkEntry:has-frame ##### --> diff --git a/docs/reference/gtk/tmpl/gtkfilesel.sgml b/docs/reference/gtk/tmpl/gtkfilesel.sgml index a68d98ebd..278971fae 100644 --- a/docs/reference/gtk/tmpl/gtkfilesel.sgml +++ b/docs/reference/gtk/tmpl/gtkfilesel.sgml @@ -88,8 +88,8 @@ void create_file_selection (void) { <para> The #GtkFileSelection struct contains the following #GtkWidget fields: -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml index 814205aa1..a4f686b0a 100644 --- a/docs/reference/gtk/tmpl/gtkfixed.sgml +++ b/docs/reference/gtk/tmpl/gtkfixed.sgml @@ -70,8 +70,8 @@ The #GtkFixed-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -90,8 +90,8 @@ The #GtkFixedChild-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml index 2b9f2ca66..95b81034b 100644 --- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml +++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml @@ -42,8 +42,8 @@ The #GtkHandleBox-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -179,7 +179,7 @@ handlebox are detached from the main window. <!-- ##### ARG GtkHandleBox:shadow ##### --> <para> -Determines the shadow type for the handlebox. + </para> <!-- ##### ARG GtkHandleBox:shadow-type ##### --> @@ -189,15 +189,11 @@ Determines the shadow type for the handlebox. <!-- ##### 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/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index 707e7d4fc..7e3c79558 100644 --- a/docs/reference/gtk/tmpl/gtklabel.sgml +++ b/docs/reference/gtk/tmpl/gtklabel.sgml @@ -33,7 +33,7 @@ the label is inside a button: <informalexample> <programlisting> /* Pressing Alt+H will activate this button */ - button = gtk_button_new (); + button = gtk_button_new (<!-- -->); label = gtk_label_new_with_mnemonic ("_Hello"); gtk_container_add (GTK_CONTAINER (button), label); </programlisting> @@ -54,7 +54,7 @@ gtk_label_set_mnemonic_widget(): <informalexample> <programlisting> /* Pressing Alt+H will focus the entry */ - entry = gtk_entry_new (); + entry = gtk_entry_new (<!-- -->); label = gtk_label_new_with_mnemonic ("_Hello"); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); </programlisting> @@ -473,7 +473,7 @@ Gtk+ 1.0.x. <!-- ##### ARG GtkLabel:label ##### --> <para> -The actual label text. Do not write to this pointer, it is not copied. + </para> <!-- ##### ARG GtkLabel:attributes ##### --> @@ -493,13 +493,12 @@ The actual label text. Do not write to this pointer, it is not copied. <!-- ##### ARG GtkLabel:justify ##### --> <para> -The #GtkJustification setting. See gtk_label_set_justify() for more info. + </para> <!-- ##### ARG GtkLabel:pattern ##### --> <para> -The pattern of underlines under the existing text. Do not change the -pointer, it isn't copied. + </para> <!-- ##### ARG GtkLabel:wrap ##### --> diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml index 75de3755c..599a4ae52 100644 --- a/docs/reference/gtk/tmpl/gtklayout.sgml +++ b/docs/reference/gtk/tmpl/gtklayout.sgml @@ -153,22 +153,22 @@ area. <!-- ##### ARG GtkLayout:hadjustment ##### --> <para> -Horizontal scroll adjustment, see gtk_layout_set_hadjustment() + </para> <!-- ##### ARG GtkLayout:vadjustment ##### --> <para> -Vertical scroll adjustment, see gtk_layout_set_vadjustment() + </para> <!-- ##### ARG GtkLayout:width ##### --> <para> -Layout width, see gtk_layout_set_size() + </para> <!-- ##### ARG GtkLayout:height ##### --> <para> -Layout height, see gtk_layout_set_size() + </para> <!-- ##### ARG GtkLayout:x ##### --> diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index bd5c539eb..08e9490a4 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -28,8 +28,8 @@ The #GtkMenuShell-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -112,8 +112,8 @@ after the menu item is activated. <para> An enumeration representing directional movements within a menu. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> diff --git a/docs/reference/gtk/tmpl/gtkmisc.sgml b/docs/reference/gtk/tmpl/gtkmisc.sgml index 7392ff8be..1354d28ab 100644 --- a/docs/reference/gtk/tmpl/gtkmisc.sgml +++ b/docs/reference/gtk/tmpl/gtkmisc.sgml @@ -31,8 +31,8 @@ The #GtkMisc-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -104,21 +104,21 @@ in pixels. <!-- ##### ARG GtkMisc:xalign ##### --> <para> -the horizontal alignment, from 0 (left) to 1 (right). + </para> <!-- ##### ARG GtkMisc:yalign ##### --> <para> -the vertical alignment, from 0 (top) to 1 (bottom). + </para> <!-- ##### ARG GtkMisc:xpad ##### --> <para> -the amount of space to add on the left and right of the widget, in pixels. + </para> <!-- ##### ARG GtkMisc:ypad ##### --> <para> -the amount of space to add on the top and bottom of the widget, in pixels. + </para> diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index b79951934..963da3141 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -447,53 +447,52 @@ Emitted when the user or a function changes the current page. <!-- ##### ARG GtkNotebook:tab-pos ##### --> <para> -The edge at which the tabs for switching pages are drawn. + </para> <!-- ##### ARG GtkNotebook:show-tabs ##### --> <para> -Whether to show tabs for the notebook pages. + </para> <!-- ##### ARG GtkNotebook:show-border ##### --> <para> -Whether to draw a bevel around the noteobook. + </para> <!-- ##### ARG GtkNotebook:scrollable ##### --> <para> -Whether the tab label area will have arrows for scrolling if there -are too many tabs to fit in the area. + </para> <!-- ##### ARG GtkNotebook:tab-border ##### --> <para> -Whether the tab labels have a border on all sides. + </para> <!-- ##### ARG GtkNotebook:tab-hborder ##### --> <para> -Whether the tab labels have a horizontal border. + </para> <!-- ##### ARG GtkNotebook:tab-vborder ##### --> <para> -Whether the tab labels have a vertical border. + </para> <!-- ##### ARG GtkNotebook:page ##### --> <para> -The current page + </para> <!-- ##### ARG GtkNotebook:enable-popup ##### --> <para> -Whether the popup menu for switching pages is enabled. + </para> <!-- ##### ARG GtkNotebook:homogeneous ##### --> <para> -whether the tabs must have all the same size. + </para> <!-- ##### ARG GtkNotebook:tab-label ##### --> diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml index 1a948be38..ade1ceb76 100644 --- a/docs/reference/gtk/tmpl/gtkobject.sgml +++ b/docs/reference/gtk/tmpl/gtkobject.sgml @@ -506,7 +506,6 @@ if all references are released. <!-- ##### ARG GtkObject:user-data ##### --> <para> -A pointer for convenience when programming applications. -Deprecated. + </para> diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 31debc57f..876a046a5 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -100,12 +100,12 @@ selected value for the option menu. </para> -<!-- ##### ARG GtkOptionMenu:indicator-size ##### --> +<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### --> <para> </para> -<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### --> +<!-- ##### ARG GtkOptionMenu:indicator-size ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml index a5ef9090f..d657b82d6 100644 --- a/docs/reference/gtk/tmpl/gtkpreview.sgml +++ b/docs/reference/gtk/tmpl/gtkpreview.sgml @@ -41,8 +41,8 @@ The #GtkPreviewInfo struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -257,8 +257,6 @@ 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/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml index cd7638149..c4a7488fc 100644 --- a/docs/reference/gtk/tmpl/gtkprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkprogress.sgml @@ -188,21 +188,21 @@ the #GtkProgress. <!-- ##### ARG GtkProgress:activity-mode ##### --> <para> -A boolean indicating whether activity mode is enabled. + </para> <!-- ##### ARG GtkProgress:show-text ##### --> <para> -A boolean indicating whether the progress is shown as text. + </para> <!-- ##### ARG GtkProgress:text-xalign ##### --> <para> -A number between 0.0 and 1.0 specifying the horizontal alignment. + </para> <!-- ##### ARG GtkProgress:text-yalign ##### --> <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 1441ce296..9125f6bfa 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -119,8 +119,8 @@ Creates a new #GtkProgressBar. An enumeration representing possible orientations and growth directions for the visible progress bar. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -210,8 +210,8 @@ Sets the style of the #GtkProgressBar. The default style is <para> An enumeration representing the styles for drawing the progress bar. -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -284,8 +284,7 @@ gtk_progress_set_percentage() instead. <!-- ##### ARG GtkProgressBar:orientation ##### --> <para> -a #GtkProgressBarOrientation value which specifies the -orientation and growth direction of the bar. + </para> <!-- ##### ARG GtkProgressBar:text ##### --> @@ -295,29 +294,26 @@ orientation and growth direction of the bar. <!-- ##### ARG GtkProgressBar:adjustment ##### --> <para> -a #GtkAdjustment to be used with the #GtkProgressBar. + </para> <!-- ##### ARG GtkProgressBar:bar-style ##### --> <para> -a #GtkProgressBarStyle value which specifies the -visual style of the bar in percentage mode. + </para> <!-- ##### ARG GtkProgressBar:activity-step ##### --> <para> -The increment used for each iteration in activity mode. + </para> <!-- ##### ARG GtkProgressBar:activity-blocks ##### --> <para> -The number of blocks which can fit in the progress bar -area in activity mode. + </para> <!-- ##### ARG GtkProgressBar:discrete-blocks ##### --> <para> -The number of blocks which which make up progress bar -when it is shown in %GTK_PROGRESS_DISCRETE style. + </para> diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml index 9d5781d74..fe0491dbc 100644 --- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml @@ -20,7 +20,7 @@ GList *group = NULL; GtkWidget *item; gint i; -for(i = 0; i < 5; i++) +for (i = 0; i < 5; i++) { item = gtk_radio_menu_item_new_with_label (group, "This is an example"); group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index 8f4f787e2..f6bd73f12 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -153,32 +153,32 @@ Emitted when the range value changes. </para> -<!-- ##### ARG GtkRange:stepper-size ##### --> +<!-- ##### ARG GtkRange:arrow-displacement-y ##### --> <para> </para> -<!-- ##### ARG GtkRange:slider-width ##### --> +<!-- ##### ARG GtkRange:arrow-displacement-x ##### --> <para> </para> -<!-- ##### ARG GtkRange:stepper-spacing ##### --> +<!-- ##### ARG GtkRange:trough-border ##### --> <para> </para> -<!-- ##### ARG GtkRange:arrow-displacement-y ##### --> +<!-- ##### ARG GtkRange:stepper-spacing ##### --> <para> </para> -<!-- ##### ARG GtkRange:arrow-displacement-x ##### --> +<!-- ##### ARG GtkRange:stepper-size ##### --> <para> </para> -<!-- ##### ARG GtkRange:trough-border ##### --> +<!-- ##### ARG GtkRange:slider-width ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 36b0dbf6d..cd0fb1e59 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -33,7 +33,7 @@ Additionally, the <envar>GTK_RC_FILES</envar> environment variable can be set to a #G_SEARCHPATH_SEPARATOR_S-separated list of files in order to overwrite the set of default files at runtime. </para> -<para><anchor id="locale-specific-rc"> +<para><anchor id="locale-specific-rc"/> For each RC file, in addition to the file itself, GTK+ will look for a locale-specific file that will be parsed after the main file. For instance, if <envar>LANG</envar> is set to <literal>ja_JP.ujis</literal>, @@ -367,7 +367,7 @@ state of the widget. The states are: </variablelist> </para> -<para><anchor id="color-format"> +<para><anchor id="color-format"/> Colors can be specified as a string containing a color name (GTK+ knows all names from the X color database <filename>/usr/lib/X11/rgb.txt</filename>), @@ -794,7 +794,7 @@ otherwise %NULL. <para> </para> -@Returns: +@Returns: <!-- ##### FUNCTION gtk_rc_get_im_module_path ##### --> diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index b78bac4c5..bca98aacb 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -30,8 +30,8 @@ The #GtkScale-struct struct contains the following fields. (These fields should be considered read-only. They should never be set by an application.) -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> @@ -115,13 +115,13 @@ Signal which allows you to change how the scale value is displayed. Connect a signal handler which returns an allocated string representing @value. That string will then be used to display the scale's value. Here's an example signal handler which displays a value 1.0 as -with "-->1.0<--". +with "-->1.0<--". <informalexample><programlisting> static gchar* format_value_callback (GtkScale *scale, gdouble value) { - return g_strdup_printf ("-->%0.*g<--", + return g_strdup_printf ("-->&percent;0.*g<--", gtk_scale_get_digits (scale), value); } </programlisting></informalexample> @@ -135,17 +135,17 @@ format_value_callback (GtkScale *scale, <!-- ##### ARG GtkScale:digits ##### --> <para> -The number of decimal places that are displayed in the value. + </para> <!-- ##### ARG GtkScale:draw-value ##### --> <para> -If the current value is displayed as a string next to the slider. + </para> <!-- ##### ARG GtkScale:value-pos ##### --> <para> -The position in which the current value is displayed. + </para> <!-- ##### ARG GtkScale:slider-length ##### --> diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml index cc947c106..48f51f9d5 100644 --- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml @@ -54,32 +54,32 @@ The #GtkScrollbar struct does not contain any public data. </para> -<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:min-slider-length ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### --> +<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:min-slider-length ##### --> +<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### --> <para> </para> -<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### --> +<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml index 350dce9cf..ab6fd97a7 100644 --- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml @@ -244,32 +244,31 @@ Sets the #GtkAdjustment for the vertical scrollbar. <!-- ##### ARG GtkScrolledWindow:hadjustment ##### --> <para> -Horizontal adjustment. See gtk_scrolled_window_set_hadjustment(), gtk_scrolled_window_get_hadjustment(). + </para> <!-- ##### ARG GtkScrolledWindow:vadjustment ##### --> <para> -Vertical adjustment. See gtk_scrolled_window_set_vadjustment(), gtk_scrolled_window_get_vadjustment(). + </para> <!-- ##### ARG GtkScrolledWindow:hscrollbar-policy ##### --> <para> -Horizontal scrollbar policy (show scrollbar always, never, or "when appropriate"). + </para> <!-- ##### ARG GtkScrolledWindow:vscrollbar-policy ##### --> <para> -Vertical scrollbar policy (show scrollbar always, never, or "when appropriate"). + </para> <!-- ##### ARG GtkScrolledWindow:window-placement ##### --> <para> -Position of child window with respect to scrollbars; top left, top -right, bottom left, bottom right. + </para> <!-- ##### ARG GtkScrolledWindow:shadow-type ##### --> <para> -Type of frame drawn around the child of the scrolled window. + </para> diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index edb7b8b71..67ecd70b0 100644 --- a/docs/reference/gtk/tmpl/gtksignal.sgml +++ b/docs/reference/gtk/tmpl/gtksignal.sgml @@ -17,7 +17,7 @@ performance hits where #GtkArg structures have to be converted into #GValue<!-- Signals are a way to get notification when something happens and to customize object behavior according to the user's needs. -Every <WordAsWord>signal</WordAsWord> is uniquely identified by a name, +Every <wordasword>signal</wordasword> is uniquely identified by a name, "class_name::signal_name", where signal_name might be something like "clicked" and class_name might be "GtkButton". Note that some other class may also define a "clicked" callback, so long as it doesn't derive from @@ -58,7 +58,7 @@ corresponding to that attachment. </para> <para> Functions that want to notify the user of certain actions, -<Emphasis>emit</Emphasis> signals. +<emphasis>emit</emphasis> signals. </para> </refsect2> <refsect2> diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index 1b406a8b0..b26742dce 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -48,7 +48,7 @@ cause unpredictable consequences, the most likely consequence being that the plug will appear as a separate toplevel window. You can check if the plug has been created by examining the -<StructField>plug_window</StructField> field of the +<structfield>plug_window</structfield> field of the #GtkSocket structure. If this field is non-%NULL, then the plug has been successfully created inside of the socket. diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml index 458abe1f6..a1daff754 100644 --- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml @@ -107,8 +107,8 @@ and should only be modified using the functions below. <!-- ##### ENUM GtkSpinButtonUpdatePolicy ##### --> <para> -<informaltable pgwide=1 frame="none" role="enum"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="enum"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> <entry>GTK_UPDATE_ALWAYS</entry> @@ -127,8 +127,8 @@ and should only be modified using the functions below. <!-- ##### ENUM GtkSpinType ##### --> <para> -<informaltable pgwide=1 frame="none" role="struct"> -<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*"> +<informaltable pgwide="1" frame="none" role="struct"> +<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/> <tbody> <row> <entry>GTK_SPIN_STEP_FORWARD, @@ -435,42 +435,42 @@ use gtk_spin_button_get_value() instead. <!-- ##### ARG GtkSpinButton:adjustment ##### --> <para> -the #GtkAdjustment that defines a spin button's main properties. + </para> <!-- ##### ARG GtkSpinButton:climb-rate ##### --> <para> -the amount a spin button changes when an arrow is clicked. + </para> <!-- ##### ARG GtkSpinButton:digits ##### --> <para> -the number of decimal places to display. + </para> <!-- ##### ARG GtkSpinButton:snap-to-ticks ##### --> <para> -whether erroneous values are automatically changed to a spin button's nearest step increment. + </para> <!-- ##### ARG GtkSpinButton:numeric ##### --> <para> -whether non-numeric characters should be ignored. + </para> <!-- ##### ARG GtkSpinButton:wrap ##### --> <para> -whether a spin button should wrap upon reaching its limits. + </para> <!-- ##### ARG GtkSpinButton:update-policy ##### --> <para> -how a spin button should be updated. + </para> <!-- ##### ARG GtkSpinButton:value ##### --> <para> -reads the current value, or sets a new value. + </para> <!-- ##### ARG GtkSpinButton:shadow-type ##### --> diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index 2dea3f083..3b4ae38ca 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -98,7 +98,7 @@ no icon, and vice versa. <!-- ##### MACRO GTK_STOCK_ADD ##### --> <para> The "Add" item. -<inlinegraphic fileref="stock_add.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_add.png" format="PNG"></inlinegraphic> </para> @@ -106,7 +106,7 @@ The "Add" item. <!-- ##### MACRO GTK_STOCK_APPLY ##### --> <para> The "Apply" item. -<inlinegraphic fileref="stock_button_apply.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_button_apply.png" format="PNG"></inlinegraphic> </para> @@ -114,7 +114,7 @@ The "Apply" item. <!-- ##### MACRO GTK_STOCK_BOLD ##### --> <para> The "Bold" item. -<inlinegraphic fileref="stock_text_bold.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_text_bold.png" format="PNG"></inlinegraphic> </para> @@ -122,7 +122,7 @@ The "Bold" item. <!-- ##### MACRO GTK_STOCK_CANCEL ##### --> <para> The "Cancel" item. -<inlinegraphic fileref="stock_button_cancel.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_button_cancel.png" format="PNG"></inlinegraphic> </para> @@ -130,7 +130,7 @@ The "Cancel" item. <!-- ##### MACRO GTK_STOCK_CDROM ##### --> <para> The "CD-Rom" item. -<inlinegraphic fileref="stock_cdrom.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_cdrom.png" format="PNG"></inlinegraphic> </para> @@ -138,7 +138,7 @@ The "CD-Rom" item. <!-- ##### MACRO GTK_STOCK_CLEAR ##### --> <para> The "Clear" item. -<inlinegraphic fileref="stock_clear.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_clear.png" format="PNG"></inlinegraphic> </para> @@ -146,7 +146,7 @@ The "Clear" item. <!-- ##### MACRO GTK_STOCK_CLOSE ##### --> <para> The "Close" item. -<inlinegraphic fileref="stock_close.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_close.png" format="PNG"></inlinegraphic> </para> @@ -154,7 +154,7 @@ The "Close" item. <!-- ##### MACRO GTK_STOCK_CONVERT ##### --> <para> The "Convert" item. -<inlinegraphic fileref="stock_convert.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_convert.png" format="PNG"></inlinegraphic> </para> @@ -162,7 +162,7 @@ The "Convert" item. <!-- ##### MACRO GTK_STOCK_COPY ##### --> <para> The "Copy" item. -<inlinegraphic fileref="stock_menu_copy.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_menu_copy.png" format="PNG"></inlinegraphic> </para> @@ -170,7 +170,7 @@ The "Copy" item. <!-- ##### MACRO GTK_STOCK_CUT ##### --> <para> The "Cut" item. -<inlinegraphic fileref="stock_menu_cut.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_menu_cut.png" format="PNG"></inlinegraphic> </para> @@ -178,7 +178,7 @@ The "Cut" item. <!-- ##### MACRO GTK_STOCK_DELETE ##### --> <para> The "Delete" item. -<inlinegraphic fileref="stock_menu_trash.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_menu_trash.png" format="PNG"></inlinegraphic> </para> @@ -186,7 +186,7 @@ The "Delete" item. <!-- ##### MACRO GTK_STOCK_DIALOG_ERROR ##### --> <para> The "Error" item. -<inlinegraphic fileref="dialog_error.png" format="png"></inlinegraphic> +<inlinegraphic fileref="dialog_error.png" format="PNG"></inlinegraphic> </para> @@ -194,7 +194,7 @@ The "Error" item. <!-- ##### MACRO GTK_STOCK_DIALOG_INFO ##### --> <para> The "Information" item. -<inlinegraphic fileref="dialog_info.png" format="png"></inlinegraphic> +<inlinegraphic fileref="dialog_info.png" format="PNG"></inlinegraphic> </para> @@ -202,7 +202,7 @@ The "Information" item. <!-- ##### MACRO GTK_STOCK_DIALOG_QUESTION ##### --> <para> The "Question" item. -<inlinegraphic fileref="dialog_question.png" format="png"></inlinegraphic> +<inlinegraphic fileref="dialog_question.png" format="PNG"></inlinegraphic> </para> @@ -210,7 +210,7 @@ The "Question" item. <!-- ##### MACRO GTK_STOCK_DIALOG_WARNING ##### --> <para> The "Warning" item. -<inlinegraphic fileref="dialog_warning.png" format="png"></inlinegraphic> +<inlinegraphic fileref="dialog_warning.png" format="PNG"></inlinegraphic> </para> @@ -218,7 +218,7 @@ The "Warning" item. <!-- ##### MACRO GTK_STOCK_DND ##### --> <para> The "Drag-And-Drop" icon. -<inlinegraphic fileref="stock_dnd.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_dnd.png" format="PNG"></inlinegraphic> </para> @@ -226,7 +226,7 @@ The "Drag-And-Drop" icon. <!-- ##### MACRO GTK_STOCK_DND_MULTIPLE ##### --> <para> The "Drag-And-Drop multiple" icon. -<inlinegraphic fileref="stock_dnd_multiple.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_dnd_multiple.png" format="PNG"></inlinegraphic> </para> @@ -234,7 +234,7 @@ The "Drag-And-Drop multiple" icon. <!-- ##### MACRO GTK_STOCK_EXECUTE ##### --> <para> The "Execute" item. -<inlinegraphic fileref="stock_exec.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_exec.png" format="PNG"></inlinegraphic> </para> @@ -242,7 +242,7 @@ The "Execute" item. <!-- ##### MACRO GTK_STOCK_FIND ##### --> <para> The "Find" item. -<inlinegraphic fileref="stock_search.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_search.png" format="PNG"></inlinegraphic> </para> @@ -250,7 +250,7 @@ The "Find" item. <!-- ##### MACRO GTK_STOCK_FIND_AND_REPLACE ##### --> <para> The "Find and Replace" item. -<inlinegraphic fileref="stock_search_replace.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_search_replace.png" format="PNG"></inlinegraphic> </para> @@ -258,7 +258,7 @@ The "Find and Replace" item. <!-- ##### MACRO GTK_STOCK_FLOPPY ##### --> <para> The "Floppy" item. -<inlinegraphic fileref="stock_save.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_save.png" format="PNG"></inlinegraphic> </para> @@ -266,7 +266,7 @@ The "Floppy" item. <!-- ##### MACRO GTK_STOCK_GOTO_BOTTOM ##### --> <para> The "Bottom" item. -<inlinegraphic fileref="stock_bottom.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_bottom.png" format="PNG"></inlinegraphic> </para> @@ -274,7 +274,7 @@ The "Bottom" item. <!-- ##### MACRO GTK_STOCK_GOTO_FIRST ##### --> <para> The "First" item. -<inlinegraphic fileref="stock_first.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_first.png" format="PNG"></inlinegraphic> </para> @@ -282,7 +282,7 @@ The "First" item. <!-- ##### MACRO GTK_STOCK_GOTO_LAST ##### --> <para> The "Last" item. -<inlinegraphic fileref="stock_last.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_last.png" format="PNG"></inlinegraphic> </para> @@ -290,7 +290,7 @@ The "Last" item. <!-- ##### MACRO GTK_STOCK_GOTO_TOP ##### --> <para> The "Top" item. -<inlinegraphic fileref="stock_top.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_top.png" format="PNG"></inlinegraphic> </para> @@ -298,7 +298,7 @@ The "Top" item. <!-- ##### MACRO GTK_STOCK_GO_BACK ##### --> <para> The "Back" item. -<inlinegraphic fileref="stock_left_arrow.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_left_arrow.png" format="PNG"></inlinegraphic> </para> @@ -306,7 +306,7 @@ The "Back" item. <!-- ##### MACRO GTK_STOCK_GO_DOWN ##### --> <para> The "Down" item. -<inlinegraphic fileref="stock_down_arrow.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_down_arrow.png" format="PNG"></inlinegraphic> </para> @@ -314,7 +314,7 @@ The "Down" item. <!-- ##### MACRO GTK_STOCK_GO_FORWARD ##### --> <para> The "Forward" item. -<inlinegraphic fileref="stock_right_arrow.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_right_arrow.png" format="PNG"></inlinegraphic> </para> @@ -322,7 +322,7 @@ The "Forward" item. <!-- ##### MACRO GTK_STOCK_GO_UP ##### --> <para> The "Up" item. -<inlinegraphic fileref="stock_up_arrow.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_up_arrow.png" format="PNG"></inlinegraphic> </para> @@ -330,7 +330,7 @@ The "Up" item. <!-- ##### MACRO GTK_STOCK_HELP ##### --> <para> The "Help" item. -<inlinegraphic fileref="stock_help.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_help.png" format="PNG"></inlinegraphic> </para> @@ -338,7 +338,7 @@ The "Help" item. <!-- ##### MACRO GTK_STOCK_HOME ##### --> <para> The "Home" item. -<inlinegraphic fileref="stock_home.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_home.png" format="PNG"></inlinegraphic> </para> @@ -346,7 +346,7 @@ The "Home" item. <!-- ##### MACRO GTK_STOCK_INDEX ##### --> <para> The "Index" item. -<inlinegraphic fileref="stock_index.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_index.png" format="PNG"></inlinegraphic> </para> @@ -354,7 +354,7 @@ The "Index" item. <!-- ##### MACRO GTK_STOCK_ITALIC ##### --> <para> The "Italic" item. -<inlinegraphic fileref="stock_text_italic.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_text_italic.png" format="PNG"></inlinegraphic> </para> @@ -362,7 +362,7 @@ The "Italic" item. <!-- ##### MACRO GTK_STOCK_JUMP_TO ##### --> <para> The "Jump to" item. -<inlinegraphic fileref="stock_jump_to.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_jump_to.png" format="PNG"></inlinegraphic> </para> @@ -370,7 +370,7 @@ The "Jump to" item. <!-- ##### MACRO GTK_STOCK_JUSTIFY_CENTER ##### --> <para> The "Center" item. -<inlinegraphic fileref="stock_align_center.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_align_center.png" format="PNG"></inlinegraphic> </para> @@ -378,7 +378,7 @@ The "Center" item. <!-- ##### MACRO GTK_STOCK_JUSTIFY_FILL ##### --> <para> The "Fill" item. -<inlinegraphic fileref="stock_align_justify.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_align_justify.png" format="PNG"></inlinegraphic> </para> @@ -386,7 +386,7 @@ The "Fill" item. <!-- ##### MACRO GTK_STOCK_JUSTIFY_LEFT ##### --> <para> The "Left" item. -<inlinegraphic fileref="stock_align_left.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_align_left.png" format="PNG"></inlinegraphic> </para> @@ -394,7 +394,7 @@ The "Left" item. <!-- ##### MACRO GTK_STOCK_JUSTIFY_RIGHT ##### --> <para> The "Right" item. -<inlinegraphic fileref="stock_align_right.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_align_right.png" format="PNG"></inlinegraphic> </para> @@ -402,7 +402,7 @@ The "Right" item. <!-- ##### MACRO GTK_STOCK_MISSING_IMAGE ##### --> <para> The "Missing image" icon. -<inlinegraphic fileref="dialog_error.png" format="png"></inlinegraphic> +<inlinegraphic fileref="dialog_error.png" format="PNG"></inlinegraphic> </para> @@ -410,7 +410,7 @@ The "Missing image" icon. <!-- ##### MACRO GTK_STOCK_NEW ##### --> <para> The "New" item. -<inlinegraphic fileref="stock_new.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_new.png" format="PNG"></inlinegraphic> </para> @@ -418,7 +418,7 @@ The "New" item. <!-- ##### MACRO GTK_STOCK_NO ##### --> <para> The "No" item. -<inlinegraphic fileref="stock_button_no.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_button_no.png" format="PNG"></inlinegraphic> </para> @@ -426,7 +426,7 @@ The "No" item. <!-- ##### MACRO GTK_STOCK_OK ##### --> <para> The "OK" item. -<inlinegraphic fileref="stock_button_ok.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_button_ok.png" format="PNG"></inlinegraphic> </para> @@ -434,7 +434,7 @@ The "OK" item. <!-- ##### MACRO GTK_STOCK_OPEN ##### --> <para> The "Open" item. -<inlinegraphic fileref="stock_open.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_open.png" format="PNG"></inlinegraphic> </para> @@ -442,7 +442,7 @@ The "Open" item. <!-- ##### MACRO GTK_STOCK_PASTE ##### --> <para> The "Paste" item. -<inlinegraphic fileref="stock_paste.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_paste.png" format="PNG"></inlinegraphic> </para> @@ -450,7 +450,7 @@ The "Paste" item. <!-- ##### MACRO GTK_STOCK_PREFERENCES ##### --> <para> The "Preferences" item. -<inlinegraphic fileref="stock_preferences.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_preferences.png" format="PNG"></inlinegraphic> </para> @@ -458,7 +458,7 @@ The "Preferences" item. <!-- ##### MACRO GTK_STOCK_PRINT ##### --> <para> The "Print" item. -<inlinegraphic fileref="stock_print.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_print.png" format="PNG"></inlinegraphic> </para> @@ -466,7 +466,7 @@ The "Print" item. <!-- ##### MACRO GTK_STOCK_PRINT_PREVIEW ##### --> <para> The "Print Preview" item. -<inlinegraphic fileref="stock_print_preview.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_print_preview.png" format="PNG"></inlinegraphic> </para> @@ -474,7 +474,7 @@ The "Print Preview" item. <!-- ##### MACRO GTK_STOCK_PROPERTIES ##### --> <para> The "Properties" item. -<inlinegraphic fileref="stock_properties.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_properties.png" format="PNG"></inlinegraphic> </para> @@ -482,7 +482,7 @@ The "Properties" item. <!-- ##### MACRO GTK_STOCK_QUIT ##### --> <para> The "Quit" item. -<inlinegraphic fileref="stock_exit.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_exit.png" format="PNG"></inlinegraphic> </para> @@ -490,7 +490,7 @@ The "Quit" item. <!-- ##### MACRO GTK_STOCK_REDO ##### --> <para> The "Redo" item. -<inlinegraphic fileref="stock_redo.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_redo.png" format="PNG"></inlinegraphic> </para> @@ -498,7 +498,7 @@ The "Redo" item. <!-- ##### MACRO GTK_STOCK_REFRESH ##### --> <para> The "Refresh" item. -<inlinegraphic fileref="stock_refresh.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_refresh.png" format="PNG"></inlinegraphic> </para> @@ -506,7 +506,7 @@ The "Refresh" item. <!-- ##### MACRO GTK_STOCK_REMOVE ##### --> <para> The "Remove" item. -<inlinegraphic fileref="stock_remove.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_remove.png" format="PNG"></inlinegraphic> </para> @@ -514,7 +514,7 @@ The "Remove" item. <!-- ##### MACRO GTK_STOCK_REVERT_TO_SAVED ##### --> <para> The "Revert" item. -<inlinegraphic fileref="stock_revert.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_revert.png" format="PNG"></inlinegraphic> </para> @@ -522,7 +522,7 @@ The "Revert" item. <!-- ##### MACRO GTK_STOCK_SAVE ##### --> <para> The "Save" item. -<inlinegraphic fileref="stock_save.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_save.png" format="PNG"></inlinegraphic> </para> @@ -530,7 +530,7 @@ The "Save" item. <!-- ##### MACRO GTK_STOCK_SAVE_AS ##### --> <para> The "Save As" item. -<inlinegraphic fileref="stock_save_as.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_save_as.png" format="PNG"></inlinegraphic> </para> @@ -538,7 +538,7 @@ The "Save As" item. <!-- ##### MACRO GTK_STOCK_SELECT_COLOR ##### --> <para> The "Color" item. -<inlinegraphic fileref="stock_colorselector.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_colorselector.png" format="PNG"></inlinegraphic> </para> @@ -546,7 +546,7 @@ The "Color" item. <!-- ##### MACRO GTK_STOCK_SELECT_FONT ##### --> <para> The "Font" item. -<inlinegraphic fileref="stock_font.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_font.png" format="PNG"></inlinegraphic> </para> @@ -554,7 +554,7 @@ The "Font" item. <!-- ##### MACRO GTK_STOCK_SORT_ASCENDING ##### --> <para> The "Ascending" item. -<inlinegraphic fileref="stock_sort_ascending.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_sort_ascending.png" format="PNG"></inlinegraphic> </para> @@ -562,7 +562,7 @@ The "Ascending" item. <!-- ##### MACRO GTK_STOCK_SORT_DESCENDING ##### --> <para> The "Descending" item. -<inlinegraphic fileref="stock_sort_descending.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_sort_descending.png" format="PNG"></inlinegraphic> </para> @@ -570,7 +570,7 @@ The "Descending" item. <!-- ##### MACRO GTK_STOCK_SPELL_CHECK ##### --> <para> The "Spell Check" item. -<inlinegraphic fileref="stock_spellcheck.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_spellcheck.png" format="PNG"></inlinegraphic> </para> @@ -578,7 +578,7 @@ The "Spell Check" item. <!-- ##### MACRO GTK_STOCK_STOP ##### --> <para> The "Stop" item. -<inlinegraphic fileref="stock_stop.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_stop.png" format="PNG"></inlinegraphic> </para> @@ -586,7 +586,7 @@ The "Stop" item. <!-- ##### MACRO GTK_STOCK_STRIKETHROUGH ##### --> <para> The "Strikethrough" item. -<inlinegraphic fileref="stock_text_strikeout.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_text_strikeout.png" format="PNG"></inlinegraphic> </para> @@ -594,7 +594,7 @@ The "Strikethrough" item. <!-- ##### MACRO GTK_STOCK_UNDELETE ##### --> <para> The "Undelete" item. -<inlinegraphic fileref="stock_undelete.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_undelete.png" format="PNG"></inlinegraphic> </para> @@ -602,7 +602,7 @@ The "Undelete" item. <!-- ##### MACRO GTK_STOCK_UNDERLINE ##### --> <para> The "Underline" item. -<inlinegraphic fileref="stock_text_underline.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_text_underline.png" format="PNG"></inlinegraphic> </para> @@ -610,7 +610,7 @@ The "Underline" item. <!-- ##### MACRO GTK_STOCK_UNDO ##### --> <para> The "Undo" item. -<inlinegraphic fileref="stock_undo.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_undo.png" format="PNG"></inlinegraphic> </para> @@ -618,7 +618,7 @@ The "Undo" item. <!-- ##### MACRO GTK_STOCK_YES ##### --> <para> The "Yes" item. -<inlinegraphic fileref="stock_button_yes.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_button_yes.png" format="PNG"></inlinegraphic> </para> @@ -626,7 +626,7 @@ The "Yes" item. <!-- ##### MACRO GTK_STOCK_ZOOM_100 ##### --> <para> The "Zoom 100%" item. -<inlinegraphic fileref="stock_zoom_1.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_zoom_1.png" format="PNG"></inlinegraphic> </para> @@ -634,7 +634,7 @@ The "Zoom 100%" item. <!-- ##### MACRO GTK_STOCK_ZOOM_FIT ##### --> <para> The "Zoom to Fit" item. -<inlinegraphic fileref="stock_zoom_fit.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_zoom_fit.png" format="PNG"></inlinegraphic> </para> @@ -642,7 +642,7 @@ The "Zoom to Fit" item. <!-- ##### MACRO GTK_STOCK_ZOOM_IN ##### --> <para> The "Zoom In" item. -<inlinegraphic fileref="stock_zoom_in.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_zoom_in.png" format="PNG"></inlinegraphic> </para> @@ -650,7 +650,7 @@ The "Zoom In" item. <!-- ##### MACRO GTK_STOCK_ZOOM_OUT ##### --> <para> The "Zoom Out" item. -<inlinegraphic fileref="stock_zoom_out.png" format="png"></inlinegraphic> +<inlinegraphic fileref="stock_zoom_out.png" format="PNG"></inlinegraphic> </para> diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index ba9a97df5..57ef0d0b4 100644 --- a/docs/reference/gtk/tmpl/gtktable.sgml +++ b/docs/reference/gtk/tmpl/gtktable.sgml @@ -253,27 +253,27 @@ to %FALSE if this is not your desired behaviour. <!-- ##### ARG GtkTable:n-rows ##### --> <para> -Sets or retrieves the number of rows in a table. + </para> <!-- ##### ARG GtkTable:n-columns ##### --> <para> -Sets or retrieves the number of columns in a table. + </para> <!-- ##### ARG GtkTable:column-spacing ##### --> <para> -Sets or retrieves the number of pixels of space between columns. + </para> <!-- ##### ARG GtkTable:row-spacing ##### --> <para> -Sets or retrieves the number of pixels of space between rows. + </para> <!-- ##### ARG GtkTable:homogeneous ##### --> <para> -Whether each cell in the table should be the same size or not. + </para> <!-- ##### ARG GtkTable:left-attach ##### --> diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index e4b9f1897..c3aebfa08 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -200,121 +200,112 @@ modified directly. <!-- ##### ARG GtkTextTag:name ##### --> <para> -Name of the tag, or %NULL for anonymous tags. Can only be set -when the tag is created. + </para> <!-- ##### ARG GtkTextTag:background ##### --> <para> -Background color, as a string such as "red" or "#FFFFFF" + </para> <!-- ##### ARG GtkTextTag:foreground ##### --> <para> -Foreground color as a string such as "red" or "#FFFFFF". + </para> <!-- ##### ARG GtkTextTag:background-gdk ##### --> <para> -Background color, as a #GdkColor. The color need not be allocated. + </para> <!-- ##### ARG GtkTextTag:foreground-gdk ##### --> <para> -Foreground color as a #GdkColor. The color need not be allocated. + </para> <!-- ##### ARG GtkTextTag:background-stipple ##### --> <para> -A #GdkBitmap to use for stippling the background color. + </para> <!-- ##### ARG GtkTextTag:foreground-stipple ##### --> <para> -A #GdkBitmap to use as a stipple pattern for the foreground. + </para> <!-- ##### ARG GtkTextTag:font ##### --> <para> -Font as a Pango font name, e.g. "Sans Italic 12" + </para> <!-- ##### ARG GtkTextTag:font-desc ##### --> <para> -Font as a #PangoFontDescription. + </para> <!-- ##### ARG GtkTextTag:family ##### --> <para> -Font family as a string. + </para> <!-- ##### ARG GtkTextTag:style ##### --> <para> -Font style as a #PangoStyle, e.g. #PANGO_STYLE_ITALIC. + </para> <!-- ##### ARG GtkTextTag:variant ##### --> <para> -Font variant as a #PangoVariant, e.g. #PANGO_VARIANT_SMALL_CAPS. + </para> <!-- ##### ARG GtkTextTag:weight ##### --> <para> -Font weight as an integer, see predefined values in #PangoWeight; -for example, #PANGO_WEIGHT_BOLD. + </para> <!-- ##### ARG GtkTextTag:stretch ##### --> <para> -Font stretch as a #PangoStretch, e.g. #PANGO_STRETCH_CONDENSED. + </para> <!-- ##### ARG GtkTextTag:size ##### --> <para> -Font size as an integer in Pango units, as for -pango_font_description_set_size(). Using the "scale" property is -usually better. + </para> <!-- ##### ARG GtkTextTag:size-points ##### --> <para> -Font size as a double, in points. Using the "scale" property is -usually better. + </para> <!-- ##### ARG GtkTextTag:scale ##### --> <para> -Font size as a scale factor relative to the default font size. -This properly adapts to theme changes etc. so is recommended. -Pango predefines some scales such as #PANGO_SCALE_X_LARGE. + </para> <!-- ##### ARG GtkTextTag:pixels-above-lines ##### --> <para> -Pixels of blank space to leave above each newline-terminated line. + </para> <!-- ##### ARG GtkTextTag:pixels-below-lines ##### --> <para> -Pixels of blank space to leave below each newline-terminated line. + </para> <!-- ##### ARG GtkTextTag:pixels-inside-wrap ##### --> <para> -Pixels of blank space to leave between wrapped lines inside the same -newline-terminated line (paragraph). + </para> <!-- ##### ARG GtkTextTag:editable ##### --> <para> -Whether the user can modify the tagged text. + </para> <!-- ##### ARG GtkTextTag:wrap-mode ##### --> <para> -A #GtkWrapMode value. Only used if the tag applies to the first -character in a paragraph. + </para> <!-- ##### ARG GtkTextTag:justification ##### --> @@ -324,75 +315,67 @@ character in a paragraph. <!-- ##### ARG GtkTextTag:direction ##### --> <para> -The #GtkTextDirection for the tagged text. + </para> <!-- ##### ARG GtkTextTag:left-margin ##### --> <para> -Pixel width of left margin of the text. + </para> <!-- ##### ARG GtkTextTag:indent ##### --> <para> -Pixel size of paragraph indentation; may be negative. + </para> <!-- ##### ARG GtkTextTag:strikethrough ##### --> <para> -%TRUE to draw a line through the text. + </para> <!-- ##### ARG GtkTextTag:right-margin ##### --> <para> -Pixel width of right margin. + </para> <!-- ##### ARG GtkTextTag:underline ##### --> <para> -A #PangoUnderline value. + </para> <!-- ##### ARG GtkTextTag:rise ##### --> <para> -Used for superscript or subscript; value is given in pixels. -Negative rise means subscript. + </para> <!-- ##### ARG GtkTextTag:background-full-height ##### --> <para> -Whether to make the background color for each character the height of -the highest font used on the current line, or the height of the font -used for the current character. + </para> <!-- ##### ARG GtkTextTag:language ##### --> <para> -The language this text is in, as an ISO code. Pango can use this as a -hint when rendering the text. If you don't understand this argument, -you probably don't need it. + </para> <!-- ##### ARG GtkTextTag:tabs ##### --> <para> -A #PangoTabArray indicating tabs for this text. Only used if the tag -applies to the first character in a paragraph. + </para> <!-- ##### ARG GtkTextTag:invisible ##### --> <para> -Not implemented in GTK 2.0. Would make text disappear. + </para> <!-- ##### ARG GtkTextTag:background-set ##### --> <para> -If %TRUE, honor the background property. Automatically toggled -on when setting the background property. + </para> <!-- ##### ARG GtkTextTag:foreground-set ##### --> <para> -If %TRUE, honor the foreground property. Automatically toggled -on when setting the foreground property. + </para> <!-- ##### ARG GtkTextTag:background-stipple-set ##### --> diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml index ae72f3a42..11cf05170 100644 --- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml +++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml @@ -189,7 +189,7 @@ Should be connected if you wish to perform an action whenever the <!-- ##### ARG GtkToggleButton:active ##### --> <para> -Sets whether the toggle button should be pressed in or not. + </para> <!-- ##### ARG GtkToggleButton:inconsistent ##### --> @@ -199,7 +199,6 @@ Sets whether the toggle button should be pressed in or not. <!-- ##### ARG GtkToggleButton:draw-indicator ##### --> <para> -A value of %TRUE causes the toggle button to be invisible. %FALSE displays it. -again. + </para> diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 9ebf2d6d8..c6cbbe373 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -386,17 +386,17 @@ Should be used if you wish to perform an action when ever the style of a toolbar </para> -<!-- ##### ARG GtkToolbar:shadow-type ##### --> +<!-- ##### ARG GtkToolbar:button-relief ##### --> <para> </para> -<!-- ##### ARG GtkToolbar:space-style ##### --> +<!-- ##### ARG GtkToolbar:space-size ##### --> <para> </para> -<!-- ##### ARG GtkToolbar:button-relief ##### --> +<!-- ##### ARG GtkToolbar:space-style ##### --> <para> </para> @@ -406,7 +406,7 @@ Should be used if you wish to perform an action when ever the style of a toolbar </para> -<!-- ##### ARG GtkToolbar:space-size ##### --> +<!-- ##### ARG GtkToolbar:shadow-type ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index b8d73fe9c..e43538a1d 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -901,7 +901,7 @@ Function used for #gtk_tree_view_map_expanded_rows. </para> -<!-- ##### ARG GtkTreeView:expander-size ##### --> +<!-- ##### ARG GtkTreeView:allow-rules ##### --> <para> </para> @@ -911,7 +911,7 @@ Function used for #gtk_tree_view_map_expanded_rows. </para> -<!-- ##### ARG GtkTreeView:allow-rules ##### --> +<!-- ##### ARG GtkTreeView:expander-size ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 0aca15d44..7fc099e49 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1328,6 +1328,8 @@ This function is not useful for applications. @klass: @property_name: @Returns: +<!-- # Unused Parameters # --> +@class: <!-- ##### FUNCTION gtk_widget_class_list_style_properties ##### --> @@ -1338,6 +1340,8 @@ This function is not useful for applications. @klass: @n_properties: @Returns: +<!-- # Unused Parameters # --> +@class: <!-- ##### FUNCTION gtk_widget_region_intersect ##### --> @@ -2183,37 +2187,37 @@ a widget changes from un-anchored to anchored or vice-versa. </para> -<!-- ##### ARG GtkWidget:focus-line-pattern ##### --> +<!-- ##### ARG GtkWidget:secondary-cursor-color ##### --> <para> </para> -<!-- ##### ARG GtkWidget:interior-focus ##### --> +<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### --> <para> </para> -<!-- ##### ARG GtkWidget:focus-padding ##### --> +<!-- ##### ARG GtkWidget:focus-line-pattern ##### --> <para> </para> -<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### --> +<!-- ##### ARG GtkWidget:cursor-color ##### --> <para> </para> -<!-- ##### ARG GtkWidget:cursor-color ##### --> +<!-- ##### ARG GtkWidget:interior-focus ##### --> <para> </para> -<!-- ##### ARG GtkWidget:focus-line-width ##### --> +<!-- ##### ARG GtkWidget:focus-padding ##### --> <para> </para> -<!-- ##### ARG GtkWidget:secondary-cursor-color ##### --> +<!-- ##### ARG GtkWidget:focus-line-width ##### --> <para> </para> diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index d08070f08..ed2afd418 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -786,22 +786,22 @@ Deprecated alias for gtk_window_set_position(). <!-- ##### ARG GtkWindow:type ##### --> <para> -The type of the window. + </para> <!-- ##### ARG GtkWindow:title ##### --> <para> -The title of the window. + </para> <!-- ##### ARG GtkWindow:allow-shrink ##### --> <para> -If the window can be resized to a smaller size by the user. + </para> <!-- ##### ARG GtkWindow:allow-grow ##### --> <para> -If the window can be resized to a larger size by the user. + </para> <!-- ##### ARG GtkWindow:resizable ##### --> @@ -811,12 +811,12 @@ If the window can be resized to a larger size by the user. <!-- ##### ARG GtkWindow:modal ##### --> <para> -If the window is modal, i.e. it grabs all GTK+ events. + </para> <!-- ##### ARG GtkWindow:window-position ##### --> <para> -The position of the window. + </para> <!-- ##### ARG GtkWindow:default-width ##### --> diff --git a/docs/reference/gtk/tree_widget.sgml b/docs/reference/gtk/tree_widget.sgml index 47e351326..0f1f94758 100644 --- a/docs/reference/gtk/tree_widget.sgml +++ b/docs/reference/gtk/tree_widget.sgml @@ -81,7 +81,7 @@ GtkTreeStore *store = gtk_tree_store_new (N_COLUMNS, /* Total number of co G_TYPE_STRING, /* Book title */ G_TYPE_STRING, /* Author */ G_TYPE_BOOLEAN); /* Is checked out? */ -]]></programlisting</informalexample> +]]></programlisting></informalexample> <para> Adding data to the model is done using <link linkend="gtk_tree_store_set"> gtk_tree_store_set()</link> or <link linkend="gtk_list_store_set"> diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index 6b8a94f10..b9a06c75c 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -43,55 +43,55 @@ * Some useful ones are: * <itemizedlist> * <listitem><para> - * <inlinegraphic format="png" fileref="right_ptr.png"></inlinegraphic> #GDK_RIGHT_PTR (right-facing arrow) + * <inlinegraphic format="PNG" fileref="right_ptr.png"></inlinegraphic> #GDK_RIGHT_PTR (right-facing arrow) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="crosshair.png"></inlinegraphic> #GDK_CROSSHAIR (crosshair) + * <inlinegraphic format="PNG" fileref="crosshair.png"></inlinegraphic> #GDK_CROSSHAIR (crosshair) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="xterm.png"></inlinegraphic> #GDK_XTERM (I-beam) + * <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic> #GDK_XTERM (I-beam) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="watch.png"></inlinegraphic> #GDK_WATCH (busy) + * <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic> #GDK_WATCH (busy) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="fleur.png"></inlinegraphic> #GDK_FLEUR (for moving objects) + * <inlinegraphic format="PNG" fileref="fleur.png"></inlinegraphic> #GDK_FLEUR (for moving objects) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="hand1.png"></inlinegraphic> #GDK_HAND1 (a right-pointing hand) + * <inlinegraphic format="PNG" fileref="hand1.png"></inlinegraphic> #GDK_HAND1 (a right-pointing hand) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="hand2.png"></inlinegraphic> #GDK_HAND2 (a left-pointing hand) + * <inlinegraphic format="PNG" fileref="hand2.png"></inlinegraphic> #GDK_HAND2 (a left-pointing hand) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="left_side.png"></inlinegraphic> #GDK_LEFT_SIDE (resize left side) + * <inlinegraphic format="PNG" fileref="left_side.png"></inlinegraphic> #GDK_LEFT_SIDE (resize left side) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="right_side.png"></inlinegraphic> #GDK_RIGHT_SIDE (resize right side) + * <inlinegraphic format="PNG" fileref="right_side.png"></inlinegraphic> #GDK_RIGHT_SIDE (resize right side) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="top_left_corner.png"></inlinegraphic> #GDK_TOP_LEFT_CORNER (resize northwest corner) + * <inlinegraphic format="PNG" fileref="top_left_corner.png"></inlinegraphic> #GDK_TOP_LEFT_CORNER (resize northwest corner) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="top_right_corner.png"></inlinegraphic> #GDK_TOP_RIGHT_CORNER (resize northeast corner) + * <inlinegraphic format="PNG" fileref="top_right_corner.png"></inlinegraphic> #GDK_TOP_RIGHT_CORNER (resize northeast corner) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="bottom_left_corner.png"></inlinegraphic> #GDK_BOTTOM_LEFT_CORNER (resize southwest corner) + * <inlinegraphic format="PNG" fileref="bottom_left_corner.png"></inlinegraphic> #GDK_BOTTOM_LEFT_CORNER (resize southwest corner) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="bottom_right_corner.png"></inlinegraphic> #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner) + * <inlinegraphic format="PNG" fileref="bottom_right_corner.png"></inlinegraphic> #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="top_side.png"></inlinegraphic> #GDK_TOP_SIDE (resize top side) + * <inlinegraphic format="PNG" fileref="top_side.png"></inlinegraphic> #GDK_TOP_SIDE (resize top side) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="bottom_side.png"></inlinegraphic> #GDK_BOTTOM_SIDE (resize bottom side) + * <inlinegraphic format="PNG" fileref="bottom_side.png"></inlinegraphic> #GDK_BOTTOM_SIDE (resize bottom side) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="sb_h_double_arrow.png"></inlinegraphic> #GDK_SB_H_DOUBLE_ARROW (move vertical splitter) + * <inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"></inlinegraphic> #GDK_SB_H_DOUBLE_ARROW (move vertical splitter) * </para></listitem> * <listitem><para> - * <inlinegraphic format="png" fileref="sb_v_double_arrow.png"></inlinegraphic> #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter) + * <inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"></inlinegraphic> #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter) * </para></listitem> * </itemizedlist> * diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 91b398483..70c85e94b 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -372,8 +372,8 @@ gtk_rc_get_theme_dir (void) * * Returns a directory in which GTK+ looks for theme engines. * For full information about the search for theme engines, - * see the docs for <envvar>GTK_PATH</envvar> in - * <xref linkend="gtk-running">. + * see the docs for <envar>GTK_PATH</envar> in + * <xref linkend="gtk-running"/>. * * return value: the directory. (Must be freed with g_free()) **/ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 38750d5bf..78822c462 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2724,8 +2724,8 @@ gtk_window_get_size (GtkWindow *window, * gdk_screen_height () - window_height)</literal>. * * The extended window manager hints specification at <ulink - * url="http://www.freedesktop.org/standards/wm-spec.html" - * >http://www.freedesktop.org/standards/wm-spec.html</ulink> has a + * url="http://www.freedesktop.org/standards/wm-spec.html"> + * http://www.freedesktop.org/standards/wm-spec.html</ulink> has a * nice table of gravities in the "implementation notes" section. * * The gtk_window_get_position() documentation may also be relevant. @@ -3205,6 +3205,7 @@ gtk_window_unmap (GtkWidget *widget) { GtkWindow *window = GTK_WINDOW (widget); GtkWindowGeometryInfo *info; + GdkWindowState state; GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); if (window->frame) @@ -3227,6 +3228,11 @@ gtk_window_unmap (GtkWidget *widget) info->initial_pos_set = FALSE; info->position_constraints_changed = FALSE; } + + state = gdk_window_get_state (widget->window); + window->iconify_initially = state & GDK_WINDOW_STATE_ICONIFIED; + window->maximize_initially = state & GDK_WINDOW_STATE_MAXIMIZED; + window->stick_initially = state & GDK_WINDOW_STATE_STICKY; } static void |