Merge remote branch 'origin/master' into graphic 50/2250/1
Pierre LANDO [Fri, 8 Oct 2010 14:09:48 +0000 (16:09 +0200)]
Conflicts:
scilab/modules/core/src/c/dynamic_gateways.c

17 files changed:
1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcproj
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -137,10 -137,10 +137,11 @@@ GUI_LIBS =      $(top_builddir)/modules/gui
        $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/jvm/libscijvm.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
 +      $(top_builddir)/modules/graphic_objects/libscigraphic_objects.la \
        $(top_builddir)/modules/scinotes/libsciscinotes.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
-       $(top_builddir)/modules/history_browser/libscihistory_browser.la
+       $(top_builddir)/modules/history_browser/libscihistory_browser.la \
+       $(top_builddir)/modules/commons/libscicommons.la
  
  if HDF5
  GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload.la
@@@ -154,11 -154,10 +155,11 @@@ NO_GUI_LIBS = $(top_builddir)/modules/g
        $(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/graphic_objects/libscigraphic_objects-disable.la \
        $(top_builddir)/modules/scinotes/libsciscinotes-disable.la \
        $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
-       $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la
+       $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la \
+       $(top_builddir)/modules/commons/libscicommons-disable.la
  
  if HDF5
  NO_GUI_LIBS += $(top_builddir)/modules/hdf5/libscihdf5-forceload-disable.la
Simple merge
@@@ -87,9 -87,8 +87,9 @@@
  /* 63 */                                              #include "dynamic_gateways.h" /* scinotes */
  /* 64 */                                              #include "dynamic_gateways.h" /* xcos */
  /* 65 */                                              #include "dynamic_gateways.h" /* action_binding */
- /* 66 */                        #include "dynamic_gateways.h" /* parallel */
+ /* 66 */                        #include "dynamic_parallel.h" /* parallel */
  /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
 +/* 68 */                                              #include "dynamic_gateways.h" /* graphic_objects */
  
  /*-------------------------------------
   * long jump to stop interface computation
@@@ -13,9 -13,9 +13,9 @@@
  #define SCI_VERSION_H
  
  #define SCI_VERSION_MAJOR 5
- #define SCI_VERSION_MINOR 3
+ #define SCI_VERSION_MINOR 4
  #define SCI_VERSION_MAINTENANCE 0
 -#define SCI_VERSION_STRING "scilab-branch-master"
 +#define SCI_VERSION_STRING "scilab-branch-graphic"
  /* SCI_VERSION_REVISION --> hash key commit */
  #define SCI_VERSION_REVISION 0
  #define SCI_VERSION_TIMESTAMP 0
@@@ -554,11 -513,6 +536,11 @@@ void freeAllDynamicGateways(void
          &gatewayname_ui_data,
          &hUi_dataLib,
          &ptr_gw_ui_data);
 +
-       freeDynamicGateway(&dynlibname_graphic_objects,
++    freeDynamicGateway(&dynlibname_graphic_objects,
 +        &gatewayname_graphic_objects,
 +        &hGraphic_objectsLib,
-               &ptr_gw_graphic_objects);
++        &ptr_gw_graphic_objects);
  }
  /*--------------------------------------------------------------------------*/
  
@@@ -815,21 -814,21 +815,21 @@@ function %h_p(h
              t=[t;
                  "Parent: "+h.parent.type
                  "Children: "+fmtchildren(h.children)
-               "Enable = "+sci2exp(h.enable)
+                 "Enable = "+sci2exp(h.enable)
                  "Foregroundcolor = "+sci2exp(h.foregroundcolor,0)
 -                "Label = "+h.label 
 +                "Label = "+h.label
                  //"Handle_visible = "+sci2exp(h.handle_visible)
                  //"Position = "+sci2exp(h.position,0)
                  "Visible = "+sci2exp(h.visible)
                  "Callback = "+h.callback
-                 "CallbackType = "+sci2exp(h.callback_type,0)
-               "Checked: "+sci2exp(h.checked)
-               "Tag = "+h.tag
+                 "Callback_type = "+sci2exp(h.callback_type,0)
+                 "Checked =  "+sci2exp(h.checked)
+                 "Tag = "+h.tag
              ]
 -        
 +
          // uicontextmenu
          // =====================================================================
 -        
 +
          case "uicontextmenu"
              t=[t;
                  "Parent: "+h.parent.type
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge