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.

2 files changed, 28 insertions, 19 deletions

diff --git a/examples/entry/Makefile b/examples/entry/Makefile
index ef5b67ef7..78984e64d 100644
--- a/examples/entry/Makefile
+++ b/examples/entry/Makefile
@@ -1,8 +1,14 @@
 
 CC = gcc
 
+CFLAGS = -Wall			 	\
+	-DG_DISABLE_DEPRECATED 	 	\
+	-DGDK_DISABLE_DEPRECATED 	\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED
+
 entry: entry.c 
-	$(CC) `pkg-config --cflags gtk+-2.0`  entry.c -o entry `pkg-config --libs gtk+-2.0`
+	$(CC) entry.c -o entry $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
 
 clean: 
 	rm -f *.o entry
diff --git a/examples/entry/entry.c b/examples/entry/entry.c
index b53a9f9a3..4de30711d 100644
--- a/examples/entry/entry.c
+++ b/examples/entry/entry.c
@@ -1,11 +1,12 @@
-/* example-start entry entry.c */
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <gtk/gtk.h>
 
 void enter_callback( GtkWidget *widget,
                      GtkWidget *entry )
 {
-  gchar *entry_text;
+  const gchar *entry_text;
   entry_text = gtk_entry_get_text(GTK_ENTRY(entry));
   printf("Entry contents: %s\n", entry_text);
 }
@@ -13,8 +14,8 @@ void enter_callback( GtkWidget *widget,
 void entry_toggle_editable( GtkWidget *checkbutton,
                             GtkWidget *entry )
 {
-  gtk_entry_set_editable(GTK_ENTRY(entry),
-			 GTK_TOGGLE_BUTTON(checkbutton)->active);
+  gtk_editable_set_editable (GTK_EDITABLE (entry),
+                             GTK_TOGGLE_BUTTON (checkbutton)->active);
 }
 
 void entry_toggle_visibility( GtkWidget *checkbutton,
@@ -33,28 +34,31 @@ int main( int   argc,
     GtkWidget *entry;
     GtkWidget *button;
     GtkWidget *check;
+    gint tmp_pos;
 
     gtk_init (&argc, &argv);
 
     /* 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 Entry");
-    gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-                       (GtkSignalFunc) gtk_exit, NULL);
+    g_signal_connect(GTK_OBJECT (window), "delete_event",
+                       (GtkSignalFunc) exit, NULL);
 
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 
-    entry = gtk_entry_new_with_max_length (50);
-    gtk_signal_connect(GTK_OBJECT(entry), "activate",
+    entry = gtk_entry_new ();
+    gtk_entry_set_max_length (GTK_ENTRY (entry), 50);
+    g_signal_connect(GTK_OBJECT(entry), "activate",
 		       GTK_SIGNAL_FUNC(enter_callback),
 		       entry);
     gtk_entry_set_text (GTK_ENTRY (entry), "hello");
-    gtk_entry_append_text (GTK_ENTRY (entry), " world");
-    gtk_entry_select_region (GTK_ENTRY (entry),
-			     0, GTK_ENTRY(entry)->text_length);
+    tmp_pos = GTK_ENTRY (entry)->text_length;
+    gtk_editable_insert_text (GTK_EDITABLE (entry), " world", -1, &tmp_pos);
+    gtk_editable_select_region (GTK_EDITABLE (entry),
+			        0, GTK_ENTRY(entry)->text_length);
     gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
     gtk_widget_show (entry);
 
@@ -64,21 +68,21 @@ int main( int   argc,
                                   
     check = gtk_check_button_new_with_label("Editable");
     gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
-    gtk_signal_connect (GTK_OBJECT(check), "toggled",
+    g_signal_connect (GTK_OBJECT(check), "toggled",
 			GTK_SIGNAL_FUNC(entry_toggle_editable), entry);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
     gtk_widget_show (check);
     
     check = gtk_check_button_new_with_label("Visible");
     gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
-    gtk_signal_connect (GTK_OBJECT(check), "toggled",
+    g_signal_connect (GTK_OBJECT(check), "toggled",
 			GTK_SIGNAL_FUNC(entry_toggle_visibility), entry);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), TRUE);
     gtk_widget_show (check);
                                    
     button = gtk_button_new_with_label ("Close");
-    gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			       GTK_SIGNAL_FUNC(gtk_exit),
+    g_signal_connect_swapped (GTK_OBJECT (button), "clicked",
+			       GTK_SIGNAL_FUNC(exit),
 			       GTK_OBJECT (window));
     gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
@@ -88,6 +92,5 @@ int main( int   argc,
     gtk_widget_show(window);
 
     gtk_main();
-    return(0);
+    return 0;
 }
-/* example-end */