Déplacement de MGroup. Ce déplacement casse du code côté utilisateurs, mais le fichier est enfin à sa place.

3 files changed, 47 insertions, 6 deletions

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);