Set svn:eol-style to native
Pierre Marechal [Tue, 19 Aug 2008 08:18:37 +0000 (08:18 +0000)]
36 files changed:
scilab/Visual-Studio-settings/giws.rules
scilab/etc/classpath.xml.vc
scilab/modules/graphics/tests/unit_tests/xlfont.tst
scilab/modules/gui/sci_gateway/cpp/sci_getinstalledlookandfeels.cpp
scilab/modules/gui/sci_gateway/cpp/sci_getlookandfeel.cpp
scilab/modules/gui/sci_gateway/cpp/sci_setlookandfeel.cpp
scilab/modules/gui/src/cpp/ScilabLookAndFeel.cpp
scilab/modules/gui/src/jni/LookAndFeelManager.cpp
scilab/modules/gui/src/jni/LookAndFeelManager.giws.xml
scilab/modules/gui/src/jni/LookAndFeelManager.hxx
scilab/modules/gui/tests/unit_tests/lookandfeel.tst
scilab/modules/helptools/src/c/DllmainHelptools.c
scilab/modules/helptools/src/c/LibScilab_Import.def
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/helptools/src/c/helptools_header.def
scilab/modules/helptools/src/c/resource.h
scilab/modules/helptools/src/java/helptools-JAVA.vcproj
scilab/modules/jvm/includes/loadBackGroundClassPath.h
scilab/modules/localization/src/c/LanguagePref.c
scilab/modules/localization/src/c/LanguagePref.h
scilab/modules/localization/src/c/getTextWarp.c
scilab/modules/localization/src/c/getTextWarp.h
scilab/modules/localization/src/c/loadLanguagePref.c
scilab/modules/localization/src/c/loadLanguagePref.h
scilab/modules/localization/src/c/saveLanguagePref.c
scilab/modules/localization/src/c/saveLanguagePref.h
scilab/modules/renderer/includes/RendererFontManager.h
scilab/modules/renderer/scilab_windows_Import.def
scilab/modules/renderer/src/cpp/RendererFontManager.cpp
scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/XlFontManager.java
scilab/modules/renderer/src/jni/XlFontManager.giws.xml
scilab/modules/windows_tools/src/c/scilab_windows/InnosetupMutex.c
scilab/modules/windows_tools/src/c/scilab_windows/InnosetupMutex.h
scilab/modules/windows_tools/src/c/scilab_windows/SetHeapOptions.c
scilab/modules/windows_tools/src/c/scilab_windows/SetHeapOptions.h
scilab/scilab-lib-doc.properties.vc

index 717d38f..84a7d76 100644 (file)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<VisualStudioToolFile\r
-       Name="Giws"\r
-       Version="8,00"\r
-       >\r
-       <Rules>\r
-               <CustomBuildRule\r
-                       Name="Giws rule"\r
-                       DisplayName="giws rule"\r
-                       CommandLine="&quot;$(SolutionDir)tools\python\python&quot; &quot;$(SolutionDir)tools\giws\giws.py&quot; -f $(InputName).giws.xml"\r
-                       Outputs="&quot;$(InputDir)$(InputName).cpp&quot;"\r
-                       FileExtensions="*.giws.xml"\r
-                       ExecutionDescription="giws process of $(InputName).giws.xml ..."\r
-                       >\r
-                       <Properties>\r
-                       </Properties>\r
-               </CustomBuildRule>\r
-       </Rules>\r
-</VisualStudioToolFile>\r
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+       Name="Giws"
+       Version="8,00"
+       >
+       <Rules>
+               <CustomBuildRule
+                       Name="Giws rule"
+                       DisplayName="giws rule"
+                       CommandLine="&quot;$(SolutionDir)tools\python\python&quot; &quot;$(SolutionDir)tools\giws\giws.py&quot; -f $(InputName).giws.xml"
+                       Outputs="&quot;$(InputDir)$(InputName).cpp&quot;"
+                       FileExtensions="*.giws.xml"
+                       ExecutionDescription="giws process of $(InputName).giws.xml ..."
+                       >
+                       <Properties>
+                       </Properties>
+               </CustomBuildRule>
+       </Rules>
+</VisualStudioToolFile>
index cc4f3f3..7f7ab54 100644 (file)
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE classpaths SYSTEM "../modules/jvm/xml/classpath.dtd">\r
-<!-- =================== -->\r
-<!--\r
- default CLASSPATH for Scilab\r
-\r
- @author Allan CORNET\r
- @author Sylvestre LEDRU\r
- @date INRIA 2007/2008\r
- ===================\r
- Don't touch if you do not know what you are doing\r
--->\r
-<!-- =================== -->\r
-<!-- \r
-Scilab Java dependencies can be load in different ways. \r
-It can be:\r
-* startup - Load immediatly the dep when Scilab starts (default behaviour)\r
-* background - After Scilab engine is loaded, load the dep in the background\r
-* onUse - Load the deps only when needed (once)\r
-\r
-Some deps can be also disabled only for a specific mode.\r
-The option is "disableUnderMode" and can be:\r
-* STD - Normal mode\r
-* NW - No Window mode (ie command line but with graphics \r
-* API - Scilab as an API \r
--->\r
-\r
-<classpaths>\r
-\r
-<!-- Mandatory on startup -->\r
-<path value="$SCILAB/thirdparty/flexdock-0.5.1.jar" load="startup"/>\r
-<path value="$SCILAB/thirdparty/jrosetta-API.jar" load="startup" disableUnderMode="NW"/>\r
-<path value="$SCILAB/thirdparty/jrosetta-engine.jar" load="startup" disableUnderMode="NW"/>\r
-<path value="$SCILAB/thirdparty/skinlf.jar" load="startup"/>\r
-<path value="$SCILAB/thirdparty/looks-2.1.1.jar" load="startup"/>\r
-<path value="$SCILAB/thirdparty/commons-logging-1.1.jar" load="startup"/>\r
-<path value="$SCILAB/thirdparty/jhall.jar" load="startup"/>\r
-\r
-\r
-<!-- Load when needed -->\r
-<path value="$SCILAB/thirdparty/jogl.jar" load="onUse">\r
-       <load on="graphics"/>\r
-       <load on="graphic_export"/>\r
-</path>\r
-<path value="$SCILAB/thirdparty/gluegen-rt.jar" load="onUse">\r
-       <load on="graphics"/>\r
-       <load on="graphic_export"/>\r
-</path>\r
-\r
-<!-- Documentation (not mandatory) -->\r
-<path value="$SCILAB/thirdparty/jeuclid-core.jar" load="onUse">\r
-       <load on="documentationGeneration"/>\r
-</path>\r
-<path value="$SCILAB/thirdparty/batik.jar" load="onUse">\r
-       <load on="documentationGeneration"/>\r
-</path>\r
-<path value="$SCILAB/thirdparty/js.jar" load="onUse">\r
-       <load on="documentationGeneration"/>\r
-</path>\r
-<path value="$SCILAB/thirdparty/saxon.jar" load="onUse">\r
-       <load on="documentationGeneration"/>\r
-</path>\r
-<path value="$SCILAB/thirdparty/docbook-xsl-saxon.jar" load="onUse">\r
-       <load on="documentationGeneration"/>\r
-</path>\r
-\r
-<!-- Mandatory on startup -->\r
-<path value="$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar" load="startup"/>\r
-<!-- Console GUI dep -->\r
-\r
-<path value="$SCILAB/modules/shell/jar/org.scilab.modules.shell.jar" load="startup" disableUnderMode="NW"/>\r
-<path value="$SCILAB/modules/history_manager/jar/org.scilab.modules.history_manager.jar" load="startup" disableUnderMode="NW"/>\r
-<path value="$SCILAB/modules/console/jar/org.scilab.modules.console.jar" load="startup"/>\r
-<path value="$SCILAB/modules/completion/jar/org.scilab.modules.completion.jar" load="startup" disableUnderMode="NW"/>\r
-\r
-<path value="$SCILAB/modules/action_binding/jar/org.scilab.modules.action_binding.jar" load="startup"/>\r
-<path value="$SCILAB/modules/gui/jar/org.scilab.modules.gui.jar" load="startup"/>\r
-<path value="$SCILAB/modules/javasci/jar/javasci.jar" load="startup"/>\r
-<path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar" load="startup"/>\r
-<path value="$SCILAB/modules/localization/jar/org.scilab.modules.localization.jar" load="startup"/>\r
-<path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar" load="startup"/>\r
-<path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="startup"/>\r
-\r
-</classpaths>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE classpaths SYSTEM "../modules/jvm/xml/classpath.dtd">
+<!-- =================== -->
+<!--
+ default CLASSPATH for Scilab
+
+ @author Allan CORNET
+ @author Sylvestre LEDRU
+ @date INRIA 2007/2008
+ ===================
+ Don't touch if you do not know what you are doing
+-->
+<!-- =================== -->
+<!-- 
+Scilab Java dependencies can be load in different ways. 
+It can be:
+* startup - Load immediatly the dep when Scilab starts (default behaviour)
+* background - After Scilab engine is loaded, load the dep in the background
+* onUse - Load the deps only when needed (once)
+
+Some deps can be also disabled only for a specific mode.
+The option is "disableUnderMode" and can be:
+* STD - Normal mode
+* NW - No Window mode (ie command line but with graphics 
+* API - Scilab as an API 
+-->
+
+<classpaths>
+
+<!-- Mandatory on startup -->
+<path value="$SCILAB/thirdparty/flexdock-0.5.1.jar" load="startup"/>
+<path value="$SCILAB/thirdparty/jrosetta-API.jar" load="startup" disableUnderMode="NW"/>
+<path value="$SCILAB/thirdparty/jrosetta-engine.jar" load="startup" disableUnderMode="NW"/>
+<path value="$SCILAB/thirdparty/skinlf.jar" load="startup"/>
+<path value="$SCILAB/thirdparty/looks-2.1.1.jar" load="startup"/>
+<path value="$SCILAB/thirdparty/commons-logging-1.1.jar" load="startup"/>
+<path value="$SCILAB/thirdparty/jhall.jar" load="startup"/>
+
+
+<!-- Load when needed -->
+<path value="$SCILAB/thirdparty/jogl.jar" load="onUse">
+       <load on="graphics"/>
+       <load on="graphic_export"/>
+</path>
+<path value="$SCILAB/thirdparty/gluegen-rt.jar" load="onUse">
+       <load on="graphics"/>
+       <load on="graphic_export"/>
+</path>
+
+<!-- Documentation (not mandatory) -->
+<path value="$SCILAB/thirdparty/jeuclid-core.jar" load="onUse">
+       <load on="documentationGeneration"/>
+</path>
+<path value="$SCILAB/thirdparty/batik.jar" load="onUse">
+       <load on="documentationGeneration"/>
+</path>
+<path value="$SCILAB/thirdparty/js.jar" load="onUse">
+       <load on="documentationGeneration"/>
+</path>
+<path value="$SCILAB/thirdparty/saxon.jar" load="onUse">
+       <load on="documentationGeneration"/>
+</path>
+<path value="$SCILAB/thirdparty/docbook-xsl-saxon.jar" load="onUse">
+       <load on="documentationGeneration"/>
+</path>
+
+<!-- Mandatory on startup -->
+<path value="$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar" load="startup"/>
+<!-- Console GUI dep -->
+
+<path value="$SCILAB/modules/shell/jar/org.scilab.modules.shell.jar" load="startup" disableUnderMode="NW"/>
+<path value="$SCILAB/modules/history_manager/jar/org.scilab.modules.history_manager.jar" load="startup" disableUnderMode="NW"/>
+<path value="$SCILAB/modules/console/jar/org.scilab.modules.console.jar" load="startup"/>
+<path value="$SCILAB/modules/completion/jar/org.scilab.modules.completion.jar" load="startup" disableUnderMode="NW"/>
+
+<path value="$SCILAB/modules/action_binding/jar/org.scilab.modules.action_binding.jar" load="startup"/>
+<path value="$SCILAB/modules/gui/jar/org.scilab.modules.gui.jar" load="startup"/>
+<path value="$SCILAB/modules/javasci/jar/javasci.jar" load="startup"/>
+<path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar" load="startup"/>
+<path value="$SCILAB/modules/localization/jar/org.scilab.modules.localization.jar" load="startup"/>
+<path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar" load="startup"/>
+<path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="startup"/>
+
+</classpaths>
index 905be68..abd362c 100644 (file)
@@ -1,58 +1,58 @@
-// =============================================================================\r
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-// Copyright (C) 2008 - DIGITEO - Allan CORNET\r
-//\r
-//  This file is distributed under the same license as the Scilab package.\r
-// =============================================================================\r
-\r
-\r
-// <-- TEST WITH GRAPHIC -->\r
-\r
-fonts = xlfont();\r
-if size(fonts,'*') <> 11 then pause,end\r
-\r
-default_fonts = [ "Monospaced" , ..\r
-"Symbol" , ..\r
-"Serif" , ..\r
-"Serif" , ..\r
-"Serif" , ..\r
-"Serif" , ..\r
-"SansSerif" , ..\r
-"SansSerif" , ..\r
-"SansSerif" , ..\r
-"SansSerif" , ..\r
-"SansSerif" ];\r
-\r
-if ~MSDOS then \r
-default_fonts = strsubst(default_fonts,'Symbol','OpenSymbol');\r
-end\r
-\r
-if ( or(fonts <> default_fonts) ) then pause,end\r
-\r
-availablefonts = xlfont('AVAILABLE_FONTS');\r
-if size(availablefonts,'*') < 11 then pause,end\r
-\r
-for i=0:size(fonts,'*')-1\r
-  xlfont(default_fonts(1),i);\r
-end  \r
-ref = emptystr(1:size(fonts,'*')) + default_fonts(1);\r
-fonts = xlfont();\r
-\r
-if ( and(fonts <> default_fonts) ) then pause,end\r
-\r
-for i=0:size(fonts,'*')-1\r
-  xlfont(default_fonts(2),i,%t);\r
-end  \r
-ref = emptystr(1:size(fonts,'*')) + default_fonts(2);\r
-fonts = xlfont();\r
-\r
-if ( and(fonts <> default_fonts) ) then pause,end\r
-\r
-for i=0:size(fonts,'*')-1\r
-  xlfont(default_fonts(2),i,%t,%t);\r
-end  \r
-ref = emptystr(1:size(fonts,'*')) + default_fonts(2);\r
-fonts = xlfont();\r
-\r
-if ( and(fonts <> default_fonts) ) then pause,end\r
-\r
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+
+// <-- TEST WITH GRAPHIC -->
+
+fonts = xlfont();
+if size(fonts,'*') <> 11 then pause,end
+
+default_fonts = [ "Monospaced" , ..
+"Symbol" , ..
+"Serif" , ..
+"Serif" , ..
+"Serif" , ..
+"Serif" , ..
+"SansSerif" , ..
+"SansSerif" , ..
+"SansSerif" , ..
+"SansSerif" , ..
+"SansSerif" ];
+
+if ~MSDOS then 
+default_fonts = strsubst(default_fonts,'Symbol','OpenSymbol');
+end
+
+if ( or(fonts <> default_fonts) ) then pause,end
+
+availablefonts = xlfont('AVAILABLE_FONTS');
+if size(availablefonts,'*') < 11 then pause,end
+
+for i=0:size(fonts,'*')-1
+  xlfont(default_fonts(1),i);
+end  
+ref = emptystr(1:size(fonts,'*')) + default_fonts(1);
+fonts = xlfont();
+
+if ( and(fonts <> default_fonts) ) then pause,end
+
+for i=0:size(fonts,'*')-1
+  xlfont(default_fonts(2),i,%t);
+end  
+ref = emptystr(1:size(fonts,'*')) + default_fonts(2);
+fonts = xlfont();
+
+if ( and(fonts <> default_fonts) ) then pause,end
+
+for i=0:size(fonts,'*')-1
+  xlfont(default_fonts(2),i,%t,%t);
+end  
+ref = emptystr(1:size(fonts,'*')) + default_fonts(2);
+fonts = xlfont();
+
+if ( and(fonts <> default_fonts) ) then pause,end
+
index 5a33cbf..7c10c09 100644 (file)
@@ -1,72 +1,72 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
\r
-#include "LookAndFeelManager.hxx"\r
-\r
-extern "C"\r
-{\r
-#include <stdlib.h>\r
-#include "gw_gui.h"\r
-#include "stack-c.h"\r
-#include "getScilabJavaVM.h"\r
-#include "Scierror.h"\r
-#include "localization.h"\r
-/*--------------------------------------------------------------------------*/\r
-int sci_getinstalledlookandfeels(char *fname,unsigned long fname_len)\r
-{\r
-       CheckRhs(0,0);\r
-       CheckLhs(1,1);\r
-\r
-       org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());\r
-       if (lnf)\r
-       {\r
-               char **lookandfeels = NULL;\r
-               int nbElems = 0;\r
-               int nbCol = 0;\r
-\r
-               lookandfeels = lnf->getInstalledLookAndFeels();\r
-               nbElems = lnf->numbersOfInstalledLookAndFeels();\r
-               delete lnf;\r
-\r
-               nbCol = 1;\r
-               CreateVarFromPtr( Rhs+1,MATRIX_OF_STRING_DATATYPE, &nbElems, &nbCol,lookandfeels );\r
-\r
-               LhsVar(1)=Rhs+1;\r
-               C2F(putlhsvar)();\r
-\r
-               if (lookandfeels)\r
-               {\r
-                       int i = 0;\r
-                       for (i=0;i<nbElems;i++)\r
-                       {\r
-                               if (lookandfeels[i])\r
-                               {\r
-                                       free(lookandfeels[i]); /* free because giws uses malloc */\r
-                                       lookandfeels[i] = NULL;\r
-                               }\r
-                       }\r
-                       free(lookandfeels);\r
-                       lookandfeels = NULL;\r
-               }\r
-       }\r
-       else\r
-       {\r
-               Scierror(999,_("%s: No more memory.\n"),fname);\r
-       }\r
-       return 0;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-}\r
-/* END OF extern "C" */\r
-/*--------------------------------------------------------------------------*/\r
-\r
-\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+#include "LookAndFeelManager.hxx"
+
+extern "C"
+{
+#include <stdlib.h>
+#include "gw_gui.h"
+#include "stack-c.h"
+#include "getScilabJavaVM.h"
+#include "Scierror.h"
+#include "localization.h"
+/*--------------------------------------------------------------------------*/
+int sci_getinstalledlookandfeels(char *fname,unsigned long fname_len)
+{
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+
+       org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());
+       if (lnf)
+       {
+               char **lookandfeels = NULL;
+               int nbElems = 0;
+               int nbCol = 0;
+
+               lookandfeels = lnf->getInstalledLookAndFeels();
+               nbElems = lnf->numbersOfInstalledLookAndFeels();
+               delete lnf;
+
+               nbCol = 1;
+               CreateVarFromPtr( Rhs+1,MATRIX_OF_STRING_DATATYPE, &nbElems, &nbCol,lookandfeels );
+
+               LhsVar(1)=Rhs+1;
+               C2F(putlhsvar)();
+
+               if (lookandfeels)
+               {
+                       int i = 0;
+                       for (i=0;i<nbElems;i++)
+                       {
+                               if (lookandfeels[i])
+                               {
+                                       free(lookandfeels[i]); /* free because giws uses malloc */
+                                       lookandfeels[i] = NULL;
+                               }
+                       }
+                       free(lookandfeels);
+                       lookandfeels = NULL;
+               }
+       }
+       else
+       {
+               Scierror(999,_("%s: No more memory.\n"),fname);
+       }
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
+}
+/* END OF extern "C" */
+/*--------------------------------------------------------------------------*/
+
+
index 9313891..a267a90 100644 (file)
@@ -1,63 +1,63 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-#include "LookAndFeelManager.hxx"\r
-\r
-\r
-extern "C"\r
-{\r
-#include <stdlib.h>\r
-#include "gw_gui.h"\r
-#include "stack-c.h"\r
-#include "getScilabJavaVM.h"\r
-#include "Scierror.h"\r
-#include "localization.h"\r
-/*--------------------------------------------------------------------------*/\r
-int sci_getlookandfeel(char *fname,unsigned long fname_len)\r
-{\r
-       CheckRhs(0,0);\r
-       CheckLhs(1,1);\r
-\r
-       org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());\r
-       if (lnf)\r
-       {\r
-               static integer n1 = 0,m1 = 0,l1 = 0;\r
-\r
-               char *look = lnf->getCurrentLookAndFeel();\r
-               delete lnf;\r
-\r
-               if (look)\r
-               {       \r
-                       m1 = (int)strlen(look);\r
-                       n1 = 1;\r
-                       CreateVarFromPtr(Rhs+1,STRING_DATATYPE,&m1,&n1,&look);\r
-                       if (look) {free(look); look = NULL;} /* free because giws uses malloc */\r
-                       LhsVar(1) = Rhs+1;\r
-                       C2F(putlhsvar)();\r
-               }\r
-               else\r
-               {\r
-                       Scierror(999,_("%s: An error occurred: %s.\n"),fname,_("Impossible to get current look and feel"));\r
-               }\r
-       }\r
-       else\r
-       {\r
-               Scierror(999,_("%s: No more memory.\n"),fname);\r
-       }\r
-\r
-       return 0;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-\r
-} /* END OF extern "C" */\r
-/*--------------------------------------------------------------------------*/\r
-\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+#include "LookAndFeelManager.hxx"
+
+
+extern "C"
+{
+#include <stdlib.h>
+#include "gw_gui.h"
+#include "stack-c.h"
+#include "getScilabJavaVM.h"
+#include "Scierror.h"
+#include "localization.h"
+/*--------------------------------------------------------------------------*/
+int sci_getlookandfeel(char *fname,unsigned long fname_len)
+{
+       CheckRhs(0,0);
+       CheckLhs(1,1);
+
+       org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());
+       if (lnf)
+       {
+               static integer n1 = 0,m1 = 0,l1 = 0;
+
+               char *look = lnf->getCurrentLookAndFeel();
+               delete lnf;
+
+               if (look)
+               {       
+                       m1 = (int)strlen(look);
+                       n1 = 1;
+                       CreateVarFromPtr(Rhs+1,STRING_DATATYPE,&m1,&n1,&look);
+                       if (look) {free(look); look = NULL;} /* free because giws uses malloc */
+                       LhsVar(1) = Rhs+1;
+                       C2F(putlhsvar)();
+               }
+               else
+               {
+                       Scierror(999,_("%s: An error occurred: %s.\n"),fname,_("Impossible to get current look and feel"));
+               }
+       }
+       else
+       {
+               Scierror(999,_("%s: No more memory.\n"),fname);
+       }
+
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
+
+} /* END OF extern "C" */
+/*--------------------------------------------------------------------------*/
+
index 56c1207..33ffc7a 100644 (file)
@@ -1,95 +1,95 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-#include "LookAndFeelManager.hxx"\r
-\r
-\r
-extern "C"\r
-{\r
-#include "gw_gui.h"\r
-#include "stack-c.h"\r
-#include "getScilabJavaVM.h"\r
-#include "Scierror.h"\r
-#include "localization.h"\r
-#include "BOOL.h"\r
-#include "MALLOC.h"\r
-/*--------------------------------------------------------------------------*/\r
-int sci_setlookandfeel(char *fname,unsigned long fname_len)\r
-{\r
-       CheckRhs(0,1);\r
-       CheckLhs(0,1);\r
-\r
-       if (Rhs == 0)\r
-       {\r
-               org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());\r
-               if (lnf)\r
-               {\r
-                       int n1 = 1;\r
-                       int *paramoutINT=(int*)MALLOC(sizeof(int));\r
-\r
-                       *paramoutINT = (int) booltoBOOL(lnf->setSystemLookAndFeel());\r
-                       delete lnf;\r
-\r
-                       n1=1;\r
-                       CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);\r
-                       LhsVar(1)=Rhs+1;\r
-\r
-                       C2F(putlhsvar)();\r
-\r
-                       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}\r
-               }\r
-               else\r
-               {\r
-                        Scierror(999,_("%s: No more memory.\n"),fname);\r
-               }\r
-       }\r
-       else if ( GetType(1) == sci_strings )\r
-       {\r
-               int m1,n1=0,l1=0;\r
-               \r
-               char *looknfeel = NULL;\r
-               \r
-               GetRhsVar(1,STRING_DATATYPE,&m1,&n1,&l1);\r
-               looknfeel = cstk(l1);\r
-\r
-               org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());\r
-               if (lnf)\r
-               {\r
-                       int *paramoutINT = (int*)MALLOC(sizeof(int));\r
-                       *paramoutINT = (int)booltoBOOL(lnf->setLookAndFeel(looknfeel));\r
-                       delete lnf;\r
-               \r
-                       n1=1;\r
-                       CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);\r
-                       LhsVar(1)=Rhs+1;\r
-\r
-                       C2F(putlhsvar)();\r
-\r
-                       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}\r
-               }\r
-               else\r
-               {\r
-                       Scierror(999,_("%s: No more memory.\n"),fname);\r
-               }\r
-       }\r
-       else\r
-       {\r
-          Scierror(999,_("%s: Wrong type for input argument #%d: A string expected.\n"), fname, 1);\r
-       }\r
-       return 0;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-\r
-}\r
-/* END OF extern "C" */\r
-/*--------------------------------------------------------------------------*/\r
-\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+#include "LookAndFeelManager.hxx"
+
+
+extern "C"
+{
+#include "gw_gui.h"
+#include "stack-c.h"
+#include "getScilabJavaVM.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "BOOL.h"
+#include "MALLOC.h"
+/*--------------------------------------------------------------------------*/
+int sci_setlookandfeel(char *fname,unsigned long fname_len)
+{
+       CheckRhs(0,1);
+       CheckLhs(0,1);
+
+       if (Rhs == 0)
+       {
+               org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());
+               if (lnf)
+               {
+                       int n1 = 1;
+                       int *paramoutINT=(int*)MALLOC(sizeof(int));
+
+                       *paramoutINT = (int) booltoBOOL(lnf->setSystemLookAndFeel());
+                       delete lnf;
+
+                       n1=1;
+                       CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);
+                       LhsVar(1)=Rhs+1;
+
+                       C2F(putlhsvar)();
+
+                       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+               }
+               else
+               {
+                        Scierror(999,_("%s: No more memory.\n"),fname);
+               }
+       }
+       else if ( GetType(1) == sci_strings )
+       {
+               int m1,n1=0,l1=0;
+               
+               char *looknfeel = NULL;
+               
+               GetRhsVar(1,STRING_DATATYPE,&m1,&n1,&l1);
+               looknfeel = cstk(l1);
+
+               org_scilab_modules_gui_utils::LookAndFeelManager *lnf = new org_scilab_modules_gui_utils::LookAndFeelManager(getScilabJavaVM());
+               if (lnf)
+               {
+                       int *paramoutINT = (int*)MALLOC(sizeof(int));
+                       *paramoutINT = (int)booltoBOOL(lnf->setLookAndFeel(looknfeel));
+                       delete lnf;
+               
+                       n1=1;
+                       CreateVarFromPtr(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &paramoutINT);
+                       LhsVar(1)=Rhs+1;
+
+                       C2F(putlhsvar)();
+
+                       if (paramoutINT) {FREE(paramoutINT);paramoutINT=NULL;}
+               }
+               else
+               {
+                       Scierror(999,_("%s: No more memory.\n"),fname);
+               }
+       }
+       else
+       {
+          Scierror(999,_("%s: Wrong type for input argument #%d: A string expected.\n"), fname, 1);
+       }
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
+
+}
+/* END OF extern "C" */
+/*--------------------------------------------------------------------------*/
+
index 19ac84b..4892e15 100644 (file)
@@ -1,34 +1,34 @@
-#include "ScilabLookAndFeel.hxx"\r
-\r
-extern "C"\r
-{\r
-}\r
-\r
-char * getInstalledLookAndFeels()\r
-{\r
-}\r
-\r
-\r
-bool isSupportedLookAndFeel(char * lookandfeel)\r
-{\r
-}\r
-\r
-\r
-char * getCurrentLookAndFeel()\r
-{\r
-}\r
-\r
-\r
-bool setLookAndFeel(char * lookandfeel)\r
-{\r
-}\r
-\r
-\r
-bool setSystemLookAndFeel()\r
-{\r
-}\r
-\r
-\r
-char ** getInstalledLookAndFeels()\r
-{\r
-}\r
+#include "ScilabLookAndFeel.hxx"
+
+extern "C"
+{
+}
+
+char * getInstalledLookAndFeels()
+{
+}
+
+
+bool isSupportedLookAndFeel(char * lookandfeel)
+{
+}
+
+
+char * getCurrentLookAndFeel()
+{
+}
+
+
+bool setLookAndFeel(char * lookandfeel)
+{
+}
+
+
+bool setSystemLookAndFeel()
+{
+}
+
+
+char ** getInstalledLookAndFeels()
+{
+}
index aaca5db..0c5d4fd 100644 (file)
-#include "LookAndFeelManager.hxx"\r
-/* Generated by GIWS (version 1.0) */\r
-/*\r
-\r
-Copyright 2007 INRIA\r
-\r
-Author : Sylvestre Ledru\r
-\r
-This software is a computer program whose purpose is to hide the complexity\r
-of accessing Java objects/methods from C++ code.\r
-\r
-This software is governed by the CeCILL-B license under French law and\r
-abiding by the rules of distribution of free software.  You can  use, \r
-modify and/ or redistribute the software under the terms of the CeCILL-B\r
-license as circulated by CEA, CNRS and INRIA at the following URL\r
-"http://www.cecill.info". \r
-\r
-As a counterpart to the access to the source code and  rights to copy,\r
-modify and redistribute granted by the license, users are provided only\r
-with a limited warranty  and the software's author,  the holder of the\r
-economic rights,  and the successive licensors  have only  limited\r
-liability. \r
-\r
-In this respect, the user's attention is drawn to the risks associated\r
-with loading,  using,  modifying and/or developing or reproducing the\r
-software by the user in light of its specific status of free software,\r
-that may mean  that it is complicated to manipulate,  and  that  also\r
-therefore means  that it is reserved for developers  and  experienced\r
-professionals having in-depth computer knowledge. Users are therefore\r
-encouraged to load and test the software's suitability as regards their\r
-requirements in conditions enabling the security of their systems and/or \r
-data to be ensured and,  more generally, to use and operate it in the \r
-same conditions as regards security. \r
-\r
-The fact that you are presently reading this means that you have had\r
-knowledge of the CeCILL-B license and that you accept its terms.\r
-*/\r
-\r
-namespace org_scilab_modules_gui_utils {\r
-\r
-// Returns the current env\r
-\r
-JNIEnv * LookAndFeelManager::getCurrentEnv() {\r
-JNIEnv * curEnv = NULL;\r
-this->jvm->AttachCurrentThread((void **) &curEnv, NULL);\r
-return curEnv;\r
-}\r
-// Destructor\r
-\r
-LookAndFeelManager::~LookAndFeelManager() {\r
-JNIEnv * curEnv = NULL;\r
-this->jvm->AttachCurrentThread((void **) &curEnv, NULL);\r
-\r
-curEnv->DeleteGlobalRef(this->instance);\r
-curEnv->DeleteGlobalRef(this->instanceClass);\r
-}\r
-// Constructors\r
-\r
-LookAndFeelManager::LookAndFeelManager(JavaVM * jvm_) {\r
-jmethodID constructObject = NULL ;\r
-jobject localInstance ;\r
-jclass localClass ;\r
-const std::string construct="<init>";\r
-const std::string param="()V";\r
-jvm=jvm_;\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-localClass = curEnv->FindClass( this->className().c_str() ) ;\r
-if (localClass == NULL) {\r
-std::cerr << "Could not get the Class " << this->className() <<  std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-\r
-this->instanceClass = (jclass) curEnv->NewGlobalRef(localClass) ;\r
-if (this->instanceClass == NULL) {\r
-std::cerr << "Could not create a Global Ref of " << this->className() <<  std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-\r
-/* localClass is not needed anymore */\r
-curEnv->DeleteLocalRef(localClass);\r
-\r
-constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;\r
-if(constructObject == NULL){\r
-std::cerr << "Could not retrieve the constructor of the class " << this->className() << " with the profile : " << construct << param << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-\r
-localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;\r
-if(localInstance == NULL){\r
-std::cerr << "Could not instantiate the object " << this->className() << " with the constructor : " << construct << param << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
\r
-this->instance = curEnv->NewGlobalRef(localInstance) ;\r
-if(this->instance == NULL){\r
-std::cerr << "Could not create a new global ref of " << this->className() << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-/* localInstance not needed anymore */\r
-curEnv->DeleteLocalRef(localInstance);\r
-\r
-                /* Methods ID set to NULL */\r
-jbooleanisSupportedLookAndFeeljstringID=NULL; \r
-jstringgetCurrentLookAndFeelID=NULL; \r
-jbooleansetLookAndFeeljstringID=NULL; \r
-jbooleansetSystemLookAndFeelID=NULL; \r
-jobjectArraygetInstalledLookAndFeelsID=NULL; \r
-jintnumbersOfInstalledLookAndFeelsID=NULL; \r
-\r
-\r
-}\r
-\r
-LookAndFeelManager::LookAndFeelManager(JavaVM * jvm_, jobject JObj) {\r
-        jvm=jvm_;\r
-\r
-        JNIEnv * curEnv = getCurrentEnv();\r
-\r
-jclass localClass = curEnv->GetObjectClass(JObj);\r
-        this->instanceClass = (jclass) curEnv->NewGlobalRef(localClass);\r
-        curEnv->DeleteLocalRef(localClass);\r
-\r
-        if (this->instanceClass == NULL) {\r
-               std::cerr << "Could not create a Global Ref of " << this->instanceClass <<  std::endl;\r
-               exit(EXIT_FAILURE);\r
-   \r
-        }\r
-\r
-        this->instance = curEnv->NewGlobalRef(JObj) ;\r
-        if(this->instance == NULL){\r
-               std::cerr << "Could not create a new global ref of " << this->instanceClass << std::endl;\r
-               exit(EXIT_FAILURE);\r
-        }\r
-        /* Methods ID set to NULL */\r
-        jbooleanisSupportedLookAndFeeljstringID=NULL; \r
-jstringgetCurrentLookAndFeelID=NULL; \r
-jbooleansetLookAndFeeljstringID=NULL; \r
-jbooleansetSystemLookAndFeelID=NULL; \r
-jobjectArraygetInstalledLookAndFeelsID=NULL; \r
-jintnumbersOfInstalledLookAndFeelsID=NULL; \r
-\r
-\r
-}\r
-\r
-// Generic methods\r
-\r
-\r
-void LookAndFeelManager::synchronize() {\r
-if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {\r
-std::cerr << "Fail to enter monitor." << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-\r
-\r
-void LookAndFeelManager::endSynchronize() {\r
-if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {\r
-std::cerr << "Fail to exit monitor." << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-\r
-// Method(s)\r
-\r
-bool LookAndFeelManager::isSupportedLookAndFeel (char * lookandfeel){\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-if (jbooleanisSupportedLookAndFeeljstringID==NULL) { /* Use the cache Luke */ jbooleanisSupportedLookAndFeeljstringID = curEnv->GetMethodID(this->instanceClass, "isSupportedLookAndFeel", "(Ljava/lang/String;)Z" ) ;\r
-if (jbooleanisSupportedLookAndFeeljstringID == NULL) {\r
-std::cerr << "Could not access to the method " << "isSupportedLookAndFeel" << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-jstring lookandfeel_ = curEnv->NewStringUTF( lookandfeel );\r
-\r
-                        jboolean res =  (jboolean) curEnv->CallBooleanMethod( this->instance, jbooleanisSupportedLookAndFeeljstringID ,lookandfeel_);\r
-                        \r
-if (curEnv->ExceptionOccurred()) {\r
-curEnv->ExceptionDescribe() ;\r
-}\r
-\r
-                        \r
-return (res == JNI_TRUE);\r
-\r
-}\r
-\r
-char * LookAndFeelManager::getCurrentLookAndFeel (){\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-if (jstringgetCurrentLookAndFeelID==NULL) { /* Use the cache Luke */ jstringgetCurrentLookAndFeelID = curEnv->GetMethodID(this->instanceClass, "getCurrentLookAndFeel", "()Ljava/lang/String;" ) ;\r
-if (jstringgetCurrentLookAndFeelID == NULL) {\r
-std::cerr << "Could not access to the method " << "getCurrentLookAndFeel" << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-                        jstring res =  (jstring) curEnv->CallObjectMethod( this->instance, jstringgetCurrentLookAndFeelID );\r
-                        \r
-if (curEnv->ExceptionOccurred()) {\r
-curEnv->ExceptionDescribe() ;\r
-}\r
-\r
-                        \r
-const char *tempString = curEnv->GetStringUTFChars(res, 0);\r
-char * myStringBuffer= (char*)malloc (strlen(tempString)*sizeof(char)+1);\r
-strcpy(myStringBuffer, tempString);\r
-curEnv->ReleaseStringUTFChars(res, tempString);\r
-\r
-return myStringBuffer;\r
-\r
-}\r
-\r
-bool LookAndFeelManager::setLookAndFeel (char * lookandfeel){\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-if (jbooleansetLookAndFeeljstringID==NULL) { /* Use the cache Luke */ jbooleansetLookAndFeeljstringID = curEnv->GetMethodID(this->instanceClass, "setLookAndFeel", "(Ljava/lang/String;)Z" ) ;\r
-if (jbooleansetLookAndFeeljstringID == NULL) {\r
-std::cerr << "Could not access to the method " << "setLookAndFeel" << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-jstring lookandfeel_ = curEnv->NewStringUTF( lookandfeel );\r
-\r
-                        jboolean res =  (jboolean) curEnv->CallBooleanMethod( this->instance, jbooleansetLookAndFeeljstringID ,lookandfeel_);\r
-                        \r
-if (curEnv->ExceptionOccurred()) {\r
-curEnv->ExceptionDescribe() ;\r
-}\r
-\r
-                        \r
-return (res == JNI_TRUE);\r
-\r
-}\r
-\r
-bool LookAndFeelManager::setSystemLookAndFeel (){\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-if (jbooleansetSystemLookAndFeelID==NULL) { /* Use the cache Luke */ jbooleansetSystemLookAndFeelID = curEnv->GetMethodID(this->instanceClass, "setSystemLookAndFeel", "()Z" ) ;\r
-if (jbooleansetSystemLookAndFeelID == NULL) {\r
-std::cerr << "Could not access to the method " << "setSystemLookAndFeel" << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-                        jboolean res =  (jboolean) curEnv->CallBooleanMethod( this->instance, jbooleansetSystemLookAndFeelID );\r
-                        \r
-if (curEnv->ExceptionOccurred()) {\r
-curEnv->ExceptionDescribe() ;\r
-}\r
-\r
-                        \r
-return (res == JNI_TRUE);\r
-\r
-}\r
-\r
-char ** LookAndFeelManager::getInstalledLookAndFeels (){\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-if (jobjectArraygetInstalledLookAndFeelsID==NULL) { /* Use the cache Luke */ jobjectArraygetInstalledLookAndFeelsID = curEnv->GetMethodID(this->instanceClass, "getInstalledLookAndFeels", "()[Ljava/lang/String;" ) ;\r
-if (jobjectArraygetInstalledLookAndFeelsID == NULL) {\r
-std::cerr << "Could not access to the method " << "getInstalledLookAndFeels" << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-                        jobjectArray res =  (jobjectArray) curEnv->CallObjectMethod( this->instance, jobjectArraygetInstalledLookAndFeelsID );\r
-                        \r
-if (curEnv->ExceptionOccurred()) {\r
-curEnv->ExceptionDescribe() ;\r
-}\r
-\r
-                        \r
-jsize len = curEnv->GetArrayLength(res);\r
-char **arrayOfString;\r
-                        arrayOfString= (char**)malloc ((len+1)*sizeof(char*));\r
-for (jsize i = 0; i < len; i++){\r
-jstring resString = (jstring)curEnv->GetObjectArrayElement(res, i);\r
-const char *tempString = curEnv->GetStringUTFChars(resString, 0);\r
-arrayOfString[i]= (char*)malloc ((strlen(tempString)+1)*sizeof(char));\r
-strcpy(arrayOfString[i], tempString);\r
-curEnv->ReleaseStringUTFChars(resString, tempString);\r
-}\r
-\r
-return arrayOfString;\r
-\r
-}\r
-\r
-long LookAndFeelManager::numbersOfInstalledLookAndFeels (){\r
-\r
-JNIEnv * curEnv = getCurrentEnv();\r
-\r
-if (jintnumbersOfInstalledLookAndFeelsID==NULL) { /* Use the cache Luke */ jintnumbersOfInstalledLookAndFeelsID = curEnv->GetMethodID(this->instanceClass, "numbersOfInstalledLookAndFeels", "()I" ) ;\r
-if (jintnumbersOfInstalledLookAndFeelsID == NULL) {\r
-std::cerr << "Could not access to the method " << "numbersOfInstalledLookAndFeels" << std::endl;\r
-exit(EXIT_FAILURE);\r
-}\r
-}\r
-                        jint res =  (jint) curEnv->CallIntMethod( this->instance, jintnumbersOfInstalledLookAndFeelsID );\r
-                        \r
-if (curEnv->ExceptionOccurred()) {\r
-curEnv->ExceptionDescribe() ;\r
-}\r
-\r
-                        \r
-return res;\r
-\r
-}\r
-\r
-}\r
+#include "LookAndFeelManager.hxx"
+/* Generated by GIWS (version 1.0) */
+/*
+
+Copyright 2007 INRIA
+
+Author : Sylvestre Ledru
+
+This software is a computer program whose purpose is to hide the complexity
+of accessing Java objects/methods from C++ code.
+
+This software is governed by the CeCILL-B license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL-B
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL-B license and that you accept its terms.
+*/
+
+namespace org_scilab_modules_gui_utils {
+
+// Returns the current env
+
+JNIEnv * LookAndFeelManager::getCurrentEnv() {
+JNIEnv * curEnv = NULL;
+this->jvm->AttachCurrentThread((void **) &curEnv, NULL);
+return curEnv;
+}
+// Destructor
+
+LookAndFeelManager::~LookAndFeelManager() {
+JNIEnv * curEnv = NULL;
+this->jvm->AttachCurrentThread((void **) &curEnv, NULL);
+
+curEnv->DeleteGlobalRef(this->instance);
+curEnv->DeleteGlobalRef(this->instanceClass);
+}
+// Constructors
+
+LookAndFeelManager::LookAndFeelManager(JavaVM * jvm_) {
+jmethodID constructObject = NULL ;
+jobject localInstance ;
+jclass localClass ;
+const std::string construct="<init>";
+const std::string param="()V";
+jvm=jvm_;
+
+JNIEnv * curEnv = getCurrentEnv();
+
+localClass = curEnv->FindClass( this->className().c_str() ) ;
+if (localClass == NULL) {
+std::cerr << "Could not get the Class " << this->className() <<  std::endl;
+exit(EXIT_FAILURE);
+}
+
+this->instanceClass = (jclass) curEnv->NewGlobalRef(localClass) ;
+if (this->instanceClass == NULL) {
+std::cerr << "Could not create a Global Ref of " << this->className() <<  std::endl;
+exit(EXIT_FAILURE);
+}
+
+/* localClass is not needed anymore */
+curEnv->DeleteLocalRef(localClass);
+
+constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
+if(constructObject == NULL){
+std::cerr << "Could not retrieve the constructor of the class " << this->className() << " with the profile : " << construct << param << std::endl;
+exit(EXIT_FAILURE);
+}
+
+localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
+if(localInstance == NULL){
+std::cerr << "Could not instantiate the object " << this->className() << " with the constructor : " << construct << param << std::endl;
+exit(EXIT_FAILURE);
+}
+this->instance = curEnv->NewGlobalRef(localInstance) ;
+if(this->instance == NULL){
+std::cerr << "Could not create a new global ref of " << this->className() << std::endl;
+exit(EXIT_FAILURE);
+}
+/* localInstance not needed anymore */
+curEnv->DeleteLocalRef(localInstance);
+
+                /* Methods ID set to NULL */
+jbooleanisSupportedLookAndFeeljstringID=NULL; 
+jstringgetCurrentLookAndFeelID=NULL; 
+jbooleansetLookAndFeeljstringID=NULL; 
+jbooleansetSystemLookAndFeelID=NULL; 
+jobjectArraygetInstalledLookAndFeelsID=NULL; 
+jintnumbersOfInstalledLookAndFeelsID=NULL; 
+
+
+}
+
+LookAndFeelManager::LookAndFeelManager(JavaVM * jvm_, jobject JObj) {
+        jvm=jvm_;
+
+        JNIEnv * curEnv = getCurrentEnv();
+
+jclass localClass = curEnv->GetObjectClass(JObj);
+        this->instanceClass = (jclass) curEnv->NewGlobalRef(localClass);
+        curEnv->DeleteLocalRef(localClass);
+
+        if (this->instanceClass == NULL) {
+               std::cerr << "Could not create a Global Ref of " << this->instanceClass <<  std::endl;
+               exit(EXIT_FAILURE);
+   
+        }
+
+        this->instance = curEnv->NewGlobalRef(JObj) ;
+        if(this->instance == NULL){
+               std::cerr << "Could not create a new global ref of " << this->instanceClass << std::endl;
+               exit(EXIT_FAILURE);
+        }
+        /* Methods ID set to NULL */
+        jbooleanisSupportedLookAndFeeljstringID=NULL; 
+jstringgetCurrentLookAndFeelID=NULL; 
+jbooleansetLookAndFeeljstringID=NULL; 
+jbooleansetSystemLookAndFeelID=NULL; 
+jobjectArraygetInstalledLookAndFeelsID=NULL; 
+jintnumbersOfInstalledLookAndFeelsID=NULL; 
+
+
+}
+
+// Generic methods
+
+
+void LookAndFeelManager::synchronize() {
+if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
+std::cerr << "Fail to enter monitor." << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+
+
+void LookAndFeelManager::endSynchronize() {
+if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
+std::cerr << "Fail to exit monitor." << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+
+// Method(s)
+
+bool LookAndFeelManager::isSupportedLookAndFeel (char * lookandfeel){
+
+JNIEnv * curEnv = getCurrentEnv();
+
+if (jbooleanisSupportedLookAndFeeljstringID==NULL) { /* Use the cache Luke */ jbooleanisSupportedLookAndFeeljstringID = curEnv->GetMethodID(this->instanceClass, "isSupportedLookAndFeel", "(Ljava/lang/String;)Z" ) ;
+if (jbooleanisSupportedLookAndFeeljstringID == NULL) {
+std::cerr << "Could not access to the method " << "isSupportedLookAndFeel" << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+jstring lookandfeel_ = curEnv->NewStringUTF( lookandfeel );
+
+                        jboolean res =  (jboolean) curEnv->CallBooleanMethod( this->instance, jbooleanisSupportedLookAndFeeljstringID ,lookandfeel_);
+                        
+if (curEnv->ExceptionOccurred()) {
+curEnv->ExceptionDescribe() ;
+}
+
+                        
+return (res == JNI_TRUE);
+
+}
+
+char * LookAndFeelManager::getCurrentLookAndFeel (){
+
+JNIEnv * curEnv = getCurrentEnv();
+
+if (jstringgetCurrentLookAndFeelID==NULL) { /* Use the cache Luke */ jstringgetCurrentLookAndFeelID = curEnv->GetMethodID(this->instanceClass, "getCurrentLookAndFeel", "()Ljava/lang/String;" ) ;
+if (jstringgetCurrentLookAndFeelID == NULL) {
+std::cerr << "Could not access to the method " << "getCurrentLookAndFeel" << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+                        jstring res =  (jstring) curEnv->CallObjectMethod( this->instance, jstringgetCurrentLookAndFeelID );
+                        
+if (curEnv->ExceptionOccurred()) {
+curEnv->ExceptionDescribe() ;
+}
+
+                        
+const char *tempString = curEnv->GetStringUTFChars(res, 0);
+char * myStringBuffer= (char*)malloc (strlen(tempString)*sizeof(char)+1);
+strcpy(myStringBuffer, tempString);
+curEnv->ReleaseStringUTFChars(res, tempString);
+
+return myStringBuffer;
+
+}
+
+bool LookAndFeelManager::setLookAndFeel (char * lookandfeel){
+
+JNIEnv * curEnv = getCurrentEnv();
+
+if (jbooleansetLookAndFeeljstringID==NULL) { /* Use the cache Luke */ jbooleansetLookAndFeeljstringID = curEnv->GetMethodID(this->instanceClass, "setLookAndFeel", "(Ljava/lang/String;)Z" ) ;
+if (jbooleansetLookAndFeeljstringID == NULL) {
+std::cerr << "Could not access to the method " << "setLookAndFeel" << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+jstring lookandfeel_ = curEnv->NewStringUTF( lookandfeel );
+
+                        jboolean res =  (jboolean) curEnv->CallBooleanMethod( this->instance, jbooleansetLookAndFeeljstringID ,lookandfeel_);
+                        
+if (curEnv->ExceptionOccurred()) {
+curEnv->ExceptionDescribe() ;
+}
+
+                        
+return (res == JNI_TRUE);
+
+}
+
+bool LookAndFeelManager::setSystemLookAndFeel (){
+
+JNIEnv * curEnv = getCurrentEnv();
+
+if (jbooleansetSystemLookAndFeelID==NULL) { /* Use the cache Luke */ jbooleansetSystemLookAndFeelID = curEnv->GetMethodID(this->instanceClass, "setSystemLookAndFeel", "()Z" ) ;
+if (jbooleansetSystemLookAndFeelID == NULL) {
+std::cerr << "Could not access to the method " << "setSystemLookAndFeel" << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+                        jboolean res =  (jboolean) curEnv->CallBooleanMethod( this->instance, jbooleansetSystemLookAndFeelID );
+                        
+if (curEnv->ExceptionOccurred()) {
+curEnv->ExceptionDescribe() ;
+}
+
+                        
+return (res == JNI_TRUE);
+
+}
+
+char ** LookAndFeelManager::getInstalledLookAndFeels (){
+
+JNIEnv * curEnv = getCurrentEnv();
+
+if (jobjectArraygetInstalledLookAndFeelsID==NULL) { /* Use the cache Luke */ jobjectArraygetInstalledLookAndFeelsID = curEnv->GetMethodID(this->instanceClass, "getInstalledLookAndFeels", "()[Ljava/lang/String;" ) ;
+if (jobjectArraygetInstalledLookAndFeelsID == NULL) {
+std::cerr << "Could not access to the method " << "getInstalledLookAndFeels" << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+                        jobjectArray res =  (jobjectArray) curEnv->CallObjectMethod( this->instance, jobjectArraygetInstalledLookAndFeelsID );
+                        
+if (curEnv->ExceptionOccurred()) {
+curEnv->ExceptionDescribe() ;
+}
+
+                        
+jsize len = curEnv->GetArrayLength(res);
+char **arrayOfString;
+                        arrayOfString= (char**)malloc ((len+1)*sizeof(char*));
+for (jsize i = 0; i < len; i++){
+jstring resString = (jstring)curEnv->GetObjectArrayElement(res, i);
+const char *tempString = curEnv->GetStringUTFChars(resString, 0);
+arrayOfString[i]= (char*)malloc ((strlen(tempString)+1)*sizeof(char));
+strcpy(arrayOfString[i], tempString);
+curEnv->ReleaseStringUTFChars(resString, tempString);
+}
+
+return arrayOfString;
+
+}
+
+long LookAndFeelManager::numbersOfInstalledLookAndFeels (){
+
+JNIEnv * curEnv = getCurrentEnv();
+
+if (jintnumbersOfInstalledLookAndFeelsID==NULL) { /* Use the cache Luke */ jintnumbersOfInstalledLookAndFeelsID = curEnv->GetMethodID(this->instanceClass, "numbersOfInstalledLookAndFeels", "()I" ) ;
+if (jintnumbersOfInstalledLookAndFeelsID == NULL) {
+std::cerr << "Could not access to the method " << "numbersOfInstalledLookAndFeels" << std::endl;
+exit(EXIT_FAILURE);
+}
+}
+                        jint res =  (jint) curEnv->CallIntMethod( this->instance, jintnumbersOfInstalledLookAndFeelsID );
+                        
+if (curEnv->ExceptionOccurred()) {
+curEnv->ExceptionDescribe() ;
+}
+
+                        
+return res;
+
+}
+
+}
index b28e1b9..2169d65 100644 (file)
@@ -1,39 +1,39 @@
-<!--\r
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
--->\r
-<package name="org.scilab.modules.gui.utils">\r
-  <object name="LookAndFeelManager">\r
-  \r
-       <method name="isSupportedLookAndFeel" returnType="boolean">\r
-               <parameter type="String" name="lookandfeel" />\r
-       </method>\r
-       \r
-       <method name="getCurrentLookAndFeel" returnType="String">\r
-       </method>\r
-\r
-       <method name="setLookAndFeel" returnType="boolean">\r
-               <parameter type="String" name="lookandfeel" />\r
-       </method>\r
-       \r
-       <method name="setSystemLookAndFeel" returnType="boolean">\r
-       </method>\r
-\r
-       <method name="getInstalledLookAndFeels" returnType="String[]">\r
-       </method>\r
-       \r
-       <method name="numbersOfInstalledLookAndFeels" returnType="int">\r
-       </method>\r
-       \r
-\r
-       </object>\r
-</package>\r
+<!--
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+-->
+<package name="org.scilab.modules.gui.utils">
+  <object name="LookAndFeelManager">
+  
+       <method name="isSupportedLookAndFeel" returnType="boolean">
+               <parameter type="String" name="lookandfeel" />
+       </method>
+       
+       <method name="getCurrentLookAndFeel" returnType="String">
+       </method>
+
+       <method name="setLookAndFeel" returnType="boolean">
+               <parameter type="String" name="lookandfeel" />
+       </method>
+       
+       <method name="setSystemLookAndFeel" returnType="boolean">
+       </method>
+
+       <method name="getInstalledLookAndFeels" returnType="String[]">
+       </method>
+       
+       <method name="numbersOfInstalledLookAndFeels" returnType="int">
+       </method>
+       
+
+       </object>
+</package>
index afd611a..f0b7f4a 100644 (file)
-/* Generated by GIWS (version 1.0) */\r
-/*\r
-\r
-Copyright 2007 INRIA\r
-\r
-Author : Sylvestre Ledru\r
-\r
-This software is a computer program whose purpose is to hide the complexity\r
-of accessing Java objects/methods from C++ code.\r
-\r
-This software is governed by the CeCILL-B license under French law and\r
-abiding by the rules of distribution of free software.  You can  use, \r
-modify and/ or redistribute the software under the terms of the CeCILL-B\r
-license as circulated by CEA, CNRS and INRIA at the following URL\r
-"http://www.cecill.info". \r
-\r
-As a counterpart to the access to the source code and  rights to copy,\r
-modify and redistribute granted by the license, users are provided only\r
-with a limited warranty  and the software's author,  the holder of the\r
-economic rights,  and the successive licensors  have only  limited\r
-liability. \r
-\r
-In this respect, the user's attention is drawn to the risks associated\r
-with loading,  using,  modifying and/or developing or reproducing the\r
-software by the user in light of its specific status of free software,\r
-that may mean  that it is complicated to manipulate,  and  that  also\r
-therefore means  that it is reserved for developers  and  experienced\r
-professionals having in-depth computer knowledge. Users are therefore\r
-encouraged to load and test the software's suitability as regards their\r
-requirements in conditions enabling the security of their systems and/or \r
-data to be ensured and,  more generally, to use and operate it in the \r
-same conditions as regards security. \r
-\r
-The fact that you are presently reading this means that you have had\r
-knowledge of the CeCILL-B license and that you accept its terms.\r
-*/\r
-\r
-\r
-#ifndef __ORG_SCILAB_MODULES_GUI_UTILS_LOOKANDFEELMANAGER__\r
-#define __ORG_SCILAB_MODULES_GUI_UTILS_LOOKANDFEELMANAGER__\r
-#include <iostream>\r
-#include <string>\r
-#include <string.h>\r
-#include <stdlib.h>\r
-#include <jni.h>\r
-\r
-namespace org_scilab_modules_gui_utils {\r
-\r
-class LookAndFeelManager {\r
-private:\r
-JavaVM * jvm;\r
-jobject instance;\r
-\r
-jclass instanceClass; // cache class\r
-jmethodID jbooleanisSupportedLookAndFeeljstringID; // cache method id\r
-jmethodID jstringgetCurrentLookAndFeelID; // cache method id\r
-jmethodID jbooleansetLookAndFeeljstringID; // cache method id\r
-jmethodID jbooleansetSystemLookAndFeelID; // cache method id\r
-jmethodID jobjectArraygetInstalledLookAndFeelsID; // cache method id\r
-jmethodID jintnumbersOfInstalledLookAndFeelsID; // cache method id\r
-\r
-\r
-/**\r
-* Get the environment matching to the current thread.\r
-*/\r
-JNIEnv * getCurrentEnv();\r
-\r
-public:\r
-// Constructor\r
-/**\r
-* Create a wrapping of the object from a JNIEnv.\r
-* It will call the default constructor\r
-* @param JEnv_ the Java Env\r
-*/\r
-LookAndFeelManager(JavaVM * jvm_);\r
-/**\r
-* Create a wrapping of an already existing object from a JNIEnv.\r
-* The object must have already been instantiated\r
-* @param JEnv_ the Java Env\r
-* @param JObj the object\r
-*/\r
-LookAndFeelManager(JavaVM * jvm_, jobject JObj);\r
-\r
-// Destructor\r
-~LookAndFeelManager();\r
-\r
-// Generic method\r
-// Synchronization methods\r
-/**\r
-* Enter monitor associated with the object.\r
-* Equivalent of creating a "synchronized(obj)" scope in Java.\r
-*/\r
-void synchronize();\r
-\r
-/**\r
-* Exit monitor associated with the object.\r
-* Equivalent of ending a "synchronized(obj)" scope.\r
-*/\r
-void endSynchronize();\r
-\r
-// Methods\r
-bool isSupportedLookAndFeel(char * lookandfeel);\r
-\r
-char * getCurrentLookAndFeel();\r
-\r
-bool setLookAndFeel(char * lookandfeel);\r
-\r
-bool setSystemLookAndFeel();\r
-\r
-char ** getInstalledLookAndFeels();\r
-\r
-long numbersOfInstalledLookAndFeels();\r
-\r
-\r
-                        /**\r
-                        * Get class name to use for static methods\r
-                        * @return class name to use for static methods\r
-                        */\r
-                        \r
-                static const std::string className()\r
-                {\r
-                return "org/scilab/modules/gui/utils/LookAndFeelManager";\r
-                }\r
-                \r
-};\r
-\r
-\r
-}\r
-#endif\r
+/* Generated by GIWS (version 1.0) */
+/*
+
+Copyright 2007 INRIA
+
+Author : Sylvestre Ledru
+
+This software is a computer program whose purpose is to hide the complexity
+of accessing Java objects/methods from C++ code.
+
+This software is governed by the CeCILL-B license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL-B
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL-B license and that you accept its terms.
+*/
+
+
+#ifndef __ORG_SCILAB_MODULES_GUI_UTILS_LOOKANDFEELMANAGER__
+#define __ORG_SCILAB_MODULES_GUI_UTILS_LOOKANDFEELMANAGER__
+#include <iostream>
+#include <string>
+#include <string.h>
+#include <stdlib.h>
+#include <jni.h>
+
+namespace org_scilab_modules_gui_utils {
+
+class LookAndFeelManager {
+private:
+JavaVM * jvm;
+jobject instance;
+
+jclass instanceClass; // cache class
+jmethodID jbooleanisSupportedLookAndFeeljstringID; // cache method id
+jmethodID jstringgetCurrentLookAndFeelID; // cache method id
+jmethodID jbooleansetLookAndFeeljstringID; // cache method id
+jmethodID jbooleansetSystemLookAndFeelID; // cache method id
+jmethodID jobjectArraygetInstalledLookAndFeelsID; // cache method id
+jmethodID jintnumbersOfInstalledLookAndFeelsID; // cache method id
+
+
+/**
+* Get the environment matching to the current thread.
+*/
+JNIEnv * getCurrentEnv();
+
+public:
+// Constructor
+/**
+* Create a wrapping of the object from a JNIEnv.
+* It will call the default constructor
+* @param JEnv_ the Java Env
+*/
+LookAndFeelManager(JavaVM * jvm_);
+/**
+* Create a wrapping of an already existing object from a JNIEnv.
+* The object must have already been instantiated
+* @param JEnv_ the Java Env
+* @param JObj the object
+*/
+LookAndFeelManager(JavaVM * jvm_, jobject JObj);
+
+// Destructor
+~LookAndFeelManager();
+
+// Generic method
+// Synchronization methods
+/**
+* Enter monitor associated with the object.
+* Equivalent of creating a "synchronized(obj)" scope in Java.
+*/
+void synchronize();
+
+/**
+* Exit monitor associated with the object.
+* Equivalent of ending a "synchronized(obj)" scope.
+*/
+void endSynchronize();
+
+// Methods
+bool isSupportedLookAndFeel(char * lookandfeel);
+
+char * getCurrentLookAndFeel();
+
+bool setLookAndFeel(char * lookandfeel);
+
+bool setSystemLookAndFeel();
+
+char ** getInstalledLookAndFeels();
+
+long numbersOfInstalledLookAndFeels();
+
+
+                        /**
+                        * Get class name to use for static methods
+                        * @return class name to use for static methods
+                        */
+                        
+                static const std::string className()
+                {
+                return "org/scilab/modules/gui/utils/LookAndFeelManager";
+                }
+                
+};
+
+
+}
+#endif
index 50705d7..3cc3165 100644 (file)
@@ -1,33 +1,33 @@
-// =============================================================================\r
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-// Copyright (C) 2008 - DIGITEO - Allan CORNET\r
-//\r
-//  This file is distributed under the same license as the Scilab package.\r
-// =============================================================================\r
-\r
-// <-- TEST WITH GRAPHIC -->\r
-// <-- INTERACTIVE TEST -->\r
-\r
-plot3d();\r
-\r
-lnf = getlookandfeel();\r
-if lnf == [] then pause,end\r
-if lnf == '' then pause,end\r
-\r
-lnfs = getinstalledlookandfeels();\r
-if lnfs == [] then pause,end\r
-if lnfs == '' then pause,end\r
-if size(lnfs,'*') == 0 then pause,end\r
-if size(lnfs,'*') == 1 then pause,end\r
-\r
-setlookandfeel(); // system look and feel\r
-lnf = getlookandfeel();\r
-\r
-for i=1:size(lnfs,'*')\r
-  setlookandfeel(lnfs(i));\r
-  sleep(2000);\r
-end\r
-\r
-setlookandfeel(); // system look and feel\r
-\r
-xdel(winsid());\r
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+// <-- INTERACTIVE TEST -->
+
+plot3d();
+
+lnf = getlookandfeel();
+if lnf == [] then pause,end
+if lnf == '' then pause,end
+
+lnfs = getinstalledlookandfeels();
+if lnfs == [] then pause,end
+if lnfs == '' then pause,end
+if size(lnfs,'*') == 0 then pause,end
+if size(lnfs,'*') == 1 then pause,end
+
+setlookandfeel(); // system look and feel
+lnf = getlookandfeel();
+
+for i=1:size(lnfs,'*')
+  setlookandfeel(lnfs(i));
+  sleep(2000);
+end
+
+setlookandfeel(); // system look and feel
+
+xdel(winsid());
index 755e04e..2a5b263 100644 (file)
@@ -1,35 +1,35 @@
-\r
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) INRIA - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-#include <windows.h> \r
-/*--------------------------------------------------------------------------*/ \r
-#pragma comment(lib,"../../../../bin/libintl.lib")\r
-/*--------------------------------------------------------------------------*/ \r
-int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)\r
-{\r
-  switch (reason) \r
-    {\r
-    case DLL_PROCESS_ATTACH:\r
-      break;\r
-    case DLL_PROCESS_DETACH:\r
-      break;\r
-    case DLL_THREAD_ATTACH:\r
-      break;\r
-    case DLL_THREAD_DETACH:\r
-      break;\r
-    }\r
-  return 1;\r
-}\r
-/*--------------------------------------------------------------------------*/ \r
-\r
+
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/ 
+#include <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../../../bin/libintl.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+  switch (reason) 
+    {
+    case DLL_PROCESS_ATTACH:
+      break;
+    case DLL_PROCESS_DETACH:
+      break;
+    case DLL_THREAD_ATTACH:
+      break;
+    case DLL_THREAD_DETACH:
+      break;
+    }
+  return 1;
+}
+/*--------------------------------------------------------------------------*/ 
+
index 45157a4..8820df1 100644 (file)
@@ -1,18 +1,18 @@
-LIBRARY    LibScilab.dll\r
-\r
-\r
-EXPORTS\r
-\r
-; core\r
-getSCIpath\r
-checkrhs_\r
-checklhs_ \r
-vstk_\r
-gettype_\r
-getrhsvar_ \r
-stack_\r
-intersci_\r
-putlhsvar_\r
-com_\r
-getScilabMode\r
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+
+; core
+getSCIpath
+checkrhs_
+checklhs_ 
+vstk_
+gettype_
+getrhsvar_ 
+stack_
+intersci_
+putlhsvar_
+com_
+getScilabMode
 callFunctionFromGateway
\ No newline at end of file
index c0dd6b7..fa38864 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="helptools"\r
-       ProjectGUID="{BED4A0F2-5129-487F-9F94-EC09480F04D7}"\r
-       RootNamespace="helptools"\r
-       Keyword="Win32Proj"\r
-       \r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="0"\r
-                               RuntimeLibrary="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions="/fixed:no"\r
-                               AdditionalDependencies="libscilab.lib"\r
-                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="helptools.def"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"\r
-                               TargetMachine="1"\r
-                               CLRUnmanagedCodeCheck="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="0"\r
-                               RuntimeLibrary="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions="/fixed:no"\r
-                               AdditionalDependencies="libscilab.lib"\r
-                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="helptools.def"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"\r
-                               TargetMachine="17"\r
-                               CLRUnmanagedCodeCheck="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="1"\r
-                               WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableEnhancedInstructionSet="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="libscilab.lib"\r
-                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="helptools.def"\r
-                               GenerateDebugInformation="false"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="0"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"\r
-                               TargetMachine="1"\r
-                               CLRUnmanagedCodeCheck="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="1"\r
-                               WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableEnhancedInstructionSet="0"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                               Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="libscilab.lib"\r
-                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"\r
-                               LinkIncremental="1"\r
-                               ModuleDefinitionFile="helptools.def"\r
-                               GenerateDebugInformation="false"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               LinkTimeCodeGeneration="0"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"\r
-                               TargetMachine="17"\r
-                               CLRUnmanagedCodeCheck="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\jni\BuildDocObject.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\DllmainHelptools.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\jni\GiwsException.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\sci_gateway\c\gw_helptools.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\sci_gateway\cpp\sci_buildDoc.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\jni\BuildDocObject.hxx"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\jni\GiwsException.hxx"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\resource.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="localization"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\locales\en_US\messages.pot"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Libraries Dependencies"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\helptools_header.def"\r
-                               >\r
-                       </File>\r
-                       <Filter\r
-                               Name="Imports"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\LibScilab_Import.def"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <File\r
-                       RelativePath="..\..\helptools.iss"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath=".\helptools.rc"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\sci_gateway\helptools_gateway.xml"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\Makefile.am"\r
-                       >\r
-               </File>\r
-               <File\r
-                       RelativePath="..\..\version.xml"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="helptools"
+       ProjectGUID="{BED4A0F2-5129-487F-9F94-EC09480F04D7}"
+       RootNamespace="helptools"
+       Keyword="Win32Proj"
+       
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="libscilab.lib"
+                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="helptools.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="libscilab.lib"
+                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="helptools.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="0"
+                               EnableEnhancedInstructionSet="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="libscilab.lib"
+                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="helptools.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="0"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n helptools.dll %%f &gt;NUL&#x0D;&#x0A;copy *.def helptoolstmp.def  &gt;NUL&#x0D;&#x0A;copy ..\helptools_header.def+helptoolstmp.def  ..\helptools.def &gt;NUL&#x0D;&#x0A;del *.def  &gt;NUL&#x0D;&#x0A;cd ..  &gt;NUL&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="libscilab.lib"
+                               OutputFile="$(SolutionDir)/bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="helptools.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)/bin/$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath="..\jni\BuildDocObject.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\DllmainHelptools.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\jni\GiwsException.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\gw_helptools.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\cpp\sci_buildDoc.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl"
+                       >
+                       <File
+                               RelativePath="..\jni\BuildDocObject.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\jni\GiwsException.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\resource.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="localization"
+                       >
+                       <File
+                               RelativePath="..\..\locales\en_US\messages.pot"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+                       <File
+                               RelativePath=".\helptools_header.def"
+                               >
+                       </File>
+                       <Filter
+                               Name="Imports"
+                               >
+                               <File
+                                       RelativePath=".\LibScilab_Import.def"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <File
+                       RelativePath="..\..\helptools.iss"
+                       >
+               </File>
+               <File
+                       RelativePath=".\helptools.rc"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\sci_gateway\helptools_gateway.xml"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\Makefile.am"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\version.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index 5d10f83..32ae78c 100644 (file)
@@ -1,5 +1,5 @@
-LIBRARY    helptools.dll\r
-\r
-\r
-EXPORTS\r
-\r
+LIBRARY    helptools.dll
+
+
+EXPORTS
+
index 8a1a06e..64ed26e 100644 (file)
@@ -1,14 +1,14 @@
-//{{NO_DEPENDENCIES}}\r
-// Microsoft Visual C++ generated include file.\r
-// Used by helptools.rc\r
-\r
-// Next default values for new objects\r
-// \r
-#ifdef APSTUDIO_INVOKED\r
-#ifndef APSTUDIO_READONLY_SYMBOLS\r
-#define _APS_NEXT_RESOURCE_VALUE        101\r
-#define _APS_NEXT_COMMAND_VALUE         40001\r
-#define _APS_NEXT_CONTROL_VALUE         1001\r
-#define _APS_NEXT_SYMED_VALUE           101\r
-#endif\r
-#endif\r
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by helptools.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
index bc11aef..8fa0a74 100644 (file)
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="helptools-Ant"\r
-       ProjectGUID="{899DECF1-D4DC-4C84-BB3C-3A343401A5B4}"\r
-       RootNamespace="helptools-Ant"\r
-       Keyword="MakeFileProj"\r
-       \r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCNMakeTool"\r
-                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCNMakeTool"\r
-                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCNMakeTool"\r
-                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCNMakeTool"\r
-                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"\r
-                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
-                               IncludeSearchPath=""\r
-                               ForcedIncludes=""\r
-                               AssemblySearchPath=""\r
-                               ForcedUsingAssemblies=""\r
-                               CompileAsManaged=""\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\org\scilab\modules\helptools\BuildDocObject.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\org\scilab\modules\helptools\BuildJavaHelp.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\org\scilab\modules\helptools\CopyConvert.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\org\scilab\modules\helptools\Helpers.java"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\org\scilab\modules\helptools\HelpViewer.java"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <File\r
-                       RelativePath="..\..\build.xml"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="helptools-Ant"
+       ProjectGUID="{899DECF1-D4DC-4C84-BB3C-3A343401A5B4}"
+       RootNamespace="helptools-Ant"
+       Keyword="MakeFileProj"
+       
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\org\scilab\modules\helptools\BuildDocObject.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\org\scilab\modules\helptools\BuildJavaHelp.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\org\scilab\modules\helptools\CopyConvert.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\org\scilab\modules\helptools\Helpers.java"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\org\scilab\modules\helptools\HelpViewer.java"
+                               >
+                       </File>
+               </Filter>
+               <File
+                       RelativePath="..\..\build.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index 82ddcbb..be7d158 100644 (file)
@@ -1,27 +1,27 @@
-\r
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) INRIA - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-#ifndef __LOADBACKGROUNDCLASSPATH_H__\r
-#define __LOADBACKGROUNDCLASSPATH_H__\r
-\r
-#include "BOOL.h"\r
-\r
-/**\r
-* load classpath in background\r
-* @return TRUE or FALSE\r
-*/\r
-BOOL loadBackGroundClassPath(void);\r
-\r
-#endif /* __LOADBACKGROUNDCLASSPATH_H__ */\r
-/*--------------------------------------------------------------------------*/ \r
+
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __LOADBACKGROUNDCLASSPATH_H__
+#define __LOADBACKGROUNDCLASSPATH_H__
+
+#include "BOOL.h"
+
+/**
+* load classpath in background
+* @return TRUE or FALSE
+*/
+BOOL loadBackGroundClassPath(void);
+
+#endif /* __LOADBACKGROUNDCLASSPATH_H__ */
+/*--------------------------------------------------------------------------*/ 
index 2c0f247..6172be5 100644 (file)
@@ -1,47 +1,47 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/\r
-#include <stdio.h>\r
-#include "SCIHOME.h"\r
-#include "MALLOC.h"\r
-#include "LanguagePref.h"\r
-/*--------------------------------------------------------------------------*/\r
-#if _MSC_VER\r
-       #define namelanguagepref "\\language.ini"\r
-#else\r
-       #define namelanguagepref "/.language"\r
-#endif\r
-/*--------------------------------------------------------------------------*/\r
-char *getFilenameLanguagePref(void)\r
-{\r
-       char *retFilename = NULL;\r
-       char *SCIHOME = NULL;\r
-\r
-       SCIHOME = getSCIHOME();\r
-\r
-       if (SCIHOME)\r
-       {\r
-               retFilename = (char*)MALLOC( (strlen(namelanguagepref) + strlen(SCIHOME) + 1) *sizeof(char));\r
-               sprintf(retFilename,"%s%s",SCIHOME,namelanguagepref);\r
-               FREE(SCIHOME);\r
-               SCIHOME = NULL;\r
-       }\r
-       else\r
-       {\r
-               retFilename = (char*)MALLOC((strlen(namelanguagepref) + 1)*sizeof(char));\r
-               strcpy(retFilename,namelanguagepref);\r
-       }\r
-\r
-       return retFilename;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/
+#include <stdio.h>
+#include "SCIHOME.h"
+#include "MALLOC.h"
+#include "LanguagePref.h"
+/*--------------------------------------------------------------------------*/
+#if _MSC_VER
+       #define namelanguagepref "\\language.ini"
+#else
+       #define namelanguagepref "/.language"
+#endif
+/*--------------------------------------------------------------------------*/
+char *getFilenameLanguagePref(void)
+{
+       char *retFilename = NULL;
+       char *SCIHOME = NULL;
+
+       SCIHOME = getSCIHOME();
+
+       if (SCIHOME)
+       {
+               retFilename = (char*)MALLOC( (strlen(namelanguagepref) + strlen(SCIHOME) + 1) *sizeof(char));
+               sprintf(retFilename,"%s%s",SCIHOME,namelanguagepref);
+               FREE(SCIHOME);
+               SCIHOME = NULL;
+       }
+       else
+       {
+               retFilename = (char*)MALLOC((strlen(namelanguagepref) + 1)*sizeof(char));
+               strcpy(retFilename,namelanguagepref);
+       }
+
+       return retFilename;
+}
+/*--------------------------------------------------------------------------*/
index ce1118a..53c230a 100644 (file)
@@ -1,26 +1,26 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-#ifndef __LANGUAGEPREF_H__\r
-#define __LANGUAGEPREF_H__\r
-\r
-/**\r
-* returns full filename (with path) of preference about LC_MESSAGES\r
-* @return a string\r
-* "" if not find or not valid\r
-*/\r
-\r
-char *getFilenameLanguagePref(void);\r
-\r
-#endif /* __LANGUAGEPREF_H__ */\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __LANGUAGEPREF_H__
+#define __LANGUAGEPREF_H__
+
+/**
+* returns full filename (with path) of preference about LC_MESSAGES
+* @return a string
+* "" if not find or not valid
+*/
+
+char *getFilenameLanguagePref(void);
+
+#endif /* __LANGUAGEPREF_H__ */
 /*--------------------------------------------------------------------------*/ 
\ No newline at end of file
index 226a841..b8bd0bf 100644 (file)
@@ -1,25 +1,25 @@
-/*\r
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-* Copyright (C) DIGITEO - Allan CORNET\r
-* \r
-* This file must be used under the terms of the CeCILL.\r
-* This source file is licensed as described in the file COPYING, which\r
-* you should have received as part of this distribution.  The terms\r
-* are also available at    \r
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
-*\r
-*/\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-#include <string.h>\r
-#include "getTextWarp.h"\r
-#include "localization.h"\r
-#ifdef _MSC_VER\r
-#include "strdup_windows.h"\r
-#endif\r
-/*--------------------------------------------------------------------------*/ \r
-char *getTextC(char *stringIn)\r
-{\r
-       return strdup(gettext(stringIn));\r
-}\r
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - Allan CORNET
+* 
+* 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-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+#include <string.h>
+#include "getTextWarp.h"
+#include "localization.h"
+#ifdef _MSC_VER
+#include "strdup_windows.h"
+#endif
+/*--------------------------------------------------------------------------*/ 
+char *getTextC(char *stringIn)
+{
+       return strdup(gettext(stringIn));
+}
 /*--------------------------------------------------------------------------*/ 
\ No newline at end of file
index d191ff4..9ee3b07 100644 (file)
@@ -1,27 +1,27 @@
-\r
-/*\r
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-* Copyright (C) 2008 - DIGITEO - Allan CORNET\r
-* \r
-* This file must be used under the terms of the CeCILL.\r
-* This source file is licensed as described in the file COPYING, which\r
-* you should have received as part of this distribution.  The terms\r
-* are also available at    \r
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
-*\r
-*/\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-#ifndef __GETTEXTWARP__H__\r
-#define __GETTEXTWARP__H__\r
-\r
-/*\r
-* Wrap of gettext for java\r
-* @param[in] english string\r
-* @return \r
-*/\r
-char *getTextC(char *stringIn);\r
-\r
-#endif /* __GETTEXTWARP__H__ */\r
-/*--------------------------------------------------------------------------*/ \r
-\r
+
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2008 - DIGITEO - Allan CORNET
+* 
+* 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-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __GETTEXTWARP__H__
+#define __GETTEXTWARP__H__
+
+/*
+* Wrap of gettext for java
+* @param[in] english string
+* @return 
+*/
+char *getTextC(char *stringIn);
+
+#endif /* __GETTEXTWARP__H__ */
+/*--------------------------------------------------------------------------*/ 
+
index 15a7f63..5a7db30 100644 (file)
@@ -1,51 +1,51 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/\r
-#include <string.h>\r
-#include <stdio.h>\r
-#include "machine.h"\r
-#include "LanguagePref.h"\r
-#include "MALLOC.h"\r
-#ifdef _MSC_VER\r
-#include "strdup_windows.h"\r
-#endif\r
-/*--------------------------------------------------------------------------*/\r
-char *loadLanguagePref(void)\r
-{\r
-       char *filepref = getFilenameLanguagePref();\r
-\r
-       if (filepref)\r
-       {\r
-               char *LANGUAGE = NULL;\r
-\r
-               FILE *fileR = fopen(filepref, "rt");\r
-\r
-               if (fileR)\r
-               {\r
-                       char LINE[PATH_MAX];\r
-\r
-                       fscanf(fileR, "%[^\n]", LINE);\r
-                       LANGUAGE = strdup(LINE);\r
-\r
-                       fclose(fileR);\r
-               }\r
-\r
-               FREE(filepref);\r
-               filepref = NULL;\r
-\r
-               if (LANGUAGE) return LANGUAGE;\r
-       }\r
-       /* the "" means that we will try to use the language of the system. */\r
-       return strdup("");\r
-}\r
-/*--------------------------------------------------------------------------*/\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/
+#include <string.h>
+#include <stdio.h>
+#include "machine.h"
+#include "LanguagePref.h"
+#include "MALLOC.h"
+#ifdef _MSC_VER
+#include "strdup_windows.h"
+#endif
+/*--------------------------------------------------------------------------*/
+char *loadLanguagePref(void)
+{
+       char *filepref = getFilenameLanguagePref();
+
+       if (filepref)
+       {
+               char *LANGUAGE = NULL;
+
+               FILE *fileR = fopen(filepref, "rt");
+
+               if (fileR)
+               {
+                       char LINE[PATH_MAX];
+
+                       fscanf(fileR, "%[^\n]", LINE);
+                       LANGUAGE = strdup(LINE);
+
+                       fclose(fileR);
+               }
+
+               FREE(filepref);
+               filepref = NULL;
+
+               if (LANGUAGE) return LANGUAGE;
+       }
+       /* the "" means that we will try to use the language of the system. */
+       return strdup("");
+}
+/*--------------------------------------------------------------------------*/
index a3e6f37..49678f9 100644 (file)
@@ -1,26 +1,26 @@
-/*\r
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-* Copyright (C) 2008 - DIGITEO - Allan CORNET\r
-* \r
-* This file must be used under the terms of the CeCILL.\r
-* This source file is licensed as described in the file COPYING, which\r
-* you should have received as part of this distribution.  The terms\r
-* are also available at    \r
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
-*\r
-*/\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-\r
-#ifndef __LOADLANGUAGEPREF_H__\r
-#define __LOADLANGUAGEPREF_H__\r
-\r
-/**\r
-* load language from preference file (SCIHOME/.language)\r
-* @returns LC_MESSAGES value\r
-*/\r
-char *loadLanguagePref(void);\r
-\r
-#endif /*  __LOADLANGUAGEPREF_H__ */\r
-\r
-/*--------------------------------------------------------------------------*/ \r
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2008 - DIGITEO - Allan CORNET
+* 
+* 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-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+
+#ifndef __LOADLANGUAGEPREF_H__
+#define __LOADLANGUAGEPREF_H__
+
+/**
+* load language from preference file (SCIHOME/.language)
+* @returns LC_MESSAGES value
+*/
+char *loadLanguagePref(void);
+
+#endif /*  __LOADLANGUAGEPREF_H__ */
+
+/*--------------------------------------------------------------------------*/ 
index 3f7242e..f257428 100644 (file)
@@ -1,55 +1,55 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-#include "saveLanguagePref.h"\r
-#include "LanguagePref.h"\r
-#include "deleteafile.h"\r
-#include "setgetlanguage.h"\r
-#include "MALLOC.h"\r
-/*--------------------------------------------------------------------------*/\r
-BOOL saveLanguagePref(void)\r
-{\r
-       BOOL bOK = FALSE;\r
-       char *filepref = getFilenameLanguagePref();\r
-\r
-       if (filepref)\r
-       {\r
-               FILE *fileW = fopen(filepref, "wt");\r
-               if (fileW)\r
-               {\r
-                       char *LANGUAGE = getlanguage();\r
-\r
-                       if (LANGUAGE)\r
-                       {\r
-                               fputs(LANGUAGE,fileW);\r
-                               fputs("\n",fileW);\r
-                               fclose(fileW);\r
-                               bOK = TRUE;\r
-                       }\r
-                       else\r
-                       {\r
-                               fclose(fileW);\r
-                               deleteafile(filepref);\r
-                               bOK = FALSE;\r
-                       }\r
-\r
-                       FREE(filepref);\r
-                       filepref = NULL;\r
-               }\r
-       }\r
-       return bOK;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "saveLanguagePref.h"
+#include "LanguagePref.h"
+#include "deleteafile.h"
+#include "setgetlanguage.h"
+#include "MALLOC.h"
+/*--------------------------------------------------------------------------*/
+BOOL saveLanguagePref(void)
+{
+       BOOL bOK = FALSE;
+       char *filepref = getFilenameLanguagePref();
+
+       if (filepref)
+       {
+               FILE *fileW = fopen(filepref, "wt");
+               if (fileW)
+               {
+                       char *LANGUAGE = getlanguage();
+
+                       if (LANGUAGE)
+                       {
+                               fputs(LANGUAGE,fileW);
+                               fputs("\n",fileW);
+                               fclose(fileW);
+                               bOK = TRUE;
+                       }
+                       else
+                       {
+                               fclose(fileW);
+                               deleteafile(filepref);
+                               bOK = FALSE;
+                       }
+
+                       FREE(filepref);
+                       filepref = NULL;
+               }
+       }
+       return bOK;
+}
+/*--------------------------------------------------------------------------*/
index 138a497..68486c1 100644 (file)
@@ -1,27 +1,27 @@
-/*\r
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-* Copyright (C) 2008 - DIGITEO - Allan CORNET\r
-* \r
-* This file must be used under the terms of the CeCILL.\r
-* This source file is licensed as described in the file COPYING, which\r
-* you should have received as part of this distribution.  The terms\r
-* are also available at    \r
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
-*\r
-*/\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-\r
-#ifndef __SAVELANGUAGEPREF_H__\r
-#define __SAVELANGUAGEPREF_H__\r
-\r
-#include "BOOL.h"\r
-\r
-/**\r
-* save language in preference file (SCIHOME/.language)\r
-* @returns TRUE or FALSE\r
-*/\r
-BOOL saveLanguagePref(void);\r
-\r
-#endif /* __SAVELANGUAGEPREF_H__ */\r
-/*--------------------------------------------------------------------------*/ \r
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2008 - DIGITEO - Allan CORNET
+* 
+* 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-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+
+#ifndef __SAVELANGUAGEPREF_H__
+#define __SAVELANGUAGEPREF_H__
+
+#include "BOOL.h"
+
+/**
+* save language in preference file (SCIHOME/.language)
+* @returns TRUE or FALSE
+*/
+BOOL saveLanguagePref(void);
+
+#endif /* __SAVELANGUAGEPREF_H__ */
+/*--------------------------------------------------------------------------*/ 
index 6f99898..fa661fe 100644 (file)
@@ -1,73 +1,73 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-#ifndef __RENDERERFONTMANAGER_H__\r
-#define __RENDERERFONTMANAGER_H__\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-#include "BOOL.h"\r
-\r
-/**\r
-* returns fontnames installed (used) by scilab\r
-* @param[out] size of array returned\r
-* @return fonts name \r
-*/\r
-char **getInstalledFontsName(int *sizeArray); \r
-\r
-/**\r
-* returns fontnames available on your system\r
-* @param[out] size of array returned\r
-* @return fonts name \r
-*/\r
-char **getAvailableFontsName(int *sizeArray); \r
-\r
-/**\r
-* check if a font name is available\r
-* @param[in] a font name\r
-* @return TRUE or FALSE\r
-*/\r
-BOOL isAvailableFontsName(char *fontname); \r
-\r
-/**\r
-* Add a new font from its font name.\r
-* @param fontName name of the font to add.\r
-* @return index of the added font.\r
-*/\r
-int addFont(char *fontname);\r
-\r
-/**\r
-* Replace a font in the font list by a new one.\r
-* @param[in] index index of the font to replace\r
-* @param[in] fontName Name of the font.\r
-* @return index of the added font or -1 if an error occured.\r
-*/\r
-int changeFont(int index, char * fontName);\r
-\r
-/**\r
-* Replace a font in the font list by a new one.\r
-* @param[in] index index of the font to replace\r
-* @param[in] fontName Name of the font.\r
-* @param[in] if it is Bold.\r
-* @param[in] if it is Italic.\r
-* @return index of the added font or -1 if an error occured.\r
-*/\r
-int changeFontWithProperty(int index, char * fontName, BOOL isBold, BOOL isItalic);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif /* __RENDERERFONTMANAGER_H__ */\r
-\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+#ifndef __RENDERERFONTMANAGER_H__
+#define __RENDERERFONTMANAGER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "BOOL.h"
+
+/**
+* returns fontnames installed (used) by scilab
+* @param[out] size of array returned
+* @return fonts name 
+*/
+char **getInstalledFontsName(int *sizeArray); 
+
+/**
+* returns fontnames available on your system
+* @param[out] size of array returned
+* @return fonts name 
+*/
+char **getAvailableFontsName(int *sizeArray); 
+
+/**
+* check if a font name is available
+* @param[in] a font name
+* @return TRUE or FALSE
+*/
+BOOL isAvailableFontsName(char *fontname); 
+
+/**
+* Add a new font from its font name.
+* @param fontName name of the font to add.
+* @return index of the added font.
+*/
+int addFont(char *fontname);
+
+/**
+* Replace a font in the font list by a new one.
+* @param[in] index index of the font to replace
+* @param[in] fontName Name of the font.
+* @return index of the added font or -1 if an error occured.
+*/
+int changeFont(int index, char * fontName);
+
+/**
+* Replace a font in the font list by a new one.
+* @param[in] index index of the font to replace
+* @param[in] fontName Name of the font.
+* @param[in] if it is Bold.
+* @param[in] if it is Italic.
+* @return index of the added font or -1 if an error occured.
+*/
+int changeFontWithProperty(int index, char * fontName, BOOL isBold, BOOL isItalic);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RENDERERFONTMANAGER_H__ */
+
index a4f353c..90674d6 100644 (file)
@@ -1,5 +1,5 @@
-LIBRARY    scilab_windows.dll\r
-\r
-\r
-EXPORTS\r
+LIBRARY    scilab_windows.dll
+
+
+EXPORTS
 strdup_windows
\ No newline at end of file
index c5cb087..ca35111 100644 (file)
-\r
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/\r
-#include "XlFontManager.hxx"\r
-\r
-extern "C" {\r
-#include <stdlib.h>\r
-#include "getScilabJavaVM.h"\r
-#include "RendererFontManager.h"\r
-#include "MALLOC.h"\r
-#ifdef _MSC_VER\r
-#include "strdup_windows.h"\r
-#endif\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-using namespace org_scilab_modules_renderer_utils_textRendering;\r
-\r
-char **getInstalledFontsName(int *sizeArray) \r
-{\r
-       char **returnedinstalledfontsname = NULL;\r
-       *sizeArray = 0;\r
-\r
-       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());\r
-       if (fntmgr)\r
-       {\r
-               char **installedfontsname = NULL;\r
-\r
-               *sizeArray = fntmgr->getSizeInstalledFontsName();\r
-               installedfontsname = fntmgr->getInstalledFontsName();\r
-               if (installedfontsname)\r
-               {\r
-                       int i = 0;\r
-                       returnedinstalledfontsname = (char**)MALLOC(sizeof(char*)*(*sizeArray));\r
-                       for( i = 0; i < *sizeArray; i++)\r
-                       {\r
-                               returnedinstalledfontsname[i] = strdup(installedfontsname[i]);\r
-                               free(installedfontsname[i]); /* free because giws uses malloc */ \r
-                               installedfontsname[i] = NULL;\r
-\r
-                       }\r
-                       free(installedfontsname);\r
-                       installedfontsname = NULL;\r
-               }\r
-               delete fntmgr;\r
-       }\r
-\r
-       return returnedinstalledfontsname;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-char **getAvailableFontsName(int *sizeArray)\r
-{\r
-       char **returnedavailablefontsname = NULL;\r
-       *sizeArray = 0;\r
-\r
-       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());\r
-       if (fntmgr)\r
-       {\r
-               char **availablefontsname = NULL;\r
-\r
-               *sizeArray = fntmgr->getSizeAvailableFontsName();\r
-               availablefontsname = fntmgr->getAvailableFontsName();\r
-               if (availablefontsname)\r
-               {\r
-                       int i = 0;\r
-                       returnedavailablefontsname = (char**)MALLOC(sizeof(char*)*(*sizeArray));\r
-                       for( i = 0; i < *sizeArray; i++)\r
-                       {\r
-                               returnedavailablefontsname[i] = strdup(availablefontsname[i]);\r
-                               free(availablefontsname[i]); /* free because giws uses malloc */ \r
-                               availablefontsname[i] = NULL;\r
-\r
-                       }\r
-                       free(availablefontsname);\r
-                       availablefontsname = NULL;\r
-               }\r
-               delete fntmgr;\r
-       }\r
-\r
-       return returnedavailablefontsname;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-BOOL isAvailableFontsName(char *fontname)\r
-{\r
-       BOOL bOK = FALSE;\r
-       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());\r
-       if (fntmgr)\r
-       {\r
-               bOK = booltoBOOL(fntmgr->isAvailableFontName(fontname));\r
-               delete fntmgr;\r
-       }\r
-       return bOK;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-int addFont(char *fontname)\r
-{\r
-       int fontID = 0;\r
-\r
-       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());\r
-       if (fntmgr)\r
-       {\r
-               fontID = (int)fntmgr->addFont(fontname);\r
-               delete fntmgr;\r
-       }\r
-\r
-       return fontID;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-int changeFont(int index, char * fontName)\r
-{\r
-       int fontID = 0;\r
-       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());\r
-       if (fntmgr)\r
-       {\r
-               fontID = (int)fntmgr->changeFont((long)index,fontName);\r
-               delete fntmgr;\r
-       }\r
-\r
-       return fontID;\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-int changeFontWithProperty(int index, char * fontName, BOOL isBold, BOOL isItalic)\r
-{\r
-       int fontID = 0;\r
-       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());\r
-       if (fntmgr)\r
-       {\r
-               fontID = (int)fntmgr->changeFontWithProperty((long)index,fontName,BOOLtobool(isBold),BOOLtobool(isItalic));\r
-               delete fntmgr;\r
-       }\r
-       return fontID;\r
-}\r
+
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/
+#include "XlFontManager.hxx"
+
+extern "C" {
+#include <stdlib.h>
+#include "getScilabJavaVM.h"
+#include "RendererFontManager.h"
+#include "MALLOC.h"
+#ifdef _MSC_VER
+#include "strdup_windows.h"
+#endif
+}
+/*--------------------------------------------------------------------------*/
+using namespace org_scilab_modules_renderer_utils_textRendering;
+
+char **getInstalledFontsName(int *sizeArray) 
+{
+       char **returnedinstalledfontsname = NULL;
+       *sizeArray = 0;
+
+       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());
+       if (fntmgr)
+       {
+               char **installedfontsname = NULL;
+
+               *sizeArray = fntmgr->getSizeInstalledFontsName();
+               installedfontsname = fntmgr->getInstalledFontsName();
+               if (installedfontsname)
+               {
+                       int i = 0;
+                       returnedinstalledfontsname = (char**)MALLOC(sizeof(char*)*(*sizeArray));
+                       for( i = 0; i < *sizeArray; i++)
+                       {
+                               returnedinstalledfontsname[i] = strdup(installedfontsname[i]);
+                               free(installedfontsname[i]); /* free because giws uses malloc */ 
+                               installedfontsname[i] = NULL;
+
+                       }
+                       free(installedfontsname);
+                       installedfontsname = NULL;
+               }
+               delete fntmgr;
+       }
+
+       return returnedinstalledfontsname;
+}
+/*--------------------------------------------------------------------------*/
+char **getAvailableFontsName(int *sizeArray)
+{
+       char **returnedavailablefontsname = NULL;
+       *sizeArray = 0;
+
+       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());
+       if (fntmgr)
+       {
+               char **availablefontsname = NULL;
+
+               *sizeArray = fntmgr->getSizeAvailableFontsName();
+               availablefontsname = fntmgr->getAvailableFontsName();
+               if (availablefontsname)
+               {
+                       int i = 0;
+                       returnedavailablefontsname = (char**)MALLOC(sizeof(char*)*(*sizeArray));
+                       for( i = 0; i < *sizeArray; i++)
+                       {
+                               returnedavailablefontsname[i] = strdup(availablefontsname[i]);
+                               free(availablefontsname[i]); /* free because giws uses malloc */ 
+                               availablefontsname[i] = NULL;
+
+                       }
+                       free(availablefontsname);
+                       availablefontsname = NULL;
+               }
+               delete fntmgr;
+       }
+
+       return returnedavailablefontsname;
+}
+/*--------------------------------------------------------------------------*/
+BOOL isAvailableFontsName(char *fontname)
+{
+       BOOL bOK = FALSE;
+       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());
+       if (fntmgr)
+       {
+               bOK = booltoBOOL(fntmgr->isAvailableFontName(fontname));
+               delete fntmgr;
+       }
+       return bOK;
+}
+/*--------------------------------------------------------------------------*/
+int addFont(char *fontname)
+{
+       int fontID = 0;
+
+       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());
+       if (fntmgr)
+       {
+               fontID = (int)fntmgr->addFont(fontname);
+               delete fntmgr;
+       }
+
+       return fontID;
+}
+/*--------------------------------------------------------------------------*/
+int changeFont(int index, char * fontName)
+{
+       int fontID = 0;
+       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());
+       if (fntmgr)
+       {
+               fontID = (int)fntmgr->changeFont((long)index,fontName);
+               delete fntmgr;
+       }
+
+       return fontID;
+}
+/*--------------------------------------------------------------------------*/
+int changeFontWithProperty(int index, char * fontName, BOOL isBold, BOOL isItalic)
+{
+       int fontID = 0;
+       org_scilab_modules_renderer_utils_textRendering::XlFontManager *fntmgr = new org_scilab_modules_renderer_utils_textRendering::XlFontManager(getScilabJavaVM());
+       if (fntmgr)
+       {
+               fontID = (int)fntmgr->changeFontWithProperty((long)index,fontName,BOOLtobool(isBold),BOOLtobool(isItalic));
+               delete fntmgr;
+       }
+       return fontID;
+}
 /*--------------------------------------------------------------------------*/
\ No newline at end of file
index 5ad953a..ecfd9ed 100644 (file)
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - DIGITEO - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-package org.scilab.modules.renderer.utils.textRendering;\r
-\r
-/**\r
- * Class to manage FontManager with xlfont in scilab\r
- * @author Allan CORNET\r
- *\r
- */\r
-\r
-public class XlFontManager {\r
-       \r
-       private static FontManager sciFontManager;\r
-       \r
-       /**\r
-        * default constructor\r
-        */\r
-       public XlFontManager() {\r
-               sciFontManager = FontManager.getSciFontManager();\r
-               }\r
-               \r
-       /**\r
-        * Returns fonts name of available fonts on system\r
-        * @return array of string\r
-        */\r
-       public String[] getAvailableFontsName() {\r
-               return sciFontManager.getAvailableFontsName();\r
-       }\r
-       \r
-       /**\r
-        * Returns number of available fonts\r
-        * @return number of available fonts\r
-        */\r
-       public int getSizeAvailableFontsName() {\r
-               return sciFontManager.getSizeAvailableFontsName();\r
-       }\r
-       \r
-       /**\r
-        * Checks if font name is available\r
-        * @param fontname  font name\r
-        * @return true or false\r
-        */\r
-       public boolean isAvailableFontName(String fontname) {\r
-               return sciFontManager.isAvailableFontName(fontname);\r
-       }\r
-       \r
-       /**\r
-        * Returns fonts name installed\r
-        * @return array of String \r
-        */\r
-       public String[] getInstalledFontsName() {\r
-               return sciFontManager.getInstalledFontsName();\r
-       }\r
-       \r
-       /**\r
-        * Returns number of installed fonts\r
-        * @return number of installed fonts\r
-        */\r
-       public int getSizeInstalledFontsName() {\r
-               return sciFontManager.getSizeInstalledFontsName();\r
-       }\r
-               \r
-       /**\r
-        * add font \r
-        * @param fontName font name\r
-        * @return index\r
-        */\r
-       public int addFont(String fontName) {\r
-               return sciFontManager.addFont(fontName);\r
-       }\r
-       \r
-       /**\r
-        * \r
-        * @param index index of font to replace\r
-        * @param fontName font name\r
-        * @return index\r
-        */\r
-       public int changeFont(int index, String fontName) {\r
-               return sciFontManager.changeFont(index, fontName);\r
-       }\r
-       \r
-       /**\r
-        * \r
-        * @param index index of font to replace\r
-        * @param fontName  font name\r
-        * @param isBold true or false\r
-        * @param isItalic true or false\r
-        * @return index\r
-        */\r
-       public int changeFontWithProperty(int index, String fontName, boolean isBold, boolean isItalic) {\r
-               return sciFontManager.changeFont(index, fontName, isBold, isItalic);\r
-       }\r
-       \r
-}\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - DIGITEO - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+package org.scilab.modules.renderer.utils.textRendering;
+
+/**
+ * Class to manage FontManager with xlfont in scilab
+ * @author Allan CORNET
+ *
+ */
+
+public class XlFontManager {
+       
+       private static FontManager sciFontManager;
+       
+       /**
+        * default constructor
+        */
+       public XlFontManager() {
+               sciFontManager = FontManager.getSciFontManager();
+               }
+               
+       /**
+        * Returns fonts name of available fonts on system
+        * @return array of string
+        */
+       public String[] getAvailableFontsName() {
+               return sciFontManager.getAvailableFontsName();
+       }
+       
+       /**
+        * Returns number of available fonts
+        * @return number of available fonts
+        */
+       public int getSizeAvailableFontsName() {
+               return sciFontManager.getSizeAvailableFontsName();
+       }
+       
+       /**
+        * Checks if font name is available
+        * @param fontname  font name
+        * @return true or false
+        */
+       public boolean isAvailableFontName(String fontname) {
+               return sciFontManager.isAvailableFontName(fontname);
+       }
+       
+       /**
+        * Returns fonts name installed
+        * @return array of String 
+        */
+       public String[] getInstalledFontsName() {
+               return sciFontManager.getInstalledFontsName();
+       }
+       
+       /**
+        * Returns number of installed fonts
+        * @return number of installed fonts
+        */
+       public int getSizeInstalledFontsName() {
+               return sciFontManager.getSizeInstalledFontsName();
+       }
+               
+       /**
+        * add font 
+        * @param fontName font name
+        * @return index
+        */
+       public int addFont(String fontName) {
+               return sciFontManager.addFont(fontName);
+       }
+       
+       /**
+        * 
+        * @param index index of font to replace
+        * @param fontName font name
+        * @return index
+        */
+       public int changeFont(int index, String fontName) {
+               return sciFontManager.changeFont(index, fontName);
+       }
+       
+       /**
+        * 
+        * @param index index of font to replace
+        * @param fontName  font name
+        * @param isBold true or false
+        * @param isItalic true or false
+        * @return index
+        */
+       public int changeFontWithProperty(int index, String fontName, boolean isBold, boolean isItalic) {
+               return sciFontManager.changeFont(index, fontName, isBold, isItalic);
+       }
+       
+}
index 4b8553f..275b37a 100644 (file)
@@ -1,29 +1,29 @@
-<package name="org.scilab.modules.renderer.utils.textRendering">\r
-  <object name="XlFontManager">\r
-    <method name="getInstalledFontsName" returnType="String[]">\r
-    </method>\r
-    <method name="getSizeInstalledFontsName" returnType="int">\r
-    </method>\r
-    <method name="getSizeAvailableFontsName" returnType="int">\r
-    </method>\r
-    <method name="getAvailableFontsName" returnType="String[]">\r
-    </method>\r
-    <method name="isAvailableFontName" returnType="boolean">\r
-    <param type="String" name="fontname" />\r
-    </method>\r
-    <method name="addFont" returnType="int">\r
-    <param type="String" name="fontName" />\r
-    </method>\r
-    <method name="changeFont" returnType="int">\r
-    <param type="int" name="index" />\r
-    <param type="String" name="fontName" />\r
-    </method>\r
-    <method name="changeFontWithProperty" returnType="int">\r
-    <param type="int" name="index" />\r
-    <param type="String" name="fontName" />\r
-    <param type="boolean" name="isBold" />\r
-    <param type="boolean" name="isItalic" />\r
-    </method>\r
-    \r
-  </object>\r
-</package>\r
+<package name="org.scilab.modules.renderer.utils.textRendering">
+  <object name="XlFontManager">
+    <method name="getInstalledFontsName" returnType="String[]">
+    </method>
+    <method name="getSizeInstalledFontsName" returnType="int">
+    </method>
+    <method name="getSizeAvailableFontsName" returnType="int">
+    </method>
+    <method name="getAvailableFontsName" returnType="String[]">
+    </method>
+    <method name="isAvailableFontName" returnType="boolean">
+    <param type="String" name="fontname" />
+    </method>
+    <method name="addFont" returnType="int">
+    <param type="String" name="fontName" />
+    </method>
+    <method name="changeFont" returnType="int">
+    <param type="int" name="index" />
+    <param type="String" name="fontName" />
+    </method>
+    <method name="changeFontWithProperty" returnType="int">
+    <param type="int" name="index" />
+    <param type="String" name="fontName" />
+    <param type="boolean" name="isBold" />
+    <param type="boolean" name="isItalic" />
+    </method>
+    
+  </object>
+</package>
index 0332d64..d770fe5 100644 (file)
@@ -1,33 +1,33 @@
-/*\r
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-* Copyright (C) DIGITEO - 2008 - Allan CORNET\r
-* \r
-* This file must be used under the terms of the CeCILL.\r
-* This source file is licensed as described in the file COPYING, which\r
-* you should have received as part of this distribution.  The terms\r
-* are also available at    \r
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
-*\r
-*/\r
-\r
-/*--------------------------------------------------------------------------*/\r
-#include <windows.h>\r
-#include "InnosetupMutex.h"\r
-#include "BOOL.h"\r
-#include "version.h"\r
-/*--------------------------------------------------------------------------*/\r
-static HANDLE hMutexScilabID;\r
-/*--------------------------------------------------------------------------*/\r
-void createInnosetupMutex(void)\r
-{\r
-       /* http://www.vincenzo.net/isxkb/index.php?title=Application_considerations */\r
-       /* creates a named mutex used by Innosetup */\r
-       hMutexScilabID = CreateMutex (NULL, FALSE,SCI_VERSION_STRING );\r
-}\r
-/*--------------------------------------------------------------------------*/\r
-void closeInnosetupMutex(void)\r
-{\r
-       /* close named mutex */\r
-       CloseHandle(hMutexScilabID);\r
-}\r
-/*--------------------------------------------------------------------------*/\r
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2008 - Allan CORNET
+* 
+* 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-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/
+#include <windows.h>
+#include "InnosetupMutex.h"
+#include "BOOL.h"
+#include "version.h"
+/*--------------------------------------------------------------------------*/
+static HANDLE hMutexScilabID;
+/*--------------------------------------------------------------------------*/
+void createInnosetupMutex(void)
+{
+       /* http://www.vincenzo.net/isxkb/index.php?title=Application_considerations */
+       /* creates a named mutex used by Innosetup */
+       hMutexScilabID = CreateMutex (NULL, FALSE,SCI_VERSION_STRING );
+}
+/*--------------------------------------------------------------------------*/
+void closeInnosetupMutex(void)
+{
+       /* close named mutex */
+       CloseHandle(hMutexScilabID);
+}
+/*--------------------------------------------------------------------------*/
index f6c32a1..8821c0f 100644 (file)
@@ -1,30 +1,30 @@
-/*\r
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
-* Copyright (C) DIGITEO - 2008 - Allan CORNET\r
-* \r
-* This file must be used under the terms of the CeCILL.\r
-* This source file is licensed as described in the file COPYING, which\r
-* you should have received as part of this distribution.  The terms\r
-* are also available at    \r
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
-*\r
-*/\r
-\r
-/*--------------------------------------------------------------------------*/\r
-#ifndef __INNOSETUPMUTEX_H__\r
-#define __INNOSETUPMUTEX_H__\r
-\r
-/*--------------------------------------------------------------------------*/\r
-/**\r
-* Create a named Mutex used by Innosetup\r
-* http://www.vincenzo.net/isxkb/index.php?title=Application_considerations \r
-*/\r
-void createInnosetupMutex(void);\r
-\r
-/**\r
-* Close named Mutex used by Innosetup\r
-*/\r
-void closeInnosetupMutex(void);\r
-/*--------------------------------------------------------------------------*/\r
-\r
-#endif /* __INNOSETUPMUTEX_H__ */\r
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2008 - Allan CORNET
+* 
+* 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-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/
+#ifndef __INNOSETUPMUTEX_H__
+#define __INNOSETUPMUTEX_H__
+
+/*--------------------------------------------------------------------------*/
+/**
+* Create a named Mutex used by Innosetup
+* http://www.vincenzo.net/isxkb/index.php?title=Application_considerations 
+*/
+void createInnosetupMutex(void);
+
+/**
+* Close named Mutex used by Innosetup
+*/
+void closeInnosetupMutex(void);
+/*--------------------------------------------------------------------------*/
+
+#endif /* __INNOSETUPMUTEX_H__ */
index 8ec2780..77d69a8 100644 (file)
@@ -1,37 +1,37 @@
-\r
-/*--------------------------------------------------------------------------*/ \r
-#include <windows.h>\r
-#include "SetHeapOptions.h"\r
-/* http://msdn.microsoft.com/en-us/library/bb430720.aspx */\r
-/*--------------------------------------------------------------------------*/ \r
-typedef BOOL (WINAPI *HSI) (HANDLE, HEAP_INFORMATION_CLASS ,PVOID, SIZE_T);\r
-/*--------------------------------------------------------------------------*/ \r
-BOOL SetHeapOptions(void) \r
-{\r
-#ifdef _DEBUG\r
-       HMODULE hLib = LoadLibrary(TEXT("kernel32.dll"));\r
-       if (hLib == NULL) return FALSE;\r
-       else\r
-       {\r
-               BOOL fRet = FALSE;\r
-               HSI pHsi = (HSI)GetProcAddress(hLib,"HeapSetInformation");\r
-               if (!pHsi) \r
-               {\r
-                       FreeLibrary(hLib);\r
-                       return FALSE;\r
-               }\r
-               #ifndef HeapEnableTerminationOnCorruption\r
-                       #define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1\r
-               #endif\r
-\r
-               fRet = (pHsi)(NULL,HeapEnableTerminationOnCorruption,NULL,0) ? TRUE : FALSE;\r
-\r
-               if (hLib) FreeLibrary(hLib);\r
-\r
-               return fRet;\r
-   }\r
-#else\r
-       return FALSE;\r
-#endif\r
-}\r
-/*--------------------------------------------------------------------------*/ \r
+
+/*--------------------------------------------------------------------------*/ 
+#include <windows.h>
+#include "SetHeapOptions.h"
+/* http://msdn.microsoft.com/en-us/library/bb430720.aspx */
+/*--------------------------------------------------------------------------*/ 
+typedef BOOL (WINAPI *HSI) (HANDLE, HEAP_INFORMATION_CLASS ,PVOID, SIZE_T);
+/*--------------------------------------------------------------------------*/ 
+BOOL SetHeapOptions(void) 
+{
+#ifdef _DEBUG
+       HMODULE hLib = LoadLibrary(TEXT("kernel32.dll"));
+       if (hLib == NULL) return FALSE;
+       else
+       {
+               BOOL fRet = FALSE;
+               HSI pHsi = (HSI)GetProcAddress(hLib,"HeapSetInformation");
+               if (!pHsi) 
+               {
+                       FreeLibrary(hLib);
+                       return FALSE;
+               }
+               #ifndef HeapEnableTerminationOnCorruption
+                       #define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
+               #endif
+
+               fRet = (pHsi)(NULL,HeapEnableTerminationOnCorruption,NULL,0) ? TRUE : FALSE;
+
+               if (hLib) FreeLibrary(hLib);
+
+               return fRet;
+   }
+#else
+       return FALSE;
+#endif
+}
+/*--------------------------------------------------------------------------*/ 
index f1736fd..3316cde 100644 (file)
@@ -1,29 +1,29 @@
-/*\r
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab\r
- * Copyright (C) 2008 - INRIA - Allan CORNET\r
- * \r
- * This file must be used under the terms of the CeCILL.\r
- * This source file is licensed as described in the file COPYING, which\r
- * you should have received as part of this distribution.  The terms\r
- * are also available at    \r
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt\r
- *\r
- */\r
-\r
-/*--------------------------------------------------------------------------*/ \r
-#ifndef __SETHEAPOPTIONS_H__\r
-#define __SETHEAPOPTIONS_H__\r
-\r
-#include "BOOL.h"\r
-\r
-/**\r
- * Heap corruption detection is the ability to fail an application if\r
- * the heap manager detects that the application has corrupted the heap.\r
- * Only on Vista and debug mode.\r
- * @return TRUE if it is enabled.\r
- */\r
-\r
-BOOL SetHeapOptions(void);\r
-\r
-#endif /* __SETHEAPOPTIONS_H__ */\r
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Allan CORNET
+ * 
+ * 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-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __SETHEAPOPTIONS_H__
+#define __SETHEAPOPTIONS_H__
+
+#include "BOOL.h"
+
+/**
+ * Heap corruption detection is the ability to fail an application if
+ * the heap manager detects that the application has corrupted the heap.
+ * Only on Vista and debug mode.
+ * @return TRUE if it is enabled.
+ */
+
+BOOL SetHeapOptions(void);
+
+#endif /* __SETHEAPOPTIONS_H__ */
 /*--------------------------------------------------------------------------*/ 
\ No newline at end of file
index fcd506a..083e40b 100644 (file)
@@ -1,17 +1,17 @@
-; Definition of lib for documentation build used in Scilab \r
-       \r
-\r
-; xml.apache.org SVG Library \r
-batik.jar=${thirdparty.dir}/batik.jar\r
-\r
-; The Saxon XSLT Processor \r
-saxon.jar=${thirdparty.dir}/saxon.jar\r
-\r
-; Reusable components used by Batik and FOP \r
-fop.jar=${thirdparty.dir}/fop.jar\r
-\r
-; A complete MathML rendering solution \r
-jeuclid-core.jar=${thirdparty.dir}/jeuclid-core.jar\r
-\r
-library.helptools.dir=${modules.dir}/helptools/${build.jar.dir}/\r
-library.helptools.name=org.scilab.modules.helptools.jar\r
+; Definition of lib for documentation build used in Scilab 
+       
+
+; xml.apache.org SVG Library 
+batik.jar=${thirdparty.dir}/batik.jar
+
+; The Saxon XSLT Processor 
+saxon.jar=${thirdparty.dir}/saxon.jar
+
+; Reusable components used by Batik and FOP 
+fop.jar=${thirdparty.dir}/fop.jar
+
+; A complete MathML rendering solution 
+jeuclid-core.jar=${thirdparty.dir}/jeuclid-core.jar
+
+library.helptools.dir=${modules.dir}/helptools/${build.jar.dir}/
+library.helptools.name=org.scilab.modules.helptools.jar