sci_x_choice.c, sci_uigetcolor.c, sci_x_dialog.c, sci_x_mdialog.c, sci_Clipboard... 80/18480/3
Dhruv Khattar [Wed, 17 Aug 2016 20:14:29 +0000 (01:14 +0530)]
Change-Id: I88caa3cc76c079140dcfeda01c44c0903850df84

scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_ClipBoard.cpp [moved from scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c with 99% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_uigetcolor.cpp [moved from scilab/modules/gui/sci_gateway/c/sci_uigetcolor.c with 97% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_x_choice.cpp [moved from scilab/modules/gui/sci_gateway/c/sci_x_choice.c with 98% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_x_dialog.cpp [moved from scilab/modules/gui/sci_gateway/c/sci_x_dialog.c with 97% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_x_mdialog.cpp [moved from scilab/modules/gui/sci_gateway/c/sci_x_mdialog.c with 99% similarity]
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters

index 77294a3..3928d51 100644 (file)
@@ -169,15 +169,11 @@ BUILT_SOURCES+=swig
 endif
 
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/sci_x_choice.c \
-    sci_gateway/c/sci_x_mdialog.c \
-    sci_gateway/c/sci_x_dialog.c \
     sci_gateway/c/sci_x_choose.c \
     sci_gateway/c/sci_x_choose_modeless.c \
     sci_gateway/c/sci_unsetmenu.c \
     sci_gateway/c/sci_delmenu.c \
     sci_gateway/c/sci_setmenu.c \
-    sci_gateway/c/sci_ClipBoard.c \
     sci_gateway/c/sci_toolbar.c \
     sci_gateway/c/sci_uicontextmenu.c \
     sci_gateway/c/sci_uicontrol.c \
@@ -187,7 +183,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_messagebox.c \
     sci_gateway/c/sci_waitbar.c \
     sci_gateway/c/sci_progressionbar.c \
-    sci_gateway/c/sci_uigetcolor.c \
     sci_gateway/c/sci_getcallbackobject.c \
     sci_gateway/c/sci_exportUI.c \
     sci_gateway/c/sci_figure.c
@@ -223,7 +218,12 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_datatip_set_interp.cpp \
     sci_gateway/cpp/sci_datatip_set_orient.cpp \
     sci_gateway/cpp/sci_saveGui.cpp \
-    sci_gateway/cpp/sci_loadGui.cpp
+    sci_gateway/cpp/sci_loadGui.cpp \
+    sci_gateway/cpp/sci_x_choice.cpp \
+    sci_gateway/cpp/sci_uigetcolor.cpp \
+    sci_gateway/cpp/sci_ClipBoard.cpp \
+    sci_gateway/cpp/sci_x_mdialog.cpp \
+    sci_gateway/cpp/sci_x_dialog.cpp
 
 libscigui_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
index 94dc2f7..881d469 100644 (file)
@@ -296,15 +296,11 @@ am__objects_4 = src/nogui/libscigui_disable_la-nogui_gw.lo
 am_libscigui_disable_la_OBJECTS = $(am__objects_3) $(am__objects_4)
 libscigui_disable_la_OBJECTS = $(am_libscigui_disable_la_OBJECTS)
 libscigui_la_DEPENDENCIES = libscigui-algo.la
-am__objects_5 = sci_gateway/c/libscigui_la-sci_x_choice.lo \
-       sci_gateway/c/libscigui_la-sci_x_mdialog.lo \
-       sci_gateway/c/libscigui_la-sci_x_dialog.lo \
-       sci_gateway/c/libscigui_la-sci_x_choose.lo \
+am__objects_5 = sci_gateway/c/libscigui_la-sci_x_choose.lo \
        sci_gateway/c/libscigui_la-sci_x_choose_modeless.lo \
        sci_gateway/c/libscigui_la-sci_unsetmenu.lo \
        sci_gateway/c/libscigui_la-sci_delmenu.lo \
        sci_gateway/c/libscigui_la-sci_setmenu.lo \
-       sci_gateway/c/libscigui_la-sci_ClipBoard.lo \
        sci_gateway/c/libscigui_la-sci_toolbar.lo \
        sci_gateway/c/libscigui_la-sci_uicontextmenu.lo \
        sci_gateway/c/libscigui_la-sci_uicontrol.lo \
@@ -314,7 +310,6 @@ am__objects_5 = sci_gateway/c/libscigui_la-sci_x_choice.lo \
        sci_gateway/c/libscigui_la-sci_messagebox.lo \
        sci_gateway/c/libscigui_la-sci_waitbar.lo \
        sci_gateway/c/libscigui_la-sci_progressionbar.lo \
-       sci_gateway/c/libscigui_la-sci_uigetcolor.lo \
        sci_gateway/c/libscigui_la-sci_getcallbackobject.lo \
        sci_gateway/c/libscigui_la-sci_exportUI.lo \
        sci_gateway/c/libscigui_la-sci_figure.lo
@@ -348,7 +343,12 @@ am__objects_6 = sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo \
        sci_gateway/cpp/libscigui_la-sci_datatip_set_interp.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_loadGui.lo \
+    sci_gateway/cpp/libscigui_la-sci_x_choice.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 \
+       sci_gateway/cpp/libscigui_la-sci_x_dialog.lo
 am_libscigui_la_OBJECTS = $(am__objects_5) $(am__objects_6)
 libscigui_la_OBJECTS = $(am_libscigui_la_OBJECTS)
 @GUI_TRUE@am_libscigui_la_rpath = -rpath $(pkglibdir)
@@ -871,15 +871,11 @@ GIWS_WRAPPERS = \
 SWIG_WRAPPERS = src/jni/ScilabTermination.i
 BUILT_SOURCES = $(am__append_1) $(am__append_2)
 GATEWAY_C_SOURCES = \
-    sci_gateway/c/sci_x_choice.c \
-    sci_gateway/c/sci_x_mdialog.c \
-    sci_gateway/c/sci_x_dialog.c \
     sci_gateway/c/sci_x_choose.c \
     sci_gateway/c/sci_x_choose_modeless.c \
     sci_gateway/c/sci_unsetmenu.c \
     sci_gateway/c/sci_delmenu.c \
     sci_gateway/c/sci_setmenu.c \
-    sci_gateway/c/sci_ClipBoard.c \
     sci_gateway/c/sci_toolbar.c \
     sci_gateway/c/sci_uicontextmenu.c \
     sci_gateway/c/sci_uicontrol.c \
@@ -889,7 +885,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_messagebox.c \
     sci_gateway/c/sci_waitbar.c \
     sci_gateway/c/sci_progressionbar.c \
-    sci_gateway/c/sci_uigetcolor.c \
     sci_gateway/c/sci_getcallbackobject.c \
     sci_gateway/c/sci_exportUI.c \
     sci_gateway/c/sci_figure.c
@@ -925,7 +920,12 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_datatip_set_interp.cpp \
     sci_gateway/cpp/sci_datatip_set_orient.cpp \
     sci_gateway/cpp/sci_saveGui.cpp \
-    sci_gateway/cpp/sci_loadGui.cpp
+    sci_gateway/cpp/sci_loadGui.cpp \
+    sci_gateway/cpp/sci_x_choice.cpp \
+    sci_gateway/cpp/sci_uigetcolor.cpp \
+    sci_gateway/cpp/sci_x_mdialog.cpp \
+    sci_gateway/cpp/sci_x_dialog.cpp \
+    sci_gateway/cpp/sci_ClipBoard.cpp
 
 libscigui_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
@@ -1504,15 +1504,6 @@ sci_gateway/c/$(am__dirstamp):
 sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
        @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigui_la-sci_x_choice.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigui_la-sci_x_mdialog.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigui_la-sci_x_dialog.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigui_la-sci_x_choose.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1528,9 +1519,6 @@ sci_gateway/c/libscigui_la-sci_delmenu.lo:  \
 sci_gateway/c/libscigui_la-sci_setmenu.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigui_la-sci_ClipBoard.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigui_la-sci_toolbar.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1558,9 +1546,6 @@ sci_gateway/c/libscigui_la-sci_waitbar.lo:  \
 sci_gateway/c/libscigui_la-sci_progressionbar.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscigui_la-sci_uigetcolor.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscigui_la-sci_getcallbackobject.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -1669,6 +1654,21 @@ 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/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/cpp/libscigui_la-sci_x_dialog.lo:  \
+       sci_gateway/cpp/$(am__dirstamp) \
+       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 
 libscigui.la: $(libscigui_la_OBJECTS) $(libscigui_la_DEPENDENCIES) $(EXTRA_libscigui_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(CXXLINK) $(am_libscigui_la_rpath) $(libscigui_la_OBJECTS) $(libscigui_la_LIBADD) $(LIBS)
@@ -1691,7 +1691,6 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_delmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_exportUI.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_figure.Plo@am__quote@
@@ -1703,16 +1702,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_toolbar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uicontextmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uicontrol.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uimenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uiwait.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_unsetmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_waitbar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choice.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose_modeless.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-gui_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_about.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_datatip_manager_mode.Plo@am__quote@
@@ -1744,6 +1739,11 @@ 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_uigetcolor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.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@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigui_algo_la-InitializeGUI.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigui_algo_la-ScilabTermination.Plo@am__quote@
@@ -1939,27 +1939,6 @@ src/nogui/libscigui_disable_la-nogui.lo: src/nogui/nogui.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nogui/libscigui_disable_la-nogui.lo `test -f 'src/nogui/nogui.c' || echo '$(srcdir)/'`src/nogui/nogui.c
 
-sci_gateway/c/libscigui_la-sci_x_choice.lo: sci_gateway/c/sci_x_choice.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_x_choice.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo -c -o sci_gateway/c/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/c/sci_x_choice.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_choice.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choice.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_x_choice.c' object='sci_gateway/c/libscigui_la-sci_x_choice.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/c/sci_x_choice.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_choice.c
-
-sci_gateway/c/libscigui_la-sci_x_mdialog.lo: sci_gateway/c/sci_x_mdialog.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_x_mdialog.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo -c -o sci_gateway/c/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/c/sci_x_mdialog.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_mdialog.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_x_mdialog.c' object='sci_gateway/c/libscigui_la-sci_x_mdialog.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/c/sci_x_mdialog.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_mdialog.c
-
-sci_gateway/c/libscigui_la-sci_x_dialog.lo: sci_gateway/c/sci_x_dialog.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_x_dialog.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo -c -o sci_gateway/c/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/c/sci_x_dialog.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_dialog.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_x_dialog.c' object='sci_gateway/c/libscigui_la-sci_x_dialog.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/c/sci_x_dialog.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_dialog.c
-
 sci_gateway/c/libscigui_la-sci_x_choose.lo: sci_gateway/c/sci_x_choose.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_x_choose.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose.Tpo -c -o sci_gateway/c/libscigui_la-sci_x_choose.lo `test -f 'sci_gateway/c/sci_x_choose.c' || echo '$(srcdir)/'`sci_gateway/c/sci_x_choose.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose.Plo
@@ -1995,13 +1974,6 @@ sci_gateway/c/libscigui_la-sci_setmenu.lo: sci_gateway/c/sci_setmenu.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_setmenu.lo `test -f 'sci_gateway/c/sci_setmenu.c' || echo '$(srcdir)/'`sci_gateway/c/sci_setmenu.c
 
-sci_gateway/c/libscigui_la-sci_ClipBoard.lo: sci_gateway/c/sci_ClipBoard.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_ClipBoard.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo -c -o sci_gateway/c/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/c/sci_ClipBoard.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ClipBoard.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_ClipBoard.c' object='sci_gateway/c/libscigui_la-sci_ClipBoard.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/c/sci_ClipBoard.c' || echo '$(srcdir)/'`sci_gateway/c/sci_ClipBoard.c
-
 sci_gateway/c/libscigui_la-sci_toolbar.lo: sci_gateway/c/sci_toolbar.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_toolbar.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_toolbar.Tpo -c -o sci_gateway/c/libscigui_la-sci_toolbar.lo `test -f 'sci_gateway/c/sci_toolbar.c' || echo '$(srcdir)/'`sci_gateway/c/sci_toolbar.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_toolbar.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_toolbar.Plo
@@ -2065,13 +2037,6 @@ sci_gateway/c/libscigui_la-sci_progressionbar.lo: sci_gateway/c/sci_progressionb
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_progressionbar.lo `test -f 'sci_gateway/c/sci_progressionbar.c' || echo '$(srcdir)/'`sci_gateway/c/sci_progressionbar.c
 
-sci_gateway/c/libscigui_la-sci_uigetcolor.lo: sci_gateway/c/sci_uigetcolor.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_uigetcolor.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo -c -o sci_gateway/c/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/c/sci_uigetcolor.c' || echo '$(srcdir)/'`sci_gateway/c/sci_uigetcolor.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_uigetcolor.c' object='sci_gateway/c/libscigui_la-sci_uigetcolor.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/c/sci_uigetcolor.c' || echo '$(srcdir)/'`sci_gateway/c/sci_uigetcolor.c
-
 sci_gateway/c/libscigui_la-sci_getcallbackobject.lo: sci_gateway/c/sci_getcallbackobject.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscigui_la-sci_getcallbackobject.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscigui_la-sci_getcallbackobject.Tpo -c -o sci_gateway/c/libscigui_la-sci_getcallbackobject.lo `test -f 'sci_gateway/c/sci_getcallbackobject.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getcallbackobject.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscigui_la-sci_getcallbackobject.Tpo sci_gateway/c/$(DEPDIR)/libscigui_la-sci_getcallbackobject.Plo
@@ -2117,6 +2082,41 @@ sci_gateway/c/libscigui_la-sci_figure.lo: sci_gateway/c/sci_figure.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
+sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo: sci_gateway/cpp/sci_ClipBoard.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CC)$(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_ClipBoard.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/cpp/sci_ClipBoard.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_ClipBoard.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_ClipBoard.cpp' object='sci_gateway/cpp/libscigui_la-sci_ClipBoard.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_ClipBoard.lo `test -f 'sci_gateway/cpp/sci_ClipBoard.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_ClipBoard.cpp
+
+sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo: sci_gateway/cpp/sci_x_mdialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CC)$(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_mdialog.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/cpp/sci_x_mdialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_mdialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_mdialog.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_mdialog.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_mdialog.lo `test -f 'sci_gateway/cpp/sci_x_mdialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_mdialog.cpp
+
+sci_gateway/cpp/libscigui_la-sci_x_dialog.lo: sci_gateway/cpp/sci_x_dialog.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_dialog.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/cpp/sci_x_dialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_dialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_dialog.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_dialog.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_dialog.lo `test -f 'sci_gateway/cpp/sci_x_dialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_dialog.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@
+@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
+
+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
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uigetcolor.cpp' object='sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(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_uigetcolor.lo `test -f 'sci_gateway/cpp/sci_uigetcolor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uigetcolor.cpp
+
 src/cpp/libscigui_algo_la-InitUIMenu.lo: src/cpp/InitUIMenu.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigui_algo_la-InitUIMenu.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigui_algo_la-InitUIMenu.Tpo -c -o src/cpp/libscigui_algo_la-InitUIMenu.lo `test -f 'src/cpp/InitUIMenu.cpp' || echo '$(srcdir)/'`src/cpp/InitUIMenu.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigui_algo_la-InitUIMenu.Tpo src/cpp/$(DEPDIR)/libscigui_algo_la-InitUIMenu.Plo
@@ -15,6 +15,8 @@
 *
 */
 
+extern "C"
+{
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -29,6 +31,7 @@
 #include "CallClipboard.h"
 #include "os_string.h"
 #include "FigureList.h"
+}
 
 /*--------------------------------------------------------------------------*/
 int sci_ClipBoard(char *fname, void* pvApiCtx)
@@ -88,8 +91,7 @@ int sci_ClipBoard(char *fname, void* pvApiCtx)
                         return 1;
                     }
 
-                    /* TO DO a delete [] and not a FREE */
-                    FREE(output);
+                    delete[] output;
                     AssignOutputVariable(pvApiCtx, 1) = nbInputArgument(pvApiCtx) + 1;
 
                     freeAllocatedSingleString(param1);
  *
  */
 
+extern "C"
+{
 #include "gw_gui.h"
 #include "api_scilab.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "CallColorChooser.h"
+}
 
 /*--------------------------------------------------------------------------*/
 int sci_uigetcolor(char *fname, void* pvApiCtx)
@@ -332,6 +335,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -347,6 +351,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -357,6 +362,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -367,6 +373,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -389,6 +396,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -403,6 +411,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -411,6 +420,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -419,6 +429,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
             {
                 printError(&sciErr, 0);
                 Scierror(999, _("%s: Memory allocation error.\n"), fname);
+                delete[] selectedRGB;
                 return 1;
             }
 
@@ -429,6 +440,7 @@ int sci_uigetcolor(char *fname, void* pvApiCtx)
         }
     }
 
+    delete[] selectedRGB;
     ReturnArguments(pvApiCtx);
     return TRUE;
 }
@@ -14,6 +14,8 @@
  *
  */
 
+extern "C"
+{
 #include "gw_gui.h"
 #include "sci_malloc.h"
 #include "api_scilab.h"
@@ -22,6 +24,7 @@
 #include "getPropertyAssignedValue.h"
 #include "Scierror.h"
 #include "freeArrayOfString.h"
+}
 
 /*--------------------------------------------------------------------------*/
 int sci_x_choice(char *fname, void* pvApiCtx)
@@ -194,12 +197,12 @@ int sci_x_choice(char *fname, void* pvApiCtx)
         {
             printError(&sciErr, 0);
             Scierror(999, _("%s: Memory allocation error.\n"), fname);
+            delete[] userValue;
             return 1;
         }
-
-        /* TO DO : do a delete []  getMessageBoxUserSelectedButtons */
     }
 
+    delete[] userValue;
     AssignOutputVariable(pvApiCtx, 1) = nbInputArgument(pvApiCtx) + 1;
     ReturnArguments(pvApiCtx);
     return TRUE;
@@ -14,6 +14,8 @@
  *
  */
 
+extern "C"
+{
 #include "gw_gui.h"
 #include "api_scilab.h"
 #include "localization.h"
@@ -21,6 +23,7 @@
 #include "Scierror.h"
 #include "getPropertyAssignedValue.h"
 #include "freeArrayOfString.h"
+}
 /*--------------------------------------------------------------------------*/
 int sci_x_dialog(char *fname, void* pvApiCtx)
 {
@@ -127,8 +130,7 @@ int sci_x_dialog(char *fname, void* pvApiCtx)
 
         nbCol = 1;
         createMatrixOfString(pvApiCtx, nbInputArgument(pvApiCtx) + 1, userValueSize, nbCol, userValue);
-        freeArrayOfString(userValue, userValueSize);
-        /* TO DO : delete of userValue */
+        delete[] userValue;
     }
 
     AssignOutputVariable(pvApiCtx, 1) = nbInputArgument(pvApiCtx) + 1;
@@ -14,6 +14,8 @@
  *
  */
 
+extern "C"
+{
 #include "gw_gui.h"
 #include "api_scilab.h"
 #include "localization.h"
@@ -21,6 +23,8 @@
 #include "getPropertyAssignedValue.h"
 #include "Scierror.h"
 #include "freeArrayOfString.h"
+}
+
 /*--------------------------------------------------------------------------*/
 int sci_x_mdialog(char *fname, void* pvApiCtx)
 {
@@ -242,8 +246,7 @@ int sci_x_mdialog(char *fname, void* pvApiCtx)
         }
 
         createMatrixOfString(pvApiCtx, nbInputArgument(pvApiCtx) + 1, nbRowDefaultValues, nbColDefaultValues, userValue);
-        freeArrayOfString(userValue, userValueSize);
-        /* TO DO : delete of userValue */
+        delete[] userValue;
     }
 
     AssignOutputVariable(pvApiCtx, 1) = nbInputArgument(pvApiCtx) + 1;
index 0d9e28c..f596c6b 100755 (executable)
     <ClCompile Include="..\jni\Jxgetmouse.cpp" />
     <ClCompile Include="..\jni\LookAndFeelManager.cpp" />
     <ClCompile Include="messageboxoptions.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_ClipBoard.c" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_ClipBoard.cpp" />
     <ClCompile Include="..\..\sci_gateway\c\sci_delmenu.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_exportUI.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_getcallbackobject.c" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_toprint.cpp" />
     <ClCompile Include="..\..\sci_gateway\c\sci_uicontextmenu.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_uicontrol.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_uigetcolor.c" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uigetcolor.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_uigetdir.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_uigetfile.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_uigetfont.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\c\sci_x_choice.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\c\sci_x_dialog.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_x_mdialog.c" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_dialog.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_mdialog.cpp" />
     <ClCompile Include="..\jni\ScilabDisplayTree.cpp" />
     <ClCompile Include="ScilabTermination.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_figure.c" />
index 514e13e..2ba751a 100755 (executable)
     <ClCompile Include="messageboxoptions.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_ClipBoard.c">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_ClipBoard.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_delmenu.c">
     <ClCompile Include="..\..\sci_gateway\c\sci_uicontrol.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_uigetcolor.c">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uigetcolor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_uigetdir.cpp">
     <ClCompile Include="..\..\sci_gateway\c\sci_waitbar.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_x_choice.c">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_choice.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_x_choose.c">
     <ClCompile Include="..\..\sci_gateway\c\sci_x_choose_modeless.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_x_dialog.c">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_dialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_x_mdialog.c">
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_x_mdialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\jni\ScilabDisplayTree.cpp">