From 2aaf3c0e197e6c3fe0ece207fd79124f8c8b71d1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 May 2002 22:23:55 +0000 Subject: [PATCH] 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. --- ChangeLog | 9 + ChangeLog.pre-2-10 | 9 + ChangeLog.pre-2-2 | 9 + ChangeLog.pre-2-4 | 9 + ChangeLog.pre-2-6 | 9 + ChangeLog.pre-2-8 | 9 + docs/reference/ChangeLog | 11 + docs/reference/gdk-pixbuf/Makefile.am | 2 +- docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 47 +-- docs/reference/gdk-pixbuf/tmpl/animation.sgml | 2 +- .../reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 2 +- docs/reference/gdk/Makefile.am | 2 +- docs/reference/gdk/gdk-docs.sgml | 62 ++-- docs/reference/gdk/multihead.sgml | 2 +- docs/reference/gdk/tmpl/cursors.sgml | 158 ++++----- docs/reference/gdk/tmpl/fonts.sgml | 4 +- docs/reference/gdk/tmpl/gdk-unused.sgml | 8 + docs/reference/gdk/tmpl/input.sgml | 4 +- docs/reference/gdk/tmpl/rgb.sgml | 10 +- docs/reference/gdk/tmpl/threads.sgml | 94 +++--- docs/reference/gdk/tmpl/visuals.sgml | 8 +- docs/reference/gtk/Makefile.am | 2 +- docs/reference/gtk/building.sgml | 7 +- docs/reference/gtk/gtk-docs.sgml | 317 +++++++++--------- docs/reference/gtk/question_index.sgml | 6 +- docs/reference/gtk/text_widget.sgml | 2 +- docs/reference/gtk/tmpl/gtkaccellabel.sgml | 4 +- docs/reference/gtk/tmpl/gtkadjustment.sgml | 4 +- docs/reference/gtk/tmpl/gtkalignment.sgml | 13 +- docs/reference/gtk/tmpl/gtkarrow.sgml | 12 +- docs/reference/gtk/tmpl/gtkbbox.sgml | 20 +- docs/reference/gtk/tmpl/gtkbin.sgml | 4 +- docs/reference/gtk/tmpl/gtkbox.sgml | 18 +- docs/reference/gtk/tmpl/gtkbutton.sgml | 29 +- docs/reference/gtk/tmpl/gtkcalendar.sgml | 4 +- docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 10 +- docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 4 +- docs/reference/gtk/tmpl/gtkcolorseldlg.sgml | 4 +- docs/reference/gtk/tmpl/gtkcombo.sgml | 4 +- docs/reference/gtk/tmpl/gtkcontainer.sgml | 6 + docs/reference/gtk/tmpl/gtkctree.sgml | 24 +- docs/reference/gtk/tmpl/gtkcurve.sgml | 6 +- docs/reference/gtk/tmpl/gtkdialog.sgml | 4 +- docs/reference/gtk/tmpl/gtkeditable.sgml | 4 +- docs/reference/gtk/tmpl/gtkentry.sgml | 6 +- docs/reference/gtk/tmpl/gtkfilesel.sgml | 4 +- docs/reference/gtk/tmpl/gtkfixed.sgml | 8 +- docs/reference/gtk/tmpl/gtkhandlebox.sgml | 14 +- docs/reference/gtk/tmpl/gtklabel.sgml | 11 +- docs/reference/gtk/tmpl/gtklayout.sgml | 8 +- docs/reference/gtk/tmpl/gtkmenushell.sgml | 8 +- docs/reference/gtk/tmpl/gtkmisc.sgml | 12 +- docs/reference/gtk/tmpl/gtknotebook.sgml | 21 +- docs/reference/gtk/tmpl/gtkobject.sgml | 3 +- docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 10 +- docs/reference/gtk/tmpl/gtkpreview.sgml | 8 +- docs/reference/gtk/tmpl/gtkprogress.sgml | 8 +- docs/reference/gtk/tmpl/gtkprogressbar.sgml | 24 +- docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 2 +- docs/reference/gtk/tmpl/gtkrange.sgml | 30 +- docs/reference/gtk/tmpl/gtkrc.sgml | 6 +- docs/reference/gtk/tmpl/gtkscale.sgml | 14 +- docs/reference/gtk/tmpl/gtkscrollbar.sgml | 14 +- .../reference/gtk/tmpl/gtkscrolledwindow.sgml | 13 +- docs/reference/gtk/tmpl/gtksignal.sgml | 4 +- docs/reference/gtk/tmpl/gtksocket.sgml | 2 +- docs/reference/gtk/tmpl/gtkspinbutton.sgml | 24 +- docs/reference/gtk/tmpl/gtkstock.sgml | 140 ++++---- docs/reference/gtk/tmpl/gtktable.sgml | 10 +- docs/reference/gtk/tmpl/gtktexttag.sgml | 87 ++--- docs/reference/gtk/tmpl/gtktogglebutton.sgml | 5 +- docs/reference/gtk/tmpl/gtktoolbar.sgml | 30 +- docs/reference/gtk/tmpl/gtktreeview.sgml | 4 +- docs/reference/gtk/tmpl/gtkwidget.sgml | 34 +- docs/reference/gtk/tmpl/gtkwindow.sgml | 12 +- docs/reference/gtk/tree_widget.sgml | 2 +- gdk/x11/gdkcursor-x11.c | 34 +- gtk/gtkrc.c | 4 +- gtk/gtkwindow.c | 10 +- 79 files changed, 824 insertions(+), 780 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbc7ab4681..e0134d2a50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen + + * 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 [ merge from stable ] diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbc7ab4681..e0134d2a50 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen + + * 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 [ merge from stable ] diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bbc7ab4681..e0134d2a50 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen + + * 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 [ merge from stable ] diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bbc7ab4681..e0134d2a50 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen + + * 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 [ merge from stable ] diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bbc7ab4681..e0134d2a50 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen + + * 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 [ merge from stable ] diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbc7ab4681..e0134d2a50 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-05-28 Matthias Clasen + + * 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 [ merge from stable ] diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 2d4729fa9d..48b4f24dea 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,14 @@ +2002-05-29 Matthias Clasen + + * gtk/*, gdk/*, gdk-pixbuf/*: Create XML, not SGML. + +2002-05-28 Matthias Clasen + + * gtk/tmpl/*: Remove property documentation which comes from the + source now. + + * gtk/building.sgml: Remove traces of gxi. + 2002-05-05 Matthias Clasen * 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 d93f8dffa3..aa568b9840 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 21886a41c7..02b8b9c7a8 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml @@ -1,28 +1,29 @@ - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - -gdk-pixbuf"> -Imlib"> +gdk-pixbuf"> +Imlib"> ]> diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml index 4d79cb98d6..a795d09ea3 100644 --- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml @@ -5,7 +5,7 @@ Animations Animated images. - + 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 de46ffc55e..6607d72539 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. - + The GdkPixbuf structure contains information that describes an image in memory. diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index d875c5a76b..296bab9e3c 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 bbbc876190..8537130e47 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]> diff --git a/docs/reference/gdk/multihead.sgml b/docs/reference/gdk/multihead.sgml index b048d3f5ca..7368d8d21c 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 f811ea9b9f..4a3fe375b6 100644 --- a/docs/reference/gdk/tmpl/cursors.sgml +++ b/docs/reference/gdk/tmpl/cursors.sgml @@ -27,83 +27,83 @@ A GdkCursor structure represents a cursor. The standard cursors available. -@GDK_X_CURSOR: -@GDK_ARROW: -@GDK_BASED_ARROW_DOWN: -@GDK_BASED_ARROW_UP: -@GDK_BOAT: -@GDK_BOGOSITY: -@GDK_BOTTOM_LEFT_CORNER: -@GDK_BOTTOM_RIGHT_CORNER: -@GDK_BOTTOM_SIDE: -@GDK_BOTTOM_TEE: -@GDK_BOX_SPIRAL: -@GDK_CENTER_PTR: -@GDK_CIRCLE: -@GDK_CLOCK: -@GDK_COFFEE_MUG: -@GDK_CROSS: -@GDK_CROSS_REVERSE: -@GDK_CROSSHAIR: -@GDK_DIAMOND_CROSS: -@GDK_DOT: -@GDK_DOTBOX: -@GDK_DOUBLE_ARROW: -@GDK_DRAFT_LARGE: -@GDK_DRAFT_SMALL: -@GDK_DRAPED_BOX: -@GDK_EXCHANGE: -@GDK_FLEUR: -@GDK_GOBBLER: -@GDK_GUMBY: -@GDK_HAND1: -@GDK_HAND2: -@GDK_HEART: -@GDK_ICON: -@GDK_IRON_CROSS: -@GDK_LEFT_PTR: -@GDK_LEFT_SIDE: -@GDK_LEFT_TEE: -@GDK_LEFTBUTTON: -@GDK_LL_ANGLE: -@GDK_LR_ANGLE: -@GDK_MAN: -@GDK_MIDDLEBUTTON: -@GDK_MOUSE: -@GDK_PENCIL: -@GDK_PIRATE: -@GDK_PLUS: -@GDK_QUESTION_ARROW: -@GDK_RIGHT_PTR: -@GDK_RIGHT_SIDE: -@GDK_RIGHT_TEE: -@GDK_RIGHTBUTTON: -@GDK_RTL_LOGO: -@GDK_SAILBOAT: -@GDK_SB_DOWN_ARROW: -@GDK_SB_H_DOUBLE_ARROW: -@GDK_SB_LEFT_ARROW: -@GDK_SB_RIGHT_ARROW: -@GDK_SB_UP_ARROW: -@GDK_SB_V_DOUBLE_ARROW: -@GDK_SHUTTLE: -@GDK_SIZING: -@GDK_SPIDER: -@GDK_SPRAYCAN: -@GDK_STAR: -@GDK_TARGET: -@GDK_TCROSS: -@GDK_TOP_LEFT_ARROW: -@GDK_TOP_LEFT_CORNER: -@GDK_TOP_RIGHT_CORNER: -@GDK_TOP_SIDE: -@GDK_TOP_TEE: -@GDK_TREK: -@GDK_UL_ANGLE: -@GDK_UMBRELLA: -@GDK_UR_ANGLE: -@GDK_WATCH: -@GDK_XTERM: +@GDK_X_CURSOR: +@GDK_ARROW: +@GDK_BASED_ARROW_DOWN: +@GDK_BASED_ARROW_UP: +@GDK_BOAT: +@GDK_BOGOSITY: +@GDK_BOTTOM_LEFT_CORNER: +@GDK_BOTTOM_RIGHT_CORNER: +@GDK_BOTTOM_SIDE: +@GDK_BOTTOM_TEE: +@GDK_BOX_SPIRAL: +@GDK_CENTER_PTR: +@GDK_CIRCLE: +@GDK_CLOCK: +@GDK_COFFEE_MUG: +@GDK_CROSS: +@GDK_CROSS_REVERSE: +@GDK_CROSSHAIR: +@GDK_DIAMOND_CROSS: +@GDK_DOT: +@GDK_DOTBOX: +@GDK_DOUBLE_ARROW: +@GDK_DRAFT_LARGE: +@GDK_DRAFT_SMALL: +@GDK_DRAPED_BOX: +@GDK_EXCHANGE: +@GDK_FLEUR: +@GDK_GOBBLER: +@GDK_GUMBY: +@GDK_HAND1: +@GDK_HAND2: +@GDK_HEART: +@GDK_ICON: +@GDK_IRON_CROSS: +@GDK_LEFT_PTR: +@GDK_LEFT_SIDE: +@GDK_LEFT_TEE: +@GDK_LEFTBUTTON: +@GDK_LL_ANGLE: +@GDK_LR_ANGLE: +@GDK_MAN: +@GDK_MIDDLEBUTTON: +@GDK_MOUSE: +@GDK_PENCIL: +@GDK_PIRATE: +@GDK_PLUS: +@GDK_QUESTION_ARROW: +@GDK_RIGHT_PTR: +@GDK_RIGHT_SIDE: +@GDK_RIGHT_TEE: +@GDK_RIGHTBUTTON: +@GDK_RTL_LOGO: +@GDK_SAILBOAT: +@GDK_SB_DOWN_ARROW: +@GDK_SB_H_DOUBLE_ARROW: +@GDK_SB_LEFT_ARROW: +@GDK_SB_RIGHT_ARROW: +@GDK_SB_UP_ARROW: +@GDK_SB_V_DOUBLE_ARROW: +@GDK_SHUTTLE: +@GDK_SIZING: +@GDK_SPIDER: +@GDK_SPRAYCAN: +@GDK_STAR: +@GDK_TARGET: +@GDK_TCROSS: +@GDK_TOP_LEFT_ARROW: +@GDK_TOP_LEFT_CORNER: +@GDK_TOP_RIGHT_CORNER: +@GDK_TOP_SIDE: +@GDK_TOP_TEE: +@GDK_TREK: +@GDK_UL_ANGLE: +@GDK_UMBRELLA: +@GDK_UR_ANGLE: +@GDK_WATCH: +@GDK_XTERM: @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. /* 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 9604889a00..832ab862e9 100644 --- a/docs/reference/gdk/tmpl/fonts.sgml +++ b/docs/reference/gdk/tmpl/fonts.sgml @@ -30,8 +30,8 @@ full description: The fields in the XLFD are: - - + + diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index d6b6b6ae1e..137f7dc7b8 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. + + + + + +@screen: +@Returns: + diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml index 057b1c1c54..ae686c31d4 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 select system call. - - + + diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index ed9dc697e4..1ed2c045ab 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. A simple example program using GdkRGB. -#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 0297636f04..017749677b 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. A minimal main program for a threaded GTK+ application looks like: - + 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; } - + Callbacks require a bit of attention. Callbacks from GTK+ signals @@ -82,7 +82,7 @@ do. illustrate how to use threads within GTK+ programs. - + /*------------------------------------------------------------------------- * 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; } - + diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml index 00e4c75dd9..4eb2afde48 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); } @@ -93,7 +93,7 @@ pixel_from_rgb (GdkVisual *visual, red_mask is a contiguous sequence of red_prec bits starting at bit number red_shift. For example, - shows constructing a pixel value + 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 d2b8972eca..09056e00db 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 1aeef8aa2c..d315b0b887 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 for more information. + See for more information. @@ -335,7 +335,7 @@ How to compile GTK+ itself --enable-gtk-doc - --with-xinput=[no|gxi|xfree] + --with-xinput=[no|yes] --with-gdktarget=[x11|linux-fb|win32] @@ -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 --with-xinput=gxi - is supplied, support for an obsolete and unsupported - way of interacting with XInput is compiled.) diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 5667b90c0b..8e99570d4d 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -1,164 +1,163 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + ]> diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml index 599e38aca0..7180ea528f 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 gtk_image_new_from_file() If the file load fails, gtk_image_new_from_file() -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 gdk_pixbuf_new_from_file() directly then -See tree widget overview &mdash you +See tree widget overview — you should use the GtkTreeView 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 -See text widget overview &mdash you +See text widget overview — you should use the GtkTextView widget. Do not use the deprecated widget GtkText in newly-written code, it has a diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index ca015bcd51..bb33940a8e 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 GtkTextView, 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 GtkWidget functions such as gtk_widget_modify_font() diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index 91249a510c..e907572ef4 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. -The widget whose accelerators are to be shown by the #GtkAccelLabel. + diff --git a/docs/reference/gtk/tmpl/gtkadjustment.sgml b/docs/reference/gtk/tmpl/gtkadjustment.sgml index 7de75d3c3a..b038e3219e 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 The #GtkAdjustment-struct struct contains the following fields. - - + + diff --git a/docs/reference/gtk/tmpl/gtkalignment.sgml b/docs/reference/gtk/tmpl/gtkalignment.sgml index 39338e9bb0..24a6dbd750 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. -the horizontal alignment of the child widget, from 0 (left) to 1 (right). + -the vertical alignment of the child widget, from 0 (top) to 1 (bottom). + -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. + -the amount that the child widget expands vertically to fill up -unused space, from 0 to 1. The values are similar to @xscale. + diff --git a/docs/reference/gtk/tmpl/gtkarrow.sgml b/docs/reference/gtk/tmpl/gtkarrow.sgml index fc40e3dcc0..89e4b7d7c8 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.) - - + + @@ -78,12 +78,12 @@ Sets the direction and style of the #GtkArrow, @arrow. - -the arrow direction, one of #GtkArrowType. + + - -the arrow style, one of #GtkShadowType. + + diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml index ceec7a0916..07898918d5 100644 --- a/docs/reference/gtk/tmpl/gtkbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbbox.sgml @@ -162,16 +162,6 @@ box. - - - - - - - - - - @@ -182,3 +172,13 @@ box. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkbin.sgml b/docs/reference/gtk/tmpl/gtkbin.sgml index 5a64c10bd2..837202ba33 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.) - - + + diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml index 0e4a35b935..bfdad588d9 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.) - - + + @@ -146,8 +146,8 @@ and pack fields. should be considered read-only. They should never be directly set by an application.) - - + + @@ -371,15 +371,13 @@ in #GtkBoxChild-struct. - -the minimum amount of space to put between children. Refers to the -spacing field of #GtkBox-struct. + + - -how to allocate space for children, equally or variably. Refers to -the homogeneous field of #GtkBox-struct. + + diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index 7b448c1a06..87becea1c8 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. - -The text within the child #GtkLabel of the #GtkButton. Only useful if -there is actually a #GtkLabel inside of the #GtkButton. + + - -The #GtkReliefStyle as outlined in gtk_button_set_relief(). + + @@ -249,16 +248,6 @@ The #GtkReliefStyle as outlined in gtk_button_set_relief(). - - - - - - - - - - @@ -269,3 +258,13 @@ The #GtkReliefStyle as outlined in gtk_button_set_relief(). + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml index 333cf03aec..439a428331 100644 --- a/docs/reference/gtk/tmpl/gtkcalendar.sgml +++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml @@ -67,8 +67,8 @@ are 0-11) while selected_day is one-based - - + + diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 7b5e72c6ad..9f985152d9 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -66,13 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index f4839373ef..7fa5ba7478 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.) - - + + diff --git a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml index d089474325..3ef7f7a5c0 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.) - - + + diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index 59be2856f4..e503adbcab 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.) - - + + diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index de1877ace7..ec7ee41ed1 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: + +@class: @@ -363,6 +365,8 @@ Does the same as gtk_container_get_children(). @cclass: @property_id: @pspec: + +@class: @@ -373,6 +377,8 @@ Does the same as gtk_container_get_children(). @cclass: @n_properties: @Returns: + +@class: diff --git a/docs/reference/gtk/tmpl/gtkctree.sgml b/docs/reference/gtk/tmpl/gtkctree.sgml index 2a3b31d7d4..bfa5ba39e4 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. - - + + @@ -119,8 +119,8 @@ FIXME A value specifying the position of a new node relative to an old one. - - + + @@ -150,8 +150,8 @@ A value specifying the position of a new node relative to an old one. The appearance of the lines in the tree graphics. - - + + @@ -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. - - + + @@ -228,8 +228,8 @@ which expand or contract parts of the tree when pressed. How to expand or collapse a part of a tree. - - + + @@ -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. - - + + diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml index 8701b8517d..90602ed947 100644 --- a/docs/reference/gtk/tmpl/gtkcurve.sgml +++ b/docs/reference/gtk/tmpl/gtkcurve.sgml @@ -56,8 +56,8 @@ Creates a new #GtkCurve. -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. @@ -79,7 +79,7 @@ FIXME: Needs a more precise definition of gamma. -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(). diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index 6a113643a3..67d4957dd6 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -298,12 +298,12 @@ was clicked. - + - + diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml index 3f890d9e0b..e1016e97e2 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.) - - + + diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index a0990a19c9..f00dbb5685 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. -Determines the maximum allowed length of the contents -of the widget. See gtk_entry_set_max_length(). + -Determines whether the contents of the entry widget -are visible or not. See gtk_entry_set_visibility(). + diff --git a/docs/reference/gtk/tmpl/gtkfilesel.sgml b/docs/reference/gtk/tmpl/gtkfilesel.sgml index a68d98ebd8..278971fae3 100644 --- a/docs/reference/gtk/tmpl/gtkfilesel.sgml +++ b/docs/reference/gtk/tmpl/gtkfilesel.sgml @@ -88,8 +88,8 @@ void create_file_selection (void) { The #GtkFileSelection struct contains the following #GtkWidget fields: - - + + diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml index 814205aa1a..a4f686b0aa 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.) - - + + @@ -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.) - - + + diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml index 2b9f2ca664..95b81034b7 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.) - - + + @@ -179,7 +179,7 @@ handlebox are detached from the main window. -Determines the shadow type for the handlebox. + @@ -189,15 +189,11 @@ Determines the shadow type for the handlebox. -Determines the side of the handlebox where the handle is drawn. + -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(). + diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index 707e7d4fc2..7e3c795584 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: /* 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); @@ -54,7 +54,7 @@ gtk_label_set_mnemonic_widget(): /* 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); @@ -473,7 +473,7 @@ Gtk+ 1.0.x. -The actual label text. Do not write to this pointer, it is not copied. + @@ -493,13 +493,12 @@ The actual label text. Do not write to this pointer, it is not copied. -The #GtkJustification setting. See gtk_label_set_justify() for more info. + -The pattern of underlines under the existing text. Do not change the -pointer, it isn't copied. + diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml index 75de3755c5..599a4ae52f 100644 --- a/docs/reference/gtk/tmpl/gtklayout.sgml +++ b/docs/reference/gtk/tmpl/gtklayout.sgml @@ -153,22 +153,22 @@ area. -Horizontal scroll adjustment, see gtk_layout_set_hadjustment() + -Vertical scroll adjustment, see gtk_layout_set_vadjustment() + -Layout width, see gtk_layout_set_size() + -Layout height, see gtk_layout_set_size() + diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index bd5c539eb6..08e9490a48 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.) - - + + @@ -112,8 +112,8 @@ after the menu item is activated. An enumeration representing directional movements within a menu. - - + + diff --git a/docs/reference/gtk/tmpl/gtkmisc.sgml b/docs/reference/gtk/tmpl/gtkmisc.sgml index 7392ff8be1..1354d28ab3 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.) - - + + @@ -104,21 +104,21 @@ in pixels. -the horizontal alignment, from 0 (left) to 1 (right). + -the vertical alignment, from 0 (top) to 1 (bottom). + -the amount of space to add on the left and right of the widget, in pixels. + -the amount of space to add on the top and bottom of the widget, in pixels. + diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index b79951934e..963da3141a 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. -The edge at which the tabs for switching pages are drawn. + -Whether to show tabs for the notebook pages. + -Whether to draw a bevel around the noteobook. + -Whether the tab label area will have arrows for scrolling if there -are too many tabs to fit in the area. + -Whether the tab labels have a border on all sides. + -Whether the tab labels have a horizontal border. + -Whether the tab labels have a vertical border. + -The current page + -Whether the popup menu for switching pages is enabled. + -whether the tabs must have all the same size. + diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml index 1a948be38e..ade1ceb762 100644 --- a/docs/reference/gtk/tmpl/gtkobject.sgml +++ b/docs/reference/gtk/tmpl/gtkobject.sgml @@ -506,7 +506,6 @@ if all references are released. -A pointer for convenience when programming applications. -Deprecated. + diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 31debc57f8..876a046a5d 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -100,13 +100,13 @@ selected value for the option menu. - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml index a5ef9090fb..d657b82d66 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.) - - + + @@ -257,8 +257,6 @@ once used for changing the colormap and visual on the fly. -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(). + diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml index cd76381490..c4a7488fcf 100644 --- a/docs/reference/gtk/tmpl/gtkprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkprogress.sgml @@ -188,21 +188,21 @@ the #GtkProgress. -A boolean indicating whether activity mode is enabled. + -A boolean indicating whether the progress is shown as text. + -A number between 0.0 and 1.0 specifying the horizontal alignment. + -A number between 0.0 and 1.0 specifying the vertical alignment. + diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index 1441ce2963..9125f6bfa4 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. - - + + @@ -210,8 +210,8 @@ Sets the style of the #GtkProgressBar. The default style is An enumeration representing the styles for drawing the progress bar. - - + + @@ -284,8 +284,7 @@ gtk_progress_set_percentage() instead. -a #GtkProgressBarOrientation value which specifies the -orientation and growth direction of the bar. + @@ -295,29 +294,26 @@ orientation and growth direction of the bar. -a #GtkAdjustment to be used with the #GtkProgressBar. + -a #GtkProgressBarStyle value which specifies the -visual style of the bar in percentage mode. + -The increment used for each iteration in activity mode. + -The number of blocks which can fit in the progress bar -area in activity mode. + -The number of blocks which which make up progress bar -when it is shown in %GTK_PROGRESS_DISCRETE style. + diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml index 9d5781d747..fe0491dbc9 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 8f4f787e29..f6bd73f129 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -153,21 +153,6 @@ Emitted when the range value changes. - - - - - - - - - - - - - - - @@ -183,3 +168,18 @@ Emitted when the range value changes. + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 36b0dbf6d5..cd0fb1e59e 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -33,7 +33,7 @@ Additionally, the GTK_RC_FILES 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. - + 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 LANG is set to ja_JP.ujis, @@ -367,7 +367,7 @@ state of the widget. The states are: - + Colors can be specified as a string containing a color name (GTK+ knows all names from the X color database /usr/lib/X11/rgb.txt), @@ -794,7 +794,7 @@ otherwise %NULL. -@Returns: +@Returns: diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index b78bac4c5e..bca98aacb2 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.) - - + + @@ -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<--". 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); } @@ -135,17 +135,17 @@ format_value_callback (GtkScale *scale, -The number of decimal places that are displayed in the value. + -If the current value is displayed as a string next to the slider. + -The position in which the current value is displayed. + diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml index cc947c106e..48f51f9d57 100644 --- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml @@ -54,12 +54,7 @@ The #GtkScrollbar struct does not contain any public data. - - - - - - + @@ -69,7 +64,7 @@ The #GtkScrollbar struct does not contain any public data. - + @@ -84,3 +79,8 @@ The #GtkScrollbar struct does not contain any public data. + + + + + diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml index 350dce9cf0..ab6fd97a73 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. -Horizontal adjustment. See gtk_scrolled_window_set_hadjustment(), gtk_scrolled_window_get_hadjustment(). + -Vertical adjustment. See gtk_scrolled_window_set_vadjustment(), gtk_scrolled_window_get_vadjustment(). + -Horizontal scrollbar policy (show scrollbar always, never, or "when appropriate"). + -Vertical scrollbar policy (show scrollbar always, never, or "when appropriate"). + -Position of child window with respect to scrollbars; top left, top -right, bottom left, bottom right. + -Type of frame drawn around the child of the scrolled window. + diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index edb7b8b71c..67ecd70b08 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 - - + + GTK_UPDATE_ALWAYS @@ -127,8 +127,8 @@ and should only be modified using the functions below. - - + + GTK_SPIN_STEP_FORWARD, @@ -435,42 +435,42 @@ use gtk_spin_button_get_value() instead. -the #GtkAdjustment that defines a spin button's main properties. + -the amount a spin button changes when an arrow is clicked. + -the number of decimal places to display. + -whether erroneous values are automatically changed to a spin button's nearest step increment. + -whether non-numeric characters should be ignored. + -whether a spin button should wrap upon reaching its limits. + -how a spin button should be updated. + -reads the current value, or sets a new value. + diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index 2dea3f083c..3b4ae38ca3 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -98,7 +98,7 @@ no icon, and vice versa. The "Add" item. - + @@ -106,7 +106,7 @@ The "Add" item. The "Apply" item. - + @@ -114,7 +114,7 @@ The "Apply" item. The "Bold" item. - + @@ -122,7 +122,7 @@ The "Bold" item. The "Cancel" item. - + @@ -130,7 +130,7 @@ The "Cancel" item. The "CD-Rom" item. - + @@ -138,7 +138,7 @@ The "CD-Rom" item. The "Clear" item. - + @@ -146,7 +146,7 @@ The "Clear" item. The "Close" item. - + @@ -154,7 +154,7 @@ The "Close" item. The "Convert" item. - + @@ -162,7 +162,7 @@ The "Convert" item. The "Copy" item. - + @@ -170,7 +170,7 @@ The "Copy" item. The "Cut" item. - + @@ -178,7 +178,7 @@ The "Cut" item. The "Delete" item. - + @@ -186,7 +186,7 @@ The "Delete" item. The "Error" item. - + @@ -194,7 +194,7 @@ The "Error" item. The "Information" item. - + @@ -202,7 +202,7 @@ The "Information" item. The "Question" item. - + @@ -210,7 +210,7 @@ The "Question" item. The "Warning" item. - + @@ -218,7 +218,7 @@ The "Warning" item. The "Drag-And-Drop" icon. - + @@ -226,7 +226,7 @@ The "Drag-And-Drop" icon. The "Drag-And-Drop multiple" icon. - + @@ -234,7 +234,7 @@ The "Drag-And-Drop multiple" icon. The "Execute" item. - + @@ -242,7 +242,7 @@ The "Execute" item. The "Find" item. - + @@ -250,7 +250,7 @@ The "Find" item. The "Find and Replace" item. - + @@ -258,7 +258,7 @@ The "Find and Replace" item. The "Floppy" item. - + @@ -266,7 +266,7 @@ The "Floppy" item. The "Bottom" item. - + @@ -274,7 +274,7 @@ The "Bottom" item. The "First" item. - + @@ -282,7 +282,7 @@ The "First" item. The "Last" item. - + @@ -290,7 +290,7 @@ The "Last" item. The "Top" item. - + @@ -298,7 +298,7 @@ The "Top" item. The "Back" item. - + @@ -306,7 +306,7 @@ The "Back" item. The "Down" item. - + @@ -314,7 +314,7 @@ The "Down" item. The "Forward" item. - + @@ -322,7 +322,7 @@ The "Forward" item. The "Up" item. - + @@ -330,7 +330,7 @@ The "Up" item. The "Help" item. - + @@ -338,7 +338,7 @@ The "Help" item. The "Home" item. - + @@ -346,7 +346,7 @@ The "Home" item. The "Index" item. - + @@ -354,7 +354,7 @@ The "Index" item. The "Italic" item. - + @@ -362,7 +362,7 @@ The "Italic" item. The "Jump to" item. - + @@ -370,7 +370,7 @@ The "Jump to" item. The "Center" item. - + @@ -378,7 +378,7 @@ The "Center" item. The "Fill" item. - + @@ -386,7 +386,7 @@ The "Fill" item. The "Left" item. - + @@ -394,7 +394,7 @@ The "Left" item. The "Right" item. - + @@ -402,7 +402,7 @@ The "Right" item. The "Missing image" icon. - + @@ -410,7 +410,7 @@ The "Missing image" icon. The "New" item. - + @@ -418,7 +418,7 @@ The "New" item. The "No" item. - + @@ -426,7 +426,7 @@ The "No" item. The "OK" item. - + @@ -434,7 +434,7 @@ The "OK" item. The "Open" item. - + @@ -442,7 +442,7 @@ The "Open" item. The "Paste" item. - + @@ -450,7 +450,7 @@ The "Paste" item. The "Preferences" item. - + @@ -458,7 +458,7 @@ The "Preferences" item. The "Print" item. - + @@ -466,7 +466,7 @@ The "Print" item. The "Print Preview" item. - + @@ -474,7 +474,7 @@ The "Print Preview" item. The "Properties" item. - + @@ -482,7 +482,7 @@ The "Properties" item. The "Quit" item. - + @@ -490,7 +490,7 @@ The "Quit" item. The "Redo" item. - + @@ -498,7 +498,7 @@ The "Redo" item. The "Refresh" item. - + @@ -506,7 +506,7 @@ The "Refresh" item. The "Remove" item. - + @@ -514,7 +514,7 @@ The "Remove" item. The "Revert" item. - + @@ -522,7 +522,7 @@ The "Revert" item. The "Save" item. - + @@ -530,7 +530,7 @@ The "Save" item. The "Save As" item. - + @@ -538,7 +538,7 @@ The "Save As" item. The "Color" item. - + @@ -546,7 +546,7 @@ The "Color" item. The "Font" item. - + @@ -554,7 +554,7 @@ The "Font" item. The "Ascending" item. - + @@ -562,7 +562,7 @@ The "Ascending" item. The "Descending" item. - + @@ -570,7 +570,7 @@ The "Descending" item. The "Spell Check" item. - + @@ -578,7 +578,7 @@ The "Spell Check" item. The "Stop" item. - + @@ -586,7 +586,7 @@ The "Stop" item. The "Strikethrough" item. - + @@ -594,7 +594,7 @@ The "Strikethrough" item. The "Undelete" item. - + @@ -602,7 +602,7 @@ The "Undelete" item. The "Underline" item. - + @@ -610,7 +610,7 @@ The "Underline" item. The "Undo" item. - + @@ -618,7 +618,7 @@ The "Undo" item. The "Yes" item. - + @@ -626,7 +626,7 @@ The "Yes" item. The "Zoom 100%" item. - + @@ -634,7 +634,7 @@ The "Zoom 100%" item. The "Zoom to Fit" item. - + @@ -642,7 +642,7 @@ The "Zoom to Fit" item. The "Zoom In" item. - + @@ -650,7 +650,7 @@ The "Zoom In" item. The "Zoom Out" item. - + diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index ba9a97df55..57ef0d0b43 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. -Sets or retrieves the number of rows in a table. + -Sets or retrieves the number of columns in a table. + -Sets or retrieves the number of pixels of space between columns. + -Sets or retrieves the number of pixels of space between rows. + -Whether each cell in the table should be the same size or not. + diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index e4b9f1897f..c3aebfa08b 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -200,121 +200,112 @@ modified directly. -Name of the tag, or %NULL for anonymous tags. Can only be set -when the tag is created. + -Background color, as a string such as "red" or "#FFFFFF" + -Foreground color as a string such as "red" or "#FFFFFF". + -Background color, as a #GdkColor. The color need not be allocated. + -Foreground color as a #GdkColor. The color need not be allocated. + -A #GdkBitmap to use for stippling the background color. + -A #GdkBitmap to use as a stipple pattern for the foreground. + -Font as a Pango font name, e.g. "Sans Italic 12" + -Font as a #PangoFontDescription. + -Font family as a string. + -Font style as a #PangoStyle, e.g. #PANGO_STYLE_ITALIC. + -Font variant as a #PangoVariant, e.g. #PANGO_VARIANT_SMALL_CAPS. + -Font weight as an integer, see predefined values in #PangoWeight; -for example, #PANGO_WEIGHT_BOLD. + -Font stretch as a #PangoStretch, e.g. #PANGO_STRETCH_CONDENSED. + -Font size as an integer in Pango units, as for -pango_font_description_set_size(). Using the "scale" property is -usually better. + -Font size as a double, in points. Using the "scale" property is -usually better. + -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. + -Pixels of blank space to leave above each newline-terminated line. + -Pixels of blank space to leave below each newline-terminated line. + -Pixels of blank space to leave between wrapped lines inside the same -newline-terminated line (paragraph). + -Whether the user can modify the tagged text. + -A #GtkWrapMode value. Only used if the tag applies to the first -character in a paragraph. + @@ -324,75 +315,67 @@ character in a paragraph. -The #GtkTextDirection for the tagged text. + -Pixel width of left margin of the text. + -Pixel size of paragraph indentation; may be negative. + -%TRUE to draw a line through the text. + -Pixel width of right margin. + -A #PangoUnderline value. + -Used for superscript or subscript; value is given in pixels. -Negative rise means subscript. + -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. + -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. + -A #PangoTabArray indicating tabs for this text. Only used if the tag -applies to the first character in a paragraph. + -Not implemented in GTK 2.0. Would make text disappear. + -If %TRUE, honor the background property. Automatically toggled -on when setting the background property. + -If %TRUE, honor the foreground property. Automatically toggled -on when setting the foreground property. + diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml index ae72f3a42f..11cf051702 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 -Sets whether the toggle button should be pressed in or not. + @@ -199,7 +199,6 @@ Sets whether the toggle button should be pressed in or not. -A value of %TRUE causes the toggle button to be invisible. %FALSE displays it. -again. + diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 9ebf2d6d86..c6cbbe3734 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -386,28 +386,28 @@ Should be used if you wish to perform an action when ever the style of a toolbar - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index b8d73fe9c8..e43538a1db 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. - + @@ -911,7 +911,7 @@ Function used for #gtk_tree_view_map_expanded_rows. - + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 0aca15d440..7fc099e49b 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: + +@class: @@ -1338,6 +1340,8 @@ This function is not useful for applications. @klass: @n_properties: @Returns: + +@class: @@ -2183,11 +2187,26 @@ a widget changes from un-anchored to anchored or vice-versa. + + + + + + + + + + + + + + + @@ -2198,23 +2217,8 @@ a widget changes from un-anchored to anchored or vice-versa. - - - - - - - - - - - - - - - diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index d08070f080..ed2afd4188 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(). -The type of the window. + -The title of the window. + -If the window can be resized to a smaller size by the user. + -If the window can be resized to a larger size by the user. + @@ -811,12 +811,12 @@ If the window can be resized to a larger size by the user. -If the window is modal, i.e. it grabs all GTK+ events. + -The position of the window. + diff --git a/docs/reference/gtk/tree_widget.sgml b/docs/reference/gtk/tree_widget.sgml index 47e351326b..0f1f947581 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? */ -]]> +]]> Adding data to the model is done using gtk_tree_store_set() or diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index 6b8a94f105..b9a06c75c6 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -43,55 +43,55 @@ * Some useful ones are: * * - * #GDK_RIGHT_PTR (right-facing arrow) + * #GDK_RIGHT_PTR (right-facing arrow) * * - * #GDK_CROSSHAIR (crosshair) + * #GDK_CROSSHAIR (crosshair) * * - * #GDK_XTERM (I-beam) + * #GDK_XTERM (I-beam) * * - * #GDK_WATCH (busy) + * #GDK_WATCH (busy) * * - * #GDK_FLEUR (for moving objects) + * #GDK_FLEUR (for moving objects) * * - * #GDK_HAND1 (a right-pointing hand) + * #GDK_HAND1 (a right-pointing hand) * * - * #GDK_HAND2 (a left-pointing hand) + * #GDK_HAND2 (a left-pointing hand) * * - * #GDK_LEFT_SIDE (resize left side) + * #GDK_LEFT_SIDE (resize left side) * * - * #GDK_RIGHT_SIDE (resize right side) + * #GDK_RIGHT_SIDE (resize right side) * * - * #GDK_TOP_LEFT_CORNER (resize northwest corner) + * #GDK_TOP_LEFT_CORNER (resize northwest corner) * * - * #GDK_TOP_RIGHT_CORNER (resize northeast corner) + * #GDK_TOP_RIGHT_CORNER (resize northeast corner) * * - * #GDK_BOTTOM_LEFT_CORNER (resize southwest corner) + * #GDK_BOTTOM_LEFT_CORNER (resize southwest corner) * * - * #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner) + * #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner) * * - * #GDK_TOP_SIDE (resize top side) + * #GDK_TOP_SIDE (resize top side) * * - * #GDK_BOTTOM_SIDE (resize bottom side) + * #GDK_BOTTOM_SIDE (resize bottom side) * * - * #GDK_SB_H_DOUBLE_ARROW (move vertical splitter) + * #GDK_SB_H_DOUBLE_ARROW (move vertical splitter) * * - * #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter) + * #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter) * * * diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 91b398483d..70c85e94bb 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 GTK_PATH in - * . + * see the docs for GTK_PATH in + * . * * return value: the directory. (Must be freed with g_free()) **/ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 38750d5bfc..78822c462b 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2724,8 +2724,8 @@ gtk_window_get_size (GtkWindow *window, * gdk_screen_height () - window_height). * * The extended window manager hints specification at http://www.freedesktop.org/standards/wm-spec.html has a + * url="http://www.freedesktop.org/standards/wm-spec.html"> + * http://www.freedesktop.org/standards/wm-spec.html 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