No comments

diff --git a/src/WOKTclLib/FILES b/src/WOKTclLib/FILES
index 4048737e824751e64b230df631bb10b694bd05cb..9a7566465c4ffec92553c5bf8d33bac40d2d07c8 100755 (executable)
--- a/src/WOKTclLib/FILES
+++ b/src/WOKTclLib/FILES
@@ -75,6 +75,8 @@ srcinc:::factory_open.xpm
 srcinc:::file.xpm
 srcinc:::frontal.xpm
 srcinc:::frontal_open.xpm
+srcinc:::jini.xpm
+srcinc:::jini_open.xpm
 srcinc:::gettable.xpm
 srcinc:::idl.xpm
 srcinc:::idl_open.xpm
@@ -143,3 +145,4 @@ srcinc:::wokQUE.tcl
 srcinc:::wcompare.tcl
 srcinc:::envir.xpm
 srcinc:::envir_open.xpm
+srcinc:::MdtvLogo33x120b.gif

diff --git a/src/WOKTclLib/MkBuild.tcl b/src/WOKTclLib/MkBuild.tcl
index bfd48b24492b38137a4f566ffce4e137e7033305..941acb6a3b4f859334bd7fe13883b8e997aadc74 100755 (executable)
--- a/src/WOKTclLib/MkBuild.tcl
+++ b/src/WOKTclLib/MkBuild.tcl
@@ -2,6 +2,7 @@ proc wokBuild { {fast 0} } {
 
     global IWOK_WINDOWS
     global IWOK_GLOBALS
+    global env
     set w $IWOK_GLOBALS(toplevel)
     set top [frame $w.thu -bd 1 -relief raised]
     
@@ -73,7 +74,8 @@ proc wokBuild { {fast 0} } {
 
     set arr [$w.l subwidget arrow] ; tixBalloon $arr.bal ; $arr.bal bind $arr -msg "Last spots"
 
-    button $w.mdtv -image [tix getimage MatraDatavision] -command wokSeeLayout
+    ;#button $w.mdtv -image [tix getimage MatraDatavision] -command wokSeeLayout
+    button $w.mdtv -image [image create photo -file $env(WOK_LIBRARY)/MdtvLogo33x120b.gif] -command wokSeeLayout
     tixBalloon $w.mdtv.bal
     $w.mdtv.bal bind $w.mdtv -msg "See Layout"
 

diff --git a/src/WOKTclLib/WCOMPATIBLE.tcl b/src/WOKTclLib/WCOMPATIBLE.tcl
index f61fe8132581a9df2d03000a3377c5cffea04fa3..966f87fb4c660a9f2dd911706674e9c58305a1fa 100755 (executable)
--- a/src/WOKTclLib/WCOMPATIBLE.tcl
+++ b/src/WOKTclLib/WCOMPATIBLE.tcl
@@ -40,7 +40,7 @@ proc wadm {{entity ""}} {
 
 
 proc wls { args } {
-    set f [lsearch -regexp $args {-[pniCtexscfOrd]} ]
+    set f [lsearch -regexp $args {-[pnijCtexscfOrd]} ]
     if { $f != -1 } {
        set ft [lindex [split [lindex $args $f] -] 1]
        set lx {}

diff --git a/src/WOKTclLib/wok.tcl b/src/WOKTclLib/wok.tcl
index 61a7810895bfb88743c05dea143914374e0da71f..256c3ee6ad57698580f19400197e50cfe4706765 100755 (executable)
--- a/src/WOKTclLib/wok.tcl
+++ b/src/WOKTclLib/wok.tcl
@@ -51,7 +51,7 @@ proc iwok { args } {
     ;#tix addbitmapdir /adv_23/WOK/k3dev/iwok/src/WOKTclLib  ;# THUY EM
 
     ;# ucreate -P dans factory/workshop/ => erreur ?!!!
-    set IWOK_GLOBALS(ucreate-P) [list {p package} {s schema} {i interface} {C client} {e engine} {x executable} {n nocdlpack} {t toolkit} {r resource} {O documentation} {c ccl} {f frontal} {d delivery} {I idl} {S server}]
+    set IWOK_GLOBALS(ucreate-P) [list {j jini} {p package} {s schema} {i interface} {C client} {e engine} {x executable} {n nocdlpack} {t toolkit} {r resource} {O documentation} {c ccl} {f frontal} {d delivery} {I idl} {S server}]
 
     foreach type $IWOK_GLOBALS(ucreate-P) {
        set st [lindex $type 0]