Mise � jour instanciation du logo

Tk:Zinc::Logo->new(-widget => $zinc, ...) remplace
$zinc->ZincLogo(...)

3 files changed, 16 insertions, 14 deletions

diff --git a/Perl/Zinc/Logo.pm b/Perl/Zinc/Logo.pm
index b83155f..b601f0d 100644
--- a/Perl/Zinc/Logo.pm
+++ b/Perl/Zinc/Logo.pm
@@ -16,8 +16,6 @@ use strict;
 use Carp;
 use Math::Trig;
 
-Construct Tk::Widget 'ZincLogo';
-
 
 my @Gradiants;
 
@@ -94,13 +92,15 @@ my %builder = (-gradset => {'logoshape' => '=axial 270 |#ffffff;100 0 28|#66848c
 sub new {
     my $proto = shift;
     my $type = ref($proto) || $proto;
-    my $widget = shift;
     my %params = @_;
 
     my $self = {};
     bless ($self, $type);
-
-    $self->{'-widget'} = $widget;
+    if (exists $params{'-widget'}) {
+	$self->{'-widget'} = $params{'-widget'};
+    } else {
+	croak "in Tk::Zinc::Logo constructor, the -widget attribute must be defined\n";
+    }
     $self->{'-parent'} = (exists $params{'-parent'}) ? $params{'-parent'} : 1;
     $self->{'-priority'} = (exists $params{'-priority'}) ? $params{'-priority'} : 500;
     $self->{'-position'} = (exists $params{'-position'}) ? $params{'-position'} : [0, 0];
diff --git a/Perl/demos/Tk/demos/zinc_lib/Zetris.pl b/Perl/demos/Tk/demos/zinc_lib/Zetris.pl
index 1f17106..f9e239f 100644
--- a/Perl/demos/Tk/demos/zinc_lib/Zetris.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/Zetris.pl
@@ -253,10 +253,11 @@ $tetris->add('rectangle',
 	     -visible => 1);
 
 my $group = $tetris->add('group', 1, );
-my $logo = $tetris->ZincLogo(-parent => $group,
-				   -position => [$step_x*($width-2)/2-200,
-						 $step_y*($height-1)/2],
-			    );
+my $logo = Tk::Zinc::Logo->new(-widget => $tetris,
+			       -parent => $group,
+			       -position => [$step_x*($width-2)/2-200,
+					     $step_y*($height-1)/2],
+			       );
 
 $tetris->lower($group);
 
diff --git a/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl b/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
index eacd57c..55a0621 100644
--- a/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
@@ -36,11 +36,12 @@ my $zinc = $mw->Zinc(-width => 350, -height => 250,
 my $group = $zinc->add('group', 1, );
 
 
-my $logo = $zinc->ZincLogo(-parent => $group,
-			   -position => [40, 70],
-			   -priority => 800,
-			   -scale => [.6, .6],
-			   );
+my $logo = Tk::Zinc::Logo->new(-widget => $zinc,
+			       -parent => $group,
+			       -position => [40, 70],
+			       -priority => 800,
+			       -scale => [.6, .6],
+			       );
 
 
 $zinc->Tk::bind('<ButtonPress-1>', [\&press, \&motion]);