GNOME.org
 

gtk+ r21859 - in trunk/modules/other/gail: . tests

Author: mitch
Date: Tue Dec  9 14:51:16 2008
New Revision: 21859
URL: http://svn.gnome.org/viewvc/gtk+?rev=21859&view=rev

Log:
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.



Modified:
   trunk/modules/other/gail/ChangeLog
   trunk/modules/other/gail/Makefile.am
   trunk/modules/other/gail/gail.c
   trunk/modules/other/gail/gailclist.c
   trunk/modules/other/gail/gailclistcell.c
   trunk/modules/other/gail/gailcombo.c
   trunk/modules/other/gail/gaillist.c
   trunk/modules/other/gail/gailmenu.c
   trunk/modules/other/gail/gailoptionmenu.c
   trunk/modules/other/gail/gailpixmap.c
   trunk/modules/other/gail/gailprogressbar.c
   trunk/modules/other/gail/gailtoplevel.c
   trunk/modules/other/gail/gailwidget.c
   trunk/modules/other/gail/gailwindow.c
   trunk/modules/other/gail/tests/Makefile.am
   trunk/modules/other/gail/tests/ferret.c
   trunk/modules/other/gail/tests/testcombo.c
   trunk/modules/other/gail/tests/testlib.h
   trunk/modules/other/gail/tests/testoptionmenu.c

Modified: trunk/modules/other/gail/Makefile.am
==============================================================================
--- trunk/modules/other/gail/Makefile.am	(original)
+++ trunk/modules/other/gail/Makefile.am	Tue Dec  9 14:51:16 2008
@@ -146,6 +146,7 @@
 	-I$(top_builddir)/gtk		\
 	-DGTK_VERSION=\"$(GTK_VERSION)\"\
 	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
 	$(AM_CPPFLAGS)
 
 libgail_la_CFLAGS = \

Modified: trunk/modules/other/gail/gail.c
==============================================================================
--- trunk/modules/other/gail/gail.c	(original)
+++ trunk/modules/other/gail/gail.c	Tue Dec  9 14:51:16 2008
@@ -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"

Modified: trunk/modules/other/gail/gailclist.c
==============================================================================
--- trunk/modules/other/gail/gailclist.c	(original)
+++ trunk/modules/other/gail/gailclist.c	Tue Dec  9 14:51:16 2008
@@ -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"

Modified: trunk/modules/other/gail/gailclistcell.c
==============================================================================
--- trunk/modules/other/gail/gailclistcell.c	(original)
+++ trunk/modules/other/gail/gailclistcell.c	Tue Dec  9 14:51:16 2008
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailclistcell.h"
 

Modified: trunk/modules/other/gail/gailcombo.c
==============================================================================
--- trunk/modules/other/gail/gailcombo.c	(original)
+++ trunk/modules/other/gail/gailcombo.c	Tue Dec  9 14:51:16 2008
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailcombo.h"
 

Modified: trunk/modules/other/gail/gaillist.c
==============================================================================
--- trunk/modules/other/gail/gaillist.c	(original)
+++ trunk/modules/other/gail/gaillist.c	Tue Dec  9 14:51:16 2008
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gaillist.h"
 #include "gailcombo.h"

Modified: trunk/modules/other/gail/gailmenu.c
==============================================================================
--- trunk/modules/other/gail/gailmenu.c	(original)
+++ trunk/modules/other/gail/gailmenu.c	Tue Dec  9 14:51:16 2008
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gailmenu.h"
 
 static void gail_menu_class_init (GailMenuClass *klass);

Modified: trunk/modules/other/gail/gailoptionmenu.c
==============================================================================
--- trunk/modules/other/gail/gailoptionmenu.c	(original)
+++ trunk/modules/other/gail/gailoptionmenu.c	Tue Dec  9 14:51:16 2008
@@ -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);

Modified: trunk/modules/other/gail/gailpixmap.c
==============================================================================
--- trunk/modules/other/gail/gailpixmap.c	(original)
+++ trunk/modules/other/gail/gailpixmap.c	Tue Dec  9 14:51:16 2008
@@ -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);

Modified: trunk/modules/other/gail/gailprogressbar.c
==============================================================================
--- trunk/modules/other/gail/gailprogressbar.c	(original)
+++ trunk/modules/other/gail/gailprogressbar.c	Tue Dec  9 14:51:16 2008
@@ -20,7 +20,11 @@
 #include "config.h"
 
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "gailprogressbar.h"
 #include "gailadjustment.h"
 

Modified: trunk/modules/other/gail/gailtoplevel.c
==============================================================================
--- trunk/modules/other/gail/gailtoplevel.c	(original)
+++ trunk/modules/other/gail/gailtoplevel.c	Tue Dec  9 14:51:16 2008
@@ -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);

Modified: trunk/modules/other/gail/gailwidget.c
==============================================================================
--- trunk/modules/other/gail/gailwidget.c	(original)
+++ trunk/modules/other/gail/gailwidget.c	Tue Dec  9 14:51:16 2008
@@ -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>

Modified: trunk/modules/other/gail/gailwindow.c
==============================================================================
--- trunk/modules/other/gail/gailwindow.c	(original)
+++ trunk/modules/other/gail/gailwindow.c	Tue Dec  9 14:51:16 2008
@@ -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"

Modified: trunk/modules/other/gail/tests/Makefile.am
==============================================================================
--- trunk/modules/other/gail/tests/Makefile.am	(original)
+++ trunk/modules/other/gail/tests/Makefile.am	Tue Dec  9 14:51:16 2008
@@ -38,7 +38,8 @@
 	-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)	\

Modified: trunk/modules/other/gail/tests/ferret.c
==============================================================================
--- trunk/modules/other/gail/tests/ferret.c	(original)
+++ trunk/modules/other/gail/tests/ferret.c	Tue Dec  9 14:51:16 2008
@@ -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 @@
        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),

Modified: trunk/modules/other/gail/tests/testcombo.c
==============================================================================
--- trunk/modules/other/gail/tests/testcombo.c	(original)
+++ trunk/modules/other/gail/tests/testcombo.c	Tue Dec  9 14:51:16 2008
@@ -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);

Modified: trunk/modules/other/gail/tests/testlib.h
==============================================================================
--- trunk/modules/other/gail/tests/testlib.h	(original)
+++ trunk/modules/other/gail/tests/testlib.h	Tue Dec  9 14:51:16 2008
@@ -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

Modified: trunk/modules/other/gail/tests/testoptionmenu.c
==============================================================================
--- trunk/modules/other/gail/tests/testoptionmenu.c	(original)
+++ trunk/modules/other/gail/tests/testoptionmenu.c	Tue Dec  9 14:51:16 2008
@@ -1,4 +1,7 @@
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "testlib.h"
 
 /*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]