minor fixes

Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>

        * docs/tutorial/gtk-tut.sgml: minor fixes

        * examples/pixmap: don't use deprecated function

9 files changed, 51 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index d18a82f1ac..37201097f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>
+
+	* docs/tutorial/gtk-tut.sgml: minor fixes
+
+	* examples/pixmap: don't use deprecated function
+
 Fri Dec  6 19:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/gtk-demo/testview.c tests/testgtk.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d18a82f1ac..37201097f5 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 <gale@gtk.org>
+
+	* docs/tutorial/gtk-tut.sgml: minor fixes
+
+	* examples/pixmap: don't use deprecated function
+
 Fri Dec  6 19:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/gtk-demo/testview.c tests/testgtk.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d18a82f1ac..37201097f5 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 <gale@gtk.org>
+
+	* docs/tutorial/gtk-tut.sgml: minor fixes
+
+	* examples/pixmap: don't use deprecated function
+
 Fri Dec  6 19:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/gtk-demo/testview.c tests/testgtk.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d18a82f1ac..37201097f5 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 <gale@gtk.org>
+
+	* docs/tutorial/gtk-tut.sgml: minor fixes
+
+	* examples/pixmap: don't use deprecated function
+
 Fri Dec  6 19:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/gtk-demo/testview.c tests/testgtk.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d18a82f1ac..37201097f5 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 <gale@gtk.org>
+
+	* docs/tutorial/gtk-tut.sgml: minor fixes
+
+	* examples/pixmap: don't use deprecated function
+
 Fri Dec  6 19:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/gtk-demo/testview.c tests/testgtk.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d18a82f1ac..37201097f5 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 <gale@gtk.org>
+
+	* docs/tutorial/gtk-tut.sgml: minor fixes
+
+	* examples/pixmap: don't use deprecated function
+
 Fri Dec  6 19:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/gtk-demo/testview.c tests/testgtk.c
diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index 6b0fee39b2..1e5a5d2a8c 100755
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -5,7 +5,7 @@
 <book id="gtk-tut">
 
 <bookinfo>
-    <date>October 27, 2002</date>
+    <date>December 7, 2002</date>
     <title>GTK+ 2.0 Tutorial</title>
     <authorgroup>
       <author>
@@ -34,13 +34,13 @@
 
 <para>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.</para>
+your vendor.</para>
 
 <para>A copy is available online for reference at <ulink 
-url="http://www.gtk.org/tutorial">http://www.gtk.org/tutorial</ulink>.</para>
+url="http://www.gtk.org/tutorial/">http://www.gtk.org/tutorial</ulink>.</para>
 
 <para>A packaged verion of this tutorial is available from
-<ulink url="ftp://ftp.gtk.org/pub/gtk/tutorial">
+<ulink url="ftp://ftp.gtk.org/pub/gtk/tutorial/">
 ftp://ftp.gtk.org/pub/gtk/tutorial</ulink> 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.</para>
 <title>Packing Demonstration Program</title>
 
 <programlisting role="C">
-<!-- example-start packbox packbox.c -->
+/* example-start packbox packbox.c */
 
 #include &lt;stdio.h&gt;
 #include &lt;stdlib.h&gt;
@@ -8806,7 +8806,7 @@ static GtkItemFactoryEntry entries[] = {
   { "/File/tear1",    NULL,      NULL,         0, "&lt;Tearoff&gt;" },
   { "/File/_New",     "&lt;CTRL&gt;N", new_file,     1, "&lt;Item&gt;" },
   { "/File/_Open...", "&lt;CTRL&gt;O", open_file,    1, "&lt;Item&gt;" },
-  { "/File/sep1",     NULL,      NULL,         0, "&lt;Seperator&gt;" },
+  { "/File/sep1",     NULL,      NULL,         0, "&lt;Separator&gt;" },
   { "/File/_Quit",    "&lt;CTRL&gt;Q", quit_program, 0, "&lt;Item&gt;"} };
 </programlisting>
 </sect3>
@@ -8927,10 +8927,10 @@ section.</para>
 <para>Here is an example using the GTK item factory.</para>
 
 <programlisting role="C">
-/* example-start menu itemfactory.c */
+<!-- example-start menu itemfactory.c -->
 
-#include &amp;lt;gtk/gtk.h&amp;gt;
-#include &amp;lt;strings.h&amp;gt;
+#include &lt;gtk/gtk.h&gt;
+#include &lt;strings.h&gt;
 
 /* Obligatory basic callback */
 static void print_hello( GtkWidget *w,
diff --git a/examples/pixmap/Makefile b/examples/pixmap/Makefile
index 34c625ed6d..3df817098d 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 7707a64ce3..af6a29024b 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 */