ajout d'une instruction package pour limite rles risque de renommage

de fonctions / variables  entre diff�rentes demos

8 files changed, 23 insertions, 8 deletions

diff --git a/Perl/demos/Tk/demos/zinc_lib/contours.pl b/Perl/demos/Tk/demos/zinc_lib/contours.pl
index 94e2e14..bfff197 100644
--- a/Perl/demos/Tk/demos/zinc_lib/contours.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/contours.pl
@@ -7,6 +7,8 @@ use Tk::Zinc;
 
 use strict;
 
+package contours; # for avoiding symbol collision between different demos
+
 my $mw = MainWindow->new();
 
 # The explanation displayed when running this demo
@@ -193,7 +195,7 @@ sub release {
 }
 
 
-MainLoop();
+Tk::MainLoop();
 
 
 1;
diff --git a/Perl/demos/Tk/demos/zinc_lib/counter.pl b/Perl/demos/Tk/demos/zinc_lib/counter.pl
index 6907fab..74c51aa 100644
--- a/Perl/demos/Tk/demos/zinc_lib/counter.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/counter.pl
@@ -7,6 +7,8 @@ use Tk::Zinc;
 use strict;
 use constant;
 
+package counter; # for avoiding symbol collision between different demos
+
 my constant $PI=3.1416;
 
 my $boldfont = '-adobe-helvetica-bold-r-normal--20-240-100-100-p-182-iso8859-1';
@@ -429,4 +431,4 @@ sub move{
   $zinc->translate("$clipped_group2",$x-$xi,$y-$yi);
 }
  
-MainLoop;
+Tk::MainLoop;
diff --git a/Perl/demos/Tk/demos/zinc_lib/groups_in_ATC_strips.pl b/Perl/demos/Tk/demos/zinc_lib/groups_in_ATC_strips.pl
index 59bcbce..38b0e41 100644
--- a/Perl/demos/Tk/demos/zinc_lib/groups_in_ATC_strips.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/groups_in_ATC_strips.pl
@@ -42,6 +42,8 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
+package groups_in_ATC_strips; # for avoiding symbol collision between different demos
+
 # to find some images (used as textures) needed by this demo
 my $image_path = Tk->findINC('demos/zinc_data');
 
@@ -389,7 +391,8 @@ for (my $index = 0; $index < 4 ; $index++) {
 
 	 
 
-MainLoop;
+Tk::MainLoop;
+
 #----------------------------------------------------------------------- fin de MAIN
 
 
diff --git a/Perl/demos/Tk/demos/zinc_lib/groups_priority.pl b/Perl/demos/Tk/demos/zinc_lib/groups_priority.pl
index e6e78f1..f2c7594 100644
--- a/Perl/demos/Tk/demos/zinc_lib/groups_priority.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/groups_priority.pl
@@ -7,6 +7,7 @@ use Tk::Zinc;
 
 use strict;
 
+package groups_priority;  # for avoiding symbol sharing between different demos
 my $mw = MainWindow->new();
 
 # The explanation displayed when running this demo
@@ -247,7 +248,7 @@ sub release {
 }
 
 
-MainLoop();
+Tk::MainLoop();
 
 
 1;
diff --git a/Perl/demos/Tk/demos/zinc_lib/simple_interaction_track.pl b/Perl/demos/Tk/demos/zinc_lib/simple_interaction_track.pl
index a506151..c872f82 100644
--- a/Perl/demos/Tk/demos/zinc_lib/simple_interaction_track.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/simple_interaction_track.pl
@@ -6,6 +6,8 @@ use Tk;
 use Tk::Zinc;
 use strict;
 
+package simple_interaction_track; # for avoiding symbol collision between different demos
+
 my $mw = MainWindow->new();
 
 
@@ -292,4 +294,4 @@ sub select_color_off{
 		       -markercolor=>"black",
 		       -leadercolor=>"black" );
        }
-MainLoop;
+Tk::MainLoop;
diff --git a/Perl/demos/Tk/demos/zinc_lib/simpleradar.pl b/Perl/demos/Tk/demos/zinc_lib/simpleradar.pl
index 3ac1dfe..796270f 100644
--- a/Perl/demos/Tk/demos/zinc_lib/simpleradar.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/simpleradar.pl
@@ -11,6 +11,8 @@ use strict;
 use lib Tk->findINC('demos/zinc_pm');
 use SimpleRadarControls;
 
+package simpleradar; # for avoiding symbol collision between different demos
+
 # to find some maps needed by these demo
 my $map_path = Tk->findINC('demos/zinc_data');
 
@@ -479,6 +481,6 @@ sub borders {
 }
 
 
-MainLoop();
+Tk::MainLoop();
 
 
diff --git a/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl b/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
index 47779c2..4cb10c4 100644
--- a/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/tkZincLogo.pl
@@ -8,6 +8,7 @@ use Tk::Zinc;
 use strict;
 use LogoZinc; # this module implements a class which instances are Zinc logo!
 
+package tkZincLogo; # for avoiding symbol collision between different demos
 
 my $defaultfont = '-adobe-helvetica-bold-r-normal-*-140-*-*-*-*-*-*';
 my $mw = MainWindow->new();
@@ -158,4 +159,4 @@ sub release {
     $zinc->Tk::bind('<Motion>', '');
 }
 
-MainLoop;
+Tk::MainLoop;
diff --git a/Perl/demos/Tk/demos/zinc_lib/window-contours.pl b/Perl/demos/Tk/demos/zinc_lib/window-contours.pl
index 17a8373..0b2d91b 100644
--- a/Perl/demos/Tk/demos/zinc_lib/window-contours.pl
+++ b/Perl/demos/Tk/demos/zinc_lib/window-contours.pl
@@ -7,6 +7,8 @@ use Tk::Zinc;
 
 use strict;
 
+package window_contours; # for avoiding symbol collision between different demos
+
 my $mw = MainWindow->new();
 
 # The explanation displayed when running this demo
@@ -105,7 +107,7 @@ sub release {
 }
 
 
-MainLoop();
+Tk::MainLoop();
 
 
 1;