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. --- doc/exemple_clip.pl | 4 ++-- doc/user_manual.txt | 4 ++-- exemples/Comete.pm | 6 ++--- exemples/Lien.pm | 6 ++--- exemples/Rattrapage.pm | 8 +++---- exemples/Selec.pm | 6 ++--- exemples/Strip.pm | 14 +++++------ exemples/StripAntiRecouvre.pm | 12 +++++----- exemples/Target.pm | 6 ++--- exemples/Visage.pm | 6 ++--- exemples/exemple_Rattrapage.pl | 2 +- exemples/exemple_anti_recouvrement.pl | 2 +- exemples/exemple_multi_selection.pl | 2 +- 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 ++--- src/SVG/SVG2zinc/Backend/PerlClass.pm | 4 ++-- 26 files changed, 111 insertions(+), 111 deletions(-) create mode 100644 src/MTools/GUI/MGroup.pm delete mode 100644 src/MTools/MGroup.pm diff --git a/doc/exemple_clip.pl b/doc/exemple_clip.pl index 8184e36..bbfab40 100755 --- a/doc/exemple_clip.pl +++ b/doc/exemple_clip.pl @@ -20,14 +20,14 @@ BEGIN { } use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MCircle; use MTools::GUI::MRect; use MTools::GUI::MClip; new MTools (800, 600, "Exemple de clip"); -my $fenetre = new MTools::MGroup (1); +my $fenetre = new MTools::GUI::MGroup (1); my $disque = new MTools::GUI::MCircle ($fenetre, 400, 300, 100, -filled => 1); my $trou = new MTools::GUI::MRect ($fenetre, 250, 300, 100, 60); diff --git a/doc/user_manual.txt b/doc/user_manual.txt index 2be59f1..e5a3d29 100644 --- a/doc/user_manual.txt +++ b/doc/user_manual.txt @@ -200,12 +200,12 @@ La cr Exemple d'utilisation : use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MCircle; use MTools::GUI::MRect; use MTools::GUI::MClip; new MTools (800, 600, "Exemple de clip"); -my $fenetre = new MTools::MGroup (1); +my $fenetre = new MTools::GUI::MGroup (1); my $disque = new MTools::GUI::MCircle ($fenetre, 400, 300, 100, -filled => 1); my $trou = new MTools::GUI::MRect ($fenetre, 250, 300, 100, 60); new MTools::GUI::MClip ($fenetre, $trou); diff --git a/exemples/Comete.pm b/exemples/Comete.pm index bb86c66..9256b4e 100644 --- a/exemples/Comete.pm +++ b/exemples/Comete.pm @@ -21,18 +21,18 @@ use MTools; use vars qw /@ISA/; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Comp::MMover; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $name, $x, $y) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('x', $x); diff --git a/exemples/Lien.pm b/exemples/Lien.pm index d8665bc..b9a6502 100644 --- a/exemples/Lien.pm +++ b/exemples/Lien.pm @@ -18,7 +18,7 @@ package Lien; use strict; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MCurve; use vars qw /@ISA/; @@ -26,12 +26,12 @@ use vars qw /@ISA/; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $comete_1, $comete_2, %options) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('comete_1', $comete_1); diff --git a/exemples/Rattrapage.pm b/exemples/Rattrapage.pm index c6ec0bc..848b6dd 100644 --- a/exemples/Rattrapage.pm +++ b/exemples/Rattrapage.pm @@ -20,7 +20,7 @@ use strict; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Widget::MToggleBouton; use MTools::Widget::MBouton; use Lien; @@ -29,13 +29,13 @@ use Tk; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $comete1, $comete2, $manager, %options) = @_; my $lien = new Lien ($parent, $comete1, $comete2); - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> {__lien} = $lien; @@ -125,7 +125,7 @@ sub new { e_release => 'DELETE' ); - my $gp_mask = new MTools::MGroup ($self); + my $gp_mask = new MTools::GUI::MGroup ($self); $self -> {__down} = minstanciate ('rattrapage.svg#mask_seuil_down', $gp_mask); $self -> {__down} -> mconfigure (-visible => 0); $self -> {__up} = minstanciate ('rattrapage.svg#mask_seuil', $gp_mask); diff --git a/exemples/Selec.pm b/exemples/Selec.pm index 28237ac..c045d0b 100644 --- a/exemples/Selec.pm +++ b/exemples/Selec.pm @@ -21,19 +21,19 @@ use MTools; use vars qw /@ISA/; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MRect; use MTools::GUI::MCircle; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $style, $x, $y) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('barycentre_x' => 0); diff --git a/exemples/Strip.pm b/exemples/Strip.pm index 2997e25..59d800f 100644 --- a/exemples/Strip.pm +++ b/exemples/Strip.pm @@ -20,7 +20,7 @@ use strict; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Widget::MToggleBouton; use MTools::Comp::MMover; use MTools::Comp::MReconizer; @@ -28,12 +28,12 @@ use MTools::Comp::MInertie; 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 -> recordEvent ('SET_FOCUS'); @@ -41,10 +41,10 @@ sub new { $self -> recordProperty ('x', 0); $self -> recordProperty ('y', 0); - my $gp1 = new MTools::MGroup ($self); - my $gp2 = new MTools::MGroup ($self); - my $gp3 = new MTools::MGroup ($self); - my $gp4 = new MTools::MGroup ($self); + my $gp1 = new MTools::GUI::MGroup ($self); + my $gp2 = new MTools::GUI::MGroup ($self); + my $gp3 = new MTools::GUI::MGroup ($self); + my $gp4 = new MTools::GUI::MGroup ($self); # Instanciation d'un petit bouton rouge qui aura pour objectif # de fixer ou non le strip (desactiver le comportement de mover) diff --git a/exemples/StripAntiRecouvre.pm b/exemples/StripAntiRecouvre.pm index 4e2c001..5c1bf0a 100644 --- a/exemples/StripAntiRecouvre.pm +++ b/exemples/StripAntiRecouvre.pm @@ -26,7 +26,7 @@ use MTools; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Comp::MMover; use MTools::Comp::MInertie; use MTools::GUI::MAntiRecouvrementGroup; @@ -45,11 +45,11 @@ sub new { $self -> recordProperty('callsign', $options{callsign}); $self -> recordProperty('color', 'grey'); - my $gp1 = new MTools::MGroup ($self); - my $gp2 = new MTools::MGroup ($self); - my $gp3 = new MTools::MGroup ($self); - my $gp4 = new MTools::MGroup ($self); - my $gp5 = new MTools::MGroup ($self); + my $gp1 = new MTools::GUI::MGroup ($self); + my $gp2 = new MTools::GUI::MGroup ($self); + my $gp3 = new MTools::GUI::MGroup ($self); + my $gp4 = new MTools::GUI::MGroup ($self); + my $gp5 = new MTools::GUI::MGroup ($self); $self -> {cadre} = minstanciate ("strip_approche_arrival.svg#cadre_strip", $gp1); plink([$self, 'color'], [mfind($self->{cadre},'cadre'),'-fillcolor']); $self -> {infosavion} = minstanciate ("strip_approche_arrival.svg#infosavion", $gp2); diff --git a/exemples/Target.pm b/exemples/Target.pm index c2fb566..a79fa95 100644 --- a/exemples/Target.pm +++ b/exemples/Target.pm @@ -21,19 +21,19 @@ use MTools; use vars qw /@ISA/; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MText; use MTools::GUI::MCircle; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $x, $y) = @_; - my $self = new MTools::MGroup ($parent, -atomic => 1); + my $self = new MTools::GUI::MGroup ($parent, -atomic => 1); bless $self, $class; my $ob = new MTools::GUI::MCircle ($self, $x, $y, 20, -filled => 1); diff --git a/exemples/Visage.pm b/exemples/Visage.pm index 67c0064..ddef0ef 100644 --- a/exemples/Visage.pm +++ b/exemples/Visage.pm @@ -20,17 +20,17 @@ use strict; use vars qw /@ISA/; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::GUI::MText; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } sub new { my ($class, $parent, $file) = @_; - my $self = new MTools::MGroup ($parent); + my $self = new MTools::GUI::MGroup ($parent); bless $self, $class; $self -> recordProperty ('nom', $file); diff --git a/exemples/exemple_Rattrapage.pl b/exemples/exemple_Rattrapage.pl index ca2b0f2..9524676 100755 --- a/exemples/exemple_Rattrapage.pl +++ b/exemples/exemple_Rattrapage.pl @@ -30,7 +30,7 @@ my $com1 = new Comete (1, 'AFR6830', 180, 200); my $com2 = new Comete (1, 'BAW753', 400, 180); my $com3 = new Comete (1, 'AZA322', 350, 340); -my $manager = new MTools::MGroup (1); +my $manager = new MTools::GUI::MGroup (1); $manager -> mconfigure (-visible => 0); new Rattrapage (1, $com1, $com2, $manager); diff --git a/exemples/exemple_anti_recouvrement.pl b/exemples/exemple_anti_recouvrement.pl index dd27cb5..db25c2a 100755 --- a/exemples/exemple_anti_recouvrement.pl +++ b/exemples/exemple_anti_recouvrement.pl @@ -21,7 +21,7 @@ BEGIN { use strict; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use MTools::Comp::MAntiRecouvrement; use StripAntiRecouvre; diff --git a/exemples/exemple_multi_selection.pl b/exemples/exemple_multi_selection.pl index 7cd089b..c0e6251 100755 --- a/exemples/exemple_multi_selection.pl +++ b/exemples/exemple_multi_selection.pl @@ -30,7 +30,7 @@ my $frame = new MTools (800, 600, 'Exemple SVG'); my $bck = new MTools::GUI::MRect (1, 0, 0, 800, 600, -filled => 1, -fillcolor => '#aaaaaa'); -my $objs = new MTools::MGroup (1); +my $objs = new MTools::GUI::MGroup (1); my $multi = new MTools::Comp::MMultiSelection ( $bck, 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; diff --git a/src/SVG/SVG2zinc/Backend/PerlClass.pm b/src/SVG/SVG2zinc/Backend/PerlClass.pm index 9b47ee7..fbab76d 100644 --- a/src/SVG/SVG2zinc/Backend/PerlClass.pm +++ b/src/SVG/SVG2zinc/Backend/PerlClass.pm @@ -144,13 +144,13 @@ sub fileHeader { use strict; use MTools; -use MTools::MGroup; +use MTools::GUI::MGroup; use vars qw /@ISA @EXPORT @EXPORT_OK/; use Tk::PNG; BEGIN { - @ISA = qw /MTools::MGroup/; + @ISA = qw /MTools::GUI::MGroup/; } -- cgit v1.1