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
author: Michael Natterer <mitch@imendio.com> 2008-12-09 14:51:16 +0000
committer: Michael Natterer <mitch@src.gnome.org> 2008-12-09 14:51:16 +0000
commit: c5edf5e513e180e824da17a61a09239a93480c4c (patch)
tree: cfe2939889f03bb9a419716889c0f1c198a2f01f
parent: 448201a8364828c7ffb943364fe5e91055fceb04 (diff)
download: gtk+-c5edf5e513e180e824da17a61a09239a93480c4c.tar.gz
19 files changed, 76 insertions, 7 deletions
diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 46d885ea6c..8ac72bd185 100644
--- a/modules/other/gail/ChangeLog
+++ b/modules/other/gail/ChangeLog
@@ -1,5 +1,29 @@
 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.
 
 2008-11-27  Matthias Clasen  <mclasen@redhat.com>
diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 00a18fc0ab..ea88fc0725 100644
--- a/modules/other/gail/Makefile.am
+++ b/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 = \
diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c
index ac27f0ba35..8964390c4e 100644
--- a/modules/other/gail/gail.c
+++ b/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"
diff --git a/modules/other/gail/gailclist.c b/modules/other/gail/gailclist.c
index 87bae77e05..6a68ffe8aa 100644
--- a/modules/other/gail/gailclist.c
+++ b/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"
diff --git a/modules/other/gail/gailclistcell.c b/modules/other/gail/gailclistcell.c
index 2eef9f39de..b683fa70e9 100644
--- a/modules/other/gail/gailclistcell.c
+++ b/modules/other/gail/gailclistcell.c
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailclistcell.h"
 
diff --git a/modules/other/gail/gailcombo.c b/modules/other/gail/gailcombo.c
index ef92b856e7..6e3ac15978 100644
--- a/modules/other/gail/gailcombo.c
+++ b/modules/other/gail/gailcombo.c
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailcombo.h"
 
diff --git a/modules/other/gail/gaillist.c b/modules/other/gail/gaillist.c
index e34cfb8551..baa5a6649a 100644
--- a/modules/other/gail/gaillist.c
+++ b/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"
diff --git a/modules/other/gail/gailmenu.c b/modules/other/gail/gailmenu.c
index 782b07294e..0a928c4cc4 100644
--- a/modules/other/gail/gailmenu.c
+++ b/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);
diff --git a/modules/other/gail/gailoptionmenu.c b/modules/other/gail/gailoptionmenu.c
index 6bbd0b3ad5..07d588c55a 100644
--- a/modules/other/gail/gailoptionmenu.c
+++ b/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);
diff --git a/modules/other/gail/gailpixmap.c b/modules/other/gail/gailpixmap.c
index 99b0b9f2f3..0e9c926aa7 100644
--- a/modules/other/gail/gailpixmap.c
+++ b/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);
diff --git a/modules/other/gail/gailprogressbar.c b/modules/other/gail/gailprogressbar.c
index cc615b8b01..31dd7ada4d 100644
--- a/modules/other/gail/gailprogressbar.c
+++ b/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"
 
diff --git a/modules/other/gail/gailtoplevel.c b/modules/other/gail/gailtoplevel.c
index 896382fc34..c8ac919011 100644
--- a/modules/other/gail/gailtoplevel.c
+++ b/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);
diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 0469b9311e..3d0eed88b1 100644
--- a/modules/other/gail/gailwidget.c
+++ b/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>
diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index 6b8fdbc6bf..7b4ef4f955 100644
--- a/modules/other/gail/gailwindow.c
+++ b/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"
diff --git a/modules/other/gail/tests/Makefile.am b/modules/other/gail/tests/Makefile.am
index f383037bb7..8e6a5d5b12 100644
--- a/modules/other/gail/tests/Makefile.am
+++ b/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)	\
diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index 39094e3be0..14281deb21 100644
--- a/modules/other/gail/tests/ferret.c
+++ b/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),
diff --git a/modules/other/gail/tests/testcombo.c b/modules/other/gail/tests/testcombo.c
index 60f84a9241..7291fa0c99 100644
--- a/modules/other/gail/tests/testcombo.c
+++ b/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);
diff --git a/modules/other/gail/tests/testlib.h b/modules/other/gail/tests/testlib.h
index 7118bbf593..621a9e5a9c 100644
--- a/modules/other/gail/tests/testlib.h
+++ b/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
diff --git a/modules/other/gail/tests/testoptionmenu.c b/modules/other/gail/tests/testoptionmenu.c
index feb6444909..6c1de3925a 100644
--- a/modules/other/gail/tests/testoptionmenu.c
+++ b/modules/other/gail/tests/testoptionmenu.c
@@ -1,4 +1,7 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "testlib.h"
 
 /*
author	Michael Natterer <mitch@imendio.com>	2008-12-09 14:51:16 +0000
committer	Michael Natterer <mitch@src.gnome.org>	2008-12-09 14:51:16 +0000
commit	c5edf5e513e180e824da17a61a09239a93480c4c (patch)
tree	cfe2939889f03bb9a419716889c0f1c198a2f01f
parent	448201a8364828c7ffb943364fe5e91055fceb04 (diff)
download	gtk+-c5edf5e513e180e824da17a61a09239a93480c4c.tar.gz