From 47ebb9739af03b8ec8e2677fd3249303838c6035 Mon Sep 17 00:00:00 2001 From: GMT 2002 Tony Gale Date: Sat, 7 Dec 2002 14:48:08 +0000 Subject: [PATCH] minor fixes Sat Dec 7 14:45:50 GMT 2002 Tony Gale * docs/tutorial/gtk-tut.sgml: minor fixes * examples/pixmap: don't use deprecated function --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/tutorial/gtk-tut.sgml | 18 +++++++++--------- examples/pixmap/Makefile | 12 +++++------- examples/pixmap/pixmap.c | 2 +- 9 files changed, 51 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index d18a82f1a..37201097f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 7 14:45:50 GMT 2002 Tony Gale + + * docs/tutorial/gtk-tut.sgml: minor fixes + + * examples/pixmap: don't use deprecated function + Fri Dec 6 19:00:59 2002 Owen Taylor * demos/gtk-demo/testview.c tests/testgtk.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d18a82f1a..37201097f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Dec 7 14:45:50 GMT 2002 Tony Gale + + * docs/tutorial/gtk-tut.sgml: minor fixes + + * examples/pixmap: don't use deprecated function + Fri Dec 6 19:00:59 2002 Owen Taylor * demos/gtk-demo/testview.c tests/testgtk.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d18a82f1a..37201097f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Dec 7 14:45:50 GMT 2002 Tony Gale + + * docs/tutorial/gtk-tut.sgml: minor fixes + + * examples/pixmap: don't use deprecated function + Fri Dec 6 19:00:59 2002 Owen Taylor * demos/gtk-demo/testview.c tests/testgtk.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d18a82f1a..37201097f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Dec 7 14:45:50 GMT 2002 Tony Gale + + * docs/tutorial/gtk-tut.sgml: minor fixes + + * examples/pixmap: don't use deprecated function + Fri Dec 6 19:00:59 2002 Owen Taylor * demos/gtk-demo/testview.c tests/testgtk.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d18a82f1a..37201097f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Dec 7 14:45:50 GMT 2002 Tony Gale + + * docs/tutorial/gtk-tut.sgml: minor fixes + + * examples/pixmap: don't use deprecated function + Fri Dec 6 19:00:59 2002 Owen Taylor * demos/gtk-demo/testview.c tests/testgtk.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d18a82f1a..37201097f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Dec 7 14:45:50 GMT 2002 Tony Gale + + * docs/tutorial/gtk-tut.sgml: minor fixes + + * examples/pixmap: don't use deprecated function + Fri Dec 6 19:00:59 2002 Owen Taylor * demos/gtk-demo/testview.c tests/testgtk.c diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml index 6b0fee39b..1e5a5d2a8 100755 --- a/docs/tutorial/gtk-tut.sgml +++ b/docs/tutorial/gtk-tut.sgml @@ -5,7 +5,7 @@ - October 27, 2002 + December 7, 2002 GTK+ 2.0 Tutorial @@ -34,13 +34,13 @@ A copy of this tutorial in SGML and HTML is distributed with each source code release of GTK+. For binary distributions, please check with -you vendor. +your vendor. A copy is available online for reference at http://www.gtk.org/tutorial. +url="http://www.gtk.org/tutorial/">http://www.gtk.org/tutorial. A packaged verion of this tutorial is available from - + ftp://ftp.gtk.org/pub/gtk/tutorial which contains the tutorial in various different formats. This package is primary for those people wanting to have the tutorial @@ -1307,7 +1307,7 @@ it. Compile it yourself and play with it. Packing Demonstration Program - +/* example-start packbox packbox.c */ #include <stdio.h> #include <stdlib.h> @@ -8806,7 +8806,7 @@ static GtkItemFactoryEntry entries[] = { { "/File/tear1", NULL, NULL, 0, "<Tearoff>" }, { "/File/_New", "<CTRL>N", new_file, 1, "<Item>" }, { "/File/_Open...", "<CTRL>O", open_file, 1, "<Item>" }, - { "/File/sep1", NULL, NULL, 0, "<Seperator>" }, + { "/File/sep1", NULL, NULL, 0, "<Separator>" }, { "/File/_Quit", "<CTRL>Q", quit_program, 0, "<Item>"} }; @@ -8927,10 +8927,10 @@ section. Here is an example using the GTK item factory. -/* example-start menu itemfactory.c */ + -#include &lt;gtk/gtk.h&gt; -#include &lt;strings.h&gt; +#include <gtk/gtk.h> +#include <strings.h> /* Obligatory basic callback */ static void print_hello( GtkWidget *w, diff --git a/examples/pixmap/Makefile b/examples/pixmap/Makefile index 34c625ed6..3df817098 100644 --- a/examples/pixmap/Makefile +++ b/examples/pixmap/Makefile @@ -1,13 +1,11 @@ CC = gcc -#CFLAGS = -Wall \ -# -DG_DISABLE_DEPRECATED \ -# -DGDK_DISABLE_DEPRECATED \ -# -DGDK_PIXBUF_DISABLE_DEPRECATED \ -# -DGTK_DISABLE_DEPRECATED - -CFLAGS = +CFLAGS = -Wall \ + -DG_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED pixmap: pixmap.c $(CC) pixmap.c -o pixmap $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs` diff --git a/examples/pixmap/pixmap.c b/examples/pixmap/pixmap.c index 7707a64ce..af6a29024 100644 --- a/examples/pixmap/pixmap.c +++ b/examples/pixmap/pixmap.c @@ -69,7 +69,7 @@ int main( int argc, (gchar **)xpm_data); /* a pixmap widget to contain the pixmap */ - pixmapwid = gtk_pixmap_new (pixmap, mask); + pixmapwid = gtk_image_new_from_pixmap (pixmap, mask); gtk_widget_show (pixmapwid); /* a button to contain the pixmap widget */ -- 2.43.2