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.

3 files changed, 20 insertions, 17 deletions

diff --git a/examples/menu/Makefile b/examples/menu/Makefile
index 8c4489ce40..290ac17922 100644
--- a/examples/menu/Makefile
+++ b/examples/menu/Makefile
@@ -1,13 +1,19 @@
 
 CC = gcc
 
+CFLAGS = -Wall			 	\
+	-DG_DISABLE_DEPRECATED 	 	\
+	-DGDK_DISABLE_DEPRECATED 	\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED
+
 all: menu itemfactory
 
 menu: menu.c 
-	$(CC) `pkg-config --cflags gtk+-2.0` menu.c -o menu `pkg-config --libs gtk+-2.0`
+	$(CC) menu.c -o menu $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
 
 itemfactory: itemfactory.c
-	$(CC) `pkg-config --cflags gtk+-2.0` itemfactory.c -o itemfactory `pkg-config --libs gtk+-2.0`
+	$(CC) itemfactory.c -o itemfactory $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
 
 clean: 
 	rm -f *.o menu itemfactory
diff --git a/examples/menu/itemfactory.c b/examples/menu/itemfactory.c
index d1239baff2..e8932f37c8 100644
--- a/examples/menu/itemfactory.c
+++ b/examples/menu/itemfactory.c
@@ -1,4 +1,3 @@
-/* example-start menu itemfactory.c */
 
 #include <gtk/gtk.h>
 #include <strings.h>
@@ -91,14 +90,14 @@ int main( int argc,
   gtk_init (&argc, &argv);
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy", 
+  g_signal_connect (GTK_OBJECT (window), "destroy", 
 		      GTK_SIGNAL_FUNC (gtk_main_quit), 
 		      "WM destroy");
   gtk_window_set_title (GTK_WINDOW(window), "Item Factory");
-  gtk_widget_set_usize (GTK_WIDGET(window), 300, 200);
+  gtk_widget_set_size_request (GTK_WIDGET (window), 300, 200);
   
   main_vbox = gtk_vbox_new (FALSE, 1);
-  gtk_container_border_width (GTK_CONTAINER (main_vbox), 1);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
   gtk_widget_show (main_vbox);
   
@@ -109,6 +108,5 @@ int main( int argc,
   gtk_widget_show (window);
   gtk_main ();
   
-  return(0);
+  return 0;
 }
-/* example-end */
diff --git a/examples/menu/menu.c b/examples/menu/menu.c
index e1420e80aa..c8479097c5 100644
--- a/examples/menu/menu.c
+++ b/examples/menu/menu.c
@@ -1,5 +1,5 @@
-/* example-start menu menu.c */
 
+#include <stdio.h>
 #include <gtk/gtk.h>
 
 static gint button_press (GtkWidget *, GdkEvent *);
@@ -23,9 +23,9 @@ int main( int   argc,
 
     /* create a new window */
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_usize (GTK_WIDGET (window), 200, 100);
+    gtk_widget_set_size_request (GTK_WIDGET (window), 200, 100);
     gtk_window_set_title (GTK_WINDOW (window), "GTK Menu Test");
-    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+    g_signal_connect (GTK_OBJECT (window), "delete_event",
                         (GtkSignalFunc) gtk_main_quit, NULL);
 
     /* Init the menu-widget, and remember -- never
@@ -49,10 +49,10 @@ int main( int   argc,
             menu_items = gtk_menu_item_new_with_label (buf);
 
             /* ...and add it to the menu. */
-            gtk_menu_append (GTK_MENU (menu), menu_items);
+            gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
 
 	    /* Do something interesting when the menuitem is selected */
-	    gtk_signal_connect_object (GTK_OBJECT (menu_items), "activate",
+	    g_signal_connect_swapped (GTK_OBJECT (menu_items), "activate",
 		GTK_SIGNAL_FUNC (menuitem_response), (gpointer) g_strdup (buf));
 
             /* Show the widget */
@@ -82,14 +82,14 @@ int main( int   argc,
 
     /* Create a button to which to attach menu as a popup */
     button = gtk_button_new_with_label ("press me");
-    gtk_signal_connect_object (GTK_OBJECT (button), "event",
+    g_signal_connect_swapped (GTK_OBJECT (button), "event",
 	GTK_SIGNAL_FUNC (button_press), GTK_OBJECT (menu));
     gtk_box_pack_end (GTK_BOX (vbox), button, TRUE, TRUE, 2);
     gtk_widget_show (button);
 
     /* And finally we append the menu-item to the menu-bar -- this is the
      * "root" menu-item I have been raving about =) */
-    gtk_menu_bar_append (GTK_MENU_BAR (menu_bar), root_menu);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), root_menu);
 
     /* always display the window as the last step so it all splashes on
      * the screen at once. */
@@ -97,7 +97,7 @@ int main( int   argc,
 
     gtk_main ();
 
-    return(0);
+    return 0;
 }
 
 /* Respond to a button-press by posting a menu passed in as widget.
@@ -130,4 +130,3 @@ static void menuitem_response( gchar *string )
 {
     printf ("%s\n", string);
 }
-/* example-end */