perl-Gtk2 r2162 - in trunk: . xs

[tsch svn gnome org]

Author: tsch
Date: Tue Mar 24 19:24:10 2009
New Revision: 2162
URL: http://svn.gnome.org/viewvc/perl-Gtk2?rev=2162&view=rev

Log:
Don't declare gtk2perl_pango_attribute_register_custom_type; it's now properly
exported by Pango.  Move the PangoAttribute related macros from the private
header directly into GdkPango.xs, the only place where they are used.


Modified:
   trunk/ChangeLog
   trunk/gtk2perl-private.h
   trunk/xs/GdkPango.xs

Modified: trunk/gtk2perl-private.h
==============================================================================
--- trunk/gtk2perl-private.h	(original)
+++ trunk/gtk2perl-private.h	Tue Mar 24 19:24:10 2009
@@ -43,25 +43,4 @@
 				                gpointer      data);
 #endif
 
-/* Implemented in PangoAttributes.xs. */
-void gtk2perl_pango_attribute_register_custom_type (PangoAttrType type, const char *package);
-
-#define GTK2PERL_PANGO_ATTR_REGISTER_CUSTOM_TYPE(attr, package)	\
-{								\
-	static gboolean type_registered_already = FALSE;	\
-	if (!type_registered_already) {				\
-		gtk2perl_pango_attribute_register_custom_type	\
-			((attr)->klass->type, package);		\
-		type_registered_already = TRUE;			\
-	}							\
-}
-
-#define GTK2PERL_PANGO_ATTR_STORE_INDICES(offset, attr)	\
-	if (items == offset + 2) {			\
-		guint start = SvUV (ST (offset));	\
-		guint end = SvUV (ST (offset + 1));	\
-		attr->start_index = start;		\
-		attr->end_index = end;			\
-	}
-
 #endif /* _GTK2PERL_PRIVATE_H_ */

Modified: trunk/xs/GdkPango.xs
==============================================================================
--- trunk/xs/GdkPango.xs	(original)
+++ trunk/xs/GdkPango.xs	Tue Mar 24 19:24:10 2009
@@ -7,7 +7,24 @@
  */
 
 #include "gtk2perl.h"
-#include "gtk2perl-private.h"
+
+#define GTK2PERL_PANGO_ATTR_REGISTER_CUSTOM_TYPE(attr, package)	\
+{								\
+	static gboolean type_registered_already = FALSE;	\
+	if (!type_registered_already) {				\
+		gtk2perl_pango_attribute_register_custom_type	\
+			((attr)->klass->type, package);		\
+		type_registered_already = TRUE;			\
+	}							\
+}
+
+#define GTK2PERL_PANGO_ATTR_STORE_INDICES(offset, attr)	\
+	if (items == offset + 2) {			\
+		guint start = SvUV (ST (offset));	\
+		guint end = SvUV (ST (offset + 1));	\
+		attr->start_index = start;		\
+		attr->end_index = end;			\
+	}
 
 MODULE = Gtk2::Gdk::Pango	PACKAGE = Gtk2::Gdk::PangoRenderer	PREFIX = gdk_pango_renderer_