More work on #71430.

	* examples/*/Makefile (CFLAGS): add deprecation guards.

	* docs/tutorial/gtk-tut.sgml, examples/*/*.c: make most examples
	deprecation-clean; the major offenders right now are the examples
	that make heavy use of completely deprecated or broken widgets:
	list, tree, text, pixmap, paned and progressbar. These will have
	to be redone from scratch.

	* demos/Makefile.am (INCLUDES): add -DGDK_PIXBUF_DISABLE_DEPRECATED.

4 files changed, 40 insertions, 38 deletions

diff --git a/examples/tictactoe/Makefile b/examples/tictactoe/Makefile
index 5fe6eb3565..f9b2cb03e1 100644
--- a/examples/tictactoe/Makefile
+++ b/examples/tictactoe/Makefile
@@ -1,14 +1,20 @@
 
 CC = gcc
 
+CFLAGS = -Wall			 	\
+	-DG_DISABLE_DEPRECATED 	 	\
+	-DGDK_DISABLE_DEPRECATED 	\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED
+
 ttt_test: tictactoe.o ttt_test.o
 	$(CC) ttt_test.o tictactoe.o -o ttt_test `pkg-config --libs gtk+-2.0`
 
 ttt_test.o: ttt_test.c tictactoe.h
-	$(CC) `pkg-config --cflags gtk+-2.0` -c ttt_test.c -o ttt_test.o
+	$(CC) -c ttt_test.c -o ttt_test.o $(CFLAGS) `pkg-config gtk+-2.0 --cflags`
 
 tictactoe.o: tictactoe.c tictactoe.h
-	$(CC) `pkg-config --cflags gtk+-2.0` -c tictactoe.c -o tictactoe.o
+	$(CC) -c tictactoe.c -o tictactoe.o $(CFLAGS) `pkg-config gtk+-2.0 --cflags`
 
 clean: 
 	rm -f *.o ttt_test
diff --git a/examples/tictactoe/tictactoe.c b/examples/tictactoe/tictactoe.c
index 040d472ea3..0625c5179d 100644
--- a/examples/tictactoe/tictactoe.c
+++ b/examples/tictactoe/tictactoe.c
@@ -1,4 +1,3 @@
-/* example-start tictactoe tictactoe.c */
 
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
@@ -34,25 +33,27 @@ static void tictactoe_toggle              (GtkWidget *widget, Tictactoe *ttt);
 
 static gint tictactoe_signals[LAST_SIGNAL] = { 0 };
 
-guint
+GType
 tictactoe_get_type ()
 {
-  static guint ttt_type = 0;
+  static GType ttt_type = 0;
 
   if (!ttt_type)
     {
-      GtkTypeInfo ttt_info =
+      static const GTypeInfo ttt_info =
       {
-	"Tictactoe",
-	sizeof (Tictactoe),
 	sizeof (TictactoeClass),
-	(GtkClassInitFunc) tictactoe_class_init,
-	(GtkObjectInitFunc) tictactoe_init,
-        (GtkArgSetFunc) NULL,
-        (GtkArgGetFunc) NULL
+	NULL,
+        NULL,
+	(GClassInitFunc) tictactoe_class_init,
+        NULL,
+	NULL,
+        sizeof (Tictactoe),
+	0,
+	(GInstanceInitFunc) tictactoe_init,
       };
 
-      ttt_type = gtk_type_unique (gtk_vbox_get_type (), &ttt_info);
+      ttt_type = g_type_register_static (GTK_TYPE_VBOX, "Tictactoe", &ttt_info, 0);
     }
 
   return ttt_type;
@@ -65,17 +66,16 @@ tictactoe_class_init (TictactoeClass *class)
 
   object_class = (GtkObjectClass*) class;
   
-  tictactoe_signals[TICTACTOE_SIGNAL] = gtk_signal_new ("tictactoe",
-					 GTK_RUN_FIRST,
-					 object_class->type,
-					 GTK_SIGNAL_OFFSET (TictactoeClass,
-                                                            tictactoe),
-					 gtk_signal_default_marshaller,
-                                         GTK_TYPE_NONE, 0);
+  tictactoe_signals[TICTACTOE_SIGNAL] = g_signal_new ("tictactoe",
+					 G_TYPE_FROM_CLASS (object_class),
+	                                 G_SIGNAL_RUN_FIRST,
+	                                 0,
+                                         NULL, 
+                                         NULL,                
+					 g_cclosure_marshal_VOID__VOID,
+                                         G_TYPE_NONE, 0, NULL);
 
 
-  gtk_object_class_add_signals (object_class, tictactoe_signals, LAST_SIGNAL);
-
   class->tictactoe = NULL;
 }
 
@@ -95,9 +95,9 @@ tictactoe_init (Tictactoe *ttt)
 	ttt->buttons[i][j] = gtk_toggle_button_new ();
 	gtk_table_attach_defaults (GTK_TABLE(table), ttt->buttons[i][j], 
 				   i, i+1, j, j+1);
-	gtk_signal_connect (GTK_OBJECT (ttt->buttons[i][j]), "toggled",
+	g_signal_connect (GTK_OBJECT (ttt->buttons[i][j]), "toggled",
 			    GTK_SIGNAL_FUNC (tictactoe_toggle), ttt);
-	gtk_widget_set_usize (ttt->buttons[i][j], 20, 20);
+	gtk_widget_set_size_request (ttt->buttons[i][j], 20, 20);
 	gtk_widget_show (ttt->buttons[i][j]);
       }
 }
@@ -105,7 +105,7 @@ tictactoe_init (Tictactoe *ttt)
 GtkWidget*
 tictactoe_new ()
 {
-  return GTK_WIDGET ( gtk_type_new (tictactoe_get_type ()));
+  return GTK_WIDGET (g_object_new (tictactoe_get_type (), NULL));
 }
 
 void	       
@@ -116,10 +116,10 @@ tictactoe_clear (Tictactoe *ttt)
   for (i=0;i<3;i++)
     for (j=0;j<3;j++)
       {
-	gtk_signal_handler_block_by_data (GTK_OBJECT(ttt->buttons[i][j]), ttt);
+	g_signal_handlers_block_by_func (GTK_OBJECT(ttt->buttons[i][j]), NULL, ttt);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ttt->buttons[i][j]),
 				     FALSE);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT(ttt->buttons[i][j]), ttt);
+	g_signal_handlers_unblock_by_func (GTK_OBJECT(ttt->buttons[i][j]), NULL, ttt);
       }
 }
 
@@ -152,11 +152,10 @@ tictactoe_toggle (GtkWidget *widget, Tictactoe *ttt)
       
       if (success && found)
 	{
-	  gtk_signal_emit (GTK_OBJECT (ttt), 
-			   tictactoe_signals[TICTACTOE_SIGNAL]);
+	  g_signal_emit (GTK_OBJECT (ttt), 
+			   tictactoe_signals[TICTACTOE_SIGNAL], 0);
 	  break;
 	}
     }
 }
 
-/* example-end */
diff --git a/examples/tictactoe/tictactoe.h b/examples/tictactoe/tictactoe.h
index 6dfa203ad7..f36df1913e 100644
--- a/examples/tictactoe/tictactoe.h
+++ b/examples/tictactoe/tictactoe.h
@@ -1,4 +1,3 @@
-/* example-start tictactoe tictactoe.h */
 
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
@@ -52,7 +51,7 @@ struct _TictactoeClass
   void (* tictactoe) (Tictactoe *ttt);
 };
 
-guint          tictactoe_get_type        (void);
+GtkType        tictactoe_get_type        (void);
 GtkWidget*     tictactoe_new             (void);
 void	       tictactoe_clear           (Tictactoe *ttt);
 
@@ -62,4 +61,3 @@ void	       tictactoe_clear           (Tictactoe *ttt);
 
 #endif /* __TICTACTOE_H__ */
 
-/* example-end */
diff --git a/examples/tictactoe/ttt_test.c b/examples/tictactoe/ttt_test.c
index 82941e8930..6d25f38578 100644
--- a/examples/tictactoe/ttt_test.c
+++ b/examples/tictactoe/ttt_test.c
@@ -1,5 +1,5 @@
-/* example-start tictactoe ttt_test.c */
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include "tictactoe.h"
 
@@ -22,8 +22,8 @@ int main( int   argc,
   
   gtk_window_set_title (GTK_WINDOW (window), "Aspect Frame");
   
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (gtk_exit), NULL);
+  g_signal_connect (GTK_OBJECT (window), "destroy",
+		      GTK_SIGNAL_FUNC (exit), NULL);
   
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
@@ -32,7 +32,7 @@ int main( int   argc,
   gtk_container_add (GTK_CONTAINER (window), ttt);
   gtk_widget_show (ttt);
 
-  gtk_signal_connect (GTK_OBJECT (ttt), "tictactoe",
+  g_signal_connect (GTK_OBJECT (ttt), "tictactoe",
 		      GTK_SIGNAL_FUNC (win), NULL);
 
   gtk_widget_show (window);
@@ -42,4 +42,3 @@ int main( int   argc,
   return 0;
 }
 
-/* example-end */