diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 664c4a86d5..a5c3045099 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,21 @@ +2002-06-03 Matthias Clasen + + * gtk/tmpl/gtkprogress.sgml: + * gtk/tmpl/gtkscale.sgml: + * gtk/tmpl/gtktreemodel.sgml: + * gtk/tmpl/gtkimage.sgml: + * gtk/tmpl/gtksignal.sgml: + * gtk/tmpl/gtkrc.sgml: + * gtk/gtk-docs.sgml: + * gdk/gdk-docs.sgml: + * gdk/tmpl/threads.sgml: + * gdk/tmpl/cursors.sgml: + * gdk/tmpl/rgb.sgml: Replace homegrown "nbsp", "hash" and + "percent" entities by standard ISO entities "nbsp", "num" and + "percnt". + + * gtk/text_widget.sgml: Fix a link. + 2002-05-30 Matthias Clasen Make stock icons appear again (patch by Gediminas Paulauskas): diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index 8537130e47..1499802114 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -1,7 +1,6 @@ diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml index 4a3fe375b6..2bbb0c39d7 100644 --- a/docs/reference/gdk/tmpl/cursors.sgml +++ b/docs/reference/gdk/tmpl/cursors.sgml @@ -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. */ -&hash;define cursor1_width 16 -&hash;define cursor1_height 16 +#define cursor1_width 16 +#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/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index 1ed2c045ab..4670cd4a9d 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. -&hash;include <gtk/gtk.h> +#include <gtk/gtk.h> -&hash;define IMAGE_WIDTH 256 -&hash;define IMAGE_HEIGHT 256 +#define IMAGE_WIDTH 256 +#define IMAGE_HEIGHT 256 guchar rgbbuf[IMAGE_WIDTH * IMAGE_HEIGHT * 3]; diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml index 017749677b..f4cbfefdc5 100644 --- a/docs/reference/gdk/tmpl/threads.sgml +++ b/docs/reference/gdk/tmpl/threads.sgml @@ -104,16 +104,16 @@ illustrate how to use threads within GTK+ programs. * */ -&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> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <time.h> +#include <gtk/gtk.h> +#include <glib.h> +#include <pthread.h> -&hash;define YES_IT_IS (1) -&hash;define NO_IT_IS_NOT (0) +#define YES_IT_IS (1) +#define NO_IT_IS_NOT (0) typedef struct { diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 8e99570d4d..dd66214ccb 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -1,8 +1,6 @@ - diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index bb33940a8e..77551f0ebe 100644 --- a/docs/reference/gtk/text_widget.sgml +++ b/docs/reference/gtk/text_widget.sgml @@ -162,7 +162,7 @@ font and foreground color — use standard functions such as gtk_widget_modify_font() or -gtk_widget_modify_text(). +gtk_widget_modify_text(). For other attributes there are dedicated methods on GtkTextView such as gtk_text_view_set_tabs(). diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml index cb473615cf..68eb6ea3a1 100644 --- a/docs/reference/gtk/tmpl/gtkimage.sgml +++ b/docs/reference/gtk/tmpl/gtkimage.sgml @@ -45,7 +45,7 @@ on the image, such as button clicks, place the image inside a GdkEventButton *event, gpointer data) { - g_print ("Event box clicked at coordinates &percent;d,&percent;d\n", + g_print ("Event box clicked at coordinates %d,%d\n", event->x, event->y); /* Returning TRUE means we handled the event, so the signal diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml index c4a7488fcf..f6652bfd38 100644 --- a/docs/reference/gtk/tmpl/gtkprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkprogress.sgml @@ -53,22 +53,22 @@ current progress. The string can contain the following substitution characters: -&percent;v - the current progress value. +%v - the current progress value. -&percent;l - the lower bound for the progress value. +%l - the lower bound for the progress value. -&percent;u - the upper bound for the progress value. +%u - the upper bound for the progress value. -&percent;p - the current progress percentage. +%p - the current progress percentage. diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index cd0fb1e59e..7125ed739f 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -371,9 +371,9 @@ 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), -in one of the hexadecimal forms &hash;rrrrggggbbbb, -&hash;rrrgggbbb, &hash;rrggbb, -or &hash;rgb, where r, +in one of the hexadecimal forms #rrrrggggbbbb, +#rrrgggbbb, #rrggbb, +or #rgb, where r, g and b are hex digits, or they can be specified as a triplet { r, g, diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index bca98aacb2..8935f1164b 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -121,7 +121,7 @@ static gchar* format_value_callback (GtkScale *scale, gdouble value) { - return g_strdup_printf ("-->&percent;0.*g<--", + return g_strdup_printf ("-->%0.*g<--", gtk_scale_get_digits (scale), value); } diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index 67ecd70b08..744c9c3783 100644 --- a/docs/reference/gtk/tmpl/gtksignal.sgml +++ b/docs/reference/gtk/tmpl/gtksignal.sgml @@ -450,7 +450,7 @@ as parameter to your function: static void button_clicked_int (GtkButton* button, gpointer func_data) { - g_print ("button pressed: &percent;d\n", GPOINTER_TO_INT (func_data)); + g_print ("button pressed: %d\n", GPOINTER_TO_INT (func_data)); } /* By calling this function, you will make the g_print above diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index ebc39533cf..6fc6e39c1d 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -177,7 +177,7 @@ enum -1); /* Do something with the data */ - g_print ("Row &percent;d: (&percent;s,&percent;d)\n", row_count, str_data, int_data); + g_print ("Row %d: (%s,%d)\n", row_count, str_data, int_data); g_free (str_data); row_count ++;