Merge remote-tracking branch 'origin/master' into gsoc2012-interactions 88/8288/1
Sylvestre Ledru [Tue, 24 Jul 2012 13:03:54 +0000 (15:03 +0200)]
Conflicts:
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters

Change-Id: Ief29d26f6feabb094dec90da11e29c8208f2c23e

1  2 
scilab/CHANGES_5.4.X
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java

Simple merge
@@@ -190,7 -188,7 +190,8 @@@ sci_gateway/cpp/sci_uiputfile.cpp 
  sci_gateway/cpp/sci_about.cpp \
  sci_gateway/cpp/sci_raise_window.cpp \
  sci_gateway/cpp/sci_usecanvas.cpp \
- sci_gateway/cpp/sci_useeditor.cpp
++sci_gateway/cpp/sci_useeditor.cpp \
+ sci_gateway/cpp/sci_fire_closing_finished.cpp
  
  libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/includes/ \
@@@ -235,7 -240,8 +241,8 @@@ am__objects_5 = libscigui_la-sci_prints
        libscigui_la-sci_uigetdir.lo libscigui_la-sci_uigetfile.lo \
        libscigui_la-sci_displaytree.lo libscigui_la-sci_uiputfile.lo \
        libscigui_la-sci_about.lo libscigui_la-sci_raise_window.lo \
-       libscigui_la-sci_usecanvas.lo libscigui_la-sci_useeditor.lo
 -      libscigui_la-sci_usecanvas.lo \
++      libscigui_la-sci_usecanvas.lo libscigui_la-sci_useeditor.lo \
+       libscigui_la-sci_fire_closing_finished.lo
  am_libscigui_la_OBJECTS = $(am__objects_4) $(am__objects_5)
  libscigui_la_OBJECTS = $(am_libscigui_la_OBJECTS)
  @GUI_TRUE@am_libscigui_la_rpath = -rpath $(pkglibdir)
@@@ -692,7 -696,7 +699,8 @@@ sci_gateway/cpp/sci_uiputfile.cpp 
  sci_gateway/cpp/sci_about.cpp \
  sci_gateway/cpp/sci_raise_window.cpp \
  sci_gateway/cpp/sci_usecanvas.cpp \
- sci_gateway/cpp/sci_useeditor.cpp
++sci_gateway/cpp/sci_useeditor.cpp \
+ sci_gateway/cpp/sci_fire_closing_finished.cpp
  
  libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/includes/ \
@@@ -2046,13 -2039,13 +2056,20 @@@ libscigui_la-sci_usecanvas.lo: sci_gate
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_la-sci_usecanvas.lo `test -f 'sci_gateway/cpp/sci_usecanvas.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_usecanvas.cpp
  
 +libscigui_la-sci_useeditor.lo: sci_gateway/cpp/sci_useeditor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_la-sci_useeditor.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_useeditor.Tpo -c -o libscigui_la-sci_useeditor.lo `test -f 'sci_gateway/cpp/sci_useeditor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_useeditor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigui_la-sci_useeditor.Tpo $(DEPDIR)/libscigui_la-sci_useeditor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='sci_gateway/cpp/sci_useeditor.cpp' object='libscigui_la-sci_useeditor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_la-sci_useeditor.lo `test -f 'sci_gateway/cpp/sci_useeditor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_useeditor.cpp
 +
+ libscigui_la-sci_fire_closing_finished.lo: sci_gateway/cpp/sci_fire_closing_finished.cpp
+ @am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigui_la-sci_fire_closing_finished.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_fire_closing_finished.Tpo -c -o libscigui_la-sci_fire_closing_finished.lo `test -f 'sci_gateway/cpp/sci_fire_closing_finished.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_fire_closing_finished.cpp
+ @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigui_la-sci_fire_closing_finished.Tpo $(DEPDIR)/libscigui_la-sci_fire_closing_finished.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='sci_gateway/cpp/sci_fire_closing_finished.cpp' object='libscigui_la-sci_fire_closing_finished.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_la-sci_fire_closing_finished.lo `test -f 'sci_gateway/cpp/sci_fire_closing_finished.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_fire_closing_finished.cpp
  mostlyclean-libtool:
        -rm -f *.lo
  
@@@ -53,7 -53,7 +53,8 @@@ GUI_IMPEXP int sci_displaytree(char *fn
  GUI_IMPEXP int sci_uiputfile( char * fname, unsigned long fname_len ) ;
  GUI_IMPEXP int sci_raise_window ( char * fname, unsigned long fname_len ) ;
  GUI_IMPEXP int sci_about ( char * fname, unsigned long fname_len ) ;
 +GUI_IMPEXP int sci_useeditor(char *fname, unsigned long fname_len);
+ GUI_IMPEXP int sci_fire_closing_finished ( char * fname, unsigned long fname_len ) ;
  /*--------------------------------------------------------------------------*/
  #endif /*  __GW_GUI__ */
  /*--------------------------------------------------------------------------*/
@@@ -60,8 -60,8 +60,9 @@@ static gw_generic_table Tab[]
        {sci_usecanvas,"usecanvas"},
        {sci_displaytree,"uiDisplayTree"},
        {sci_uiputfile,"uiputfile"},
 -        {sci_about,"about"},
 +      {sci_about,"about"},
-       {sci_useeditor,"useeditor"}
++      {sci_useeditor,"useeditor"},
+         {sci_fire_closing_finished,"fire_closing_finished"}
  };
  /*--------------------------------------------------------------------------*/
  int gw_gui(void)
@@@ -67,5 -67,5 +67,6 @@@
  <PRIMITIVE gatewayId="25" primitiveId="34" primitiveName="uiDisplayTree" />
  <PRIMITIVE gatewayId="25" primitiveId="35" primitiveName="uiputfile" />
  <PRIMITIVE gatewayId="25" primitiveId="36" primitiveName="about" />
 -<PRIMITIVE gatewayId="25" primitiveId="37" primitiveName="fire_closing_finished" />
 +<PRIMITIVE gatewayId="25" primitiveId="37" primitiveName="useeditor" />
++<PRIMITIVE gatewayId="25" primitiveId="38" primitiveName="fire_closing_finished" />
  </GATEWAY>
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
 +    <ClCompile Include="..\..\sci_gateway\cpp\sci_useeditor.cpp" />
+     <ClCompile Include="..\..\sci_gateway\cpp\sci_fire_closing_finished.cpp" />
      <ClCompile Include="..\cpp\GetConsoleShowHiddenHandles.cpp" />
      <ClCompile Include="..\cpp\GetUicontrolTooltipString.cpp" />
      <ClCompile Include="..\cpp\SetConsoleShowHiddenHandles.cpp" />
      <ClCompile Include="..\cpp\SetUicontrolTooltipString.cpp">
        <Filter>Source Files</Filter>
      </ClCompile>
 +    <ClCompile Include="..\jni\EditorManager.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\sci_gateway\cpp\sci_useeditor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
+     <ClCompile Include="..\..\sci_gateway\cpp\sci_fire_closing_finished.cpp">
+       <Filter>Source Files</Filter>
+     </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <None Include="core_import.def">