callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable deprecation guards

Browse Source
This commit is contained in:
Javier Jardón
2010-10-29 03:28:24 +02:00
parent a4d9d2c3d4
commit 8b512bd9dd
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtklayout.c
View File

@ -30,8 +30,6 @@
#include "config.h" #include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtklayout.h" #include "gtklayout.h"
#include "gdkconfig.h" #include "gdkconfig.h"

2
gtk/gtklayout.h
View File

@ -94,7 +94,7 @@ void gtk_layout_get_size (GtkLayout *layout,
guint *width, guint *width,
guint *height); guint *height);
#ifndef GTK_DISABLE_DEPRECATED #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout *layout); GtkAdjustment* gtk_layout_get_hadjustment (GtkLayout *layout);
GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout *layout); GtkAdjustment* gtk_layout_get_vadjustment (GtkLayout *layout);

3
gtk/gtkviewport.c
View File

@ -26,9 +26,8 @@
#include "config.h" #include "config.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkviewport.h" #include "gtkviewport.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktypeutils.h" #include "gtktypeutils.h"

2
gtk/gtkviewport.h
View File

@ -75,7 +75,7 @@ GType gtk_viewport_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment, GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment); GtkAdjustment *vadjustment);
#ifndef GTK_DISABLE_DEPRECATED #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport *viewport); GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport *viewport);
GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport *viewport); GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport *viewport);