GNOME.org
 

gtk+ r20970 - in trunk: . gtk

Author: mitch
Date: Mon Aug  4 14:38:35 2008
New Revision: 20970
URL: http://svn.gnome.org/viewvc/gtk+?rev=20970&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/Makefile.am
   trunk/gtk/gtkclist.c
   trunk/gtk/gtkclist.h
   trunk/gtk/gtkctree.c
   trunk/gtk/gtkctree.h
   trunk/gtk/gtklist.c
   trunk/gtk/gtklist.h
   trunk/gtk/gtklistitem.c
   trunk/gtk/gtklistitem.h
   trunk/gtk/gtkpixmap.c
   trunk/gtk/gtkpixmap.h
   trunk/gtk/gtkprogress.c
   trunk/gtk/gtkprogress.h
   trunk/gtk/gtkprogressbar.c

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Mon Aug  4 14:38:35 2008
@@ -35,6 +35,7 @@
 	-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)				\

Modified: trunk/gtk/gtkclist.c
==============================================================================
--- trunk/gtk/gtkclist.c	(original)
+++ trunk/gtk/gtkclist.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
     }
 }
 
-#define __GTK_CLIST_C__
 #include "gtkaliasdef.c"
-

Modified: trunk/gtk/gtkclist.h
==============================================================================
--- trunk/gtk/gtkclist.h	(original)
+++ trunk/gtk/gtkclist.h	Mon Aug  4 14:38:35 2008
@@ -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__

Modified: trunk/gtk/gtkctree.c
==============================================================================
--- trunk/gtk/gtkctree.c	(original)
+++ trunk/gtk/gtkctree.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
   return our_type;
 }
 
-#define __GTK_CTREE_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtkctree.h
==============================================================================
--- trunk/gtk/gtkctree.h	(original)
+++ trunk/gtk/gtkctree.h	Mon Aug  4 14:38:35 2008
@@ -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__

Modified: trunk/gtk/gtklist.c
==============================================================================
--- trunk/gtk/gtklist.c	(original)
+++ trunk/gtk/gtklist.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
     }
 }
 
-#define __GTK_LIST_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtklist.h
==============================================================================
--- trunk/gtk/gtklist.h	(original)
+++ trunk/gtk/gtklist.h	Mon Aug  4 14:38:35 2008
@@ -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__

Modified: trunk/gtk/gtklistitem.c
==============================================================================
--- trunk/gtk/gtklistitem.c	(original)
+++ trunk/gtk/gtklistitem.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
     }
 }
 
-#define __GTK_LIST_ITEM_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtklistitem.h
==============================================================================
--- trunk/gtk/gtklistitem.h	(original)
+++ trunk/gtk/gtklistitem.h	Mon Aug  4 14:38:35 2008
@@ -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__

Modified: trunk/gtk/gtkpixmap.c
==============================================================================
--- trunk/gtk/gtkpixmap.c	(original)
+++ trunk/gtk/gtkpixmap.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
   g_object_unref (G_OBJECT (stated));
 }
 
-#define __GTK_PIXMAP_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtkpixmap.h
==============================================================================
--- trunk/gtk/gtkpixmap.h	(original)
+++ trunk/gtk/gtkpixmap.h	Mon Aug  4 14:38:35 2008
@@ -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__

Modified: trunk/gtk/gtkprogress.c
==============================================================================
--- trunk/gtk/gtkprogress.c	(original)
+++ trunk/gtk/gtkprogress.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
     }
 }
 
-#define __GTK_PROGRESS_C__
 #include "gtkaliasdef.c"

Modified: trunk/gtk/gtkprogress.h
==============================================================================
--- trunk/gtk/gtkprogress.h	(original)
+++ trunk/gtk/gtkprogress.h	Mon Aug  4 14:38:35 2008
@@ -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 @@
 #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 @@
  * 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_percentage_from_value (GtkProgress *progress,
 						   gdouble      value);
 
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
+#endif /* !GTK_DISABLE_DEPRECATED */
 
 G_END_DECLS
 

Modified: trunk/gtk/gtkprogressbar.c
==============================================================================
--- trunk/gtk/gtkprogressbar.c	(original)
+++ trunk/gtk/gtkprogressbar.c	Mon Aug  4 14:38:35 2008
@@ -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 @@
   return pbar->ellipsize;
 }
 
-#define __GTK_PROGRESS_BAR_C__
 #include "gtkaliasdef.c"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]