Makefile.am add GTK_DISABLE_DEPRECATED to CFLAGS.

2008-12-09  Michael Natterer  <mitch@imendio.com>

	* Makefile.am
	* tests/Makefile.am: add GTK_DISABLE_DEPRECATED to CFLAGS.

	* gail.c
	* gailclist.c
	* gailclistcell.c
	* gailcombo.c
	* gaillist.c
	* gailmenu.c
	* gailoptionmenu.c
	* gailpixmap.c
	* gailprogressbar.c
	* gailtoplevel.c
	* gailwidget.c
	* gailwindow.c
	* tests/ferret.c
	* tests/testcombo.c
	* tests/testlib.h

	* tests/testoptionmenu.c: #undef it where we need to access
	deprecated cruft.


svn path=/trunk/; revision=21859

modules/other/gail/ChangeLog

@@ -1,3 +1,27 @@
+2008-12-09  Michael Natterer  <mitch@imendio.com>
+
+	* Makefile.am
+	* tests/Makefile.am: add GTK_DISABLE_DEPRECATED to CFLAGS.
+
+	* gail.c
+	* gailclist.c
+	* gailclistcell.c
+	* gailcombo.c
+	* gaillist.c
+	* gailmenu.c
+	* gailoptionmenu.c
+	* gailpixmap.c
+	* gailprogressbar.c
+	* gailtoplevel.c
+	* gailwidget.c
+	* gailwindow.c
+	* tests/ferret.c
+	* tests/testcombo.c
+	* tests/testlib.h
+
+	* tests/testoptionmenu.c: #undef it where we need to access
+	deprecated cruft.
+
 2008-12-09  Michael Natterer  <mitch@imendio.com>
 
 	* gailtreeview.c: undeprecate.

modules/other/gail/Makefile.am

@@ -146,6 +146,7 @@ libgail_la_CPPFLAGS = \
 	-I$(top_builddir)/gtk		\
 	-DGTK_VERSION=\"$(GTK_VERSION)\"\
 	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
 	$(AM_CPPFLAGS)
 
 libgail_la_CFLAGS = \

modules/other/gail/gail.c

@@ -21,7 +21,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <atk/atk.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gail.h"
 #include "gailfactory.h"

modules/other/gail/gailclist.c

@@ -19,8 +19,11 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <stdio.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
+#include <gtk/gtk.h>
 #include "gailclist.h"
 #include "gailclistcell.h"
 #include "gailcellparent.h"

modules/other/gail/gailclistcell.c

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailclistcell.h"
 

modules/other/gail/gailcombo.c

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailcombo.h"
 

modules/other/gail/gaillist.c

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gaillist.h"
 #include "gailcombo.h"

modules/other/gail/gailmenu.c

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gailmenu.h"
 
 static void gail_menu_class_init (GailMenuClass *klass);

modules/other/gail/gailoptionmenu.c

@@ -20,8 +20,12 @@
 #include "config.h"
 
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+
 #include "gailoptionmenu.h"
 
 static void                  gail_option_menu_class_init       (GailOptionMenuClass *klass);

modules/other/gail/gailpixmap.c

@@ -19,7 +19,10 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "gailpixmap.h"
 
 static void	 gail_pixmap_class_init		(GailPixmapClass *klass);

modules/other/gail/gailprogressbar.c

@@ -20,7 +20,11 @@
 #include "config.h"
 
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "gailprogressbar.h"
 #include "gailadjustment.h"
 

modules/other/gail/gailtoplevel.c

@@ -21,7 +21,11 @@
 
 #include <stdlib.h>
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "gailtoplevel.h"
 
 static void             gail_toplevel_class_init        (GailToplevelClass      *klass);

modules/other/gail/gailwidget.c

@@ -20,6 +20,9 @@
 #include "config.h"
 
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>

modules/other/gail/gailwindow.c

@@ -20,7 +20,11 @@
 #include "config.h"
 
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "gailwindow.h"
 #include "gailtoplevel.h"
 #include "gail-private-macros.h"

modules/other/gail/tests/Makefile.am

@@ -38,7 +38,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gdk	\
 	-I$(top_srcdir)/gtk	\
 	-I$(top_builddir)/gtk	\
-	-DGDK_DISABLE_DEPRECATED
+	-DGDK_DISABLE_DEPRECATED\
+	-DGTK_DISABLE_DEPRECATED
 
 AM_CFLAGS = \
 	$(GTK_DEP_CFLAGS)	\

modules/other/gail/tests/ferret.c

@@ -1,8 +1,11 @@
 #define MAX_BUFFER 256
+#undef GTK_DISABLE_DEPRECATED
 #define GTK_ENABLE_BROKEN
 #define MAX_GROUPS 20
 #define MAX_NAME_VALUE 20
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -11,8 +14,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <strings.h>
+
 #include "testlib.h"
-#include "config.h"
 
 typedef enum
 {
@@ -1856,7 +1859,7 @@ _get_group(TabInfo *tab, GroupId group_id, const gchar *groupname)
        if (group->is_scrolled)
          {
            group->frame = gtk_scrolled_window_new (NULL, NULL);
-           gtk_widget_set_usize(GTK_WIDGET(group->frame), -2,
+           gtk_widget_set_size_request (GTK_WIDGET (group->frame), -2,
              group->default_height);
            group->scroll_outer_frame = GTK_FRAME(gtk_frame_new(groupname));
            gtk_container_add(GTK_CONTAINER(group->scroll_outer_frame),

modules/other/gail/tests/testcombo.c

@@ -1,5 +1,7 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
-#include <testlib.h>
+#include "testlib.h"
 
 static void _test_selection (AtkObject *obj);
 static void _check_combo_box (AtkObject *obj);

modules/other/gail/tests/testlib.h

@@ -1,5 +1,5 @@
-#include <gtk/gtk.h>
 #include <stdio.h>
+#include <gtk/gtk.h>
 
 /* Maximum characters in the output buffer */
 #define MAX_LINE_SIZE   1000

modules/other/gail/tests/testoptionmenu.c

@@ -1,4 +1,7 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "testlib.h"
 
 /*