From 026e394a8e78c52c9c3319408f1b1b66e88a745b Mon Sep 17 00:00:00 2001
From: saal
Date: Mon, 4 Jun 2007 13:10:07 +0000
Subject: utilisation du constructeur de MObjet + suppression du use
 MTools::MObjet

---
 src/MTools/Anim/MTranslator.pm | 3 +--
 src/MTools/Comp/MFocuser.pm    | 3 +--
 src/MTools/Comp/MMover.pm      | 3 +--
 src/MTools/GUI/MCircle.pm      | 3 +--
 src/MTools/GUI/MClip.pm        | 3 +--
 src/MTools/GUI/MCurve.pm       | 3 +--
 src/MTools/GUI/MGroup.pm       | 3 +--
 src/MTools/GUI/MRect.pm        | 1 -
 src/MTools/MSwitch.pm          | 8 +++-----
 src/MTools/MTimer.pm           | 3 +--
 10 files changed, 11 insertions(+), 22 deletions(-)

(limited to 'src/MTools')

diff --git a/src/MTools/Anim/MTranslator.pm b/src/MTools/Anim/MTranslator.pm
index 320c17c..c50aef9 100644
--- a/src/MTools/Anim/MTranslator.pm
+++ b/src/MTools/Anim/MTranslator.pm
@@ -37,7 +37,6 @@ package MTools::Anim::MTranslator;
 
 use strict;
 use MTools;
-use MTools::MObjet;
 
 use Anim;
 use Anim::Pacing::Linear;
@@ -54,7 +53,7 @@ use Tk;
 
 sub new {
 	my ($class, %options) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 
 	$self -> recordProperty ('-visible', 0);
diff --git a/src/MTools/Comp/MFocuser.pm b/src/MTools/Comp/MFocuser.pm
index cb821ae..7d984da 100644
--- a/src/MTools/Comp/MFocuser.pm
+++ b/src/MTools/Comp/MFocuser.pm
@@ -26,7 +26,6 @@ package MTools::Comp::MFocuser;
 
 use strict;
 use MTools;
-use MTools::MObjet;
 
 use vars qw /@ISA/;
 
@@ -39,7 +38,7 @@ use Tk;
 
 sub new {
 	my ($class, @targets) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 	
 	$self -> recordEvent ('GET_FOCUS');
diff --git a/src/MTools/Comp/MMover.pm b/src/MTools/Comp/MMover.pm
index 2d767ff..0d2628c 100644
--- a/src/MTools/Comp/MMover.pm
+++ b/src/MTools/Comp/MMover.pm
@@ -31,7 +31,6 @@ package MTools::Comp::MMover;
 
 use strict;
 use MTools;
-use MTools::MObjet;
 
 use vars qw /@ISA/;
 
@@ -44,7 +43,7 @@ use Tk;
 
 sub new {
 	my ($class, $src, $targets, $button, %options) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 
 	$self -> recordProperty ('x_min', -10000);
diff --git a/src/MTools/GUI/MCircle.pm b/src/MTools/GUI/MCircle.pm
index 35463ef..2fc5aa1 100644
--- a/src/MTools/GUI/MCircle.pm
+++ b/src/MTools/GUI/MCircle.pm
@@ -26,7 +26,6 @@ package MTools::GUI::MCircle;
 use strict;
 
 use MTools;
-use MTools::MObjet;
 use vars qw / @ISA /;
 
 BEGIN 
@@ -36,7 +35,7 @@ BEGIN
 
 sub new {
 	my ($class, $parent, $x, $y, $r, %options) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 	$self -> {instance} = $zinc -> add('arc', 
 		ref ($parent) eq '' ? $parent : $parent -> {instance}, 
diff --git a/src/MTools/GUI/MClip.pm b/src/MTools/GUI/MClip.pm
index 248e395..b34a537 100644
--- a/src/MTools/GUI/MClip.pm
+++ b/src/MTools/GUI/MClip.pm
@@ -26,7 +26,6 @@ package MTools::GUI::MClip;
 use strict;
 
 use MTools;
-use MTools::MObjet;
 use vars qw / @ISA /;
 
 BEGIN 
@@ -36,7 +35,7 @@ BEGIN
 
 sub new {
 	my ($class, $clipped, $path, $debug) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 
 	if (!defined $debug) {$debug = 0}
diff --git a/src/MTools/GUI/MCurve.pm b/src/MTools/GUI/MCurve.pm
index 3458e49..e96ec6e 100644
--- a/src/MTools/GUI/MCurve.pm
+++ b/src/MTools/GUI/MCurve.pm
@@ -26,7 +26,6 @@ package MTools::GUI::MCurve;
 use strict;
 
 use MTools;
-use MTools::MObjet;
 use vars qw / @ISA /;
 
 BEGIN 
@@ -36,7 +35,7 @@ BEGIN
 
 sub new {
 	my ($class, $parent, $coords, %options) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 	$self -> {instance} = $zinc -> add('curve', 
 		ref ($parent) eq '' ? $parent : $parent -> {instance}, 
diff --git a/src/MTools/GUI/MGroup.pm b/src/MTools/GUI/MGroup.pm
index ca48fe1..ef5468f 100644
--- a/src/MTools/GUI/MGroup.pm
+++ b/src/MTools/GUI/MGroup.pm
@@ -21,7 +21,6 @@ package MTools::GUI::MGroup;
 use strict;
 
 use MTools;
-use MTools::MObjet;
 use vars qw / @ISA /;
 
 BEGIN 
@@ -31,7 +30,7 @@ BEGIN
 
 sub new {
 	my ($class, $parent, %options) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 	$parent = ref($parent) eq ''?$parent:$parent -> {instance};
 	$self -> {instance} = $zinc -> add ('group', $parent, -priority => 10, %options);
diff --git a/src/MTools/GUI/MRect.pm b/src/MTools/GUI/MRect.pm
index e28b044..2a11402 100644
--- a/src/MTools/GUI/MRect.pm
+++ b/src/MTools/GUI/MRect.pm
@@ -27,7 +27,6 @@ package MTools::GUI::MRect;
 use strict;
 
 use MTools;
-use MTools::MObjet;
 use vars qw / @ISA /;
 
 BEGIN 
diff --git a/src/MTools/MSwitch.pm b/src/MTools/MSwitch.pm
index 3eb62d5..8d94fa9 100644
--- a/src/MTools/MSwitch.pm
+++ b/src/MTools/MSwitch.pm
@@ -35,8 +35,6 @@ package MTools::MSwitch;
 #	* setState : $switch -> setState ('etat') ?quivalent ? $swicth -> mconfigure (state => 'etat')
 
 use strict;
-use MTools;
-use MTools::GUI::MGroup;
 use MTools::SVG::SVGLoader;
 
 use vars qw /@ISA/;
@@ -80,7 +78,7 @@ sub new {
 			{
 				if ( ref ($tb [$i]) eq '')
 				{
-					$self -> {"__instance_".$tb [$i]} = minstance ($tb [$i], $self);
+					$self -> {"__instance_".$tb [$i]} = MTools::minstance ($tb [$i], $self);
 					MTools::mconfigure ($self -> {"__instance_".$tb [$i]}, -visible => 0, -sensitive => 0);
 				}
 				else
@@ -149,7 +147,7 @@ sub __setState {
 			{
 				$self -> {"__instance_".$tb [$i]} -> mconfigure (-visible => 1, -sensitive => 1);
 			}
-			raise ($self -> {"__instance_".$tb [$i]});
+			MTools::raise ($self -> {"__instance_".$tb [$i]});
 		}
 	}
 	else
@@ -184,7 +182,7 @@ sub mconfigure {
 					}
 					if ($v)
 					{
-						raise ($self -> {"__instance_".$tb [$i]});
+						MTools::raise ($self -> {"__instance_".$tb [$i]});
 					}
 				}
 			}
diff --git a/src/MTools/MTimer.pm b/src/MTools/MTimer.pm
index 68d1a00..9377706 100644
--- a/src/MTools/MTimer.pm
+++ b/src/MTools/MTimer.pm
@@ -39,7 +39,6 @@ package MTools::MTimer;
 
 use strict;
 use MTools;
-use MTools::MObjet;
 
 use vars qw /@ISA/;
 
@@ -53,7 +52,7 @@ use Tk;
 
 sub new {
 	my ($class, $timeout, $repeat, $callback, %options) = @_;
-	my $self = {};
+	my $self = new MTools::MObjet ();
 	bless $self, $class;
 	
 	$repeat = 0 if !defined $repeat;
-- 
cgit v1.1