From 2f25598e4a83295f0bbe806114417ec2936aa7ab Mon Sep 17 00:00:00 2001 From: Vincent COUVERT Date: Mon, 31 Mar 2014 14:18:30 +0200 Subject: [PATCH 1/1] * winclose removed. Please use close instead. Change-Id: If91d810c04ac6e997853702f1751906526d233ff --- scilab/CHANGES_5.5.X | 2 + .../helptools/data/configuration/scilab_macros.txt | 1 - scilab/modules/tclsci/help/en_US/winclose.xml | 64 -------------------- scilab/modules/tclsci/macros/winclose.sci | 39 ------------ 4 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 scilab/modules/tclsci/help/en_US/winclose.xml delete mode 100644 scilab/modules/tclsci/macros/winclose.sci diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X index dc5fe70..dec25d4 100644 --- a/scilab/CHANGES_5.5.X +++ b/scilab/CHANGES_5.5.X @@ -202,6 +202,8 @@ Obsolete & Removed Functions * fit_dat removed. Please use datafit instead. +* winclose removed. Please use close instead. + * regress tagged as obsolete. Will be removed in Scilab 5.5.1. Please use reglin instead. diff --git a/scilab/modules/helptools/data/configuration/scilab_macros.txt b/scilab/modules/helptools/data/configuration/scilab_macros.txt index e867ccd..0372c5f 100644 --- a/scilab/modules/helptools/data/configuration/scilab_macros.txt +++ b/scilab/modules/helptools/data/configuration/scilab_macros.txt @@ -224,7 +224,6 @@ wavwrite TCL_CreateSlave gettklib sciGUI_init -winclose winlist cb_m2sci_gui m2sci_gui diff --git a/scilab/modules/tclsci/help/en_US/winclose.xml b/scilab/modules/tclsci/help/en_US/winclose.xml deleted file mode 100644 index eee3556..0000000 --- a/scilab/modules/tclsci/help/en_US/winclose.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - winclose - - close windows created by sciGUI. This function is obsolete. - - - - Calling Sequence - winclose(winIds) - - - Arguments - - - winIds - - matrix of integer greater than 0, window identificator. - - - - - - Description - - winclose(winIds) close windows created by sciGUI. - This function is obsolete. - It is better to use close instead of winclose. - - - - Examples - - - - History - - - 5.4.1 - - Function tagged obsolete. Will be removed in 5.5.0. Please use close instead. - - - - - diff --git a/scilab/modules/tclsci/macros/winclose.sci b/scilab/modules/tclsci/macros/winclose.sci deleted file mode 100644 index f843571..0000000 --- a/scilab/modules/tclsci/macros/winclose.sci +++ /dev/null @@ -1,39 +0,0 @@ -// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -// Copyright (C) 2004 - Jaime Urzua -// Copyright (C) 2008 - INRIA - Vincent COUVERT -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt - - -function sta=winclose(h) - // Close a window - // This file is part of sciGUI toolbox - // rev. 0.1 - // - // This program is free software; you can redistribute it and/or modify - //it under the terms of the GNU General Public License as published by - //the Free Software Foundation; either version 2 of the License, or - //(at your option) any later version. - - warnobsolete("close", "5.5.0"); - - // Java waitbar or progressbar - if type(h) == 9 then - delete(h); - sta=1 - return - end - - if execstr("TCL_GetVar(''sciGUITable(win,id)'')","errcatch")<>0 then - sta=1 - return - end - sta=0; - for j=1:length(h), - TCL_EvalStr("sciGUIDestroy "+string(h(j))); - end -endfunction -- 1.7.9.5