Merge remote branch 'origin/master' into graphic 12/1112/5
Bruno JOFRET [Thu, 24 Jun 2010 14:53:42 +0000 (16:53 +0200)]
Conflicts:
scilab/configure
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/xpad/Makefile.in

Change-Id: I8fa0388f23836f45425775816138652ab9ec2de3

88 files changed:
1  2 
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_objects/sci_gateway/graphic_objects_gateway.xml
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

Simple merge
Simple merge
Simple merge
        <path id="compile.classpath">
                <pathelement location="${library.types.dir}/${library.types.name}"/>
                <pathelement location="${library.graph.dir}/${library.graph.name}"/>
 +              <pathelement location="${library.graphic_objects.dir}/${library.graphic_objects.name}"/>
                <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
                <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
-               <pathelement location="${library.xpad.dir}/${library.xpad.name}"/>
+               <pathelement location="${library.scinotes.dir}/${library.scinotes.name}"/>
                <pathelement location="${library.localization.dir}/${library.localization.name}"/>
                <pathelement location="${library.shell.dir}/${library.shell.name}"/>
                <pathelement location="${library.history_manager.dir}/${library.history_manager.name}"/>
  #
  if test "$enable_stop_on_warning" = yes; then
     CFLAGS="$CFLAGS -Werror -O0"
-    CXXFLAGS="$CXXFLAGS -Werror -O0"
+    CPPFLAGS="$CPPFLAGS -Werror -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/graph/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
Simple merge
@@@ -156,16 -156,15 +156,19 @@@ The option is "disableUnderMode" and ca
  
  <path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar"/>
  
- <!-- xpad module -->
- <path value="$SCILAB/modules/xpad/jar/org.scilab.modules.xpad.jar" load="onUse">
-       <load on="Xpad"/>
+ <!-- scinotes module -->
+ <path value="$SCILAB/modules/scinotes/jar/org.scilab.modules.scinotes.jar" load="onUse">
+       <load on="SciNotes"/>
  </path>
  
 +
 +<!-- TO DO Load only when we need -->
 +<path value="$SCILAB/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar"/>
 +
  <!-- TO DO Load only when we need -->
+ <path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
+ <!-- TO DO Load only when we need -->
  <path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
  
  </classpaths>
@@@ -160,16 -160,15 +160,19 @@@ The option is "disableUnderMode" and ca
  
  <path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar"/>
  
- <!-- xpad module -->
- <path value="$SCILAB/modules/xpad/jar/org.scilab.modules.xpad.jar" load="onUse">
-       <load on="Xpad"/>
+ <!-- scinotes module -->
+ <path value="$SCILAB/modules/scinotes/jar/org.scilab.modules.scinotes.jar" load="onUse">
+       <load on="SciNotes"/>
  </path>
  
 +
 +<!-- TO DO Load only when we need -->
 +<path value="$SCILAB/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar"/>
 +
  <!-- TO DO Load only when we need -->
+ <path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
+ <!-- TO DO Load only when we need -->
  <path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
  
  
@@@ -81,8 -81,8 +81,9 @@@
  <module name="types" activate="@JAVA_ENABLE@"/>
  <module name="hdf5" activate="yes"/>
  <module name="xcos" activate="@GUI_ENABLE@"/>
- <module name="xpad" activate="@GUI_ENABLE@"/>
 +<module name="graphic_objects" activate="@GUI_ENABLE@"/>
+ <module name="scinotes" activate="@GUI_ENABLE@"/>
+ <module name="ui_data" activate="@GUI_ENABLE@"/>
  <module name="api_scilab" activate="yes"/>
  <module name="helptools" activate="@HELP_ENABLE@"/>
  <module name="graph" activate="@JAVA_ENABLE@"/>
@@@ -83,8 -83,8 +83,9 @@@
  <module name="types" activate="yes"/>
  <module name="hdf5" activate="yes"/>
  <module name="xcos" activate="yes"/>
- <module name="xpad" activate="yes"/>
 +<module name="graphic_objects" activate="yes"/>
+ <module name="scinotes" activate="yes"/>
+ <module name="ui_data" activate="yes"/>
  <module name="api_scilab" activate="yes"/>
  <module name="helptools" activate="yes"/>
  <module name="graph" activate="yes"/>
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -84,9 -84,12 +84,12 @@@ types 
  hdf5 \
  graph\
  xcos \
- xpad \
- graphic_objects
++graphic_objects \
+ scinotes \
+ parallel \
+ modules_manager \
+ ui_data
  
 -
  #umfpack
  
  #if MPI
@@@ -130,10 -133,11 +133,12 @@@ GUI_LIBS =      $(top_builddir)/modules/gui
        $(top_builddir)/modules/graphics/libscigraphics.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
        $(top_builddir)/modules/console/libsciconsole.la \
+       $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/jvm/libscijvm.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
-       $(top_builddir)/modules/xpad/libscixpad.la \
-       $(top_builddir)/modules/graphic_objects/libscigraphic_objects.la
++      $(top_builddir)/modules/graphic_objects/libscigraphic_objects.la \
+       $(top_builddir)/modules/scinotes/libsciscinotes.la \
+       $(top_builddir)/modules/ui_data/libsciui_data.la
  
  if HDF5
  GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
@@@ -144,10 -148,11 +149,12 @@@ NO_GUI_LIBS = $(top_builddir)/modules/g
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
        $(top_builddir)/modules/console/libsciconsole-disable.la \
+       $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \
        $(top_builddir)/modules/jvm/libscijvm-disable.la \
        $(top_builddir)/modules/xcos/libscixcos-disable.la \
-       $(top_builddir)/modules/xpad/libscixpad-disable.la \
-       $(top_builddir)/modules/graphic_objects/libscigraphic_objects-disable.la
++      $(top_builddir)/modules/graphic_objects/libscigraphic_objects-disable.la \
+       $(top_builddir)/modules/scinotes/libsciscinotes-disable.la \
+       $(top_builddir)/modules/ui_data/libsciui_data-disable.la
  
  if HDF5
  NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
@@@ -162,8 -162,8 +162,9 @@@ DIST_SUBDIRS = core output_stream arnol
        windows_tools functions overloading maple2scilab m2sci texmacs \
        development_tools compatibility_functions helptools fftw \
        umfpack demo_tools genetic_algorithms simulated_annealing \
-       parameters matio atoms types hdf5 graph xcos xpad \
-       graphic_objects scicos_blocks scicos . javasci
 -      parameters matio atoms types hdf5 graph xcos scinotes parallel \
 -      modules_manager ui_data scicos_blocks scicos . javasci
++      parameters matio atoms types hdf5 graph xcos graphic_objects \
++      scinotes parallel modules_manager ui_data scicos_blocks scicos \
++      . javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -445,8 -449,8 +450,9 @@@ SUBDIRS = core output_stream arnoldi el
        maple2scilab m2sci texmacs development_tools \
        compatibility_functions helptools fftw umfpack demo_tools \
        genetic_algorithms simulated_annealing parameters matio atoms \
-       types hdf5 graph xcos xpad graphic_objects $(am__append_1) \
-       scicos . $(am__append_2)
 -      types hdf5 graph xcos scinotes parallel modules_manager \
 -      ui_data $(am__append_1) scicos . $(am__append_2)
++      types hdf5 graph xcos graphic_objects scinotes parallel \
++      modules_manager ui_data $(am__append_1) scicos . \
++      $(am__append_2)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
@@@ -468,20 -472,22 +474,24 @@@ GUI_LIBS = $(top_builddir)/modules/gui/
        $(top_builddir)/modules/graphics/libscigraphics.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
        $(top_builddir)/modules/console/libsciconsole.la \
+       $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/jvm/libscijvm.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
-       $(top_builddir)/modules/xpad/libscixpad.la \
 +      $(top_builddir)/modules/graphic_objects/libscigraphic_objects.la \
+       $(top_builddir)/modules/scinotes/libsciscinotes.la \
+       $(top_builddir)/modules/ui_data/libsciui_data.la \
        $(am__append_3)
  # HDF5 is here because it needs the JVM (see bug #5481)
  NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
        $(top_builddir)/modules/console/libsciconsole-disable.la \
+       $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \
        $(top_builddir)/modules/jvm/libscijvm-disable.la \
        $(top_builddir)/modules/xcos/libscixcos-disable.la \
-       $(top_builddir)/modules/xpad/libscixpad-disable.la \
 +      $(top_builddir)/modules/graphic_objects/libscigraphic_objects-disable.la \
+       $(top_builddir)/modules/scinotes/libsciscinotes-disable.la \
+       $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
        $(am__append_4)
  # HDF5 is here because it needs the JVM (see bug #5481)
  ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  /* 60 */                                              #include "dynamic_gateways.h" /* helptools */
  /* 61 */                                              #include "../../call_scilab/includes/gw_call_scilab.h"
  /* 62 */                                              #include "dynamic_gateways.h" /* hdf5 */
- /* 63 */                                              #include "dynamic_gateways.h" /* xpad */
+ /* 63 */                                              #include "dynamic_gateways.h" /* scinotes */
  /* 64 */                                              #include "dynamic_gateways.h" /* xcos */
- /* ATTENTION : MERGE with editvar branch change id */
- /* 65 */                                              #include "dynamic_gateways.h" /* graphic_objects */
+ /* 65 */                                              #include "dynamic_gateways.h" /* action_binding */
+ /* 66 */                        #include "dynamic_gateways.h" /* parallel */
+ /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
++/* 68 */                                              #include "dynamic_gateways.h" /* graphic_objects */
  
  /*-------------------------------------
   * long jump to stop interface computation
@@@ -33,7 -32,7 +32,7 @@@ static void sci_sigint_addinter(int n)
   ** Watch out the positions are crutial !!!
   ** @TODO : Make this less crappy...
   **/
- #define INTERFACES_MAX 65
 -#define INTERFACES_MAX 67
++#define INTERFACES_MAX 68
  static OpTab Interfaces[INTERFACES_MAX] = {
      /* 01  */ {gw_user}, /* free position may be used */
        /* 02  */ {gw_linear_algebra},
        /* 60  */ {gw_dynamic_helptools},
        /* 61  */ {gw_call_scilab},
        /* 62  */ {gw_dynamic_hdf5},
-       /* 63  */ {gw_dynamic_xpad},
+       /* 63  */ {gw_dynamic_scinotes},
        /* 64  */ {gw_dynamic_xcos},
-       /* 65  */ {gw_dynamic_graphic_objects}
+     /* 65  */ {gw_dynamic_action_binding},
+     /* 66  */ {gw_dynamic_parallel},
 -      /* 67  */ {gw_dynamic_ui_data}
++      /* 67  */ {gw_dynamic_ui_data},
++      /* 68  */ {gw_dynamic_graphic_objects}
  };
  /*--------------------------------------------------------------------------*/
  static int sig_ok = 0;
@@@ -327,40 -326,77 +326,100 @@@ static char* gatewayname_graphic_expor
  int gw_dynamic_graphic_export(void)
  {
  #ifdef _MSC_VER
-       if (dynlibname_graphic_export == NULL)
+     if (dynlibname_graphic_export == NULL)
+     {
+         dynlibname_graphic_export = buildModuleDynLibraryName(GRAPHIC_EXPORT_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+     }
+ #endif
+     return gw_dynamic_generic(GRAPHIC_EXPORT_MODULE_NAME,
+         &dynlibname_graphic_export,
+         &gatewayname_graphic_export,
+         &hGraphic_exportLib ,
+         &ptr_gw_graphic_export);
+ }
+ /*--------------------------------------------------------------------------*/
+ /* graphic_exports module */
+ #define ACTION_BINDING_MODULE_NAME "action_binding"
+ static DynLibHandle hAction_bindingLib = NULL;
+ static PROC_GATEWAY ptr_gw_action_binding = NULL;
+ static char* dynlibname_action_binding = NULL;
+ static char* gatewayname_action_binding = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_action_binding(void)
+ {
+ #ifdef _MSC_VER
+     if (dynlibname_action_binding == NULL)
+     {
+         dynlibname_action_binding = buildModuleDynLibraryName(ACTION_BINDING_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+     }
+ #endif
+     return gw_dynamic_generic(ACTION_BINDING_MODULE_NAME,
+         &dynlibname_action_binding,
+         &gatewayname_action_binding,
+         &hAction_bindingLib ,
+         &ptr_gw_action_binding);
+ }
+ /*--------------------------------------------------------------------------*/
+ /* PARALLEL module */
+ #define PARALLEL_MODULE_NAME "parallel"
+ static DynLibHandle hParallelLib = NULL;
+ static PROC_GATEWAY ptr_gw_parallel = NULL;
+ static char* dynlibname_parallel = NULL;
+ static char* gatewayname_parallel = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_parallel(void)
+ {
+     return gw_dynamic_generic(PARALLEL_MODULE_NAME,
+         &dynlibname_parallel,
+         &gatewayname_parallel,
+         &hParallelLib,
+         &ptr_gw_parallel);
+ }
+ /*--------------------------------------------------------------------------*/
+ /* ui_data module */
+ #define UI_DATA_MODULE_NAME "ui_data"
+ static DynLibHandle hUi_dataLib = NULL;
+ static PROC_GATEWAY ptr_gw_ui_data = NULL;
+ static char* dynlibname_ui_data = NULL;
+ static char* gatewayname_ui_data = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_ui_data(void)
+ {
+ #ifdef _MSC_VER
+       if (dynlibname_ui_data == NULL)
        {
-               dynlibname_graphic_export = buildModuleDynLibraryName(GRAPHIC_EXPORT_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+               dynlibname_ui_data = buildModuleDynLibraryName(UI_DATA_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
        }
  #endif
-       return gw_dynamic_generic(GRAPHIC_EXPORT_MODULE_NAME,
-               &dynlibname_graphic_export,
-               &gatewayname_graphic_export,
-               &hGraphic_exportLib ,
-               &ptr_gw_graphic_export);
+       return gw_dynamic_generic(UI_DATA_MODULE_NAME,
+               &dynlibname_ui_data,
+               &gatewayname_ui_data,
+               &hUi_dataLib,
+               &ptr_gw_ui_data);
  }
  /*--------------------------------------------------------------------------*/
 +/* graphic_objects module */
 +#define GRAPHIC_OBJECTS_MODULE_NAME "graphic_objects"
 +static DynLibHandle hGraphic_objectsLib = NULL;
 +static PROC_GATEWAY ptr_gw_graphic_objects = NULL;
 +static char* dynlibname_graphic_objects = NULL;
 +static char* gatewayname_graphic_objects = NULL;
 +/*--------------------------------------------------------------------------*/
 +int gw_dynamic_graphic_objects(void)
 +{
 +#ifdef _MSC_VER
 +      if (dynlibname_graphic_objects == NULL)
 +      {
 +              dynlibname_graphic_objects = buildModuleDynLibraryName(GRAPHIC_OBJECTS_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
 +      }
 +#endif
 +
 +      return gw_dynamic_generic(GRAPHIC_OBJECTS_MODULE_NAME,
 +              &dynlibname_graphic_objects,
 +              &gatewayname_graphic_objects,
 +              &hGraphic_objectsLib,
 +              &ptr_gw_graphic_objects);
 +}
 +/*--------------------------------------------------------------------------*/
  
@@@ -1,11 -1,11 +1,11 @@@
  /*
   * 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    
++ * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
   *
   */
  #define __DYNAMIC_GATEWAYS_H__
  
  /**
 +* graphic_objects gateway
 +* graphic_objects is loaded dynamically at runtime
 +* load gw_graphic_objects in SCI/modules/graphic_objects/sci_gateway/gw_graphic_objects.c
 +*/
 +int gw_dynamic_graphic_objects(void);
 +
++/*
+ * ui_data gateway
+ * ui_data is loaded dynamically at runtime
+ * load gw_ui_data in SCI/modules/ui_data/sci_gateway/gw_ui_data.c
+ */
+ int gw_dynamic_ui_data(void);
  /**
  * pvm gateway
  * pvm is loaded dynamically at runtime
Simple merge
Simple merge
Simple merge
Simple merge
index e1ffba1,0000000..6e629ee
mode 100644,000000..100644
--- /dev/null
@@@ -1,28 -1,0 +1,28 @@@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +
 +<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
 +<GATEWAY name="graphic_objects">
 +<!-- =================== -->
 +<!--
 + Scilab
 + Interface description. In this file, we define the list of the function which
 + will be available into Scilab and the link to the "native" function.
 +
 + gatewayId is the position in the hashtable 'Interfaces' defined in the
 + file SCI/modules/core/src/c/callinterf.h
 +
 + primitiveId is the position in the hashtable '<module>Table Tab[]' defined
 + in the file modules/<module>/sci_gateway/c/gw_<module>.c
 +
 + primitiveName is the name of the Scilab function
 +
 + @author Allan CORNET
 + @date DIGITEO 2010
 + ===================
 + Don't touch if you do not know what you are doing
 +-->
 +<!-- =================== -->
 +
- <PRIMITIVE gatewayId="65" primitiveId="1" primitiveName="graphicfunction" />
++<PRIMITIVE gatewayId="68" primitiveId="1" primitiveName="graphicfunction" />
 +
 +</GATEWAY>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -81,12 -81,12 +81,15 @@@ library.hdf5.name=org.scilab.modules.hd
  library.xcos.dir=${modules.dir}/xcos/${build.jar.dir}/
  library.xcos.name=org.scilab.modules.xcos.jar
  
- library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
- library.xpad.name=org.scilab.modules.xpad.jar
+ library.scinotes.dir=${modules.dir}/scinotes/${build.jar.dir}/
+ library.scinotes.name=org.scilab.modules.scinotes.jar
+ library.ui_data.dir=${modules.dir}/ui_data/${build.jar.dir}/
+ library.ui_data.name=org.scilab.modules.ui_data.jar
  
 +library.graphic_objects.dir=${modules.dir}/graphic_objects/${build.jar.dir}/
 +library.graphic_objects.name=org.scilab.modules.graphic_objects.jar
 +
  library.graph.dir=${modules.dir}/graph/${build.jar.dir}/
  library.graph.name=org.scilab.modules.graph.jar
  
@@@ -80,12 -80,12 +80,15 @@@ library.hdf5.name=org.scilab.modules.hd
  library.xcos.dir=${modules.dir}/xcos/${build.jar.dir}/
  library.xcos.name=org.scilab.modules.xcos.jar
  
- library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
- library.xpad.name=org.scilab.modules.xpad.jar
+ library.scinotes.dir=${modules.dir}/scinotes/${build.jar.dir}/
+ library.scinotes.name=org.scilab.modules.scinotes.jar
+ library.ui_data.dir=${modules.dir}/ui_data/${build.jar.dir}/
+ library.ui_data.name=org.scilab.modules.ui_data.jar
  
 +library.graphic_objects.dir=${modules.dir}/graphic_objects/${build.jar.dir}/
 +library.graphic_objects.name=org.scilab.modules.graphic_objects.jar
 +
  library.graph.dir=${modules.dir}/graph/${build.jar.dir}/
  library.graph.name=org.scilab.modules.graph.jar