From 95ba2d44fffe340619c5fdf5624790ac64442d80 Mon Sep 17 00:00:00 2001
From: ribet
Date: Mon, 14 May 2007 14:32:34 +0000
Subject: Déplacement de MGroup. Ce déplacement casse du code côté
 utilisateurs, mais le fichier est enfin à sa place.

---
 src/MTools/Comp/MMultiSelection.pm       |  4 ++--
 src/MTools/Comp/MReconizer.pm            |  2 +-
 src/MTools/Comp/MWritable.pm             |  8 +++----
 src/MTools/GUI/MAntiRecouvrementGroup.pm |  6 ++---
 src/MTools/GUI/MGroup.pm                 | 41 ++++++++++++++++++++++++++++++++
 src/MTools/GUI/MTexture.pm               |  6 ++---
 src/MTools/MGroup.pm                     | 41 --------------------------------
 src/MTools/MSwitch.pm                    |  6 ++---
 src/MTools/Widget/MBouton.pm             |  8 +++----
 src/MTools/Widget/MRadioBouton.pm        |  6 ++---
 src/MTools/Widget/MSplitPane.pm          |  6 ++---
 src/MTools/Widget/MToggleBouton.pm       |  6 ++---
 12 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 src/MTools/GUI/MGroup.pm
 delete mode 100644 src/MTools/MGroup.pm

(limited to 'src/MTools')

diff --git a/src/MTools/Comp/MMultiSelection.pm b/src/MTools/Comp/MMultiSelection.pm
index f124720..9a7260b 100644
--- a/src/MTools/Comp/MMultiSelection.pm
+++ b/src/MTools/Comp/MMultiSelection.pm
@@ -87,7 +87,7 @@ use MTools::MObjet;
 use Math::Trig;
 use MTools::Anim::MOpacity;
 use MTools::Comp::MInertie;
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 
 use vars qw /@ISA/;
 
@@ -143,7 +143,7 @@ sub new {
 	$self -> {__owns_data} = ();
 	$self -> {__source} = minstance ($src);
 	
-	$self -> {__gp_anime} = my $group = new MTools::MGroup ($dessin);
+	$self -> {__gp_anime} = my $group = new MTools::GUI::MGroup ($dessin);
 	
 	push (@{$self -> {__owns_data}}, minstance ($src));
 	push (@{$self -> {__owns_data}}, minstance ($group));
diff --git a/src/MTools/Comp/MReconizer.pm b/src/MTools/Comp/MReconizer.pm
index 9605eb9..8792295 100644
--- a/src/MTools/Comp/MReconizer.pm
+++ b/src/MTools/Comp/MReconizer.pm
@@ -74,7 +74,7 @@ sub new {
 	});
 	$self -> {__dessin} = undef;
 	
-	$self -> {__dessin} = my $dessin = new MTools::MGroup (1);
+	$self -> {__dessin} = my $dessin = new MTools::GUI::MGroup (1);
 	$self -> {__fleche} = $zinc -> add ('curve', minstance($dessin), [[0,0],[0,0]],
 		-linecolor => 'blue',
 		-linewidth => 2,
diff --git a/src/MTools/Comp/MWritable.pm b/src/MTools/Comp/MWritable.pm
index 8a2a2d5..e611972 100644
--- a/src/MTools/Comp/MWritable.pm
+++ b/src/MTools/Comp/MWritable.pm
@@ -49,14 +49,14 @@ use vars qw /@ISA/;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 use Tk;
 
 sub new {
 	my ($class, $parent, $src, $button, %options) = @_;
-	my $self = new MTools::MGroup ($parent);
+	my $self = new MTools::GUI::MGroup ($parent);
 	bless $self, $class;
 	if (defined $options {clip})
 	{
@@ -83,7 +83,7 @@ sub new {
 	$self -> {__curves} = ();
 	$self -> {__points} = ();
 	$self -> {__current_curves} = ();
-	$self -> {__tmp_curves} = new MTools::MGroup ($self);
+	$self -> {__tmp_curves} = new MTools::GUI::MGroup ($self);
 	return $self;
 }
 
@@ -133,7 +133,7 @@ sub endWrite {
 		);
 		$self -> {__points} = ();
 		$self -> {__tmp_curves} -> mdelete ();
-		$self -> {__tmp_curves} = new MTools::MGroup ($self);
+		$self -> {__tmp_curves} = new MTools::GUI::MGroup ($self);
 	}
 	$self -> {__old_coords} = ();
 }
diff --git a/src/MTools/GUI/MAntiRecouvrementGroup.pm b/src/MTools/GUI/MAntiRecouvrementGroup.pm
index 4e8dbc7..cc0924e 100644
--- a/src/MTools/GUI/MAntiRecouvrementGroup.pm
+++ b/src/MTools/GUI/MAntiRecouvrementGroup.pm
@@ -44,12 +44,12 @@ use MTools;
 use vars qw /@ISA/;
 
 
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 require Exporter;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup Exporter/;
+	@ISA = qw /MTools::GUI::MGroup Exporter/;
 	@EXPORT = qw / translate scale rotate /;
 }
 
@@ -58,7 +58,7 @@ use Tk;
 
 sub new {
 	my ($class, $parent, %options) = @_;
-	my $self = new MTools::MGroup ($parent);
+	my $self = new MTools::GUI::MGroup ($parent);
 	bless $self, $class;
 
 	$self -> recordEvent ('TRANSLATED');	
diff --git a/src/MTools/GUI/MGroup.pm b/src/MTools/GUI/MGroup.pm
new file mode 100644
index 0000000..c08aaa8
--- /dev/null
+++ b/src/MTools/GUI/MGroup.pm
@@ -0,0 +1,41 @@
+package MTools::GUI::MGroup;
+#	This program is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU LGPL Libray General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU Library General Public License for more details.
+#
+#	You should have received a copy of the GNU Library General Public License
+#	along with this program; if not, write to the Free Software
+#	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA,
+#	or refer to http://www.gnu.org/copyleft/lgpl.html
+#
+##################################################################
+
+# L'objet MTools::GUI::MGroup encapsule la cr?ation d'un objet group zinc en toute rigueur il aurait d? ?tre plac? dans MTools::GUI
+
+use strict;
+
+use MTools;
+use MTools::MObjet;
+use vars qw / @ISA /;
+
+BEGIN 
+{
+	@ISA = qw /MTools::MObjet/;
+}
+
+sub new {
+	my ($class, $parent, %options) = @_;
+	my $self = {};
+	bless $self, $class;
+	$parent = ref($parent) eq ''?$parent:$parent -> {instance};
+	$self -> {instance} = $zinc -> add ('group', $parent, -priority => 10, %options);
+	return $self;
+}
+
+1;
diff --git a/src/MTools/GUI/MTexture.pm b/src/MTools/GUI/MTexture.pm
index 12d9d5a..82c7d2d 100644
--- a/src/MTools/GUI/MTexture.pm
+++ b/src/MTools/GUI/MTexture.pm
@@ -25,7 +25,7 @@ package MTools::GUI::MTexture;
 use strict;
 
 use MTools;
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 use MTools::GUI::MImage;
 use MTools::GUI::MClip;
 
@@ -34,12 +34,12 @@ use vars qw / @ISA /;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 sub new {
 	my ($class, $parent, $target, $image_name) = @_;
-	my $self = new MTools::MGroup ($parent);
+	my $self = new MTools::GUI::MGroup ($parent);
 	bless $self, $class;
 	
 	chggroup ($target, $self);
diff --git a/src/MTools/MGroup.pm b/src/MTools/MGroup.pm
deleted file mode 100644
index fb00925..0000000
--- a/src/MTools/MGroup.pm
+++ /dev/null
@@ -1,41 +0,0 @@
-package MTools::MGroup;
-#	This program is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU LGPL Libray General Public License
-#	as published by the Free Software Foundation; either version 2
-#	of the License, or (at your option) any later version.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#	GNU Library General Public License for more details.
-#
-#	You should have received a copy of the GNU Library General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA,
-#	or refer to http://www.gnu.org/copyleft/lgpl.html
-#
-##################################################################
-
-# L'objet MTools::MGroup encapsule la cr?ation d'un objet group zinc en toute rigueur il aurait d? ?tre plac? dans MTools::GUI
-
-use strict;
-
-use MTools;
-use MTools::MObjet;
-use vars qw / @ISA /;
-
-BEGIN 
-{
-	@ISA = qw /MTools::MObjet/;
-}
-
-sub new {
-	my ($class, $parent, %options) = @_;
-	my $self = {};
-	bless $self, $class;
-	$parent = ref($parent) eq ''?$parent:$parent -> {instance};
-	$self -> {instance} = $zinc -> add ('group', $parent, -priority => 10, %options);
-	return $self;
-}
-
-1;
diff --git a/src/MTools/MSwitch.pm b/src/MTools/MSwitch.pm
index 8933ca3..3eb62d5 100644
--- a/src/MTools/MSwitch.pm
+++ b/src/MTools/MSwitch.pm
@@ -36,19 +36,19 @@ package MTools::MSwitch;
 
 use strict;
 use MTools;
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 use MTools::SVG::SVGLoader;
 
 use vars qw /@ISA/;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 sub new {
 	my ($class, $parent, %etats) = @_;
-	my $self = new MTools::MGroup ($parent);
+	my $self = new MTools::GUI::MGroup ($parent);
 	bless $self, $class;
 
 	$self -> recordProperty ('state', '');
diff --git a/src/MTools/Widget/MBouton.pm b/src/MTools/Widget/MBouton.pm
index 73c0fc0..fbb1bbe 100644
--- a/src/MTools/Widget/MBouton.pm
+++ b/src/MTools/Widget/MBouton.pm
@@ -18,7 +18,7 @@ package MTools::Widget::MBouton;
 
 use strict;
 use MTools;
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 use MTools::MSwitch;
 use MTools::MState;
 use MTools::MTimer;
@@ -27,12 +27,12 @@ use vars qw /@ISA/;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 sub new {
 	my ($class, %options) = @_;
-	my $self = new MTools::MGroup ($options {parent});
+	my $self = new MTools::GUI::MGroup ($options {parent});
 	
 	bless $self, $class;
 
@@ -66,7 +66,7 @@ sub new {
 		plink ([$self, 'text'], [$txt, '-text']);
 	}
 	
-	$self -> {gp_over} = new MTools::MGroup ($self);
+	$self -> {gp_over} = new MTools::GUI::MGroup ($self);
 	push (@gon, $self -> {gp_over});
 	push (@goff, $self -> {gp_over});
 	push (@gover, $self -> {gp_over});
diff --git a/src/MTools/Widget/MRadioBouton.pm b/src/MTools/Widget/MRadioBouton.pm
index 630f0f6..1dfa1a4 100644
--- a/src/MTools/Widget/MRadioBouton.pm
+++ b/src/MTools/Widget/MRadioBouton.pm
@@ -18,7 +18,7 @@ package MTools::Widget::MRadioBouton;
 
 use strict;
 use MTools;
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 use MTools::MSwitch;
 use MTools::MState;
 
@@ -26,12 +26,12 @@ use vars qw /@ISA/;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 sub new {
 	my ($class, %options) = @_;
-	my $self = new MTools::MGroup ($options {parent});
+	my $self = new MTools::GUI::MGroup ($options {parent});
 	
 	bless $self, $class;
 		
diff --git a/src/MTools/Widget/MSplitPane.pm b/src/MTools/Widget/MSplitPane.pm
index dd593bf..df6c7f2 100644
--- a/src/MTools/Widget/MSplitPane.pm
+++ b/src/MTools/Widget/MSplitPane.pm
@@ -23,7 +23,7 @@ use MTools::SVG::SVGLoader;
 
 use vars qw /@ISA/;
 
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 use MTools::Widget::MBouton;
 use MTools::Comp::MMover;
 use MTools::Anim::MTranslator;
@@ -31,12 +31,12 @@ use MTools::GUI::MClip;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 sub new {
 	my ($class, $parent, %options) = @_;
-	my $self = new MTools::MGroup ($parent);
+	my $self = new MTools::GUI::MGroup ($parent);
 	bless $self, $class;
 	
 	$self -> recordProperty ('percentage', 0.00001);
diff --git a/src/MTools/Widget/MToggleBouton.pm b/src/MTools/Widget/MToggleBouton.pm
index 56c976c..57f90d3 100644
--- a/src/MTools/Widget/MToggleBouton.pm
+++ b/src/MTools/Widget/MToggleBouton.pm
@@ -18,7 +18,7 @@ package MTools::Widget::MToggleBouton;
 
 use strict;
 use MTools;
-use MTools::MGroup;
+use MTools::GUI::MGroup;
 use MTools::MSwitch;
 use MTools::MState;
 
@@ -26,12 +26,12 @@ use vars qw /@ISA/;
 
 BEGIN 
 {
-	@ISA = qw /MTools::MGroup/;
+	@ISA = qw /MTools::GUI::MGroup/;
 }
 
 sub new {
 	my ($class, %options) = @_;
-	my $self = new MTools::MGroup ($options {parent});
+	my $self = new MTools::GUI::MGroup ($options {parent});
 	
 	bless $self, $class;
 		
-- 
cgit v1.1