r56156 - in /branches/upstream/libchamplain-perl/current: ./ debian/ lib/ t/ xs/

chrisb at users.alioth.debian.org chrisb at users.alioth.debian.org
Thu Apr 15 21:46:30 UTC 2010


Author: chrisb
Date: Thu Apr 15 21:46:23 2010
New Revision: 56156

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56156
Log:
[svn-upgrade] Integrating new upstream version, libchamplain-perl (0.11)

Removed:
    branches/upstream/libchamplain-perl/current/debian/
Modified:
    branches/upstream/libchamplain-perl/current/Changes
    branches/upstream/libchamplain-perl/current/MANIFEST.SKIP
    branches/upstream/libchamplain-perl/current/META.yml
    branches/upstream/libchamplain-perl/current/Makefile.PL
    branches/upstream/libchamplain-perl/current/README
    branches/upstream/libchamplain-perl/current/lib/Champlain.pm
    branches/upstream/libchamplain-perl/current/maps
    branches/upstream/libchamplain-perl/current/t/ChamplainMapSource.t
    branches/upstream/libchamplain-perl/current/t/ChamplainMapSourceDesc.t
    branches/upstream/libchamplain-perl/current/t/ChamplainMarker.t
    branches/upstream/libchamplain-perl/current/t/ChamplainPolygon.t
    branches/upstream/libchamplain-perl/current/t/ChamplainView.t
    branches/upstream/libchamplain-perl/current/xs/ChamplainMapSource.xs
    branches/upstream/libchamplain-perl/current/xs/ChamplainMarker.xs
    branches/upstream/libchamplain-perl/current/xs/ChamplainPolygon.xs
    branches/upstream/libchamplain-perl/current/xs/ChamplainView.xs

Modified: branches/upstream/libchamplain-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/Changes?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/Changes (original)
+++ branches/upstream/libchamplain-perl/current/Changes Thu Apr 15 21:46:23 2010
@@ -1,4 +1,14 @@
 Revision history for Champlain
+
+0.11 Sat Jan  9 10:48:45 CET 2010
+	API coverage for libchamplain 0.4.3.
+
+
+0.10 Tue Nov  3 06:31:52 CET 2009
+	Build update: add Champliain to write_boot ignore.
+	Minor documentation update.
+	Advertise Gtk2::Champlain.
+
 
 0.09 Sat Oct 17 19:41:46 CEST 2009
 	Full API coverage for libchamplain 0.4.1.

Modified: branches/upstream/libchamplain-perl/current/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/MANIFEST.SKIP?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/MANIFEST.SKIP (original)
+++ branches/upstream/libchamplain-perl/current/MANIFEST.SKIP Thu Apr 15 21:46:23 2010
@@ -1,5 +1,4 @@
 ^build/
-\.svn
 ^Makefile$
 ^Makefile[.]am$
 ^Makefile[.]in$

Modified: branches/upstream/libchamplain-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/META.yml?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/META.yml (original)
+++ branches/upstream/libchamplain-perl/current/META.yml Thu Apr 15 21:46:23 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Champlain
-version:             0.09
+version:             0.11
 abstract:            Map rendering canvas
 license:             perl, lgpl
 author:              

Modified: branches/upstream/libchamplain-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/Makefile.PL?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/Makefile.PL (original)
+++ branches/upstream/libchamplain-perl/current/Makefile.PL Thu Apr 15 21:46:23 2010
@@ -50,7 +50,10 @@
 
 	# Code generation
 	Glib::CodeGen->parse_maps('champlain', input => [ @typemaps ]);
-	Glib::CodeGen->write_boot(xs_files => [ @XS_FILES ]);
+	Glib::CodeGen->write_boot(
+		xs_files => [ @XS_FILES ],
+		ignore   => qr/^Champlain$/,
+	);
 	
 	
 	$DEPENDS->set_inc($pkgconfig{cflags} . ' -I./build');

Modified: branches/upstream/libchamplain-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/README?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/README (original)
+++ branches/upstream/libchamplain-perl/current/README Thu Apr 15 21:46:23 2010
@@ -7,7 +7,7 @@
 an existing application.
 
 The library relies on Clutter for all rendering and can easily be embedded in
-any Gtk2 application.
+any Gtk2 application (look for Gtk2::Champlain on CPAN).
 
 The maps displayed are taken from various sources, all providing maps for free,
 at the moment the following sources area available: OpenStreetMap, OpenAerialMap
@@ -61,3 +61,4 @@
 You should have received a copy of the GNU Library General Public License along
 with this library; if not, write to the Free Software Foundation, Inc., 59
 Temple Place - Suite 330, Boston, MA  02111-1307  USA.
+

Modified: branches/upstream/libchamplain-perl/current/lib/Champlain.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/lib/Champlain.pm?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/lib/Champlain.pm (original)
+++ branches/upstream/libchamplain-perl/current/lib/Champlain.pm Thu Apr 15 21:46:23 2010
@@ -28,16 +28,17 @@
 
 =head1 DESCRIPTION
 
-Champlain is a Perl binding for the C library libchamplain which provides a
-canvas widget based on L<Clutter> that displays maps from various free map
-sources such as I<OpenStreetMap>, I<OpenAerialMap> and I<Maps for free>.
+Champlain consists of the Perl bindings for the C library libchamplain which
+provides a canvas widget based on L<Clutter> that displays maps from various
+free map sources such as I<OpenStreetMap>, I<OpenAerialMap> and
+I<Maps for free>.
 
 For more information about libchamplain see:
 L<http://projects.gnome.org/libchamplain/>.
 
 =head1 EXPORTS
 
-The library makes the following constants available:
+The module defines the following constants which can be exported on demand:
 
 =over
 
@@ -52,7 +53,7 @@
 =back
 
 The tag I<coords> can be used for importing the constants providing the minimal
-and maximal values for (latitude, longitude) coordinates:
+and maximal values for I<(latitude, longitude)> coordinates:
 
 	use Champlain ':coords';
 
@@ -63,13 +64,12 @@
 built with Gtk2 support.
 
 While this was very handy it made the Perl modules hard to maintain and starting
-with Clutter 1.0 the Gtk2 wrappers are no longer bundled. They will be provided
-by another CPAN package that doesn't exist yet. This will mimic what the C
-libraries do and what other bindings do.
+with Clutter 1.0 the Gtk2 wrappers are no longer bundled together. Instead they
+now need to be downloaded and installed separately. This mimics what the C
+libraries and other bindings already do for Clutter & co.
 
-In the meanwhile this means that this Perl module no longer supports Gtk2.
-Just as with Clutter, another module will be created that will add support for
-Gtk2 once the Gkt2 Perl bindings for Clutter are written.
+The Gtk2 Perl bindings for this widget are available in CPAN as
+L<Gtk2::Champlain>.
 
 =head1 BUGS
 
@@ -119,7 +119,7 @@
 use warnings;
 use strict;
 
-our $VERSION = '0.09';
+our $VERSION = '0.11';
 
 use base 'DynaLoader';
 use Exporter 'import';
@@ -174,3 +174,4 @@
 __PACKAGE__->bootstrap($VERSION);
 
 1;
+

Modified: branches/upstream/libchamplain-perl/current/maps
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/maps?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/maps (original)
+++ branches/upstream/libchamplain-perl/current/maps Thu Apr 15 21:46:23 2010
@@ -16,3 +16,4 @@
 CHAMPLAIN_TYPE_POLYGON             ChamplainPolygon           GObject  Champlain::Polygon
 CHAMPLAIN_TYPE_SELECTION_LAYER     ChamplainSelectionLayer    GObject  Champlain::SelectionLayer
 CHAMPLAIN_TYPE_SELECTION_MODE      ChamplainSelectionMode     GEnum    Champlain::SelectionMode
+CHAMPLAIN_TYPE_UNIT                ChamplainUnit              GEnum    Champlain::Unit

Modified: branches/upstream/libchamplain-perl/current/t/ChamplainMapSource.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/t/ChamplainMapSource.t?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/t/ChamplainMapSource.t (original)
+++ branches/upstream/libchamplain-perl/current/t/ChamplainMapSource.t Thu Apr 15 21:46:23 2010
@@ -3,11 +3,11 @@
 use strict;
 use warnings;
 
-use Clutter::TestHelper tests => 165;
+use Clutter::TestHelper tests => 177;
 
 use Champlain qw(:coords :maps);
 
-my $OSM_LICENSE = "CC-BY-SA 2.0 OpenStreetMap contributors";
+my $OSM_LICENSE_REGEXP = qr/OpenStreetMap contributors/;
 my $OSM_URL_LICENSE = 'http://creativecommons.org/licenses/by-sa/2.0/';
 
 exit tests();
@@ -18,6 +18,7 @@
 	test_osm_osmarender();
 	test_oam();
 	test_mff_relief();
+
 	return 0;
 }
 
@@ -34,7 +35,7 @@
 	is($map->get_min_zoom_level, 0, "$label min zoom");
 	is($map->get_max_zoom_level, 18, "$label max zoom");
 	is($map->get_tile_size, 256, "$label tile size");
-	is($map->get_license, $OSM_LICENSE, "$label license");
+	ok($map->get_license =~ /$OSM_LICENSE_REGEXP/, "$label license");
 	is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
 	
 	# Generic map operations
@@ -54,7 +55,7 @@
 	is($map->get_min_zoom_level, 0, "$label min zoom");
 	is($map->get_max_zoom_level, 18, "$label max zoom");
 	is($map->get_tile_size, 256, "$label tile size");
-	is($map->get_license, $OSM_LICENSE, "$label license");
+	ok($map->get_license =~ /$OSM_LICENSE_REGEXP/, "$label license");
 	is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
 	
 	# Generic map operations
@@ -74,7 +75,7 @@
 	is($map->get_min_zoom_level, 0, "$label min zoom");
 	is($map->get_max_zoom_level, 17, "$label max zoom");
 	is($map->get_tile_size, 256, "$label tile size");
-	is($map->get_license, $OSM_LICENSE, "$label license");
+	ok($map->get_license =~ /$OSM_LICENSE_REGEXP/, "$label license");
 	is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
 	
 	# Generic map operations
@@ -238,6 +239,20 @@
 		1,
 		"$label column count at min zoom"
 	);
+
+
+	# Check that min zoom level and max zoom level meters per pixel at different
+	SKIP: {
+		Champlain->CHECK_VERSION(0, 4, 3) or skip '0.4.3 stuff', 2;
+		my $meters_at_min = $map->get_meters_per_pixel($map->get_min_zoom_level, 0, 0);
+		ok($meters_at_min > 0, "Meters per pixel $meters_at_min at min zoom level");
+
+		my $meters_at_max = $map->get_meters_per_pixel($map->get_max_zoom_level, 0, 0);
+		ok($meters_at_max > 0, "Meters per pixel $meters_at_max at max zoom level");
+
+		ok($meters_at_max < $meters_at_min, "Meters per pixel are different at max/min zoom level");
+	}
+
 
 	my $tile = Champlain::Tile->new();
 	is($tile->get_size(), 0, "get_size() default tile");

Modified: branches/upstream/libchamplain-perl/current/t/ChamplainMapSourceDesc.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/t/ChamplainMapSourceDesc.t?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/t/ChamplainMapSourceDesc.t (original)
+++ branches/upstream/libchamplain-perl/current/t/ChamplainMapSourceDesc.t Thu Apr 15 21:46:23 2010
@@ -37,7 +37,7 @@
 	isa_ok($source, 'Champlain::MapSourceDesc');
 	is($source->id, Champlain::MapSourceFactory->OSM_MAPNIK, "get id()");
 	is($source->name, 'OpenStreetMap Mapnik', "get name()");
-	is($source->license, "CC-BY-SA 2.0 OpenStreetMap contributors", "get license()");
+	ok($source->license =~ /OpenStreetMap contributors/, "get license()");
 	is($source->license_uri, 'http://creativecommons.org/licenses/by-sa/2.0/', "get license_uri()");
 	is($source->min_zoom_level, 0, "get min_zoom_level()");
 	is($source->max_zoom_level, 18, "get max_zoom_level()");

Modified: branches/upstream/libchamplain-perl/current/t/ChamplainMarker.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/t/ChamplainMarker.t?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/t/ChamplainMarker.t (original)
+++ branches/upstream/libchamplain-perl/current/t/ChamplainMarker.t Thu Apr 15 21:46:23 2010
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Clutter::TestHelper tests => 312;
+use Clutter::TestHelper tests => 324;
 use Test::Builder;
 
 use Champlain ':coords';
@@ -21,16 +21,40 @@
 
 
 sub tests {
+
 	test_new();
 	test_new_with_text();
 	test_new_from_file();
 	test_new_full();
 	test_new_with_image();
-
-	# Can't be tested but at least we call it
+	test_global_colors();
+
+	return 0;
+}
+
+
+sub test_global_colors {
+
 	Champlain::Marker->set_highlight_color(Clutter::Color->new(0xff, 0xff, 0x00));
-
-	return 0;
+	SKIP: {
+		Champlain->CHECK_VERSION(0, 4, 1) or skip '0.4.1 stuff', 1;
+		is_color(
+			Champlain::Marker->get_highlight_color,
+			Clutter::Color->new(0xff, 0xff, 0x00),
+			"get_highlight_color()"
+		);
+	}
+
+
+	Champlain::Marker->set_highlight_text_color(Clutter::Color->new(0xff, 0xef, 0x00));
+	SKIP: {
+		Champlain->CHECK_VERSION(0, 4, 1) or skip '0.4.1 stuff', 1;
+		is_color(
+			Champlain::Marker->get_highlight_text_color,
+			Clutter::Color->new(0xff, 0xef, 0x00),
+			"get_highlight_color()"
+		);
+	}
 }
 
 
@@ -188,6 +212,13 @@
 	is($marker->get_font_name, "Mono 14", "set_font_name()");
 	$marker->set_font_name(undef);
 	is($marker->get_font_name, $DEFAULT_FONT_NAME, "set_font_name(undef)");
+
+
+	# Can't be tested but at least we call it
+	SKIP: {
+		Champlain->CHECK_VERSION(0, 4, 3) or skip '0.4.3 stuff', 0;
+		$marker->queue_redraw();
+	}
 }
 
 

Modified: branches/upstream/libchamplain-perl/current/t/ChamplainPolygon.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/t/ChamplainPolygon.t?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/t/ChamplainPolygon.t (original)
+++ branches/upstream/libchamplain-perl/current/t/ChamplainPolygon.t Thu Apr 15 21:46:23 2010
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Clutter::TestHelper tests => 50;
+use Clutter::TestHelper tests => 52;
 
 use Champlain;
 
@@ -43,6 +43,15 @@
 	# These fields have no accessor yet
 	ok(!$polygon->get('closed-path'), "closed-path is unset on a new polygon");
 	ok($polygon->get('visible'), "closed-path is set on a new polygon");
+
+	SKIP: {
+		Champlain->CHECK_VERSION(0, 4, 3) or skip '0.4.3 stuff', 2;
+		$polygon->set_mark_points(TRUE);
+		is($polygon->get_mark_points, TRUE, "set_mark_points(TRUE)");
+
+		$polygon->set_mark_points(FALSE);
+		is($polygon->get_mark_points, FALSE, "set_mark_points(FALSE)");
+	}
 }
 
 

Modified: branches/upstream/libchamplain-perl/current/t/ChamplainView.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/t/ChamplainView.t?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/t/ChamplainView.t (original)
+++ branches/upstream/libchamplain-perl/current/t/ChamplainView.t Thu Apr 15 21:46:23 2010
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Clutter::TestHelper tests => 82;
+use Clutter::TestHelper tests => 88;
 
 use Champlain ':coords';
 
@@ -38,25 +38,9 @@
 	ok($view->get('latitude') != $latitude, "center_on() changed latitude");
 	ok($view->get('longitude') != $longitude, "center_on() changed longitude");
 	
-	# NOTE: In recent versions of libchamplain the view requests the first tile
-	#       (0, 0 at zoom level 0). If the tile is already in the cache then it
-	#       will be loaded and the view's initial size will be of the tile's size.
-	#       If the tile is not in the cache then it will be downloaded
-	#       asynchronously and the view will have a size of (0, 0).
-	#
-	#       For the moment there's no mechanism for disabling the cache nor for
-	#       finding out if the view has a tile loaded. This is why the test for
-	#       both.
-	# 
-	#
-	my $source_original = $view->get('map-source');
-	ok($view->get('width') == 0 || $view->get('width') == $source_original->get_tile_size, "original width");
-	ok($view->get('height') == 0 || $view->get('height') == $source_original->get_tile_size, "original height");
-
-	# set_size() can be tested by checking the properties width and height
 	$view->set_size(600, 400);
-	is($view->get('width'), 600, "set_size() changed width");
-	is($view->get('height'), 400, "set_size() changed height");
+	ok($view->get('width') >= 600, "set_size() changed width");
+	ok($view->get('height') >=  400, "set_size() changed height");
 
 	
 	# Can't be tested but at least we check that it doesn't crash when invoked
@@ -71,6 +55,7 @@
 	# Change the map source (get a different map source)
 	my $factory = Champlain::MapSourceFactory->dup_default();
 	my $source_new = $factory->create(Champlain::MapSourceFactory->OSM_MAPNIK);
+	my $source_original = $view->get('map-source');
 	if ($source_original->get_id eq $source_new->get_id) {
 		# The new map source is the same as the original! Take another map
 		# source instead
@@ -123,6 +108,37 @@
 	
 	# Call ensure_visible(), it's to test, but at least we test that it doesn't crash
 	$view->ensure_visible(10, 10, 30, 30, TRUE);
+
+
+	SKIP: {
+		Champlain->CHECK_VERSION(0, 4, 3) or skip '0.4.3 stuff', 2;
+		$view->set_license_text("Perl Universal License");
+		is($view->get_license_text, "Perl Universal License", "set_license_text(text)");
+
+		$view->set_license_text(undef);
+		is($view->get_license_text, undef, "set_license_text(undef)");
+
+
+		$view->set_max_scale_width(200);
+		is($view->get_max_scale_width, 200, "set_max_scale_width(200)");
+
+		$view->set_max_scale_width(400);
+		is($view->get_max_scale_width, 400, "set_max_scale_width(400)");
+
+
+		$view->set_scale_unit('miles');
+		is($view->get_scale_unit, 'miles', "set_max_scale_width('miles')");
+
+		$view->set_scale_unit('km');
+		is($view->get_scale_unit, 'km', "set_max_scale_width('km')");
+
+
+		$view->set_show_scale(TRUE);
+		is($view->get_show_scale, TRUE, "set_show_scale(TRUE)");
+
+		$view->set_show_scale(FALSE);
+		is($view->get_show_scale, FALSE, "set_show_scale(FALSE)");
+	}
 }
 
 

Modified: branches/upstream/libchamplain-perl/current/xs/ChamplainMapSource.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/xs/ChamplainMapSource.xs?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/xs/ChamplainMapSource.xs (original)
+++ branches/upstream/libchamplain-perl/current/xs/ChamplainMapSource.xs Thu Apr 15 21:46:23 2010
@@ -82,3 +82,11 @@
 
 void
 champlain_map_source_fill_tile (ChamplainMapSource *map_source, ChamplainTile *tile)
+
+
+#if CHAMPLAIN_CHECK_VERSION (0, 4, 3)
+
+gfloat
+champlain_map_source_get_meters_per_pixel (ChamplainMapSource *map_source, gint zoom_level, gdouble latitude, gdouble longitude)
+
+#endif /* 0.4.3 */

Modified: branches/upstream/libchamplain-perl/current/xs/ChamplainMarker.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/xs/ChamplainMarker.xs?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/xs/ChamplainMarker.xs (original)
+++ branches/upstream/libchamplain-perl/current/xs/ChamplainMarker.xs Thu Apr 15 21:46:23 2010
@@ -142,3 +142,29 @@
 void
 champlain_marker_set_highlight_color (class, ClutterColor *color);
 	C_ARGS: color
+
+
+void
+champlain_marker_set_highlight_text_color (class, ClutterColor *color);
+	C_ARGS: color
+
+
+#if CHAMPLAIN_CHECK_VERSION (0, 4, 1)
+
+ClutterColor*
+champlain_marker_get_highlight_color (class)
+	C_ARGS:  /* No args */
+
+const ClutterColor*
+champlain_marker_get_highlight_text_color (class)
+	C_ARGS:  /* No args */
+
+#endif /* 0.4.1 */
+
+
+#if CHAMPLAIN_CHECK_VERSION (0, 4, 3)
+
+void
+champlain_marker_queue_redraw (ChamplainMarker *marker)
+
+#endif /* 0.4.3 */

Modified: branches/upstream/libchamplain-perl/current/xs/ChamplainPolygon.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/xs/ChamplainPolygon.xs?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/xs/ChamplainPolygon.xs (original)
+++ branches/upstream/libchamplain-perl/current/xs/ChamplainPolygon.xs Thu Apr 15 21:46:23 2010
@@ -91,3 +91,15 @@
 
 void
 champlain_polygon_remove_point (ChamplainPolygon *self, ChamplainPoint *point)
+
+
+#if CHAMPLAIN_CHECK_VERSION (0, 4, 3)
+
+void
+champlain_polygon_set_mark_points (ChamplainPolygon *polygon, gboolean value)
+
+
+gboolean
+champlain_polygon_get_mark_points (ChamplainPolygon *polygon)
+
+#endif /* 0.4.3 */

Modified: branches/upstream/libchamplain-perl/current/xs/ChamplainView.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libchamplain-perl/current/xs/ChamplainView.xs?rev=56156&op=diff
==============================================================================
--- branches/upstream/libchamplain-perl/current/xs/ChamplainView.xs (original)
+++ branches/upstream/libchamplain-perl/current/xs/ChamplainView.xs Thu Apr 15 21:46:23 2010
@@ -154,3 +154,39 @@
 champlain_view_remove_layer (ChamplainView *view, ChamplainLayer *layer)
 
 #endif /* 0.4.1 */
+
+
+#if CHAMPLAIN_CHECK_VERSION (0, 4, 3)
+
+const gchar_ornull *
+champlain_view_get_license_text (ChamplainView *view)
+
+
+void
+champlain_view_set_license_text (ChamplainView *view, const gchar_ornull *text)
+
+
+guint
+champlain_view_get_max_scale_width (ChamplainView *view)
+
+
+ChamplainUnit
+champlain_view_get_scale_unit (ChamplainView *view)
+
+
+gboolean
+champlain_view_get_show_scale (ChamplainView *view)
+
+
+void
+champlain_view_set_max_scale_width (ChamplainView *view, guint value)
+
+
+void
+champlain_view_set_scale_unit (ChamplainView *view, ChamplainUnit unit)
+
+
+void
+champlain_view_set_show_scale (ChamplainView *view, gboolean value)
+
+#endif /* 0.4.3 */




More information about the Pkg-perl-cvs-commits mailing list