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

diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 46d885ea6c4743d239034e6dc04608a032ec7e20..8ac72bd185952f5d299e5e4bff199b3cfe76f833 100644 (file)
--- a/modules/other/gail/ChangeLog
+++ b/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.

diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 00a18fc0ab0caf32f9fadcbd97f000fbb68ebe24..ea88fc0725d9a93accd283a9d727123f0b7c193b 100644 (file)
--- 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 ac27f0ba3578c2b0377c5df46450adab9f197c52..8964390c4e0b1e1bbc60322e0950c89768e4eba9 100644 (file)
--- 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 87bae77e053050bbab85a069cd1dde0c9116734f..6a68ffe8aa0dd2d9ee0a9a5742f35ec59e84fca0 100644 (file)
--- 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 2eef9f39dedf7d7257a36c4a641023e94e0b0f31..b683fa70e9ed0d823268f4d0eeae17dfe088f6f0 100644 (file)
--- 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 ef92b856e7883f78dd4c2cbbea86522ccfffdbd9..6e3ac15978201791ed1198dbb6e3610750759b5b 100644 (file)
--- 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 e34cfb85515dba686abb4362ab3546e8545b2ade..baa5a6649a4683bc78e6f88f081932ff690d857d 100644 (file)
--- 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 782b07294e648e2d54bd2e6e90dfc2a6fe161288..0a928c4cc4b4f6bf09f00eace5c15629b396edf6 100644 (file)
--- 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 6bbd0b3ad5adde867163826025be7d2c48a71a81..07d588c55a52572c95ed29ba0b0ddf80b504bf8e 100644 (file)
--- 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 99b0b9f2f3764b91460d12e6d422b71fc904eaee..0e9c926aa72d00b39aa0e25ebf7d3d39da4a0d8c 100644 (file)
--- 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 cc615b8b0103a23feb0e0485d6237a4f1692d15e..31dd7ada4d96713c0c9be46fbd7c6c8cfdfc89ed 100644 (file)
--- 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 896382fc3424e74850eacc202cf794629c87614b..c8ac91901140c82868be2806e76da4e102ffad44 100644 (file)
--- 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 0469b9311edfdb8e892b5f2a4365d6be702b0875..3d0eed88b10b421074ae4490699390c4870a5fd5 100644 (file)
--- 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 6b8fdbc6bf7d6490d0a004a68542130383fda6fb..7b4ef4f955d8e3e11b0691baaa1f6e1d4d436b47 100644 (file)
--- 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 f383037bb79bfd810231a6431e8b494157847c68..8e6a5d5b12258f1618d15210628751dae3c5338b 100644 (file)
--- 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 39094e3be09873c6186df384f81a6669b2eb0993..14281deb218a535d7b0c338ac83363794ed4aa1d 100644 (file)
--- 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 60f84a92410c60e4eddfffc962818b5641f100ba..7291fa0c998adae3d578f425777cc399c12f6880 100644 (file)
--- 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 7118bbf593194ef99bb43fd0ba28e1cf0a18e23b..621a9e5a9cd6eb1c8125c37e30045c7329ef1a55 100644 (file)
--- 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 feb6444909ab75c15e1e173046e94c6b122bc9f7..6c1de3925a8362afe0bde1ea4ec56686b6f15147 100644 (file)
--- 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"
 
 /*