aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/MTools/Comp/MWritable.pm14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/MTools/Comp/MWritable.pm b/src/MTools/Comp/MWritable.pm
index fd77804..cdef1b5 100644
--- a/src/MTools/Comp/MWritable.pm
+++ b/src/MTools/Comp/MWritable.pm
@@ -23,8 +23,7 @@ package MTools::Comp::MWritable;
# * parent : objet parent des curves qui vont etre dessinee au cours de l'ecriture
# * src : objet source des evenements qui vont generer le dessin
# * button : bouton de la souris utilise pour genere la reco de geste
-# * %options : table de hash permettant la configuration initiale des proprietes et de definir un objet clip ($options {clip})
-# l'objet clip permet de contenir l'ecriture libre dans une zone.
+# * clip : l'objet clip permet de contenir l'ecriture libre dans une zone.
# Proprietes :
# * color : couleur d'ecriture
# * writing_mode : ('write' ou 'erase') permet de specifier le resultat de l'interaction sur l'objet source (ecriture ou effacement)
@@ -56,18 +55,16 @@ BEGIN
use Tk;
sub new {
- my ($class, $parent, $src, $button, %options) = @_;
+ my ($class, $parent, $src, $button, $clip) = @_;
my $self = new MTools::GUI::MGroup ($parent);
bless $self, $class;
- if (defined $options {clip})
+ if (defined $clip)
{
$self -> {__clip} = new MTools::GUI::MClip (
$self,
- $options {clip},
+ $clip,
);
}
- delete $options {clip};
- $self -> mconfigure (-atomic => 1);
$self -> recordProperty ('color', '#000000');
$self -> recordProperty ('writing_mode', 'write');
$self -> recordEvent ('BEGIN_WRITE');
@@ -78,9 +75,6 @@ sub new {
binding ($src, "<Button-$button>", [\&__beginWrite, $self, Ev('x'), Ev('y'), Ev('t')]);
binding ($src, "<Button$button-Motion>", [\&__writing, $self, Ev('x'), Ev('y'), Ev('t')]);
binding ($src, "<ButtonRelease-$button>", [\&__endWrite, $self, Ev('x'), Ev('y'), Ev('t')]);
- binding ($self, "<Button-$button>", [\&__beginWrite, $self, Ev('x'), Ev('y'), Ev('t')]);
- binding ($self, "<Button$button-Motion>", [\&__writing, $self, Ev('x'), Ev('y'), Ev('t')]);
- binding ($self, "<ButtonRelease-$button>", [\&__endWrite, $self, Ev('x'), Ev('y'), Ev('t')]);
$self -> {__curves} = ();
$self -> {__points} = ();
$self -> {__current_curves} = ();