Champlain::Marker->new_with_text() gets passed only the parameters that are defined

diff --git a/bindings/perl/Champlain/examples/gtk2.pl b/bindings/perl/Champlain/examples/gtk2.pl
index ca2f971937b27c0f6306ac249a0155de71096e57..02a7d92b65bca7981afafa2ac9c6381d1457afb8 100755 (executable)
--- a/bindings/perl/Champlain/examples/gtk2.pl
+++ b/bindings/perl/Champlain/examples/gtk2.pl
@@ -134,23 +134,17 @@ sub create_marker_layer {
        
        my $marker;
        
-       $marker = Champlain::Marker->new_with_text(
-               "Montr\x{e9}al", "Airmole 14", undef, undef
-       );
+       $marker = Champlain::Marker->new_with_text("Montr\x{e9}al", "Airmole 14");
        $marker->set_position(45.528178, -73.563788);
        $marker->set_reactive(TRUE);
        $marker->signal_connect_after("button-release-event", \&marker_button_release_cb, $map);
        $layer->add($marker);
 
-       $marker = Champlain::Marker->new_with_text(
-               "New York", "Sans 15", $white, undef
-       );
+       $marker = Champlain::Marker->new_with_text("New York", "Sans 15", $white);
        $marker->set_position(40.77, -73.98);
        $layer->add($marker);
 
-       $marker = Champlain::Marker->new_with_text(
-               "Bratislava", "Sans 15", $orange, undef
-       );
+       $marker = Champlain::Marker->new_with_text("Bratislava", "Sans 15", $orange);
        $marker->set_position(47.130885, -70.764141);
        $layer->add($marker);
 

diff --git a/bindings/perl/Champlain/examples/launcher.pl b/bindings/perl/Champlain/examples/launcher.pl
index c1b17110ef905b3c4b9ae88fbb9e64d5da493888..c5cc5b707de084e635ba0375a5498dc00e6492e5 100755 (executable)
--- a/bindings/perl/Champlain/examples/launcher.pl
+++ b/bindings/perl/Champlain/examples/launcher.pl
@@ -105,17 +105,13 @@ sub create_marker_layer {
        
        my $marker;
        
-       $marker = Champlain::Marker->new_with_text(
-               "Montr\x{e9}al", "Airmole 14", undef, undef
-       );
+       $marker = Champlain::Marker->new_with_text("Montr\x{e9}al", "Airmole 14");
        $marker->set_position(45.528178, -73.563788);
        $marker->set_reactive(TRUE);
        $marker->signal_connect_after("button-release-event", \&marker_button_release_cb, $map);
        $layer->add($marker);
 
-       $marker = Champlain::Marker->new_with_text(
-               "New York", "Sans 15", $white, undef
-       );
+       $marker = Champlain::Marker->new_with_text("New York", "Sans 15", $white);
        $marker->set_position(40.77, -73.98);
        $layer->add($marker);
 

diff --git a/bindings/perl/Champlain/t/ChamplainMarker.t b/bindings/perl/Champlain/t/ChamplainMarker.t
index 2b8dd1a3c0900ae72ff73fe8bb1162cab7a9cd00..81b76478b2163312a95a197e7ab71ae071bf2a63 100644 (file)
--- a/bindings/perl/Champlain/t/ChamplainMarker.t
+++ b/bindings/perl/Champlain/t/ChamplainMarker.t
@@ -37,9 +37,7 @@ sub test_new_with_text {
        my $marker;
 
        # Create a label without mandatory arguments
-       $marker = Champlain::Marker->new_with_text(
-               "Home", undef, undef, undef
-       );
+       $marker = Champlain::Marker->new_with_text("Home");
        isa_ok($marker, 'Champlain::Marker');
        is($marker->get_text, 'Home', "new_with_text() sets 'text'");
        ok($marker->get_font_name, "new_with_text(font = undef) sets 'font_name'");