diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 8a1c8cc970..39085efac8 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -31,7 +31,6 @@ #include #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 5ea2d1dffc..ab9e267f0c 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 648b5db1d0..e15106e8dc 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 82b8d35ed2..bab518e48b 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 #include #include diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c index c1811f3a18..424436cd35 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 a8206849de..832a4dcc2e 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 static gboolean destroyed = FALSE; static void diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c index d6cca2bdad..bea1e00357 100644 --- a/modules/other/gail/gail.c +++ b/modules/other/gail/gail.c @@ -22,8 +22,6 @@ #include #include -#undef GTK_DISABLE_DEPRECATED - #include #include "gail.h" #include "gailfactory.h" diff --git a/modules/other/gail/gailitem.c b/modules/other/gail/gailitem.c index a5a1489c82..531710a724 100644 --- a/modules/other/gail/gailitem.c +++ b/modules/other/gail/gailitem.c @@ -21,8 +21,6 @@ #include -#undef GTK_DISABLE_DEPRECATED - #include #include "gailitem.h" #include diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c index c6d02788b9..158a718203 100644 --- a/modules/other/gail/gaillabel.c +++ b/modules/other/gail/gaillabel.c @@ -21,8 +21,6 @@ #include -#undef GTK_DISABLE_DEPRECATED - #include #include "gaillabel.h" #include "gailwindow.h" diff --git a/modules/other/gail/gailmenu.c b/modules/other/gail/gailmenu.c index 897bfec415..0c559ef2d7 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 422b97f38f..afbd5b366b 100644 --- a/modules/other/gail/gailtoplevel.c +++ b/modules/other/gail/gailtoplevel.c @@ -22,8 +22,6 @@ #include #include -#undef GTK_DISABLE_DEPRECATED - #include #include "gailtoplevel.h" diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c index 20b5573990..c92c3c6663 100644 --- a/modules/other/gail/gailwidget.c +++ b/modules/other/gail/gailwidget.c @@ -21,8 +21,6 @@ #include -#undef GTK_DISABLE_DEPRECATED - #include #ifdef GDK_WINDOWING_X11 #include diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c index ac6e8810c8..a4947e6020 100644 --- a/modules/other/gail/gailwindow.c +++ b/modules/other/gail/gailwindow.c @@ -21,8 +21,6 @@ #include -#undef GTK_DISABLE_DEPRECATED - #include #include "gailwindow.h" diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c index d6754f2630..2dfa914c44 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 4598010ef1..f34a812577 100644 --- a/modules/other/gail/tests/testcombo.c +++ b/modules/other/gail/tests/testcombo.c @@ -1,5 +1,3 @@ -#undef GTK_DISABLE_DEPRECATED - #include #include "testlib.h" diff --git a/tests/testgtk.c b/tests/testgtk.c index 86ad601173..2f76cacdef 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -39,7 +39,6 @@ #include #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 646cf7ee62..c29b67c202 100644 --- a/tests/testoffscreen.c +++ b/tests/testoffscreen.c @@ -2,8 +2,6 @@ * testoffscreen.c */ -#undef GTK_DISABLE_DEPRECATED - #include #include #include "gtkoffscreenbox.h" diff --git a/tests/testselection.c b/tests/testselection.c index 3e9419241a..3af0c9fd4b 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 #include -#define GTK_ENABLE_BROKEN #include "gtk/gtk.h" typedef enum { diff --git a/tests/testtext.c b/tests/testtext.c index fcc5b834c3..c4019cfc40 100644 --- a/tests/testtext.c +++ b/tests/testtext.c @@ -25,8 +25,6 @@ #include #include -#undef GTK_DISABLE_DEPRECATED - #include #include