x_choices: use "xchoicesi" as an helper gateway 12/19112/4 6.0.0
Adeline CARNIS [Tue, 14 Feb 2017 10:53:17 +0000 (11:53 +0100)]
Change-Id: I059c5c7661577249c733d714487af1ebfa7c0846

scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/cpp/sci_xchoicesi.cpp [moved from scilab/modules/gui/sci_gateway/cpp/sci_x_choice.cpp with 99% similarity]
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters

index 2a06ddd..9306bfa 100644 (file)
@@ -218,7 +218,7 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_datatip_set_orient.cpp \
     sci_gateway/cpp/sci_saveGui.cpp \
     sci_gateway/cpp/sci_loadGui.cpp \
-    sci_gateway/cpp/sci_x_choice.cpp \
+    sci_gateway/cpp/sci_xchoicesi.cpp \
     sci_gateway/cpp/sci_uigetcolor.cpp \
     sci_gateway/cpp/sci_ClipBoard.cpp \
     sci_gateway/cpp/sci_x_mdialog.cpp \
index 282296a..307dd3b 100644 (file)
@@ -334,7 +334,7 @@ am__objects_5 = sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo \
        sci_gateway/cpp/libscigui_la-sci_datatip_set_orient.lo \
        sci_gateway/cpp/libscigui_la-sci_saveGui.lo \
        sci_gateway/cpp/libscigui_la-sci_loadGui.lo \
-       sci_gateway/cpp/libscigui_la-sci_x_choice.lo \
+       sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo \
        sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo \
        sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo \
        sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo \
@@ -911,7 +911,7 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_datatip_set_orient.cpp \
     sci_gateway/cpp/sci_saveGui.cpp \
     sci_gateway/cpp/sci_loadGui.cpp \
-    sci_gateway/cpp/sci_x_choice.cpp \
+    sci_gateway/cpp/sci_xchoicesi.cpp \
     sci_gateway/cpp/sci_uigetcolor.cpp \
     sci_gateway/cpp/sci_ClipBoard.cpp \
     sci_gateway/cpp/sci_x_mdialog.cpp \
@@ -1639,7 +1639,7 @@ sci_gateway/cpp/libscigui_la-sci_saveGui.lo:  \
 sci_gateway/cpp/libscigui_la-sci_loadGui.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscigui_la-sci_x_choice.lo:  \
+sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo:  \
@@ -1725,7 +1725,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uiputfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_usecanvas.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_useeditor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_xchoicesi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigui_algo_la-CreateUimenu.Plo@am__quote@
@@ -2842,12 +2842,12 @@ sci_gateway/cpp/libscigui_la-sci_loadGui.lo: sci_gateway/cpp/sci_loadGui.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_loadGui.lo `test -f 'sci_gateway/cpp/sci_loadGui.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_loadGui.cpp
 
-sci_gateway/cpp/libscigui_la-sci_x_choice.lo: sci_gateway/cpp/sci_x_choice.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_choice.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/cpp/sci_x_choice.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_choice.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_choice.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_choice.lo' libtool=yes @AMDEPBACKSLASH@
+sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo: sci_gateway/cpp/sci_xchoicesi.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_xchoicesi.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo `test -f 'sci_gateway/cpp/sci_xchoicesi.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xchoicesi.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_xchoicesi.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_xchoicesi.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_xchoicesi.cpp' object='sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/cpp/sci_x_choice.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_choice.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_xchoicesi.lo `test -f 'sci_gateway/cpp/sci_xchoicesi.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xchoicesi.cpp
 
 sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo: sci_gateway/cpp/sci_uigetcolor.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/cpp/sci_uigetcolor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uigetcolor.cpp
index 7e966e9..48a9aac 100755 (executable)
@@ -23,7 +23,7 @@ GUI_IMPEXP int gw_gui(void);
 GUI_IMPEXP int sci_x_dialog(char* fname, void* pvApiCtx);
 GUI_IMPEXP int sci_x_choose(char* fname, void* pvApiCtx);
 GUI_IMPEXP int sci_x_mdialog(char* fname, void* pvApiCtx);
-GUI_IMPEXP int sci_x_choice(char* fname, void* pvApiCtx);
+GUI_IMPEXP int sci_xchoicesi(char* fname, void* pvApiCtx);
 GUI_IMPEXP int sci_delmenu(char* fname, void* pvApiCtx);
 GUI_IMPEXP int sci_setmenu(char* fname, void* pvApiCtx);
 GUI_IMPEXP int sci_unsetmenu(char* fname, void* pvApiCtx);
@@ -27,7 +27,7 @@ extern "C"
 }
 
 /*--------------------------------------------------------------------------*/
-int sci_x_choice(char *fname, void* pvApiCtx)
+int sci_xchoicesi(char *fname, void* pvApiCtx)
 {
     SciErr sciErr;
 
index b70aeb3..c38f1ad 100755 (executable)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatipcreate.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatipremove.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_saveGui.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_xchoicesi.cpp" />
     <ClCompile Include="..\cpp\CreateUIControl.cpp" />
     <ClCompile Include="..\cpp\GetConsoleShowHiddenHandles.cpp" />
     <ClCompile Include="..\cpp\GetUicontrolIcon.cpp" />
     <ClCompile Include="..\..\sci_gateway\c\sci_unsetmenu.c" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_usecanvas.cpp" />
     <ClCompile Include="..\..\sci_gateway\c\sci_waitbar.c" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_choice.cpp" />
     <ClCompile Include="..\..\sci_gateway\c\sci_x_choose.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_x_choose_modeless.c" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_x_dialog.cpp" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index d25bcc0..f310c93 100755 (executable)
     <ClCompile Include="..\..\sci_gateway\c\sci_waitbar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_choice.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_x_choose.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\cpp\InitializeGUI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_xchoicesi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="core_import.def">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>