gtkmathview r1182 - in trunk: . src/widget

[luca svn gnome org]

Author: luca
Date: Tue Jun 10 16:17:42 2008
New Revision: 1182
URL: http://svn.gnome.org/viewvc/gtkmathview?rev=1182&view=rev

Log:
+ applied patch by Ed Catmur for marshalling functions in recent GTK versions


Modified:
   trunk/CONTRIBUTORS
   trunk/configure.ac
   trunk/src/widget/Makefile.am
   trunk/src/widget/gtkmathview_common.cc

Modified: trunk/CONTRIBUTORS
==============================================================================
--- trunk/CONTRIBUTORS	(original)
+++ trunk/CONTRIBUTORS	Tue Jun 10 16:17:42 2008
@@ -38,3 +38,5 @@
 * Nicola Rossi
   PostScript backend and accents
 
+* Ed Catmur
+  patch for marshalling functions in new gtk

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jun 10 16:17:42 2008
@@ -332,6 +332,9 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
 have_gtk="no"
 have_pango="no"
 if test "$enable_gtk" = "auto" -o "$enable_gtk" = "yes"; then

Modified: trunk/src/widget/Makefile.am
==============================================================================
--- trunk/src/widget/Makefile.am	(original)
+++ trunk/src/widget/Makefile.am	Tue Jun 10 16:17:42 2008
@@ -68,10 +68,14 @@
 libgtkmathview_libxml2_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@
 libgtkmathview_gmetadom_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@
 
-libgtkmathview_custom_reader_la_SOURCES = gtkmathview_custom_reader.cc
-libgtkmathview_libxml2_reader_la_SOURCES = gtkmathview_libxml2_reader.cc
-libgtkmathview_libxml2_la_SOURCES = gtkmathview_libxml2.cc
-libgtkmathview_gmetadom_la_SOURCES = gtkmathview_gmetadom.cc
+libgtkmathview_custom_reader_la_SOURCES = gtkmathview_custom_reader.cc \
+  gtkmathview_marshal.c
+libgtkmathview_libxml2_reader_la_SOURCES = gtkmathview_libxml2_reader.cc \
+  gtkmathview_marshal.c
+libgtkmathview_libxml2_la_SOURCES = gtkmathview_libxml2.cc \
+  gtkmathview_marshal.c
+libgtkmathview_gmetadom_la_SOURCES = gtkmathview_gmetadom.cc \
+  gtkmathview_marshal.c
 
 libgtkmathview_custom_reader_la_CPPFLAGS = -DGMV_Widget_DLL
 libgtkmathview_libxml2_reader_la_CPPFLAGS = -DGMV_Widget_DLL
@@ -81,6 +85,7 @@
 EXTRA_DIST = \
   gtkmathview_common.cc \
   gtkmathview_decorators_common.cc \
+  marshal.list \
   $(NULL)
 
 gtkdir = $(includedir)/$(PACKAGE)/gtk
@@ -94,6 +99,25 @@
   gtkmathview_libxml2.h \
   gtkmathview_gmetadom.h
 
+noinst_HEADERS = \
+  gtkmathview_marshal.h \
+  $(NULL)
+
+BUILT_SOURCES = \
+  gtkmathview_marshal.c \
+  gtkmathview_marshal.h \
+  $(NULL)
+
+CLEANFILES = \
+  $(BUILT_SOURCES) \
+  $(NULL)
+
+gtkmathview_marshal.h: marshal.list
+	$(GLIB_GENMARSHAL) --prefix=gtkmathview_marshal $< --header > $@
+
+gtkmathview_marshal.c: marshal.list
+	$(GLIB_GENMARSHAL) --prefix=gtkmathview_marshal $< --body > $@
+
 INCLUDES = \
   -I$(top_builddir)/auto \
   -I$(top_srcdir)/auto \

Modified: trunk/src/widget/gtkmathview_common.cc
==============================================================================
--- trunk/src/widget/gtkmathview_common.cc	(original)
+++ trunk/src/widget/gtkmathview_common.cc	Tue Jun 10 16:17:42 2008
@@ -36,6 +36,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 
+#include "gtkmathview_marshal.h"
+
 #include "gtkmathview_common.h"
 #if GTKMATHVIEW_USES_CUSTOM_READER
 #define GTK_MATH_VIEW_WIDGET_NAME "GtkMathView_Custom_Reader"
@@ -512,7 +514,7 @@
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET(GtkMathViewClass,set_scroll_adjustments),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER_POINTER,
+		 gtkmathview_marshal_VOID__POINTER_POINTER,
 		 G_TYPE_NONE , 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); 
 	
   click_signal = 
@@ -521,8 +523,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, click),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   select_begin_signal=
     g_signal_new("select_begin",
@@ -530,8 +532,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, select_begin),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
   select_over_signal = 
     g_signal_new("select_over",
@@ -539,8 +541,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, select_over),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
   select_end_signal = 
     g_signal_new("select_end",
@@ -548,8 +550,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, select_end),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 	
   select_abort_signal = 
     g_signal_new("select_abort",
@@ -557,7 +559,7 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, select_abort),
 		 NULL, NULL,
-		 gtk_marshal_NONE__NONE,
+		 g_cclosure_marshal_VOID__VOID,
 		 G_TYPE_NONE, 0);
 	
   element_over_signal = 
@@ -566,8 +568,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, element_over),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   decorate_under_signal =
     g_signal_new("decorate_under",
@@ -575,8 +577,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, decorate_under),
 		 NULL, NULL,
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   decorate_over_signal =
     g_signal_new("decorate_over",
@@ -584,8 +586,8 @@
 		 G_SIGNAL_RUN_FIRST,
 		 G_STRUCT_OFFSET(GtkMathViewClass, decorate_over),
 		 NULL, NULL, 
-		 gtk_marshal_NONE__POINTER,
-		 G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		 g_cclosure_marshal_VOID__POINTER,
+		 G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 #if 0	
   g_object_class_install_property(gobject_class,