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

build with GTK_DISABLE_DEPRECATED again.

Browse Source 
2008-08-04  Michael Natterer  <mitch@imendio.com>

	* gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED again.

	Fix pltcheck.sh by restricting the visibility of deprecated
	symbols to the places where they are actually used:

	* gtk/gtkclist.c
	* gtk/gtkctree.c
	* gtk/gtklistitem.c
	* gtk/gtklist.c
	* gtk/gtkprogressbar.c
	* gtk/gtkpixmap.c
	* gtk/gtkprogress.c: #undef GTK_DISABLE_DEPRECATED and #define
	__GTK_FOO_C__ on top instead of before including gtkaliasdef.c.

	* gtk/gtkclist.h
	* gtk/gtkctree.h
	* gtk/gtklistitem.h
	* gtk/gtklist.h
	* gtk/gtkpixmap.h
	* gtk/gtkprogress.h: make the headers visible if the respective
	__GTK_FOO_C__ are defined.


svn path=/trunk/; revision=20970
This commit is contained in:
Michael Natterer
2008-08-04 14:38:35 +00:00
committed by Michael Natterer
parent dbd5b75e5e
commit aa435e024a
15 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,3 +1,27 @@
2008-08-04 Michael Natterer <mitch@imendio.com>
* gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED again.
Fix pltcheck.sh by restricting the visibility of deprecated
symbols to the places where they are actually used:
* gtk/gtkclist.c
* gtk/gtkctree.c
* gtk/gtklistitem.c
* gtk/gtklist.c
* gtk/gtkprogressbar.c
* gtk/gtkpixmap.c
* gtk/gtkprogress.c: #undef GTK_DISABLE_DEPRECATED and #define
__GTK_FOO_C__ on top instead of before including gtkaliasdef.c.
* gtk/gtkclist.h
* gtk/gtkctree.h
* gtk/gtklistitem.h
* gtk/gtklist.h
* gtk/gtkpixmap.h
* gtk/gtkprogress.h: make the headers visible if the respective
__GTK_FOO_C__ are defined.
2008-08-04 Michael Natterer <mitch@imendio.com>
* gtk/gtkclist.c

1
gtk/Makefile.am
View File

@ -35,6 +35,7 @@ INCLUDES = \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \

4
gtk/gtkclist.c
View File

@ -31,6 +31,8 @@
#include <string.h>
#undef GDK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#define __GTK_CLIST_C__
#include <gdk/gdkkeysyms.h>
@ -7790,6 +7792,4 @@ gtk_clist_set_button_actions (GtkCList *clist,
}
}
#define __GTK_CLIST_C__
#include "gtkaliasdef.c"

2
gtk/gtkclist.h
View File

@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_CLIST_C__) || defined (__GTK_CTREE_C__)
#ifndef __GTK_CLIST_H__
#define __GTK_CLIST_H__

8
gtk/gtkctree.c
View File

@ -28,10 +28,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#undef GDK_DISABLE_DEPRECATED
#include "config.h"
#include <stdlib.h>
#undef GDK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#define __GTK_CTREE_C__
#include "gtkctree.h"
#include "gtkbindings.h"
#include "gtkmain.h"
@ -6098,5 +6101,4 @@ gtk_ctree_node_get_type (void)
return our_type;
}
#define __GTK_CTREE_C__
#include "gtkaliasdef.c"

2
gtk/gtkctree.h
View File

@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_CLIST_C__) || defined (__GTK_CTREE_C__)
#ifndef __GTK_CTREE_H__
#define __GTK_CTREE_H__

4
gtk/gtklist.c
View File

@ -27,6 +27,9 @@
#include "config.h"
#include <string.h> /* memset */
#undef GTK_DISABLE_DEPRECATED
#define __GTK_LIST_C__
#include "gtklist.h"
#include "gtklistitem.h"
#include "gtkmain.h"
@ -2575,5 +2578,4 @@ gtk_list_drag_begin (GtkWidget *widget,
}
}
#define __GTK_LIST_C__
#include "gtkaliasdef.c"

2
gtk/gtklist.h
View File

@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_LIST_C__)
#ifndef __GTK_LIST_H__
#define __GTK_LIST_H__

4
gtk/gtklistitem.c
View File

@ -28,6 +28,9 @@
#include <gdk/gdkkeysyms.h>
#undef GTK_DISABLE_DEPRECATED
#define __GTK_LIST_ITEM_C__
#include "gtkbindings.h"
#include "gtklabel.h"
#include "gtklistitem.h"
@ -624,5 +627,4 @@ gtk_real_list_item_toggle (GtkItem *item)
}
}
#define __GTK_LIST_ITEM_C__
#include "gtkaliasdef.c"

2
gtk/gtklistitem.h
View File

@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_LIST_ITEM_C__)
#ifndef __GTK_LIST_ITEM_H__
#define __GTK_LIST_ITEM_H__

8
gtk/gtkpixmap.c
View File

@ -27,10 +27,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#undef GDK_DISABLE_DEPRECATED
#include "config.h"
#include <math.h>
#undef GDK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#define __GTK_PIXMAP_C__
#include "gtkcontainer.h"
#include "gtkpixmap.h"
#include "gtkintl.h"
@ -277,5 +280,4 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap)
g_object_unref (G_OBJECT (stated));
}
#define __GTK_PIXMAP_C__
#include "gtkaliasdef.c"

2
gtk/gtkpixmap.h
View File

@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PIXMAP_C__)
#ifndef __GTK_PIXMAP_H__
#define __GTK_PIXMAP_H__

4
gtk/gtkprogress.c
View File

@ -27,7 +27,10 @@
#include "config.h"
#include <math.h>
#include <string.h>
#undef GTK_DISABLE_DEPRECATED
#define __GTK_PROGRESS_C__
#include "gtkprogress.h"
#include "gtkprivate.h"
#include "gtkintl.h"
@ -707,5 +710,4 @@ gtk_progress_set_activity_mode (GtkProgress *progress,
}
}
#define __GTK_PROGRESS_C__
#include "gtkaliasdef.c"

8
gtk/gtkprogress.h
View File

@ -35,7 +35,7 @@
G_BEGIN_DECLS
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PROGRESS_C__) || defined (__GTK_PROGRESS_BAR_C__)
#define GTK_TYPE_PROGRESS (gtk_progress_get_type ())
#define GTK_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS, GtkProgress))
@ -44,7 +44,7 @@ G_BEGIN_DECLS
#define GTK_IS_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS))
#define GTK_PROGRESS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS, GtkProgressClass))
#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
#endif /* !GTK_DISABLE_DEPRECATED */
typedef struct _GtkProgress GtkProgress;
typedef struct _GtkProgressClass GtkProgressClass;
@ -84,7 +84,7 @@ struct _GtkProgressClass
* directly.
*/
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PROGRESS_C__) || defined (__GTK_PROGRESS_BAR_C__)
GType gtk_progress_get_type (void) G_GNUC_CONST;
void gtk_progress_set_show_text (GtkProgress *progress,
@ -114,7 +114,7 @@ gdouble gtk_progress_get_current_percentage (GtkProgress *progress);
gdouble gtk_progress_get_percentage_from_value (GtkProgress *progress,
gdouble value);
#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
#endif /* !GTK_DISABLE_DEPRECATED */
G_END_DECLS

4
gtk/gtkprogressbar.c
View File

@ -28,6 +28,9 @@
#include <string.h>
#undef GTK_DISABLE_DEPRECATED
#define __GTK_PROGRESS_BAR_C__
#include "gtkprogressbar.h"
#include "gtkprivate.h"
#include "gtkintl.h"
@ -1378,5 +1381,4 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
return pbar->ellipsize;
}
#define __GTK_PROGRESS_BAR_C__
#include "gtkaliasdef.c"