[xiph-commits] r18295 - trunk/spectrum

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2012-05-18 01:41:15 -0700 (Fri, 18 May 2012)
New Revision: 18295

Modified:
   trunk/spectrum/Makefile
   trunk/spectrum/spec_plot.c
   trunk/spectrum/spec_plot.h
   trunk/spectrum/version.h
   trunk/spectrum/wave_plot.c
   trunk/spectrum/wave_plot.h
Log:
Eliminate inclusion of individual widget headers



Modified: trunk/spectrum/Makefile
===================================================================
--- trunk/spectrum/Makefile	2012-05-17 22:33:21 UTC (rev 18294)
+++ trunk/spectrum/Makefile	2012-05-18 08:41:15 UTC (rev 18295)
@@ -30,7 +30,7 @@
 WAVEFORM_OBJ = waveform.o wave_process.o wave_panel.o wave_plot.o io.o
 OBJ = $(SPECTRUM_OBJ) $(WAVEFORM_OBJ)
 
-GCF = -DETCDIR=\\\"$(ETCDIR)\\\" `pkg-config --cflags gtk+-2.0`
+GCF = -DETCDIR=\\\"$(ETCDIR)\\\" `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_SINGLE_INCLUDES
 
 CFLAGS := ${CFLAGS} $(GCF) $(ADD_DEF)
 

Modified: trunk/spectrum/spec_plot.c
===================================================================
--- trunk/spectrum/spec_plot.c	2012-05-17 22:33:21 UTC (rev 18294)
+++ trunk/spectrum/spec_plot.c	2012-05-18 08:41:15 UTC (rev 18295)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 #include "spec_plot.h"
 
 static double log_lfreqs[5]={10.,100.,1000.,10000.,100000};

Modified: trunk/spectrum/spec_plot.h
===================================================================
--- trunk/spectrum/spec_plot.h	2012-05-17 22:33:21 UTC (rev 18294)
+++ trunk/spectrum/spec_plot.h	2012-05-18 08:41:15 UTC (rev 18295)
@@ -26,9 +26,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/spectrum/version.h
===================================================================
--- trunk/spectrum/version.h	2012-05-17 22:33:21 UTC (rev 18294)
+++ trunk/spectrum/version.h	2012-05-18 08:41:15 UTC (rev 18295)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Thu May 17 11:14:32 EDT 2012] */
+/* DO NOT EDIT: Automated versioning hack [Fri May 18 04:39:31 EDT 2012] */

Modified: trunk/spectrum/wave_plot.c
===================================================================
--- trunk/spectrum/wave_plot.c	2012-05-17 22:33:21 UTC (rev 18294)
+++ trunk/spectrum/wave_plot.c	2012-05-18 08:41:15 UTC (rev 18295)
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 #include "wave_plot.h"
 
 static GtkDrawingAreaClass *parent_class = NULL;

Modified: trunk/spectrum/wave_plot.h
===================================================================
--- trunk/spectrum/wave_plot.h	2012-05-17 22:33:21 UTC (rev 18294)
+++ trunk/spectrum/wave_plot.h	2012-05-18 08:41:15 UTC (rev 18295)
@@ -26,9 +26,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS