summaryrefslogtreecommitdiffstats
path: root/scilab/modules/tclsci
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-01-11 09:17:40 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-01-11 09:17:40 +0100
commitae71a9da29df1a05d0ee6eb6a92e7f8c3be71da6 (patch)
tree8c48cd5a5e45f4afbb2977f14d6a86cf6aa34ede /scilab/modules/tclsci
parent734410ffd3ad93315a45bb6cc4c992a8f3442f2c (diff)
parent9e9d707ccc60d084cb75f08c398bc0f2695fc4f5 (diff)
downloadscilab-ae71a9da29df1a05d0ee6eb6a92e7f8c3be71da6.zip
scilab-ae71a9da29df1a05d0ee6eb6a92e7f8c3be71da6.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/tclsci')
-rw-r--r--scilab/modules/tclsci/demos/tk/scroll.dem.sce14
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_5035.tst25
2 files changed, 39 insertions, 0 deletions
diff --git a/scilab/modules/tclsci/demos/tk/scroll.dem.sce b/scilab/modules/tclsci/demos/tk/scroll.dem.sce
index 722aeb0..1de3c05 100644
--- a/scilab/modules/tclsci/demos/tk/scroll.dem.sce
+++ b/scilab/modules/tclsci/demos/tk/scroll.dem.sce
@@ -5,11 +5,25 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// 6//
7 7
8consolestatus = 'off';
8tkpath = get_absolute_file_path("scroll.dem.sce"); 9tkpath = get_absolute_file_path("scroll.dem.sce");
9 10
10TCL_EvalFile(tkpath+'cscroll') 11TCL_EvalFile(tkpath+'cscroll')
12
13if MSDOS then
14 consolestatus = consolebox();
15 if consolestatus == 'off' then
16 consolebox("on");
17 end
18end
19
11while %t //wait for toplevel to disapear 20while %t //wait for toplevel to disapear
12 TCL_EvalStr('set h [winfo exists .cscroll]'); 21 TCL_EvalStr('set h [winfo exists .cscroll]');
13 if TCL_GetVar("h")=='0' then break,end 22 if TCL_GetVar("h")=='0' then break,end
14 sleep(1); 23 sleep(1);
15end 24end
25
26if MSDOS then
27 consolebox(consolestatus);
28end
29
diff --git a/scilab/modules/tclsci/tests/nonreg_tests/bug_5035.tst b/scilab/modules/tclsci/tests/nonreg_tests/bug_5035.tst
new file mode 100644
index 0000000..aae6c12
--- /dev/null
+++ b/scilab/modules/tclsci/tests/nonreg_tests/bug_5035.tst
@@ -0,0 +1,25 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2009 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8// <-- Non-regression test for bug 5035 -->
9//
10// <-- Bugzilla URL -->
11// http://bugzilla.scilab.org/show_bug.cgi?id=5035
12//
13// <-- INTERACTIVE TEST -->
14//
15// <-- Short Description -->
16// Demos --> tcl/tk --> Scroll Information printed on terminal
17//was not displayed on Windows.
18//
19
20// launch demo on Windows
21// ? --> Demos --> tcl/tk --> Scroll
22// terminal should be opened
23// see result of scroll in this console
24// when you quit demo console get previous state
25