GNOME.org
 

[gtk+] Remove some GTK_DISABLE_DEPRECATED and ENABLE_BROKEN guards

commit da8643e4571a72eb092c837b94ab0b66b4e3d057
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 7 04:39:21 2010 +0200

    Remove some GTK_DISABLE_DEPRECATED and ENABLE_BROKEN guards

 gtk/gtkstyle.c                       |    1 -
 gtk/gtktestutils.c                   |    1 -
 gtk/gtktypebuiltins.c.template       |    1 -
 gtk/tests/defaultvalue.c             |    2 --
 gtk/tests/filechooser.c              |    2 --
 gtk/tests/floating.c                 |    3 +--
 modules/other/gail/gail.c            |    2 --
 modules/other/gail/gailitem.c        |    2 --
 modules/other/gail/gaillabel.c       |    2 --
 modules/other/gail/gailmenu.c        |    2 --
 modules/other/gail/gailtoplevel.c    |    2 --
 modules/other/gail/gailwidget.c      |    2 --
 modules/other/gail/gailwindow.c      |    2 --
 modules/other/gail/tests/ferret.c    |    2 --
 modules/other/gail/tests/testcombo.c |    2 --
 tests/testgtk.c                      |    1 -
 tests/testoffscreen.c                |    2 --
 tests/testselection.c                |    2 --
 tests/testtext.c                     |    2 --
 19 files changed, 1 insertions(+), 34 deletions(-)
---
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 8a1c8cc..39085ef 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -31,7 +31,6 @@
 #include <gobject/gvaluecollector.h>
 #include "gtkgc.h"
 #include "gtkmarshalers.h"
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkrc.h"
 #include "gtkspinbutton.h"
 #include "gtkstyle.h"
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 5ea2d1d..ab9e267 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -19,7 +19,6 @@
  */
 
 /* need to get the prototypes of all get_type functions */
-#define GTK_ENABLE_BROKEN
 #undef GTK_DISABLE_DEPRECATED
 /* Need to get GDK_WINDOW_OBJECT */
 #undef GDK_DISABLE_DEPRECATED
diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template
index 648b5db..e15106e 100644
--- a/gtk/gtktypebuiltins.c.template
+++ b/gtk/gtktypebuiltins.c.template
@@ -1,6 +1,5 @@
 /*** BEGIN file-header ***/
 #undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #include "gtk.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"
diff --git a/gtk/tests/defaultvalue.c b/gtk/tests/defaultvalue.c
index 82b8d35..bab518e 100644
--- a/gtk/tests/defaultvalue.c
+++ b/gtk/tests/defaultvalue.c
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index c1811f3..424436c 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -29,8 +29,6 @@
  * - More tests!
  */
 
-#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#undef GTK_DISABLE_DEPRECATED
 #define SLEEP_DURATION  100
 
 #include "config.h"
diff --git a/gtk/tests/floating.c b/gtk/tests/floating.c
index a820684..832a4dc 100644
--- a/gtk/tests/floating.c
+++ b/gtk/tests/floating.c
@@ -16,8 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#undef GTK_DISABLE_DEPRECATED
-#include "../gtk/gtk.h"
+#include <gtk/gtk.h>
 
 static gboolean destroyed = FALSE;
 static void
diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c
index d6cca2b..bea1e00 100644
--- a/modules/other/gail/gail.c
+++ b/modules/other/gail/gail.c
@@ -22,8 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "gail.h"
 #include "gailfactory.h"
diff --git a/modules/other/gail/gailitem.c b/modules/other/gail/gailitem.c
index a5a1489..531710a 100644
--- a/modules/other/gail/gailitem.c
+++ b/modules/other/gail/gailitem.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "gailitem.h"
 #include <libgail-util/gailmisc.h>
diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index c6d0278..158a718 100644
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "gaillabel.h"
 #include "gailwindow.h"
diff --git a/modules/other/gail/gailmenu.c b/modules/other/gail/gailmenu.c
index 897bfec..0c559ef 100644
--- a/modules/other/gail/gailmenu.c
+++ b/modules/other/gail/gailmenu.c
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "gailmenu.h"
 
 static void gail_menu_class_init (GailMenuClass *klass);
diff --git a/modules/other/gail/gailtoplevel.c b/modules/other/gail/gailtoplevel.c
index 422b97f..afbd5b3 100644
--- a/modules/other/gail/gailtoplevel.c
+++ b/modules/other/gail/gailtoplevel.c
@@ -22,8 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 
 #include "gailtoplevel.h"
diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 20b5573..c92c3c6 100644
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -21,8 +21,6 @@
 
 #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 ac6e881..a4947e6 100644
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -21,8 +21,6 @@
 
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 
 #include "gailwindow.h"
diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index d6754f2..2dfa914 100644
--- a/modules/other/gail/tests/ferret.c
+++ b/modules/other/gail/tests/ferret.c
@@ -1,6 +1,4 @@
 #define MAX_BUFFER 256
-#undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #define MAX_GROUPS 20
 #define MAX_NAME_VALUE 20
 
diff --git a/modules/other/gail/tests/testcombo.c b/modules/other/gail/tests/testcombo.c
index 4598010..f34a812 100644
--- a/modules/other/gail/tests/testcombo.c
+++ b/modules/other/gail/tests/testcombo.c
@@ -1,5 +1,3 @@
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include "testlib.h"
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 86ad601..2f76cac 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -39,7 +39,6 @@
 #include <unistd.h>
 #endif
 
-#define GTK_ENABLE_BROKEN
 #include "gtk/gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
diff --git a/tests/testoffscreen.c b/tests/testoffscreen.c
index 646cf7e..c29b67c 100644
--- a/tests/testoffscreen.c
+++ b/tests/testoffscreen.c
@@ -2,8 +2,6 @@
  * testoffscreen.c
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <math.h>
 #include <gtk/gtk.h>
 #include "gtkoffscreenbox.h"
diff --git a/tests/testselection.c b/tests/testselection.c
index 3e94192..3af0c9f 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -24,12 +24,10 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GTK_DISABLE_DEPRECATED
 
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#define GTK_ENABLE_BROKEN
 #include "gtk/gtk.h"
 
 typedef enum {
diff --git a/tests/testtext.c b/tests/testtext.c
index fcc5b83..c4019cf 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]