aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--patchlvl.h4
-rw-r--r--sandbox/contours.tcl10
-rw-r--r--sandbox/local.pl2
-rw-r--r--sandbox/local.tcl4
4 files changed, 12 insertions, 8 deletions
diff --git a/patchlvl.h b/patchlvl.h
index 4e23536..9280578 100644
--- a/patchlvl.h
+++ b/patchlvl.h
@@ -11,6 +11,6 @@
#ifndef ZINCVERSION
#define ZINCVER 3
#define ZINCREV 1
-#define ZINCPLVL 23
-#define ZINCVERSION "zinc-version-3123"
+#define ZINCPLVL 24
+#define ZINCVERSION "zinc-version-3124"
#endif
diff --git a/sandbox/contours.tcl b/sandbox/contours.tcl
index 02a6438..cbddcb8 100644
--- a/sandbox/contours.tcl
+++ b/sandbox/contours.tcl
@@ -1,4 +1,4 @@
-#!/usr/bin/wish -f
+#!/usr/bin/wish8.0 -f
load tkzinc3.1.so
package require Img
@@ -15,7 +15,7 @@ set view [.r add group $top -tags controls]
#set poly [.r add curve $view "50 -150 300 -150 300 -300 50 -300 50 -150" \
# -closed t -fillcolor tan]
set poly [.r add curve $view "50 -150 50 -300 300 -300 300 -150 50 -150" \
- -closed t -fillcolor tan]
+ -closed t -fillcolor tan -linewidth 2 -relief raised]
.r scale $poly 2.0 2.0
.r translate $poly -60 150
set rect [.r add rectangle $view "50 -200 100 -50"]
@@ -30,12 +30,14 @@ set mp [.r add curve $view "" \
.r contour $mp union $poly
.r contour $mp diff $ellipse
-.r contour $mp union $arc
.r contour $mp diff $rect
+.r contour $mp union $arc
.r itemconfigure $mp -relief raised -visible t
+.r lower $mp
-.r remove $arc $ellipse $rect $poly
+#.r remove $arc $ellipse $rect $poly
+.r remove $rect $arc $ellipse
#.r itemconfigure $poly -relief raised -linewidth 8
diff --git a/sandbox/local.pl b/sandbox/local.pl
index ccebad0..f448420 100644
--- a/sandbox/local.pl
+++ b/sandbox/local.pl
@@ -9,7 +9,7 @@ $papier = $mw->Photo(-file => "texture-paper.xpm");
#$penguin = $mw->Photo(-file => "xpenguin.png");
$top = 1;
-$zinc = $mw->Zinc(-localrender => 1, -relief => 'sunken');
+$zinc = $mw->Zinc(-Render, -relief => 'sunken');
$zinc->pack(-expand => 1, -fill => 'both');
$zinc->configure(-width => 500, -height => 500);
$gr1 = $zinc->add('group', $top);
diff --git a/sandbox/local.tcl b/sandbox/local.tcl
index 06931b6..0033f47 100644
--- a/sandbox/local.tcl
+++ b/sandbox/local.tcl
@@ -8,6 +8,8 @@ set top 1
image create photo logo -file logo.gif
image create photo papier -file texture-paper.xpm
image create photo penguin -file xpenguin.png
+image create photo bouton -file bouton.xpm
+image create photo bois -file texture-bois1.xpm
set r [zinc .r -relief sunken -render 1]
pack .r -expand t -fill both
@@ -30,7 +32,7 @@ set rect2 [.r add rectangle $view "150 50 300 300" -linewidth 0 \
-tile logo -fillcolor white -fillalpha 90 -filled 1]
set x 100
set y 100
-for {set i 0} {$i < 1} {incr i} {
+for {set i 0} {$i < 50} {incr i} {
set x [expr $x+3]
set y [expr $y+3]
.r add text $view -text "BlaBla et tout et tout, bref..."\