Commit 83700521 authored by Matthias Clasen's avatar Matthias Clasen

Don't use *DISABLE_DEPRECATED guards

Instead define GDK_DISABLE_DEPRECATION_WARNINGS where appropriate.
parent 416e1a14
......@@ -48,8 +48,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/gtk \
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
......@@ -1042,8 +1040,6 @@ endif
Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
Gtk_3_0_gir_CFLAGS = \
$(AM_CPPFLAGS) \
-UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_3_0_gir_LIBS = libgtk-3.la
Gtk_3_0_gir_FILES = $(introspection_files)
......
......@@ -37,7 +37,6 @@
#include <atk/atk.h>
#undef GTK_DISABLE_DEPRECATED
#define GDK_DISABLE_DEPRECATION_WARNINGS
#include "gtkfontsel.h"
......
......@@ -29,7 +29,6 @@
#include <stdlib.h>
#undef GTK_DISABLE_DEPRECATED
#define GDK_DISABLE_DEPRECATION_WARNINGS
#include "gtkhandlebox.h"
......
......@@ -25,7 +25,7 @@
*/
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhbbox.h"
#include "gtkorientable.h"
#include "gtkintl.h"
......
......@@ -28,7 +28,7 @@
#include "gtkboxprivate.h"
#include "gtkorientable.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhbox.h"
......
......@@ -26,7 +26,6 @@
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhpaned.h"
#include "gtkorientable.h"
......
......@@ -29,7 +29,6 @@
#include <math.h>
#include <stdlib.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtkhscale.h"
#include "gtkorientable.h"
......
......@@ -28,7 +28,7 @@
#include "config.h"
#include "gtkscrollbar.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhscrollbar.h"
#include "gtkorientable.h"
#include "gtkintl.h"
......
......@@ -26,7 +26,6 @@
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkhseparator.h"
#include "gtkorientable.h"
......
......@@ -113,7 +113,6 @@
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
......
......@@ -191,13 +191,6 @@ static void gtk_menu_item_set_related_action (GtkMenuItem *menu
static void gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu_item,
gboolean use_appearance);
/* Declare deprecated function that need a declaration */
#ifdef GTK_DISABLE_DEPRECATED
void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item,
gboolean right_justified);
gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item);
#endif /* GTK_DISABLE_DEPRECATED */
static guint menu_item_signals[LAST_SIGNAL] = { 0 };
static GtkBuildableIface *parent_buildable_iface;
......
......@@ -53,7 +53,6 @@
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
#include "a11y/gtkmenushellaccessible.h"
......
......@@ -26,7 +26,6 @@
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#define GDK_DISABLE_DEPRECATION_WARNINGS
#include "gtktable.h"
......
......@@ -26,8 +26,6 @@
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkmenuprivate.h"
#include "gtkmenuitemprivate.h"
#include "gtktearoffmenuitem.h"
......
......@@ -46,7 +46,6 @@
#include "gtkmenushellprivate.h"
#include "gtkprivate.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtktearoffmenuitem.h"
/* GObjectClass */
......
......@@ -662,10 +662,6 @@ static void gtk_tree_view_drag_data_received (GtkWidget *widget,
guint time);
/* tree_model signals */
static void gtk_tree_view_set_hadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment);
static void gtk_tree_view_set_vadjustment (GtkTreeView *tree_view,
GtkAdjustment *adjustment);
static gboolean gtk_tree_view_real_move_cursor (GtkTreeView *tree_view,
GtkMovementStep step,
gint count);
......
......@@ -47,7 +47,6 @@
#include "gtkwindow.h"
#include "gtkprivate.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkuimanager.h"
#include "gtktearoffmenuitem.h"
......
......@@ -25,7 +25,7 @@
*/
#include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkvbbox.h"
#include "gtkorientable.h"
#include "gtkintl.h"
......
......@@ -28,7 +28,7 @@
#include "gtkboxprivate.h"
#include "gtkorientable.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkvbox.h"
#include "gtkboxprivate.h"
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include "gtkorientable.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkvpaned.h"
......
......@@ -29,7 +29,6 @@
#include <math.h>
#include <stdlib.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtkvscale.h"
#include "gtkorientable.h"
......
......@@ -29,7 +29,7 @@
#include "gtkorientable.h"
#include "gtkscrollbar.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkvscrollbar.h"
#include "gtkintl.h"
......
......@@ -27,7 +27,7 @@
#include "config.h"
#include "gtkorientable.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkvseparator.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment