UIW: delete module and move the code in gui 10/12910/2
Calixte DENIZET [Mon, 14 Oct 2013 11:18:00 +0000 (13:18 +0200)]
Change-Id: I444ca442dcabc1b39cb95bedc0d21ab03fe820e4

179 files changed:
scilab/Scilab.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
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/functions/scripts/buildmacros/BuildMacros.vcxproj
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/GraphicObjectBuilder.java
scilab/modules/graphics/Gui_Import.def
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/sci_gateway/c/sci_get.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/uiwidget_Import.def [deleted file]
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/help/en_US/uiwidget/components/CHAPTER [moved from scilab/modules/uiwidget/help/en_US/components/CHAPTER with 100% similarity]
scilab/modules/gui/help/en_US/uiwidget/components/UIButton.xml [moved from scilab/modules/uiwidget/help/en_US/components/UIButton.xml with 100% similarity]
scilab/modules/gui/help/en_US/uiwidget/uiwidget.xml [moved from scilab/modules/uiwidget/help/en_US/uiwidget.xml with 100% similarity]
scilab/modules/gui/includes/UIWidget.h [moved from scilab/modules/uiwidget/includes/UIWidget.h with 78% similarity]
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/cpp/sci_createUIWidgetHandle.cpp [moved from scilab/modules/uiwidget/sci_gateway/cpp/sci_createUIWidgetHandle.cpp with 98% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_uiget.cpp [moved from scilab/modules/uiwidget/sci_gateway/cpp/sci_uiget.cpp with 98% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_uiset.cpp [moved from scilab/modules/uiwidget/sci_gateway/cpp/sci_uiset.cpp with 98% similarity]
scilab/modules/gui/sci_gateway/cpp/sci_uiwidget.cpp [moved from scilab/modules/uiwidget/sci_gateway/cpp/sci_uiwidget.cpp with 98% similarity]
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/gui/src/c/core_Import.def
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/c/uiwidget_Import.def [deleted file]
scilab/modules/gui/src/cpp/UIWidgetTools.cpp [moved from scilab/modules/uiwidget/src/cpp/UIWidgetTools.cpp with 75% similarity]
scilab/modules/gui/src/cpp/UIWidgetTools.hxx [moved from scilab/modules/uiwidget/src/cpp/UIWidgetTools.hxx with 94% similarity]
scilab/modules/gui/src/cpp/UserDataHandler.cpp [moved from scilab/modules/uiwidget/src/cpp/UserDataHandler.cpp with 92% similarity]
scilab/modules/gui/src/cpp/UserDataHandler.hxx [moved from scilab/modules/uiwidget/src/cpp/UserDataHandler.hxx with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/CSSParser.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/CSSParser.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/CSSParserException.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/CSSParserException.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/ConvertableMap.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/ConvertableMap.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/ObjectToScilabConverters.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/ObjectToScilabConverters.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/ScilabTypeConverters.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/ScilabTypeConverters.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/ScilabTypeMap.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/ScilabTypeMap.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/StringConverters.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/StringConverters.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/StringMap.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/StringMap.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/StyleParser.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/StyleParser.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIAccessTools.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIAccessTools.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIBorderFactory.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIBorderFactory.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIClassFinder.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIClassFinder.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIComponent.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIComponent.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIComponentAnnotation.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIComponentAnnotation.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UICursorFactory.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UICursorFactory.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIFakeComponent.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIFakeComponent.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UILayoutFactory.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UILayoutFactory.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIListener.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIListener.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UILocator.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UILocator.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIMethodFinder.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIMethodFinder.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIModele.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIModele.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIWidget.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIWidget.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIWidgetException.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIWidgetException.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIWidgetHandler.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIWidgetHandler.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UIWidgetTools.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UIWidgetTools.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UserData.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UserData.java with 69% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/UserDataJNI.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/UserDataJNI.java with 52% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/XMLToUIComponentConverter.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/XMLToUIComponentConverter.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/callback/CallbackParser.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/callback/CallbackParser.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/callback/UICallback.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/callback/UICallback.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/callback/UIJavaCallback.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/callback/UIJavaCallback.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/callback/UIScilabCodeCallback.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/callback/UIScilabCodeCallback.java with 93% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/callback/UIScilabFunctionCallback.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/callback/UIScilabFunctionCallback.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/callback/UIURLCallback.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/callback/UIURLCallback.java with 89% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Checkbox.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Checkbox.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Edit.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Edit.java with 93% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Frame.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Frame.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Image.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Image.java with 93% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/ListBox.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/ListBox.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Menu.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Menu.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/NoLayout.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/NoLayout.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Popupmenu.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Popupmenu.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Pushbutton.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Pushbutton.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Radiobutton.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Radiobutton.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/ScilabWidget.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/ScilabWidget.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/ScreenInfo.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/ScreenInfo.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Slider.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Slider.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Table.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Table.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/Text.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/Text.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/TextData.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/TextData.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIButton.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIButton.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UICheckbox.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UICheckbox.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIColorElement.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIColorElement.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIComboBox.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIComboBox.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIComboColor.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIComboColor.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIDialog.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIDialog.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIFocusListener.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIFocusListener.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIFrame.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIFrame.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIInfoBar.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIInfoBar.java with 89% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIKeymap.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIKeymap.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIKeystroke.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIKeystroke.java with 90% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UILaTeXLabel.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UILaTeXLabel.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UILabel.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UILabel.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UILayer.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UILayer.java with 90% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIList.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIList.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIListElement.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIListElement.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIListSpinner.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIListSpinner.java with 91% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIMenu.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIMenu.java with 93% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIMenuBar.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIMenuBar.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIMenuItem.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIMenuItem.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIMouseListener.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIMouseListener.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIMultiLineLabel.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIMultiLineLabel.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UINode.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UINode.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UINodeList.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UINodeList.java with 84% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UINumberSpinner.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UINumberSpinner.java with 97% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIPanel.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIPanel.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIPopupMenu.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIPopupMenu.java with 82% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIProgressBar.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIProgressBar.java with 90% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIRadio.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIRadio.java with 92% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIScilabPlot.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIScilabPlot.java with 98% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIScilabTab.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIScilabTab.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIScilabWindow.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIScilabWindow.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIScroll.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIScroll.java with 82% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UISeparator.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UISeparator.java with 86% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UISlider.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UISlider.java with 90% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UISplashScreen.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UISplashScreen.java with 96% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UISplit.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UISplit.java with 94% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UITab.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UITab.java with 90% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIText.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIText.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UITextarea.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UITextarea.java with 90% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UITextfield.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UITextfield.java with 95% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UIToolBar.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIToolBar.java with 91% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UITools.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UITools.java with 99% similarity]
scilab/modules/gui/src/java/org/scilab/modules/gui/uiwidget/components/UITree.java [moved from scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UITree.java with 97% similarity]
scilab/modules/gui/src/jflex/callback.jflex [moved from scilab/modules/uiwidget/src/jflex/callback.jflex with 90% similarity]
scilab/modules/gui/src/jflex/css.jflex [moved from scilab/modules/uiwidget/src/jflex/css.jflex with 97% similarity]
scilab/modules/gui/src/jni/UIWidget.cpp [new file with mode: 0644]
scilab/modules/gui/src/jni/UIWidget.giws.xml [moved from scilab/modules/uiwidget/src/jni/UIWidget.giws.xml with 97% similarity]
scilab/modules/gui/src/jni/UIWidget.hxx [new file with mode: 0644]
scilab/modules/gui/src/jni/UserData.i [moved from scilab/modules/uiwidget/src/jni/UserData.i with 81% similarity]
scilab/modules/gui/src/jni/UserData_wrap.c [moved from scilab/modules/uiwidget/src/jni/UserData_wrap.c with 66% similarity]
scilab/modules/helptools/etc/MAIN_CHAPTERS
scilab/modules/io/Makefile.in
scilab/modules/prebuildjava/build.xml
scilab/modules/types/types.vcxproj
scilab/modules/uiwidget/Makefile.am [deleted file]
scilab/modules/uiwidget/Makefile.in [deleted file]
scilab/modules/uiwidget/build.xml [deleted file]
scilab/modules/uiwidget/etc/uiwidget.quit [deleted file]
scilab/modules/uiwidget/etc/uiwidget.start [deleted file]
scilab/modules/uiwidget/help/en_US/addchapter.sce [deleted file]
scilab/modules/uiwidget/help/fr_FR/addchapter.sce [deleted file]
scilab/modules/uiwidget/help/fr_FR/components/CHAPTER [deleted file]
scilab/modules/uiwidget/help/fr_FR/components/UIButton.xml [deleted file]
scilab/modules/uiwidget/help/ja_JP/addchapter.sce [deleted file]
scilab/modules/uiwidget/help/pt_BR/addchapter.sce [deleted file]
scilab/modules/uiwidget/help/ru_RU/addchapter.sce [deleted file]
scilab/modules/uiwidget/includes/dynlib_uiwidget_scilab.h [deleted file]
scilab/modules/uiwidget/includes/gw_uiwidget.h [deleted file]
scilab/modules/uiwidget/license.txt [deleted file]
scilab/modules/uiwidget/macros/buildmacros.bat [deleted file]
scilab/modules/uiwidget/macros/buildmacros.sce [deleted file]
scilab/modules/uiwidget/macros/cleanmacros.bat [deleted file]
scilab/modules/uiwidget/sci_gateway/c/gw_uiwidget.c [deleted file]
scilab/modules/uiwidget/sci_gateway/uiwidget_gateway.xml [deleted file]
scilab/modules/uiwidget/src/java/org/scilab/modules/uiwidget/components/UIScilabCode.java [deleted file]
scilab/modules/uiwidget/src/jni/UIWidget.cpp [deleted file]
scilab/modules/uiwidget/src/jni/UIWidget.hxx [deleted file]
scilab/modules/uiwidget/tests/unit_tests/test1.tst [deleted file]
scilab/modules/uiwidget/uiwidget.iss [deleted file]
scilab/modules/uiwidget/uiwidget.vcxproj [deleted file]
scilab/modules/uiwidget/uiwidget.vcxproj.filters [deleted file]
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/files.iss

index e2044ad..2bb0d90 100644 (file)
@@ -505,8 +505,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographic_objects", "module
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules\external_objects\external_objects.vcxproj", "{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uiwidget", "modules\uiwidget\uiwidget.vcxproj", "{2EDF3A4A-737C-45A0-91C8-4190382F158E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects_java", "modules\external_objects_java\external_objects_java.vcxproj", "{C51BA525-D7C8-4385-862D-F8E67187B827}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}"
@@ -1578,16 +1576,6 @@ Global
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|Win32.Build.0 = Release|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.ActiveCfg = Release|x64
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.Build.0 = Release|x64
-<<<<<<< HEAD
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Debug|Win32.Build.0 = Debug|Win32
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Debug|x64.ActiveCfg = Debug|x64
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Debug|x64.Build.0 = Debug|x64
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Release|Win32.ActiveCfg = Release|Win32
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Release|Win32.Build.0 = Release|Win32
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Release|x64.ActiveCfg = Release|x64
-               {2EDF3A4A-737C-45A0-91C8-4190382F158E}.Release|x64.Build.0 = Release|x64
-=======
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.ActiveCfg = Debug|Win32
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.Build.0 = Debug|Win32
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.ActiveCfg = Debug|x64
@@ -1596,7 +1584,6 @@ Global
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.Build.0 = Release|Win32
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.ActiveCfg = Release|x64
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.Build.0 = Release|x64
->>>>>>> origin/master
                {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.ActiveCfg = Debug|Win32
                {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.Build.0 = Debug|Win32
                {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.ActiveCfg = Debug|x64
index 947045d..8af88ad 100644 (file)
@@ -56,7 +56,6 @@
         <pathelement location="${library.graphic_export.dir}/${library.graphic_export.name}"/>
         <pathelement location="${library.core.dir}/${library.core.name}"/>
         <pathelement location="${library.preferences.dir}/${library.preferences.name}"/>
-        <pathelement location="${library.uiwidget.dir}/${library.uiwidget.name}"/>
         <!-- Not use at build time but used for unitary tests -->
         <pathelement location="${library.javasci.dir}/${library.javasci.name}"/>
         <pathelement location="${library.javasci.dir}/${library.javasci-v1.name}"/>
index 4181e1e..f09983d 100755 (executable)
@@ -40223,7 +40223,7 @@ SCI_LDFLAGS=$(echo  $LARGEFILE_LDFLAGS  $CODECOVERAGE_LDFLAGS  $DEBUG_LDFLAGS  $
 
 
 
-ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/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/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/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/m2sci/Makefile modules/compatibility_functions/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/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/uiwidget/Makefile modules/external_objects_java/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
+ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/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/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/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/m2sci/Makefile modules/compatibility_functions/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/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 
 
 # Detection of the module for the future version of Scilab 6
@@ -41650,7 +41650,6 @@ do
     "modules/preferences/Makefile") CONFIG_FILES="$CONFIG_FILES modules/preferences/Makefile" ;;
     "modules/xml/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xml/Makefile" ;;
     "modules/external_objects/Makefile") CONFIG_FILES="$CONFIG_FILES modules/external_objects/Makefile" ;;
-    "modules/uiwidget/Makefile") CONFIG_FILES="$CONFIG_FILES modules/uiwidget/Makefile" ;;
     "modules/external_objects_java/Makefile") CONFIG_FILES="$CONFIG_FILES modules/external_objects_java/Makefile" ;;
     "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
index 6301655..67f677c 100644 (file)
@@ -1923,7 +1923,6 @@ modules/history_browser/Makefile
 modules/preferences/Makefile
 modules/xml/Makefile
 modules/external_objects/Makefile
-modules/uiwidget/Makefile
 modules/external_objects_java/Makefile
 modules/Makefile
 Makefile
index f2d0276..776b169 100644 (file)
@@ -156,8 +156,6 @@ The option is "disableUnderMode" and can be:
 <path value="$SCILAB/modules/gui/etc"/> <!-- Scilab Flexdock theme -->
 <path value="$SCILAB/modules/gui/images/icons/"/> <!-- Scilab Flexdock icons -->
 
-<path value="$SCILAB/modules/uiwidget/jar/org.scilab.modules.uiwidget.jar"/>
-
 <path value="$SCILAB/modules/preferences/jar/org.scilab.modules.preferences.jar"/>
 
 <path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar"/>
index 7eaaf06..5220aa9 100644 (file)
@@ -158,8 +158,6 @@ The option is "disableUnderMode" and can be:
     <path value="$SCILAB/modules/gui/images/icons/"/>
     <!-- Scilab Flexdock icons -->
 
-    <path value="$SCILAB/modules/uiwidget/jar/org.scilab.modules.uiwidget.jar"/>
-
     <path value="$SCILAB/modules/preferences/jar/org.scilab.modules.preferences.jar"/>
 
     <path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar"/>
index 0435d02..589167e 100644 (file)
@@ -90,7 +90,6 @@
 <module name="preferences" activate="@GUI_ENABLE@"/>
 <module name="xml" activate="yes"/>
 <module name="external_objects" activate="yes"/>
-<module name="uiwidget" activate="@GUI_ENABLE@"/>
 <module name="external_objects_java" activate="yes"/>
 </modules>
 
index fb7d618..8b9c161 100644 (file)
@@ -91,7 +91,6 @@
 <module name="preferences" activate="yes"/>
 <module name="xml" activate="yes"/>
 <module name="external_objects" activate="yes"/>
-<module name="uiwidget" activate="yes"/>
 <module name="external_objects_java" activate="yes"/>
 <module name="mpi" activate="yes"/>
 <!-- comments -->
index a50a874..84b276b 100644 (file)
@@ -89,8 +89,7 @@ history_browser \
 preferences \
 xml \
 types \
-external_objects \
-uiwidget
+external_objects
 
 if GUI
 SUBDIRS += external_objects_java
@@ -139,7 +138,6 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
-       $(top_builddir)/modules/uiwidget/libsciuiwidget.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
        $(top_builddir)/modules/helptools/libscihelptools.la
 
@@ -209,7 +207,6 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/matio/libscimatio.la \
        $(top_builddir)/modules/helptools/libscihelptools.la \
        $(top_builddir)/modules/parallel/libsciparallel.la \
-       $(top_builddir)/modules/uiwidget/libsciuiwidget.la \
        $(top_builddir)/modules/parallel/libsciparallel.la
 
 if MPI
index dccd2de..0d61619 100644 (file)
@@ -271,8 +271,8 @@ DIST_SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
        compatibility_functions helptools umfpack demo_tools \
        genetic_algorithms simulated_annealing matio atoms graph xcos \
        scinotes parallel modules_manager ui_data history_browser \
-       preferences xml types external_objects uiwidget \
-       external_objects_java scicos_blocks scicos mpi . javasci
+       preferences xml types external_objects external_objects_java \
+       scicos_blocks scicos mpi . javasci
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -580,9 +580,8 @@ SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
        compatibility_functions helptools umfpack demo_tools \
        genetic_algorithms simulated_annealing matio atoms hdf5 graph \
        xcos scinotes parallel modules_manager ui_data history_browser \
-       preferences xml types external_objects uiwidget \
-       $(am__append_1) $(am__append_2) scicos $(am__append_3) . \
-       $(am__append_4)
+       preferences xml types external_objects $(am__append_1) \
+       $(am__append_2) scicos $(am__append_3) . $(am__append_4)
 
 #### Basic files ####
 libscilab_la_rootdir = $(mydatadir)
@@ -606,7 +605,6 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/commons/libscicommons.la \
        $(top_builddir)/modules/tclsci/libscitclsci.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
-       $(top_builddir)/modules/uiwidget/libsciuiwidget.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
        $(top_builddir)/modules/helptools/libscihelptools.la
 
@@ -676,7 +674,6 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/matio/libscimatio.la \
        $(top_builddir)/modules/helptools/libscihelptools.la \
        $(top_builddir)/modules/parallel/libsciparallel.la \
-       $(top_builddir)/modules/uiwidget/libsciuiwidget.la \
        $(top_builddir)/modules/parallel/libsciparallel.la
 
 
index 4336c9e..76ad370 100644 (file)
@@ -95,7 +95,6 @@
 /* 71 */                        #include "dynamic_gateways.h" /* external_objects */
 /* 72 */                        #include "dynamic_gateways.h" /* external_objects_java */
 /* 73 */                                   #include "dynamic_gateways.h" /* MPI */
-/* 74 */                        #include "dynamic_gateways.h" /* uiwidget */
 
 /** table of interfaces **/
 
index 6463485..b6fef9b 100644 (file)
@@ -34,7 +34,7 @@ jmp_buf jmp_env;
  ** Watch out the positions are crutial !!!
  ** @TODO : Make this less crappy...
  **/
-#define INTERFACES_MAX 74
+#define INTERFACES_MAX 73
 static OpTab Interfaces[INTERFACES_MAX] =
 {
     /* 01  */ {gw_user}, /* free position may be used */
@@ -109,8 +109,7 @@ static OpTab Interfaces[INTERFACES_MAX] =
     /* 70  */ {gw_dynamic_graphic_objects},
     /* 71  */ {gw_dynamic_external_objects},
     /* 72  */ {gw_dynamic_external_objects_java},
-    /* 73  */ {gw_dynamic_mpi},
-    /* 74  */ {gw_dynamic_uiwidget}
+    /* 73  */ {gw_dynamic_mpi}
 };
 /*--------------------------------------------------------------------------*/
 /**
index fdddbe4..b38be88 100644 (file)
@@ -479,28 +479,6 @@ int gw_dynamic_external_objects(void)
                               &ptr_gw_external_objects);
 }
 /*--------------------------------------------------------------------------*/
-/* uiwidget module */
-#define UIWIDGET_MODULE_NAME "uiwidget"
-static DynLibHandle hUIWidgetLib = NULL;
-static PROC_GATEWAY ptr_gw_uiwidget = NULL;
-static char* dynlibname_uiwidget = NULL;
-static char* gatewayname_uiwidget = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_uiwidget(void)
-{
-#ifdef _MSC_VER
-    if (dynlibname_uiwidget == NULL)
-    {
-        dynlibname_uiwidget = buildModuleDynLibraryName(UIWIDGET_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-    }
-#endif
-    return gw_dynamic_generic(UIWIDGET_MODULE_NAME,
-                              &dynlibname_uiwidget,
-                              &gatewayname_uiwidget,
-                              &hUIWidgetLib,
-                              &ptr_gw_uiwidget);
-}
-/*--------------------------------------------------------------------------*/
 /* external_objects_java module */
 #define EXTERNAL_OBJECTS_JAVA_MODULE_NAME "external_objects_java"
 static DynLibHandle hExternal_Objects_JavaLib = NULL;
@@ -645,11 +623,6 @@ void freeAllDynamicGateways(void)
                        &hExternal_ObjectsLib,
                        &ptr_gw_external_objects);
 
-    freeDynamicGateway(&dynlibname_uiwidget,
-                       &gatewayname_uiwidget,
-                       &hUIWidgetLib,
-                       &ptr_gw_uiwidget);
-
     freeDynamicGateway(&dynlibname_external_objects_java,
                        &gatewayname_external_objects_java,
                        &hExternal_Objects_JavaLib,
index 2e5928d..594fce0 100644 (file)
@@ -207,8 +207,6 @@ int gw_dynamic_external_objects(void);
 
 int gw_dynamic_external_objects_java(void);
 
-int gw_dynamic_uiwidget(void);
-
 #endif /* __DYNAMIC_GATEWAYS_H__ */
 /*--------------------------------------------------------------------------*/
 
index d845ceb..a04a114 100644 (file)
@@ -127,9 +127,6 @@ exit /B 0</NMakeReBuildCommandLine>
     <None Include="loadgenlib.sce" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\uiwidget\uiwidget.vcxproj">
-      <Project>{2edf3a4a-737c-45a0-91c8-4190382f158e}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\windows_tools\src\c\CScilex\CScilex.vcxproj">
       <Project>{9ba6f7e4-ae64-4fd9-a5a7-0996a8b73b77}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
index 5ae1779..37556d1 100644 (file)
@@ -48,13 +48,13 @@ public final class GraphicObjectBuilder {
         controller.setProperty(newFID, GraphicObjectProperties.__GO_SELECTED_CHILD__, newAID);
 
         for (Integer type : props) {
-            final double[] position = new double[] {1, 1, 1};
+           final Double[] position = new Double[] {1., 1., 1.};
             String modelLabelUID = (String) controller.getProperty(axesModelUID, type);
             String pobjUID = controller.createUID().toString();
             GraphicModel.getModel().cloneObject(modelLabelUID, pobjUID);
             controller.setProperty(pobjUID, GraphicObjectProperties.__GO_POSITION__, position);
 
-            Boolean autoPosition = (Boolean ) controller.getProperty(modelLabelUID, GraphicObjectProperties.__GO_AUTO_POSITION__);
+            Boolean autoPosition = (Boolean) controller.getProperty(modelLabelUID, GraphicObjectProperties.__GO_AUTO_POSITION__);
             controller.setProperty(pobjUID, GraphicObjectProperties.__GO_AUTO_POSITION__, autoPosition);
 
             controller.setProperty(newAID, type, pobjUID);
index d7e8c7f..3ffbe4b 100644 (file)
@@ -66,3 +66,8 @@ SetUicontrolString
 SetUicontrolTooltipString
 SetUimenuLabel
 SetUiobjectEnable
+deleteUIWidget
+sci_uiget
+sci_uiset
+isValidUIWidget
+showWindowUIWidget
index e7cecbd..d96e0db 100644 (file)
 lib /DEF:"$(ProjectDir)Gui_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scigui.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -122,11 +121,10 @@ lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
 lib /DEF:"$(ProjectDir)Gui_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scigui.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -153,11 +151,10 @@ lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
 lib /DEF:"$(ProjectDir)Gui_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scigui.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -189,11 +186,10 @@ lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
 lib /DEF:"$(ProjectDir)Gui_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scigui.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)scilab_windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;scigui.lib;scilab_windows.lib;elementary_functions_f.lib;../../bin/blasplus.lib;../../bin/lapack.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
index ed94c17..e9c4668 100644 (file)
@@ -19,7 +19,7 @@
 /* desc : interface for sci_get routine                                   */
 /*------------------------------------------------------------------------*/
 #include "gw_graphics.h"
-#include "gw_uiwidget.h"
+#include "gw_gui.h"
 /*--------------------------------------------------------------------------*/
 
 #include "HandleManagement.h"
index 7b54afe..14439a5 100644 (file)
@@ -21,7 +21,6 @@
 #include <stdio.h>
 /*------------------------------------------------------------------------*/
 #include "gw_graphics.h"
-#include "gw_uiwidget.h"
 #include "stack-c.h"
 #include "Scierror.h"
 #include "HandleManagement.h"
@@ -314,12 +313,12 @@ int sci_set(char *fname, unsigned long fname_len)
             /* 'figure_style' for compatibility but do nothing */
             /* others values must return a error */
             char *propertiesSupported[NB_PROPERTIES_SUPPORTED] = { "current_entity",
-                                                                   "hdl",
-                                                                   "current_figure",
-                                                                   "current_axes",
-                                                                   "figure_style",
-                                                                   "default_values",
-                                                                   "auto_clear"
+                    "hdl",
+                    "current_figure",
+                    "current_axes",
+                    "figure_style",
+                    "default_values",
+                    "auto_clear"
                                                                  };
 
             int i = 0;
diff --git a/scilab/modules/graphics/uiwidget_Import.def b/scilab/modules/graphics/uiwidget_Import.def
deleted file mode 100644 (file)
index 0d9c8cc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-LIBRARY    sciuiwidget.dll
-
-
-EXPORTS
-;--------------------------
-; GUI
-;--------------------------
-deleteUIWidget
-isValidUIWidget
-showWindowUIWidget
-sci_uiget
-sci_uiset
index 4a3695b..159911e 100755 (executable)
@@ -58,7 +58,8 @@ src/c/CreateUimenu.c \
 src/c/checkColorRange.c \
 src/c/messageboxoptions.c \
 src/c/ScilabTermination.c \
-src/jni/ScilabTermination_wrap.c
+src/jni/ScilabTermination_wrap.c \
+src/jni/UserData_wrap.c
 
 GUI_CXX_SOURCES = \
 src/cpp/InitUIMenu.cpp \
@@ -126,6 +127,8 @@ src/cpp/UnitsConversion.cpp \
 src/cpp/GetScreenProperty.cpp \
 src/cpp/CallClipboard.cpp \
 src/cpp/exportUserInterface.cpp \
+src/cpp/UIWidgetTools.cpp \
+src/cpp/UserDataHandler.cpp \
 src/jni/LookAndFeelManager.cpp \
 src/jni/Juigetfile.cpp \
 src/cpp/CallJuigetfile.cpp \
@@ -139,7 +142,9 @@ src/jni/DatatipCreate.cpp \
 src/jni/DatatipDelete.cpp \
 src/jni/DatatipDrag.cpp \
 src/jni/DatatipSetStyle.cpp \
-src/jni/DatatipOrientation.cpp
+src/jni/DatatipOrientation.cpp \
+src/jni/UIWidget.cpp
+
 
 GIWS_WRAPPERS = \
 src/jni/SwingView.giws.xml \
@@ -216,7 +221,11 @@ sci_gateway/cpp/sci_datatipmove.cpp \
 sci_gateway/cpp/sci_datatip_set_style.cpp \
 sci_gateway/cpp/sci_datatip_set_display.cpp \
 sci_gateway/cpp/sci_datatip_set_interp.cpp \
-sci_gateway/cpp/sci_datatip_set_orient.cpp
+sci_gateway/cpp/sci_datatip_set_orient.cpp \
+sci_gateway/cpp/sci_uiwidget.cpp \
+sci_gateway/cpp/sci_uiget.cpp \
+sci_gateway/cpp/sci_uiset.cpp \
+sci_gateway/cpp/sci_createUIWidgetHandle.cpp
 
 libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/includes/ \
@@ -242,7 +251,7 @@ libscigui_la_CPPFLAGS = \
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/renderer/src/jni/ \
                        -I$(top_srcdir)/modules/renderer/src/cpp/ \
-                       -I$(top_srcdir)/modules/uiwidget/includes/ \
+                       -I$(top_srcdir)/modules/types/includes/ \
                        $(JAVA_JNI_INCLUDE) \
                        $(TCL_INC_PATH) \
                        $(Tk_INC_PATH) \
index 1b0af09..c8a9a30 100644 (file)
@@ -186,7 +186,8 @@ am__objects_1 = libscigui_algo_la-buildMainWindowTitle.lo \
        libscigui_algo_la-checkColorRange.lo \
        libscigui_algo_la-messageboxoptions.lo \
        libscigui_algo_la-ScilabTermination.lo \
-       libscigui_algo_la-ScilabTermination_wrap.lo
+       libscigui_algo_la-ScilabTermination_wrap.lo \
+       libscigui_algo_la-UserData_wrap.lo
 am__objects_2 = libscigui_algo_la-InitUIMenu.lo \
        libscigui_algo_la-CallScilabBridge.lo \
        libscigui_algo_la-Jxclick.lo libscigui_algo_la-SwingView.lo \
@@ -250,6 +251,8 @@ am__objects_2 = libscigui_algo_la-InitUIMenu.lo \
        libscigui_algo_la-GetScreenProperty.lo \
        libscigui_algo_la-CallClipboard.lo \
        libscigui_algo_la-exportUserInterface.lo \
+       libscigui_algo_la-UIWidgetTools.lo \
+       libscigui_algo_la-UserDataHandler.lo \
        libscigui_algo_la-LookAndFeelManager.lo \
        libscigui_algo_la-Juigetfile.lo \
        libscigui_algo_la-CallJuigetfile.lo \
@@ -263,7 +266,8 @@ am__objects_2 = libscigui_algo_la-InitUIMenu.lo \
        libscigui_algo_la-DatatipDelete.lo \
        libscigui_algo_la-DatatipDrag.lo \
        libscigui_algo_la-DatatipSetStyle.lo \
-       libscigui_algo_la-DatatipOrientation.lo
+       libscigui_algo_la-DatatipOrientation.lo \
+       libscigui_algo_la-UIWidget.lo
 am_libscigui_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscigui_algo_la_OBJECTS = $(am_libscigui_algo_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -310,7 +314,10 @@ am__objects_5 = libscigui_la-sci_printsetupbox.lo \
        libscigui_la-sci_datatip_set_style.lo \
        libscigui_la-sci_datatip_set_display.lo \
        libscigui_la-sci_datatip_set_interp.lo \
-       libscigui_la-sci_datatip_set_orient.lo
+       libscigui_la-sci_datatip_set_orient.lo \
+       libscigui_la-sci_uiwidget.lo libscigui_la-sci_uiget.lo \
+       libscigui_la-sci_uiset.lo \
+       libscigui_la-sci_createUIWidgetHandle.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)
@@ -710,7 +717,8 @@ src/c/CreateUimenu.c \
 src/c/checkColorRange.c \
 src/c/messageboxoptions.c \
 src/c/ScilabTermination.c \
-src/jni/ScilabTermination_wrap.c
+src/jni/ScilabTermination_wrap.c \
+src/jni/UserData_wrap.c
 
 GUI_CXX_SOURCES = \
 src/cpp/InitUIMenu.cpp \
@@ -778,6 +786,8 @@ src/cpp/UnitsConversion.cpp \
 src/cpp/GetScreenProperty.cpp \
 src/cpp/CallClipboard.cpp \
 src/cpp/exportUserInterface.cpp \
+src/cpp/UIWidgetTools.cpp \
+src/cpp/UserDataHandler.cpp \
 src/jni/LookAndFeelManager.cpp \
 src/jni/Juigetfile.cpp \
 src/cpp/CallJuigetfile.cpp \
@@ -791,7 +801,8 @@ src/jni/DatatipCreate.cpp \
 src/jni/DatatipDelete.cpp \
 src/jni/DatatipDrag.cpp \
 src/jni/DatatipSetStyle.cpp \
-src/jni/DatatipOrientation.cpp
+src/jni/DatatipOrientation.cpp \
+src/jni/UIWidget.cpp
 
 GIWS_WRAPPERS = \
 src/jni/SwingView.giws.xml \
@@ -860,7 +871,11 @@ sci_gateway/cpp/sci_datatipmove.cpp \
 sci_gateway/cpp/sci_datatip_set_style.cpp \
 sci_gateway/cpp/sci_datatip_set_display.cpp \
 sci_gateway/cpp/sci_datatip_set_interp.cpp \
-sci_gateway/cpp/sci_datatip_set_orient.cpp
+sci_gateway/cpp/sci_datatip_set_orient.cpp \
+sci_gateway/cpp/sci_uiwidget.cpp \
+sci_gateway/cpp/sci_uiget.cpp \
+sci_gateway/cpp/sci_uiset.cpp \
+sci_gateway/cpp/sci_createUIWidgetHandle.cpp
 
 libscigui_la_CPPFLAGS = \
                        -I$(srcdir)/includes/ \
@@ -886,7 +901,7 @@ libscigui_la_CPPFLAGS = \
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/renderer/src/jni/ \
                        -I$(top_srcdir)/modules/renderer/src/cpp/ \
-                       -I$(top_srcdir)/modules/uiwidget/includes/ \
+                       -I$(top_srcdir)/modules/types/includes/ \
                        $(JAVA_JNI_INCLUDE) \
                        $(TCL_INC_PATH) \
                        $(Tk_INC_PATH) \
@@ -1302,7 +1317,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-StartPlotBrowser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-SwingView.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-Toolbar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-UIWidget.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-UIWidgetTools.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-UnitsConversion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-UserDataHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-UserData_wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-Widget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-addmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-buildMainWindowTitle.Plo@am__quote@
@@ -1316,6 +1335,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-gw_gui.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_about.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_createUIWidgetHandle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_datatip_manager_mode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_datatip_set_display.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_datatip_set_interp.Plo@am__quote@
@@ -1347,13 +1367,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_toprint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uicontextmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uicontrol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uiget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uigetdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uigetfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uigetfont.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uimenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uiputfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uiset.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uiwait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_uiwidget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_unsetmenu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_usecanvas.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_la-sci_useeditor.Plo@am__quote@
@@ -1462,6 +1485,13 @@ libscigui_algo_la-ScilabTermination_wrap.lo: src/jni/ScilabTermination_wrap.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigui_algo_la-ScilabTermination_wrap.lo `test -f 'src/jni/ScilabTermination_wrap.c' || echo '$(srcdir)/'`src/jni/ScilabTermination_wrap.c
 
+libscigui_algo_la-UserData_wrap.lo: src/jni/UserData_wrap.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigui_algo_la-UserData_wrap.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-UserData_wrap.Tpo -c -o libscigui_algo_la-UserData_wrap.lo `test -f 'src/jni/UserData_wrap.c' || echo '$(srcdir)/'`src/jni/UserData_wrap.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_algo_la-UserData_wrap.Tpo $(DEPDIR)/libscigui_algo_la-UserData_wrap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/jni/UserData_wrap.c' object='libscigui_algo_la-UserData_wrap.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscigui_algo_la-UserData_wrap.lo `test -f 'src/jni/UserData_wrap.c' || echo '$(srcdir)/'`src/jni/UserData_wrap.c
+
 libscigui_disable_la-nogui.lo: src/nogui/nogui.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscigui_disable_la-nogui.lo -MD -MP -MF $(DEPDIR)/libscigui_disable_la-nogui.Tpo -c -o libscigui_disable_la-nogui.lo `test -f 'src/nogui/nogui.c' || echo '$(srcdir)/'`src/nogui/nogui.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_disable_la-nogui.Tpo $(DEPDIR)/libscigui_disable_la-nogui.Plo
@@ -2113,6 +2143,20 @@ libscigui_algo_la-exportUserInterface.lo: src/cpp/exportUserInterface.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-exportUserInterface.lo `test -f 'src/cpp/exportUserInterface.cpp' || echo '$(srcdir)/'`src/cpp/exportUserInterface.cpp
 
+libscigui_algo_la-UIWidgetTools.lo: src/cpp/UIWidgetTools.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 libscigui_algo_la-UIWidgetTools.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-UIWidgetTools.Tpo -c -o libscigui_algo_la-UIWidgetTools.lo `test -f 'src/cpp/UIWidgetTools.cpp' || echo '$(srcdir)/'`src/cpp/UIWidgetTools.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_algo_la-UIWidgetTools.Tpo $(DEPDIR)/libscigui_algo_la-UIWidgetTools.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/cpp/UIWidgetTools.cpp' object='libscigui_algo_la-UIWidgetTools.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-UIWidgetTools.lo `test -f 'src/cpp/UIWidgetTools.cpp' || echo '$(srcdir)/'`src/cpp/UIWidgetTools.cpp
+
+libscigui_algo_la-UserDataHandler.lo: src/cpp/UserDataHandler.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 libscigui_algo_la-UserDataHandler.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-UserDataHandler.Tpo -c -o libscigui_algo_la-UserDataHandler.lo `test -f 'src/cpp/UserDataHandler.cpp' || echo '$(srcdir)/'`src/cpp/UserDataHandler.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_algo_la-UserDataHandler.Tpo $(DEPDIR)/libscigui_algo_la-UserDataHandler.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/cpp/UserDataHandler.cpp' object='libscigui_algo_la-UserDataHandler.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-UserDataHandler.lo `test -f 'src/cpp/UserDataHandler.cpp' || echo '$(srcdir)/'`src/cpp/UserDataHandler.cpp
+
 libscigui_algo_la-LookAndFeelManager.lo: src/jni/LookAndFeelManager.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 libscigui_algo_la-LookAndFeelManager.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-LookAndFeelManager.Tpo -c -o libscigui_algo_la-LookAndFeelManager.lo `test -f 'src/jni/LookAndFeelManager.cpp' || echo '$(srcdir)/'`src/jni/LookAndFeelManager.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_algo_la-LookAndFeelManager.Tpo $(DEPDIR)/libscigui_algo_la-LookAndFeelManager.Plo
@@ -2211,6 +2255,13 @@ libscigui_algo_la-DatatipOrientation.lo: src/jni/DatatipOrientation.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-DatatipOrientation.lo `test -f 'src/jni/DatatipOrientation.cpp' || echo '$(srcdir)/'`src/jni/DatatipOrientation.cpp
 
+libscigui_algo_la-UIWidget.lo: src/jni/UIWidget.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 libscigui_algo_la-UIWidget.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-UIWidget.Tpo -c -o libscigui_algo_la-UIWidget.lo `test -f 'src/jni/UIWidget.cpp' || echo '$(srcdir)/'`src/jni/UIWidget.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_algo_la-UIWidget.Tpo $(DEPDIR)/libscigui_algo_la-UIWidget.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/jni/UIWidget.cpp' object='libscigui_algo_la-UIWidget.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_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigui_algo_la-UIWidget.lo `test -f 'src/jni/UIWidget.cpp' || echo '$(srcdir)/'`src/jni/UIWidget.cpp
+
 libscigui_la-sci_printsetupbox.lo: sci_gateway/cpp/sci_printsetupbox.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 libscigui_la-sci_printsetupbox.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_printsetupbox.Tpo -c -o libscigui_la-sci_printsetupbox.lo `test -f 'sci_gateway/cpp/sci_printsetupbox.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_printsetupbox.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_la-sci_printsetupbox.Tpo $(DEPDIR)/libscigui_la-sci_printsetupbox.Plo
@@ -2393,6 +2444,34 @@ libscigui_la-sci_datatip_set_orient.lo: sci_gateway/cpp/sci_datatip_set_orient.c
 @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 libscigui_la-sci_datatip_set_orient.lo `test -f 'sci_gateway/cpp/sci_datatip_set_orient.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_datatip_set_orient.cpp
 
+libscigui_la-sci_uiwidget.lo: sci_gateway/cpp/sci_uiwidget.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 libscigui_la-sci_uiwidget.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_uiwidget.Tpo -c -o libscigui_la-sci_uiwidget.lo `test -f 'sci_gateway/cpp/sci_uiwidget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiwidget.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_la-sci_uiwidget.Tpo $(DEPDIR)/libscigui_la-sci_uiwidget.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uiwidget.cpp' object='libscigui_la-sci_uiwidget.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 libscigui_la-sci_uiwidget.lo `test -f 'sci_gateway/cpp/sci_uiwidget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiwidget.cpp
+
+libscigui_la-sci_uiget.lo: sci_gateway/cpp/sci_uiget.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 libscigui_la-sci_uiget.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_uiget.Tpo -c -o libscigui_la-sci_uiget.lo `test -f 'sci_gateway/cpp/sci_uiget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiget.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_la-sci_uiget.Tpo $(DEPDIR)/libscigui_la-sci_uiget.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uiget.cpp' object='libscigui_la-sci_uiget.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 libscigui_la-sci_uiget.lo `test -f 'sci_gateway/cpp/sci_uiget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiget.cpp
+
+libscigui_la-sci_uiset.lo: sci_gateway/cpp/sci_uiset.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 libscigui_la-sci_uiset.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_uiset.Tpo -c -o libscigui_la-sci_uiset.lo `test -f 'sci_gateway/cpp/sci_uiset.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiset.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_la-sci_uiset.Tpo $(DEPDIR)/libscigui_la-sci_uiset.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uiset.cpp' object='libscigui_la-sci_uiset.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 libscigui_la-sci_uiset.lo `test -f 'sci_gateway/cpp/sci_uiset.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiset.cpp
+
+libscigui_la-sci_createUIWidgetHandle.lo: sci_gateway/cpp/sci_createUIWidgetHandle.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 libscigui_la-sci_createUIWidgetHandle.lo -MD -MP -MF $(DEPDIR)/libscigui_la-sci_createUIWidgetHandle.Tpo -c -o libscigui_la-sci_createUIWidgetHandle.lo `test -f 'sci_gateway/cpp/sci_createUIWidgetHandle.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_createUIWidgetHandle.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libscigui_la-sci_createUIWidgetHandle.Tpo $(DEPDIR)/libscigui_la-sci_createUIWidgetHandle.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_createUIWidgetHandle.cpp' object='libscigui_la-sci_createUIWidgetHandle.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 libscigui_la-sci_createUIWidgetHandle.lo `test -f 'sci_gateway/cpp/sci_createUIWidgetHandle.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_createUIWidgetHandle.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
similarity index 78%
rename from scilab/modules/uiwidget/includes/UIWidget.h
rename to scilab/modules/gui/includes/UIWidget.h
index 871fa8d..ba7e410 100644 (file)
 #define __UIWIDGET_H__
 /*--------------------------------------------------------------------------*/
 
-#include "dynlib_uiwidget_scilab.h"
-UIWIDGET_SCILAB_IMPEXP void deleteUIWidget(const long long hdl);
+#include "dynlib_gui.h"
+GUI_IMPEXP void deleteUIWidget(const long long hdl);
 
 void deleteAllUIWidget();
 
-UIWIDGET_SCILAB_IMPEXP int isValidUIWidget(const long long hdl);
+GUI_IMPEXP int isValidUIWidget(const long long hdl);
 
-UIWIDGET_SCILAB_IMPEXP void showWindowUIWidget(const long long hdl);
+GUI_IMPEXP void showWindowUIWidget(const long long hdl);
 
 /*--------------------------------------------------------------------------*/
 #endif /* __UIWIDGET_H__ */
index 42c8834..cdfb37d 100755 (executable)
@@ -66,6 +66,10 @@ GUI_IMPEXP int sci_datatip_set_style(char *fname, unsigned long fname_len);
 GUI_IMPEXP int sci_datatip_set_display(char *fname, unsigned long fname_len);
 GUI_IMPEXP int sci_datatip_set_interp(char *fname, unsigned long fname_len);
 GUI_IMPEXP int sci_datatip_set_orient(char *fname, unsigned long fname_len);
+GUI_IMPEXP int sci_uiwidget(char *fname, unsigned long fname_len);
+GUI_IMPEXP int sci_uiget(char *fname, unsigned long fname_len);
+GUI_IMPEXP int sci_uiset(char *fname, unsigned long fname_len);
+GUI_IMPEXP int sci_createUIWidgetHandle(char *fname, unsigned long fname_len);
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_GUI__ */
 /*--------------------------------------------------------------------------*/
index 3c1167b..e8bfda0 100755 (executable)
@@ -73,7 +73,11 @@ static gw_generic_table Tab[] =
     {sci_datatip_set_style, "datatipSetStyle"},
     {sci_datatip_set_display, "datatipSetDisplay"},
     {sci_datatip_set_interp, "datatipSetInterp"},
-    {sci_datatip_set_orient, "datatipSetOrientation"}
+    {sci_datatip_set_orient, "datatipSetOrientation"},
+    {sci_uiwidget, "uiwidget"},
+    {sci_uiget, "uiget"},
+    {sci_uiset, "uiset"},
+    {sci_createUIWidgetHandle, "createUIWidgetHandle"}
 };
 /*--------------------------------------------------------------------------*/
 int gw_gui(void)
@@ -97,6 +101,7 @@ int gw_gui(void)
      */
     if (!loadedDep && (strcmp(Tab[Fin - 1].name, "uicontrol") == 0
                        || strcmp(Tab[Fin - 1].name, "uimenu") == 0
+                       || strcmp(Tab[Fin - 1].name, "uiwidget") == 0
                        || strcmp(Tab[Fin - 1].name, "usecanvas") == 0))
     {
         loadOnUseClassPath("graphics");
index bc0f861..ffe89a8 100644 (file)
@@ -33,7 +33,6 @@
 #include "CurrentFigure.h"
 #include "BuildObjects.h"
 #include "api_scilab.h"
-#include "gw_uiwidget.h" // UIWidget
 
 /* DO NOT CHANGE ORDER !! */
 static const char* propertiesNames[] =
@@ -302,7 +301,7 @@ int sci_uicontrol(char *fname, unsigned long fname_len)
                 if (hParent < 0)
                 {
                     // UIWidget
-                    return sci_uiwidget(fname, fname_len);
+                    //return sci_uiwidget(fname, fname_len);
                 }
 
                 pParentUID = (char*)getObjectFromHandle((long)hParent);
@@ -16,7 +16,7 @@
 
 extern "C"
 {
-#include "gw_uiwidget.h"
+#include "gw_gui.h"
 #include "api_scilab.h"
 #include "localization.h"
 #include "Scierror.h"
@@ -27,7 +27,7 @@ extern "C"
 #include "stricmp.h"
 }
 
-using namespace org_scilab_modules_uiwidget;
+using namespace org_scilab_modules_gui_uiwidget;
 
 /*--------------------------------------------------------------------------*/
 int sci_uiget(char *fname, unsigned long fname_len)
@@ -19,7 +19,7 @@
 
 extern "C"
 {
-#include "gw_uiwidget.h"
+#include "gw_gui.h"
 #include "api_scilab.h"
 #include "localization.h"
 #include "Scierror.h"
@@ -30,7 +30,7 @@ extern "C"
 #include "stricmp.h"
 }
 
-using namespace org_scilab_modules_uiwidget;
+using namespace org_scilab_modules_gui_uiwidget;
 
 /*--------------------------------------------------------------------------*/
 int sci_uiset(char *fname, unsigned long fname_len)
@@ -17,7 +17,7 @@
 
 extern "C"
 {
-#include "gw_uiwidget.h"
+#include "gw_gui.h"
 #include "api_scilab.h"
 #include "localization.h"
 #include "Scierror.h"
@@ -28,7 +28,7 @@ extern "C"
 #include "stricmp.h"
 }
 
-using namespace org_scilab_modules_uiwidget;
+using namespace org_scilab_modules_gui_uiwidget;
 
 /*--------------------------------------------------------------------------*/
 int sci_uiwidget(char * fname, unsigned long fname_len)
index 027f560..c18e18b 100644 (file)
@@ -80,4 +80,8 @@
     <PRIMITIVE gatewayId="25" primitiveId="47" primitiveName="datatipSetDisplay" />
     <PRIMITIVE gatewayId="25" primitiveId="48" primitiveName="datatipSetInterp" />
     <PRIMITIVE gatewayId="25" primitiveId="49" primitiveName="datatipSetOrientation" />
+    <PRIMITIVE gatewayId="25" primitiveId="50" primitiveName="uiwidget" />
+    <PRIMITIVE gatewayId="25" primitiveId="51" primitiveName="uiget" />
+    <PRIMITIVE gatewayId="25" primitiveId="52" primitiveName="uiset" />
+    <PRIMITIVE gatewayId="25" primitiveId="53" primitiveName="createUIWidgetHandle" />
 </GATEWAY>
index 38e0fa5..5f83cef 100644 (file)
@@ -35,3 +35,6 @@ vartype_
 vstk_
 MyHeapAlloc
 MyHeapFree
+GetDataSize
+GetData
+sciReturnUserData
index 63adb77..be4c409 100755 (executable)
@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../uiwidget/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -113,7 +112,7 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../uiwidget/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -122,11 +121,10 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -140,7 +138,7 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../uiwidget/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -151,11 +149,10 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -174,7 +171,7 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../uiwidget/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,11 +182,10 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <PreLinkEvent>
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciuiwidget.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core.lib;sciuiwidget.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -202,6 +198,7 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_createUIWidgetHandle.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatipmove.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_set_display.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_set_interp.cpp" />
@@ -210,6 +207,9 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_toggle.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_manager_mode.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_plotbrowser.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uiget.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uiset.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uiwidget.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_useeditor.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_fire_closing_finished.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_openged.cpp" />
@@ -218,6 +218,8 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile Include="..\cpp\GetConsoleShowHiddenHandles.cpp" />
     <ClCompile Include="..\cpp\GetUicontrolTooltipString.cpp" />
     <ClCompile Include="..\cpp\SetConsoleShowHiddenHandles.cpp" />
+    <ClCompile Include="..\cpp\UIWidgetTools.cpp" />
+    <ClCompile Include="..\cpp\UserDataHandler.cpp" />
     <ClCompile Include="..\jni\DatatipCreate.cpp" />
     <ClCompile Include="..\jni\DatatipSetStyle.cpp" />
     <ClCompile Include="..\jni\DatatipDelete.cpp" />
@@ -230,6 +232,8 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile Include="..\jni\ScilabTermination_wrap.c" />
     <ClCompile Include="..\jni\StartPlotBrowser.cpp" />
     <ClCompile Include="..\jni\SwingView.cpp" />
+    <ClCompile Include="..\jni\UIWidget.cpp" />
+    <ClCompile Include="..\jni\UserData_wrap.c" />
     <ClCompile Include="addmenu.c" />
     <ClCompile Include="buildMainWindowTitle.c" />
     <ClCompile Include="..\cpp\CallClipboard.cpp" />
@@ -353,7 +357,6 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <None Include="..\..\gui.iss" />
     <None Include="..\..\sci_gateway\gui_gateway.xml" />
     <None Include="..\..\Makefile.am" />
-    <None Include="uiwidget_Import.def" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="gui.rc" />
@@ -404,6 +407,9 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
       <Project>{c456d5b8-8a32-496a-a2ee-164b0d734126}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\types\types.vcxproj">
+      <Project>{626b9142-13a1-4765-a072-fb08952e7bb8}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\windows_tools\src\c\scilab_windows\scilab_windows.vcxproj">
       <Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -477,6 +483,8 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClInclude Include="..\..\includes\TerminateGui.h" />
     <ClInclude Include="..\..\includes\Toolbar.h" />
     <ClInclude Include="..\..\includes\Widget.h" />
+    <ClInclude Include="..\cpp\UIWidgetTools.hxx" />
+    <ClInclude Include="..\cpp\UserDataHandler.hxx" />
     <ClInclude Include="..\jni\DatatipCreate.hxx" />
     <ClInclude Include="..\jni\DatatipSetStyle.hxx" />
     <ClInclude Include="..\jni\DatatipDelete.hxx" />
@@ -554,6 +562,7 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClInclude Include="..\jni\StartPlotBrowser.hxx" />
     <ClInclude Include="..\jni\SwingView.hxx" />
     <ClInclude Include="..\jni\UIElementMapper.hxx" />
+    <ClInclude Include="..\jni\UIWidget.hxx" />
     <ClInclude Include="buildMainWindowTitle.h" />
     <ClInclude Include="checkColorRange.h" />
     <ClInclude Include="CreateUIControl.h" />
@@ -568,4 +577,4 @@ lib /DEF:"$(ProjectDir)uiwidget_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 186ea75..b4dc500 100755 (executable)
     <ClCompile Include="..\jni\DatatipOrientation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\jni\UIWidget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_createUIWidgetHandle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uiget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uiset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_uiwidget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\jni\UserData_wrap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\UIWidgetTools.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cpp\UserDataHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="core_import.def">
     <None Include="..\..\locales\gui.pot">
       <Filter>localization</Filter>
     </None>
-    <None Include="uiwidget_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="gui.rc">
     <ClInclude Include="..\jni\DatatipOrientation.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\jni\UIWidget.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cpp\UIWidgetTools.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cpp\UserDataHandler.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/gui/src/c/uiwidget_Import.def b/scilab/modules/gui/src/c/uiwidget_Import.def
deleted file mode 100644 (file)
index 94eb00c..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY    sciuiwidget.dll
-
-
-EXPORTS
-;
-sci_uiwidget
\ No newline at end of file
@@ -1,6 +1,6 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Scilab Enterprises
+ * Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
  *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
@@ -20,7 +20,7 @@ extern "C"
 #include "getScilabJavaVM.h"
 }
 
-namespace org_scilab_modules_uiwidget
+namespace org_scilab_modules_gui_uiwidget
 {
 
 bool UIWidgetTools::isUIWidget(int * addr, void * pvApiCtx)
@@ -59,20 +59,20 @@ int UIWidgetTools::createOnScilabStack(const int uid, const int pos, void * pvAp
 
 void deleteUIWidget(const long long hdl)
 {
-    org_scilab_modules_uiwidget::UIWidget::uidelete(getScilabJavaVM(), (int)(-hdl - 1));
+    org_scilab_modules_gui_uiwidget::UIWidget::uidelete(getScilabJavaVM(), (int)(-hdl - 1));
 }
 
 void deleteAllUIWidget()
 {
-    org_scilab_modules_uiwidget::UIWidget::uideleteAll(getScilabJavaVM());
+    org_scilab_modules_gui_uiwidget::UIWidget::uideleteAll(getScilabJavaVM());
 }
 
 int isValidUIWidget(const long long hdl)
 {
-    return org_scilab_modules_uiwidget::UIWidget::uiisValid(getScilabJavaVM(), (int)(-hdl - 1)) ? 1 : 0;
+    return org_scilab_modules_gui_uiwidget::UIWidget::uiisValid(getScilabJavaVM(), (int)(-hdl - 1)) ? 1 : 0;
 }
 
 void showWindowUIWidget(const long long hdl)
 {
-    org_scilab_modules_uiwidget::UIWidget::uishowWindow(getScilabJavaVM(), (int)(-hdl - 1));
+    org_scilab_modules_gui_uiwidget::UIWidget::uishowWindow(getScilabJavaVM(), (int)(-hdl - 1));
 }
@@ -15,7 +15,7 @@
 
 #include <cstring>
 
-namespace org_scilab_modules_uiwidget
+namespace org_scilab_modules_gui_uiwidget
 {
 
 class UIWidgetTools
@@ -1,6 +1,6 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Scilab Enterprises
+ * Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
  *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
@@ -17,7 +17,7 @@ extern "C"
 #include "returnProperty.h"
 }
 
-namespace org_scilab_modules_uiwidget
+namespace org_scilab_modules_gui_uiwidget
 {
 
 UserDataHandler::UserDataMap UserDataHandler::map;
@@ -85,5 +85,5 @@ void UserDataHandler::remove(const int uid)
 
 void removeUIWidgetUserData(const int uid)
 {
-    org_scilab_modules_uiwidget::UserDataHandler::remove(uid);
+    org_scilab_modules_gui_uiwidget::UserDataHandler::remove(uid);
 }
@@ -21,7 +21,7 @@ extern "C"
     void removeUIWidgetUserData(const int uid);
 }
 
-namespace org_scilab_modules_uiwidget
+namespace org_scilab_modules_gui_uiwidget
 {
 
 /**
@@ -1,10 +1,10 @@
 /* The following code was generated by JFlex 1.4.3 on 22/11/12 18:50 */
 
-// jflex --nobak -d ../java/org/scilab/modules/uiwidget/ css.jflex
+// jflex --nobak -d ../java/org.scilab.modules.gui.uiwidget/ css.jflex
 
 //CHECKSTYLE:OFF
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.io.File;
 import java.io.FileReader;
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.Color;
 import java.awt.Cursor;
@@ -34,7 +34,7 @@ import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.Size;
 import org.scilab.modules.types.ScilabHandle;
 import org.scilab.modules.types.ScilabStackPutter;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * Class to provide easy way to convert a Java object into a Scilab variable and to put the result
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.Color;
 import java.awt.Cursor;
@@ -49,17 +49,17 @@ import org.scilab.modules.gui.events.callback.ScilabCallBack;
 import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 import org.scilab.modules.gui.utils.Size;
-import org.scilab.modules.uiwidget.components.UIButton;
-import org.scilab.modules.uiwidget.components.UILabel;
-import org.scilab.modules.uiwidget.components.UIMenuItem;
-import org.scilab.modules.uiwidget.components.UIPanel;
-import org.scilab.modules.uiwidget.components.UIProgressBar;
-import org.scilab.modules.uiwidget.components.UISlider;
-import org.scilab.modules.uiwidget.components.UISplit;
-import org.scilab.modules.uiwidget.components.UITab;
-import org.scilab.modules.uiwidget.components.UITextfield;
-import org.scilab.modules.uiwidget.components.UIToolBar;
-import org.scilab.modules.uiwidget.components.UITools;
+import org.scilab.modules.gui.uiwidget.components.UIButton;
+import org.scilab.modules.gui.uiwidget.components.UILabel;
+import org.scilab.modules.gui.uiwidget.components.UIMenuItem;
+import org.scilab.modules.gui.uiwidget.components.UIPanel;
+import org.scilab.modules.gui.uiwidget.components.UIProgressBar;
+import org.scilab.modules.gui.uiwidget.components.UISlider;
+import org.scilab.modules.gui.uiwidget.components.UISplit;
+import org.scilab.modules.gui.uiwidget.components.UITab;
+import org.scilab.modules.gui.uiwidget.components.UITextfield;
+import org.scilab.modules.gui.uiwidget.components.UIToolBar;
+import org.scilab.modules.gui.uiwidget.components.UITools;
 
 /**
  * Main class which handle conversion between String and basic Java objects
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -22,8 +22,8 @@ import javax.swing.JPopupMenu;
 import javax.swing.SwingUtilities;
 
 import org.scilab.modules.types.ScilabType;
-import org.scilab.modules.uiwidget.components.TextData;
-import org.scilab.modules.uiwidget.components.UIKeymap;
+import org.scilab.modules.gui.uiwidget.components.TextData;
+import org.scilab.modules.gui.uiwidget.components.UIKeymap;
 
 /**
  * Tools to access to the UIComponents and their properties
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -25,7 +25,7 @@ import javax.swing.border.Border;
 import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
 
-import org.scilab.modules.uiwidget.components.UITools;
+import org.scilab.modules.gui.uiwidget.components.UITools;
 
 /**
  * Border Factory
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -58,12 +58,12 @@ import org.scilab.modules.commons.ScilabCommonsUtils;
 import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
 import org.scilab.modules.gui.utils.ScilabRelief;
 import org.scilab.modules.types.ScilabType;
-import org.scilab.modules.uiwidget.callback.UICallback;
-import org.scilab.modules.uiwidget.components.NoLayout;
-import org.scilab.modules.uiwidget.components.UIFocusListener;
-import org.scilab.modules.uiwidget.components.UIMouseListener;
-import org.scilab.modules.uiwidget.components.UITab;
-import org.scilab.modules.uiwidget.components.UITools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.components.NoLayout;
+import org.scilab.modules.gui.uiwidget.components.UIFocusListener;
+import org.scilab.modules.gui.uiwidget.components.UIMouseListener;
+import org.scilab.modules.gui.uiwidget.components.UITab;
+import org.scilab.modules.gui.uiwidget.components.UITools;
 import org.xml.sax.Attributes;
 
 /**
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import javax.swing.BoxLayout;
 
-import org.scilab.modules.uiwidget.components.NoLayout;
+import org.scilab.modules.gui.uiwidget.components.NoLayout;
 
 /**
  * LayoutManager factory
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.Component;
 import java.awt.Frame;
@@ -331,7 +331,7 @@ public class UIWidget {
 
         final UIComponent ui;
         if (style.length == 1) {
-            ui = UIComponent.getUIComponent("org.scilab.modules.uiwidget.components", style[0], attributes, parent, null);
+            ui = UIComponent.getUIComponent("org.scilab.modules.gui.uiwidget.components", style[0], attributes, parent, null);
         } else {
             ui = null;
             // TODO: gerer les modeles correctement en ajoutant le ScilabTypeMap au StringMap deja defini
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.awt.Component;
 import java.io.File;
@@ -24,7 +24,7 @@ import javax.swing.JComponent;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.gui.utils.WebBrowser;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * Few tools
@@ -1,16 +1,16 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.10
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 public class UserData {
-    public static void removeUIWidgetUserData(int uid) {
-        UserDataJNI.removeUIWidgetUserData(uid);
-    }
+  public static void removeUIWidgetUserData(int uid) {
+    UserDataJNI.removeUIWidgetUserData(uid);
+  }
 
 }
@@ -1,23 +1,23 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.10
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 public class UserDataJNI {
 
-    static {
-        try {
-            System.loadLibrary("sciuiwidget");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native library failed to load. \n" + e);
-            System.exit(1);
-        }
+  static {
+    try {
+        System.loadLibrary("scigui");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native library failed to load. \n" + e);
+      System.exit(1);
     }
+  }
 
-    public final static native void removeUIWidgetUserData(int jarg1);
+  public final static native void removeUIWidgetUserData(int jarg1);
 }
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,7 +27,7 @@ import java.util.Stack;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.scilab.modules.uiwidget.components.TextData;
+import org.scilab.modules.gui.uiwidget.components.TextData;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
@@ -60,7 +60,7 @@ public class XMLToUIComponentConverter extends DefaultHandler {
         this.stackFake = new Stack<UIFakeComponent>();
         this.buffer = new StringBuilder(128);
 
-        registerURI("http://forge.scilab.org/uicontrol2", "org.scilab.modules.uiwidget.components");
+        registerURI("http://forge.scilab.org/uicontrol2", "org.scilab.modules.gui.uiwidget.components");
     }
 
     /**
@@ -1,10 +1,10 @@
 /* The following code was generated by JFlex 1.4.3 on 15/06/13 17:56 */
 
-// jflex --nobak -d ../java/org/scilab/modules/uiwidget/callback callback.jflex
+// jflex --nobak -d ../java/org.scilab.modules.gui.uiwidget/callback callback.jflex
 
 //CHECKSTYLE:OFF
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import java.io.IOException;
 import java.io.StringReader;
  *
  */
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import org.scilab.modules.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponent;
 
 public abstract class UICallback implements ActionListener {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import java.awt.Component;
 import java.lang.reflect.Method;
@@ -18,7 +18,7 @@ import java.lang.reflect.Modifier;
 
 import javax.swing.JComponent;
 
-import org.scilab.modules.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponent;
 
 public class UIJavaCallback extends UICallback {
 
  *
  */
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
-import org.scilab.modules.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponent;
 
 public class UIScilabCodeCallback extends UICallback {
 
  *
  */
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import org.scilab.modules.action_binding.InterpreterManagement;
-import org.scilab.modules.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponent;
 
 public class UIScilabFunctionCallback extends UICallback {
 
  *
  */
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import org.scilab.modules.gui.utils.WebBrowser;
-import org.scilab.modules.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponent;
 
 public class UIURLCallback extends UICallback {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import javax.swing.JCheckBox;
 
 import org.scilab.modules.gui.utils.ScilabAlignment;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Checkbox extends ScilabWidget {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 
@@ -19,8 +19,8 @@ import javax.swing.JTextField;
 
 import org.scilab.modules.gui.utils.ScilabAlignment;
 import org.scilab.modules.gui.utils.ScilabRelief;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Edit extends ScilabWidget {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Component;
 import java.awt.GridBagConstraints;
@@ -21,8 +21,8 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
 import org.scilab.modules.gui.utils.ScilabRelief;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Frame extends ScilabWidget {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -22,9 +22,9 @@ import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 
 import org.scilab.modules.gui.utils.ScilabRelief;
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Image extends ScilabWidget {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Point;
 import java.awt.event.AdjustmentListener;
@@ -24,8 +24,8 @@ import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 
 import org.scilab.modules.gui.utils.ScilabRelief;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class ListBox extends ScilabWidget {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Container;
 import java.awt.event.MouseAdapter;
@@ -23,11 +23,11 @@ import javax.swing.JMenuItem;
 import javax.swing.KeyStroke;
 
 import org.scilab.modules.types.ScilabList;
-import org.scilab.modules.uiwidget.ScilabTypeConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.ScilabTypeConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * Wrapper for uicontrol menu
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionListener;
 
 import javax.swing.JComboBox;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Popupmenu extends ScilabWidget {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 
 import org.scilab.modules.gui.bridge.pushbutton.SwingScilabPushButton;
 import org.scilab.modules.gui.utils.ScilabRelief;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Pushbutton extends ScilabWidget {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import javax.swing.JRadioButton;
 
 import org.scilab.modules.gui.utils.ScilabAlignment;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Radiobutton extends ScilabWidget {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.geom.Rectangle2D;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.ScilabRelief;
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Rectangle;
 import java.awt.event.AdjustmentEvent;
@@ -20,9 +20,9 @@ import java.awt.event.ComponentEvent;
 
 import org.scilab.modules.gui.bridge.slider.SwingScilabSlider;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Slider extends ScilabWidget {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -34,8 +34,8 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.JTableHeader;
 
 import org.scilab.modules.gui.utils.ScilabAlignment;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Table extends ScilabWidget {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import javax.swing.SwingUtilities;
 
 import org.scilab.modules.gui.bridge.label.SwingScilabLabel;
 import org.scilab.modules.gui.utils.ScilabRelief;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class Text extends ScilabWidget {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Text data
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -27,12 +27,12 @@ import javax.swing.KeyStroke;
 
 import org.flexdock.view.Titlebar;
 
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JButton wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 import java.util.Map;
@@ -19,12 +19,12 @@ import javax.swing.AbstractAction;
 import javax.swing.Icon;
 import javax.swing.JCheckBox;
 
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JCheckBox wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -20,9 +20,9 @@ import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for color element to put in a combo
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -27,10 +27,10 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JComboBox wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -27,10 +27,10 @@ import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
 
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
 
 /**
  * Wrapper for a JComboBox used to select a color
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -26,11 +26,11 @@ import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JMenuBar;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JDialog wrapper
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Component;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.UIListener;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.UIListener;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * FocusListener wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -24,11 +24,11 @@ import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JMenuBar;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JFrame wrapper
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import org.scilab.modules.gui.textbox.ScilabTextBox;
 import org.scilab.modules.gui.textbox.TextBox;
 import org.scilab.modules.gui.bridge.textbox.SwingScilabTextBox;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class UIInfoBar extends UIComponent {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -20,8 +20,8 @@ import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for a keymap object
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 
@@ -18,10 +18,10 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.KeyStroke;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
 
 /**
  * KeyStroke wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -27,9 +27,9 @@ import org.scilab.forge.jlatexmath.TeXFormula;
 import org.scilab.forge.jlatexmath.TeXIcon;
 
 import org.scilab.modules.commons.ScilabCommonsUtils;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Label with LaTeX wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Cursor;
@@ -24,10 +24,10 @@ import javax.swing.Icon;
 import javax.swing.JLabel;
 
 import org.scilab.modules.gui.utils.WebBrowser;
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * JLabel wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -18,9 +18,9 @@ import java.awt.Component;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for a kind of component stack
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -30,10 +30,10 @@ import javax.swing.JList;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JList wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -18,9 +18,9 @@ import java.awt.Font;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for list element to put in a UIList
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,10 +20,10 @@ import javax.swing.SpinnerListModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JSpinner wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -19,11 +19,11 @@ import javax.swing.Icon;
 import javax.swing.JMenu;
 import javax.swing.KeyStroke;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JMenu wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
@@ -18,8 +18,8 @@ import javax.swing.JMenuBar;
 import org.scilab.modules.gui.menubar.ScilabMenuBar;
 import org.scilab.modules.gui.menubar.MenuBar;
 import org.scilab.modules.gui.bridge.menubar.SwingScilabMenuBar;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * JMenuBar wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -21,11 +21,11 @@ import javax.swing.JMenuItem;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.KeyStroke;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JMenuItem wrapper
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.UIListener;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.UIListener;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * Various mouse Listeners wrappers
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 
 import javax.swing.JLabel;
 import javax.swing.JTextPane;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for a multiline label (in fact a JTextPane)
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -23,9 +23,9 @@ import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for a JTree node
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class UINodeList extends UIComponent {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,11 +21,11 @@ import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JSpinner wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -38,12 +38,12 @@ import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIAccessTools;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UILayoutFactory;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIAccessTools;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UILayoutFactory;
 
 /**
  * JPanel wrapper
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.Map;
 
 import javax.swing.JPopupMenu;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class UIPopupMenu extends UIComponent {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.Map;
 
@@ -19,11 +19,11 @@ import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JProgressBar wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.ActionEvent;
 import java.util.Map;
@@ -19,12 +19,12 @@ import javax.swing.AbstractAction;
 import javax.swing.Icon;
 import javax.swing.JRadioButton;
 
-import org.scilab.modules.uiwidget.StringConverters;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JRadioButton wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -48,11 +48,11 @@ import javax.swing.event.AncestorListener;
 import org.scilab.forge.scirenderer.Canvas;
 import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UILayoutFactory;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UILayoutFactory;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
 
 import org.scilab.modules.graphic_objects.GraphicObjectBuilder;
 import org.scilab.modules.graphic_objects.ScilabNativeView;
@@ -67,7 +67,7 @@ import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvasImpl;
 import org.scilab.modules.gui.events.GlobalEventWatcher;
 import org.scilab.modules.gui.events.ScilabEventListener;
 import org.scilab.modules.renderer.JoGLView.DrawerVisitor;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 public class UIScilabPlot extends UIComponent implements GraphicView {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -25,10 +25,10 @@ import org.flexdock.docking.DockingManager;
 import org.flexdock.docking.event.DockingEvent;
 import org.flexdock.view.Titlebar;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UILocator;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UILocator;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -27,11 +27,11 @@ import javax.swing.JMenuBar;
 import org.flexdock.docking.DockingManager;
 import org.flexdock.docking.activation.ActiveDockableTracker;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
 import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.Map;
 
 import javax.swing.JScrollPane;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class UIScroll extends UIComponent {
 
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.Map;
 
 import javax.swing.JSeparator;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * JSeparator wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.util.Map;
 
@@ -19,11 +19,11 @@ import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 public class UISlider extends UIComponent {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -38,9 +38,9 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * Wrapper for a splash screen component
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -22,10 +22,10 @@ import javax.swing.JComponent;
 import javax.swing.JSplitPane;
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 
-import org.scilab.modules.uiwidget.UIAccessTools;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIAccessTools;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class UISplit extends UIComponent {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Component;
 import java.awt.LayoutManager;
@@ -22,10 +22,10 @@ import javax.swing.JTabbedPane;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ChangeEvent;
 
-import org.scilab.modules.uiwidget.UIAccessTools;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIAccessTools;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 import javax.swing.event.AncestorListener;
 import javax.swing.event.AncestorEvent;
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Container;
@@ -27,11 +27,11 @@ import javax.swing.text.Document;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JEditorPane wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Container;
@@ -19,9 +19,9 @@ import java.util.Map;
 
 import javax.swing.JTextArea;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 public class UITextarea extends UIComponent {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -25,11 +25,11 @@ import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JTextField wrapper
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import javax.swing.JToolBar;
 
 import org.scilab.modules.gui.toolbar.ScilabToolBar;
 import org.scilab.modules.gui.toolbar.ToolBar;
 import org.scilab.modules.gui.bridge.toolbar.SwingScilabToolBar;
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
 
 /**
  * ToolBar wrapper
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -35,7 +35,7 @@ import javax.swing.AbstractButton;
 import javax.swing.Icon;
 import javax.swing.UIManager;
 
-import org.scilab.modules.uiwidget.StringConverters;
+import org.scilab.modules.gui.uiwidget.StringConverters;
 
 public class UITools {
 
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.uiwidget.components;
+package org.scilab.modules.gui.uiwidget.components;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -33,11 +33,11 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import org.scilab.modules.uiwidget.UIComponent;
-import org.scilab.modules.uiwidget.UIComponentAnnotation;
-import org.scilab.modules.uiwidget.UIWidgetException;
-import org.scilab.modules.uiwidget.UIWidgetTools;
-import org.scilab.modules.uiwidget.callback.UICallback;
+import org.scilab.modules.gui.uiwidget.UIComponent;
+import org.scilab.modules.gui.uiwidget.UIComponentAnnotation;
+import org.scilab.modules.gui.uiwidget.UIWidgetException;
+import org.scilab.modules.gui.uiwidget.UIWidgetTools;
+import org.scilab.modules.gui.uiwidget.callback.UICallback;
 
 /**
  * JTree wrapper
@@ -1,8 +1,8 @@
-// jflex --nobak -d ../java/org/scilab/modules/uiwidget/callback callback.jflex
+// jflex --nobak -d ../java/org/scilab/modules/gui/uiwidget/callback callback.jflex
 
 //CHECKSTYLE:OFF
 
-package org.scilab.modules.uiwidget.callback;
+package org.scilab.modules.gui.uiwidget.callback;
 
 import java.io.IOException;
 import java.io.StringReader;
similarity index 97%
rename from scilab/modules/uiwidget/src/jflex/css.jflex
rename to scilab/modules/gui/src/jflex/css.jflex
index d1ff5cd..c7bb057 100644 (file)
@@ -1,8 +1,8 @@
-// jflex --nobak -d ../java/org/scilab/modules/uiwidget/ css.jflex
+// jflex --nobak -d ../java/org/scilab/modules/gui/uiwidget/ css.jflex
 
 //CHECKSTYLE:OFF
 
-package org.scilab.modules.uiwidget;
+package org.scilab.modules.gui.uiwidget;
 
 import java.io.IOException;
 import java.io.File;
diff --git a/scilab/modules/gui/src/jni/UIWidget.cpp b/scilab/modules/gui/src/jni/UIWidget.cpp
new file mode 100644 (file)
index 0000000..b206289
--- /dev/null
@@ -0,0 +1,465 @@
+#include "UIWidget.hxx"
+/* Generated by GIWS (version 2.0.2) with command:
+giws -e -f UIWidget.giws.xml 
+*/
+/*
+
+This is generated code.
+
+This software is a computer program whose purpose is to hide the complexity
+of accessing Java objects/methods from C++ code.
+
+This software is governed by the CeCILL-B license under French law and
+abiding by the rules of distribution of free software.  You can  use,
+modify and/ or redistribute the software under the terms of the CeCILL-B
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and,  more generally, to use and operate it in the
+same conditions as regards security.
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL-B license and that you accept its terms.
+*/
+
+namespace org_scilab_modules_gui_uiwidget {
+
+                // Static declarations (if any)
+                
+// Returns the current env
+
+JNIEnv * UIWidget::getCurrentEnv() {
+JNIEnv * curEnv = NULL;
+jint res=this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+if (res != JNI_OK) {
+throw GiwsException::JniException(getCurrentEnv());
+}
+return curEnv;
+}
+// Destructor
+
+UIWidget::~UIWidget() {
+JNIEnv * curEnv = NULL;
+this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+curEnv->DeleteGlobalRef(this->instance);
+curEnv->DeleteGlobalRef(this->instanceClass);
+}
+// Constructors
+UIWidget::UIWidget(JavaVM * jvm_) {
+jmethodID constructObject = NULL ;
+jobject localInstance ;
+jclass localClass ;
+
+const std::string construct="<init>";
+const std::string param="()V";
+jvm=jvm_;
+
+JNIEnv * curEnv = getCurrentEnv();
+
+localClass = curEnv->FindClass( this->className().c_str() ) ;
+if (localClass == NULL) {
+  throw GiwsException::JniClassNotFoundException(curEnv, this->className());
+}
+
+this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
+
+/* localClass is not needed anymore */
+curEnv->DeleteLocalRef(localClass);
+
+if (this->instanceClass == NULL) {
+throw GiwsException::JniObjectCreationException(curEnv, this->className());
+}
+
+
+constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
+if(constructObject == NULL){
+throw GiwsException::JniObjectCreationException(curEnv, this->className());
+}
+
+localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
+if(localInstance == NULL){
+throw GiwsException::JniObjectCreationException(curEnv, this->className());
+}
+this->instance = curEnv->NewGlobalRef(localInstance) ;
+if(this->instance == NULL){
+throw GiwsException::JniObjectCreationException(curEnv, this->className());
+}
+/* localInstance not needed anymore */
+curEnv->DeleteLocalRef(localInstance);
+
+                /* Methods ID set to NULL */
+jintuiwidgetLoadjstringjava_lang_StringID=NULL;
+jintuiwidgetID=NULL;
+voiduigetjintintjstringjava_lang_StringjintintID=NULL;
+voiduisetjintintID=NULL;
+voiduisetjstringjava_lang_StringID=NULL;
+jbooleanuiisValidjintintID=NULL;
+voiduishowWindowjintintID=NULL;
+voiduideletejintintID=NULL;
+voiduideleteAllID=NULL;
+jintgetUIWidgetHandlerID=NULL;
+jintgetUidFromPathjstringjava_lang_StringID=NULL;
+voidgetRootsjintintID=NULL;
+
+
+}
+
+UIWidget::UIWidget(JavaVM * jvm_, jobject JObj) {
+        jvm=jvm_;
+
+        JNIEnv * curEnv = getCurrentEnv();
+
+jclass localClass = curEnv->GetObjectClass(JObj);
+        this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
+        curEnv->DeleteLocalRef(localClass);
+
+        if (this->instanceClass == NULL) {
+throw GiwsException::JniObjectCreationException(curEnv, this->className());
+        }
+
+        this->instance = curEnv->NewGlobalRef(JObj) ;
+        if(this->instance == NULL){
+throw GiwsException::JniObjectCreationException(curEnv, this->className());
+        }
+        /* Methods ID set to NULL */
+        jintuiwidgetLoadjstringjava_lang_StringID=NULL;
+jintuiwidgetID=NULL;
+voiduigetjintintjstringjava_lang_StringjintintID=NULL;
+voiduisetjintintID=NULL;
+voiduisetjstringjava_lang_StringID=NULL;
+jbooleanuiisValidjintintID=NULL;
+voiduishowWindowjintintID=NULL;
+voiduideletejintintID=NULL;
+voiduideleteAllID=NULL;
+jintgetUIWidgetHandlerID=NULL;
+jintgetUidFromPathjstringjava_lang_StringID=NULL;
+voidgetRootsjintintID=NULL;
+
+
+}
+
+// Generic methods
+
+void UIWidget::synchronize() {
+if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
+throw GiwsException::JniMonitorException(getCurrentEnv(), "UIWidget");
+}
+}
+
+void UIWidget::endSynchronize() {
+if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
+throw GiwsException::JniMonitorException(getCurrentEnv(), "UIWidget");
+}
+}
+// Method(s)
+
+int UIWidget::uiwidgetLoad (JavaVM * jvm_, char const* fileName){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID jintuiwidgetLoadjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "uiwidgetLoad", "(Ljava/lang/String;)I" ) ;
+if (jintuiwidgetLoadjstringjava_lang_StringID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uiwidgetLoad");
+}
+
+jstring fileName_ = curEnv->NewStringUTF( fileName );
+if (fileName != NULL && fileName_ == NULL)
+{
+throw GiwsException::JniBadAllocException(curEnv);
+}
+
+
+                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintuiwidgetLoadjstringjava_lang_StringID ,fileName_));
+                        curEnv->DeleteLocalRef(fileName_);
+curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+return res;
+
+}
+
+int UIWidget::uiwidget (JavaVM * jvm_){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID jintuiwidgetID = curEnv->GetStaticMethodID(cls, "uiwidget", "()I" ) ;
+if (jintuiwidgetID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uiwidget");
+}
+
+                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintuiwidgetID ));
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+return res;
+
+}
+
+void UIWidget::uiget (JavaVM * jvm_, int uid, char const* property, int stackPos){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voiduigetjintintjstringjava_lang_StringjintintID = curEnv->GetStaticMethodID(cls, "uiget", "(ILjava/lang/String;I)V" ) ;
+if (voiduigetjintintjstringjava_lang_StringjintintID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uiget");
+}
+
+jstring property_ = curEnv->NewStringUTF( property );
+if (property != NULL && property_ == NULL)
+{
+throw GiwsException::JniBadAllocException(curEnv);
+}
+
+
+                         curEnv->CallStaticVoidMethod(cls, voiduigetjintintjstringjava_lang_StringjintintID ,uid, property_, stackPos);
+                        curEnv->DeleteLocalRef(property_);
+curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+void UIWidget::uiset (JavaVM * jvm_, int uid){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voiduisetjintintID = curEnv->GetStaticMethodID(cls, "uiset", "(I)V" ) ;
+if (voiduisetjintintID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uiset");
+}
+
+                         curEnv->CallStaticVoidMethod(cls, voiduisetjintintID ,uid);
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+void UIWidget::uiset (JavaVM * jvm_, char const* path){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voiduisetjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "uiset", "(Ljava/lang/String;)V" ) ;
+if (voiduisetjstringjava_lang_StringID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uiset");
+}
+
+jstring path_ = curEnv->NewStringUTF( path );
+if (path != NULL && path_ == NULL)
+{
+throw GiwsException::JniBadAllocException(curEnv);
+}
+
+
+                         curEnv->CallStaticVoidMethod(cls, voiduisetjstringjava_lang_StringID ,path_);
+                        curEnv->DeleteLocalRef(path_);
+curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+bool UIWidget::uiisValid (JavaVM * jvm_, int uid){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID jbooleanuiisValidjintintID = curEnv->GetStaticMethodID(cls, "uiisValid", "(I)Z" ) ;
+if (jbooleanuiisValidjintintID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uiisValid");
+}
+
+                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleanuiisValidjintintID ,uid));
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+return (res == JNI_TRUE);
+
+}
+
+void UIWidget::uishowWindow (JavaVM * jvm_, int uid){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voiduishowWindowjintintID = curEnv->GetStaticMethodID(cls, "uishowWindow", "(I)V" ) ;
+if (voiduishowWindowjintintID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uishowWindow");
+}
+
+                         curEnv->CallStaticVoidMethod(cls, voiduishowWindowjintintID ,uid);
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+void UIWidget::uidelete (JavaVM * jvm_, int uid){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voiduideletejintintID = curEnv->GetStaticMethodID(cls, "uidelete", "(I)V" ) ;
+if (voiduideletejintintID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uidelete");
+}
+
+                         curEnv->CallStaticVoidMethod(cls, voiduideletejintintID ,uid);
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+void UIWidget::uideleteAll (JavaVM * jvm_){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voiduideleteAllID = curEnv->GetStaticMethodID(cls, "uideleteAll", "()V" ) ;
+if (voiduideleteAllID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "uideleteAll");
+}
+
+                         curEnv->CallStaticVoidMethod(cls, voiduideleteAllID );
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+int UIWidget::getUIWidgetHandler (JavaVM * jvm_){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID jintgetUIWidgetHandlerID = curEnv->GetStaticMethodID(cls, "getUIWidgetHandler", "()I" ) ;
+if (jintgetUIWidgetHandlerID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "getUIWidgetHandler");
+}
+
+                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetUIWidgetHandlerID ));
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+return res;
+
+}
+
+int UIWidget::getUidFromPath (JavaVM * jvm_, char const* path){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID jintgetUidFromPathjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getUidFromPath", "(Ljava/lang/String;)I" ) ;
+if (jintgetUidFromPathjstringjava_lang_StringID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "getUidFromPath");
+}
+
+jstring path_ = curEnv->NewStringUTF( path );
+if (path != NULL && path_ == NULL)
+{
+throw GiwsException::JniBadAllocException(curEnv);
+}
+
+
+                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetUidFromPathjstringjava_lang_StringID ,path_));
+                        curEnv->DeleteLocalRef(path_);
+curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+return res;
+
+}
+
+void UIWidget::getRoots (JavaVM * jvm_, int stackPos){
+
+JNIEnv * curEnv = NULL;
+jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
+jclass cls = curEnv->FindClass( className().c_str() );
+if ( cls == NULL) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+
+jmethodID voidgetRootsjintintID = curEnv->GetStaticMethodID(cls, "getRoots", "(I)V" ) ;
+if (voidgetRootsjintintID == NULL) {
+throw GiwsException::JniMethodNotFoundException(curEnv, "getRoots");
+}
+
+                         curEnv->CallStaticVoidMethod(cls, voidgetRootsjintintID ,stackPos);
+                        curEnv->DeleteLocalRef(cls);
+if (curEnv->ExceptionCheck()) {
+throw GiwsException::JniCallMethodException(curEnv);
+}
+}
+
+}
@@ -1,4 +1,4 @@
-<package name="org.scilab.modules.uiwidget">
+<package name="org.scilab.modules.gui.uiwidget">
     <object name="UIWidget">
         <method name="uiwidgetLoad" returnType="int" modifier="static">
             <parameter name="fileName" type="String"/>
diff --git a/scilab/modules/gui/src/jni/UIWidget.hxx b/scilab/modules/gui/src/jni/UIWidget.hxx
new file mode 100644 (file)
index 0000000..39d53ff
--- /dev/null
@@ -0,0 +1,189 @@
+/* Generated by GIWS (version 2.0.2) with command:
+giws -e -f UIWidget.giws.xml 
+*/
+/*
+
+This is generated code.
+
+This software is a computer program whose purpose is to hide the complexity
+of accessing Java objects/methods from C++ code.
+
+This software is governed by the CeCILL-B license under French law and
+abiding by the rules of distribution of free software.  You can  use,
+modify and/ or redistribute the software under the terms of the CeCILL-B
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and,  more generally, to use and operate it in the
+same conditions as regards security.
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL-B license and that you accept its terms.
+*/
+
+
+#ifndef __ORG_SCILAB_MODULES_GUI_UIWIDGET_UIWIDGET__
+#define __ORG_SCILAB_MODULES_GUI_UIWIDGET_UIWIDGET__
+#include <iostream>
+#include <string>
+#include <string.h>
+#include <stdlib.h>
+#include <jni.h>
+
+#include "GiwsException.hxx"
+
+        #if defined(_MSC_VER) /* Defined anyway with Visual */
+            #include <Windows.h>
+        #else
+            typedef signed char byte;
+        #endif
+
+
+#ifndef GIWSEXPORT
+# if defined(_MSC_VER) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define GIWSEXPORT
+#   else
+#     define GIWSEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if __GNUC__ >= 4
+#     define GIWSEXPORT __attribute__ ((visibility ("default")))
+#   else
+#     define GIWSEXPORT
+#   endif
+# endif
+#endif
+
+namespace org_scilab_modules_gui_uiwidget {
+class GIWSEXPORT UIWidget {
+
+private:
+JavaVM * jvm;
+
+protected:
+jmethodID jintuiwidgetLoadjstringjava_lang_StringID; // cache method id
+jmethodID jintuiwidgetID; // cache method id
+jmethodID voiduigetjintintjstringjava_lang_StringjintintID; // cache method id
+jmethodID voiduisetjintintID; // cache method id
+jmethodID voiduisetjstringjava_lang_StringID; // cache method id
+jmethodID jbooleanuiisValidjintintID; // cache method id
+jmethodID voiduishowWindowjintintID; // cache method id
+jmethodID voiduideletejintintID; // cache method id
+jmethodID voiduideleteAllID; // cache method id
+jmethodID jintgetUIWidgetHandlerID; // cache method id
+jmethodID jintgetUidFromPathjstringjava_lang_StringID; // cache method id
+jmethodID voidgetRootsjintintID; // cache method id
+
+
+
+jobject instance;
+jclass instanceClass; // cache class
+
+                       
+// Caching (if any)
+
+
+/**
+* Get the environment matching to the current thread.
+*/
+virtual JNIEnv * getCurrentEnv();
+
+public:
+// Constructor
+/**
+* Create a wrapping of the object from a JNIEnv.
+* It will call the default constructor
+* @param JEnv_ the Java Env
+*/
+UIWidget(JavaVM * jvm_);
+
+/**
+* Create a wrapping of an already existing object from a JNIEnv.
+* The object must have already been instantiated
+* @param JEnv_ the Java Env
+* @param JObj the object
+*/
+UIWidget(JavaVM * jvm_, jobject JObj);
+
+
+/** 
+* This is a fake constructor to avoid the constructor
+* chaining when dealing with extended giws classes 
+*/
+#ifdef FAKEGIWSDATATYPE
+UIWidget(fakeGiwsDataType::fakeGiwsDataType /* unused */) {}
+#endif
+
+// Destructor
+~UIWidget();
+
+// Generic method
+// Synchronization methods
+/**
+* Enter monitor associated with the object.
+* Equivalent of creating a "synchronized(obj)" scope in Java.
+*/
+void synchronize();
+
+/**
+* Exit monitor associated with the object.
+* Equivalent of ending a "synchronized(obj)" scope.
+*/
+void endSynchronize();
+
+// Methods
+static int uiwidgetLoad(JavaVM * jvm_, char const* fileName);
+
+static int uiwidget(JavaVM * jvm_);
+
+static void uiget(JavaVM * jvm_, int uid, char const* property, int stackPos);
+
+static void uiset(JavaVM * jvm_, int uid);
+
+static void uiset(JavaVM * jvm_, char const* path);
+
+static bool uiisValid(JavaVM * jvm_, int uid);
+
+static void uishowWindow(JavaVM * jvm_, int uid);
+
+static void uidelete(JavaVM * jvm_, int uid);
+
+static void uideleteAll(JavaVM * jvm_);
+
+static int getUIWidgetHandler(JavaVM * jvm_);
+
+static int getUidFromPath(JavaVM * jvm_, char const* path);
+
+static void getRoots(JavaVM * jvm_, int stackPos);
+
+
+                        /**
+                        * Get class name to use for static methods
+                        * @return class name to use for static methods
+                        */
+                        
+                static const std::string className()
+                {
+                return "org/scilab/modules/gui/uiwidget/UIWidget";
+                }
+                
+};
+
+
+}
+#endif
similarity index 81%
rename from scilab/modules/uiwidget/src/jni/UserData.i
rename to scilab/modules/gui/src/jni/UserData.i
index 97a1acd..3a9377a 100644 (file)
  *
  */
 
-// swig -java -package org.scilab.modules.uiwidget -outdir ../java/org/scilab/modules/uiwidget/ UserData.i
+// swig -java -package org.scilab.modules.gui.uiwidget -outdir ../java/org/scilab/modules/gui/uiwidget/ UserData.i
 
 %module UserData
 
 %pragma(java) jniclasscode=%{
   static {
     try {
-        System.loadLibrary("sciuiwidget");
+        System.loadLibrary("scigui");
     } catch (UnsatisfiedLinkError e) {
       System.err.println("Native library failed to load. \n" + e);
       System.exit(1);
similarity index 66%
rename from scilab/modules/uiwidget/src/jni/UserData_wrap.c
rename to scilab/modules/gui/src/jni/UserData_wrap.c
index 99f98b2..39b05c9 100644 (file)
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- *
- * This file is not intended to be easily readable and contains a number of
+ * Version 2.0.10
+ * 
+ * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG
- * interface file instead.
+ * changes to this file unless you know what you are doing--modify the SWIG 
+ * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
 #define SWIGJAVA
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__))
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
 # else
-#   define SWIGUNUSED
+#   define SWIGUNUSED 
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif
+# endif 
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
 # endif
 #endif
 
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif
+# endif 
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
 
 /* Fix for jlong on some versions of gcc on Windows */
 #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-typedef long long __int64;
+  typedef long long __int64;
 #endif
 
 /* Fix for jlong on 64-bit x86 Solaris */
@@ -138,55 +138,47 @@ typedef long long __int64;
 
 
 /* Support for throwing Java exceptions */
-typedef enum
-{
-    SWIG_JavaOutOfMemoryError = 1,
-    SWIG_JavaIOException,
-    SWIG_JavaRuntimeException,
-    SWIG_JavaIndexOutOfBoundsException,
-    SWIG_JavaArithmeticException,
-    SWIG_JavaIllegalArgumentException,
-    SWIG_JavaNullPointerException,
-    SWIG_JavaDirectorPureVirtual,
-    SWIG_JavaUnknownError
+typedef enum {
+  SWIG_JavaOutOfMemoryError = 1, 
+  SWIG_JavaIOException, 
+  SWIG_JavaRuntimeException, 
+  SWIG_JavaIndexOutOfBoundsException,
+  SWIG_JavaArithmeticException,
+  SWIG_JavaIllegalArgumentException,
+  SWIG_JavaNullPointerException,
+  SWIG_JavaDirectorPureVirtual,
+  SWIG_JavaUnknownError
 } SWIG_JavaExceptionCodes;
 
-typedef struct
-{
-    SWIG_JavaExceptionCodes code;
-    const char *java_exception;
+typedef struct {
+  SWIG_JavaExceptionCodes code;
+  const char *java_exception;
 } SWIG_JavaExceptions_t;
 
 
-static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg)
-{
-    jclass excep;
-    static const SWIG_JavaExceptions_t java_exceptions[] =
-    {
-        { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
-        { SWIG_JavaIOException, "java/io/IOException" },
-        { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
-        { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
-        { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
-        { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
-        { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
-        { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
-        { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-        { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
-    };
-    const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
-
-    while (except_ptr->code != code && except_ptr->code)
-    {
-        except_ptr++;
-    }
-
-    (*jenv)->ExceptionClear(jenv);
-    excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
-    if (excep)
-    {
-        (*jenv)->ThrowNew(jenv, excep, msg);
-    }
+static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
+  jclass excep;
+  static const SWIG_JavaExceptions_t java_exceptions[] = {
+    { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
+    { SWIG_JavaIOException, "java/io/IOException" },
+    { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
+    { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
+    { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
+    { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
+    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
+    { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
+    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
+    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
+  };
+  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
+
+  while (except_ptr->code != code && except_ptr->code)
+    except_ptr++;
+
+  (*jenv)->ExceptionClear(jenv);
+  excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
+  if (excep)
+    (*jenv)->ThrowNew(jenv, excep, msg);
 }
 
 
@@ -195,22 +187,21 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
 
 
-extern void removeUIWidgetUserData(const int uid);
+    extern void removeUIWidgetUserData(const int uid);
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-    SWIGEXPORT void JNICALL Java_org_scilab_modules_uiwidget_UserDataJNI_removeUIWidgetUserData(JNIEnv *jenv, jclass jcls, jint jarg1)
-    {
-        int arg1 ;
-
-        (void)jenv;
-        (void)jcls;
-        arg1 = (int)jarg1;
-        removeUIWidgetUserData(arg1);
-    }
+SWIGEXPORT void JNICALL Java_org_scilab_modules_gui_uiwidget_UserDataJNI_removeUIWidgetUserData(JNIEnv *jenv, jclass jcls, jint jarg1) {
+  int arg1 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = (int)jarg1; 
+  removeUIWidgetUserData(arg1);
+}
 
 
 #ifdef __cplusplus
index 58cb122..2b7ee5f 100644 (file)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -799,14 +799,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
index f884688..5e4bb58 100644 (file)
@@ -19,7 +19,7 @@ The main idea is to build at once all the var files
     <property file="../../scilab-lib.properties"/>
     
     <!-- Order matter : fixed order to avoid dependency handling-->
-    <target name="all" depends="scirenderer, localization, commons, history_manager, jvm, action_binding, graphic_objects, completion, console, renderer, graphic_export, gui, core, helptools, types, scinotes, ui_data, history_browser, javasci, graph, xcos, preferences, uiwidget" />
+    <target name="all" depends="scirenderer, localization, commons, history_manager, jvm, action_binding, graphic_objects, completion, console, renderer, graphic_export, types, gui, core, helptools, scinotes, ui_data, history_browser, javasci, graph, xcos, preferences" />
     <target name="clean">
         <antcall target="all">
             <param name="target-jar" value="clean"/>
index 18f7fbf..479756d 100644 (file)
     <ProjectReference Include="..\commons\src\c\commons.vcxproj">
       <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\core\src\c\core.vcxproj">
-      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\jvm\libjvm.vcxproj">
       <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
     </ProjectReference>
diff --git a/scilab/modules/uiwidget/Makefile.am b/scilab/modules/uiwidget/Makefile.am
deleted file mode 100644 (file)
index 3c28c3b..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
-#
-# 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
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-#
-
-#### Target ######
-modulename=uiwidget
-
-
-#### uiwidget : Conf files ####
-libsciuiwidget_la_rootdir = $(mydatadir)
-libsciuiwidget_la_root_DATA =  license.txt 
-
-
-#### scinotes : init scripts & configuration files ####
-libsciuiwidget_la_etcdir = $(mydatadir)/etc
-libsciuiwidget_la_etc_DATA = etc/uiwidget.quit \
-                            etc/uiwidget.start
-
-UIWIDGET_JNI_SOURCES = src/jni/UIWidget.cpp \
-                      src/jni/UserData_wrap.c
-
-UIWIDGET_C_SOURCES = 
-
-UIWIDGET_CXX_SOURCES = src/cpp/UIWidgetTools.cpp \
-                      src/cpp/UserDataHandler.cpp
-
-GATEWAY_C_SOURCES = sci_gateway/c/gw_uiwidget.c
-
-GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_uiwidget.cpp \
-                     sci_gateway/cpp/sci_uiget.cpp \
-                     sci_gateway/cpp/sci_uiset.cpp \
-                     sci_gateway/cpp/sci_createUIWidgetHandle.cpp
-
-libsciuiwidget_la_CPPFLAGS = -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
-    -I$(srcdir)/src/c/ \
-    -I$(srcdir)/src/jni/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
-    -I$(top_srcdir)/modules/commons/src/jni/ \
-    -I$(top_srcdir)/modules/core/includes/ \
-    -I$(top_srcdir)/modules/api_scilab/includes/ \
-    -I$(top_srcdir)/modules/localization/includes/ \
-    -I$(top_srcdir)/modules/output_stream/includes/ \
-    -I$(top_srcdir)/modules/string/includes/ \
-    -I$(top_srcdir)/modules/fileio/includes/ \
-    -I$(top_srcdir)/modules/jvm/includes/ \
-    -I$(top_srcdir)/modules/types/includes/ \
-    $(JAVA_JNI_INCLUDE) \
-    $(UIWIDGET_FLAGS) \
-    $(AM_CPPFLAGS)
-
-
-pkglib_LTLIBRARIES = libsciuiwidget.la 
-noinst_LTLIBRARIES = libsciuiwidget-algo.la 
-
-libsciuiwidget_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(AM_LDFLAGS)
-
-libsciuiwidget_algo_la_SOURCES = $(UIWIDGET_C_SOURCES) $(UIWIDGET_JNI_SOURCES) $(UIWIDGET_CXX_SOURCES)
-libsciuiwidget_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES) 
-libsciuiwidget_algo_la_CPPFLAGS = $(libsciuiwidget_la_CPPFLAGS)
-
-libsciuiwidget_la_LIBADD = libsciuiwidget-algo.la
-
-# For the code check (splint)
-CHECK_SRC= $(UIWIDGET_C_SOURCES) $(GATEWAY_C_SOURCES)
-INCLUDE_FLAGS = $(libsciuiwidget_la_CPPFLAGS)
-
-#### uiwidget : include files ####
-libsciuiwidget_la_includedir=$(pkgincludedir)
-
-#### uiwidget : gateway declaration ####
-libsciuiwidget_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libsciuiwidget_la_sci_gateway_DATA = sci_gateway/uiwidget_gateway.xml
-
-if GUI
-if BUILD_HELP
-    USEANT=1
-endif
-endif
-
-include $(top_srcdir)/Makefile.incl.am
\ No newline at end of file
diff --git a/scilab/modules/uiwidget/Makefile.in b/scilab/modules/uiwidget/Makefile.in
deleted file mode 100644 (file)
index 7e01ceb..0000000
+++ /dev/null
@@ -1,1396 +0,0 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
-#
-# 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
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-#
-
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
-# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
-#
-# 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
-# http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
-#
-
-##########
-### Makefile included stuff
-### Target, variable, suffixes which are supposed to be useful in every makefile.am
-##########
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \  ]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
-       $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp
-@NEED_JAVA_TRUE@am__append_1 = java
-subdir = modules/uiwidget
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
-       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
-       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
-       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
-       $(top_srcdir)/m4/intel_compiler.m4 \
-       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
-       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
-       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
-       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
-       $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
-       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pkglibdir)" \
-       "$(DESTDIR)$(libsciuiwidget_la_etcdir)" \
-       "$(DESTDIR)$(libsciuiwidget_la_rootdir)" \
-       "$(DESTDIR)$(libsciuiwidget_la_sci_gatewaydir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
-libsciuiwidget_algo_la_LIBADD =
-am__objects_1 =
-am__objects_2 = libsciuiwidget_algo_la-UIWidget.lo \
-       libsciuiwidget_algo_la-UserData_wrap.lo
-am__objects_3 = libsciuiwidget_algo_la-UIWidgetTools.lo \
-       libsciuiwidget_algo_la-UserDataHandler.lo
-am_libsciuiwidget_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-       $(am__objects_3)
-libsciuiwidget_algo_la_OBJECTS = $(am_libsciuiwidget_algo_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libsciuiwidget_la_DEPENDENCIES = libsciuiwidget-algo.la
-am__objects_4 = libsciuiwidget_la-gw_uiwidget.lo
-am__objects_5 = libsciuiwidget_la-sci_uiwidget.lo \
-       libsciuiwidget_la-sci_uiget.lo libsciuiwidget_la-sci_uiset.lo \
-       libsciuiwidget_la-sci_createUIWidgetHandle.lo
-am_libsciuiwidget_la_OBJECTS = $(am__objects_4) $(am__objects_5)
-libsciuiwidget_la_OBJECTS = $(am_libsciuiwidget_la_OBJECTS)
-libsciuiwidget_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-       $(AM_CXXFLAGS) $(CXXFLAGS) $(libsciuiwidget_la_LDFLAGS) \
-       $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-SOURCES = $(libsciuiwidget_algo_la_SOURCES) \
-       $(libsciuiwidget_la_SOURCES)
-DIST_SOURCES = $(libsciuiwidget_algo_la_SOURCES) \
-       $(libsciuiwidget_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DATA = $(libsciuiwidget_la_etc_DATA) $(libsciuiwidget_la_root_DATA) \
-       $(libsciuiwidget_la_sci_gateway_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-ANT = @ANT@
-ANTLR = @ANTLR@
-AR = @AR@
-ARPACK_LIBS = @ARPACK_LIBS@
-ASM3 = @ASM3@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
-AWK = @AWK@
-BATIK = @BATIK@
-BLAS_LIBS = @BLAS_LIBS@
-CC = @CC@
-CCACHE = @CCACHE@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECKSTYLE = @CHECKSTYLE@
-COBERTURA = @COBERTURA@
-COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
-COMMONS_IO = @COMMONS_IO@
-COMMONS_LOGGING = @COMMONS_LOGGING@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-CURL_CONFIG = @CURL_CONFIG@
-CURL_LIBS = @CURL_LIBS@
-CURL_VERSION = @CURL_VERSION@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
-DEPDIR = @DEPDIR@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-DOXYGEN_BIN = @DOXYGEN_BIN@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFTW3_LIB = @FFTW3_LIB@
-FFTW_ENABLE = @FFTW_ENABLE@
-FGREP = @FGREP@
-FLEXDOCK = @FLEXDOCK@
-FLIBS = @FLIBS@
-FOP = @FOP@
-GENHTML = @GENHTML@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GIWS_BIN = @GIWS_BIN@
-GLUEGEN2_RT = @GLUEGEN2_RT@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
-GREP = @GREP@
-GUI_ENABLE = @GUI_ENABLE@
-HDF5_CFLAGS = @HDF5_CFLAGS@
-HDF5_LIBS = @HDF5_LIBS@
-HELP_ENABLE = @HELP_ENABLE@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JAR = @JAR@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVAC_DEBUG = @JAVAC_DEBUG@
-JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
-JAVASCI_ENABLE = @JAVASCI_ENABLE@
-JAVA_ENABLE = @JAVA_ENABLE@
-JAVA_G = @JAVA_G@
-JAVA_HOME = @JAVA_HOME@
-JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
-JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
-JDB = @JDB@
-JEUCLID_CORE = @JEUCLID_CORE@
-JGRAPHX = @JGRAPHX@
-JHALL = @JHALL@
-JLATEXMATH = @JLATEXMATH@
-JLATEXMATH_FOP = @JLATEXMATH_FOP@
-JOGL2 = @JOGL2@
-JROSETTA_API = @JROSETTA_API@
-JROSETTA_ENGINE = @JROSETTA_ENGINE@
-JUNIT4 = @JUNIT4@
-LAPACK_LIBS = @LAPACK_LIBS@
-LCOV = @LCOV@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOGGING_LEVEL = @LOGGING_LEVEL@
-LOOKS = @LOOKS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MATIO_CFLAGS = @MATIO_CFLAGS@
-MATIO_ENABLE = @MATIO_ENABLE@
-MATIO_LIBS = @MATIO_LIBS@
-MKDIR_P = @MKDIR_P@
-MPI_ENABLE = @MPI_ENABLE@
-MSGCAT = @MSGCAT@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OCAMLC = @OCAMLC@
-OCAMLDEP = @OCAMLDEP@
-OCAMLLEX = @OCAMLLEX@
-OCAMLOPT = @OCAMLOPT@
-OCAMLYACC = @OCAMLYACC@
-OPENMPI_CC = @OPENMPI_CC@
-OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
-OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
-OPENMPI_LIBS = @OPENMPI_LIBS@
-OPENMP_CFLAGS = @OPENMP_CFLAGS@
-OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
-OPENMP_ENABLE = @OPENMP_ENABLE@
-OPENMP_LIBS = @OPENMP_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PCRE_CFLAGS = @PCRE_CFLAGS@
-PCRE_CONFIG = @PCRE_CONFIG@
-PCRE_LIBS = @PCRE_LIBS@
-PCRE_VERSION = @PCRE_VERSION@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-RANLIB = @RANLIB@
-RELOCATABLE = @RELOCATABLE@
-RT_LIB = @RT_LIB@
-SAXON = @SAXON@
-SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
-SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
-SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
-SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
-SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
-SCIRENDERER = @SCIRENDERER@
-SCIRENDERER_CP = @SCIRENDERER_CP@
-SCI_CFLAGS = @SCI_CFLAGS@
-SCI_CXXFLAGS = @SCI_CXXFLAGS@
-SCI_FFLAGS = @SCI_FFLAGS@
-SCI_LDFLAGS = @SCI_LDFLAGS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SET_RELOCATABLE = @SET_RELOCATABLE@
-SHELL = @SHELL@
-SKINLF = @SKINLF@
-SPLINT = @SPLINT@
-STRIP = @STRIP@
-SWIG_BIN = @SWIG_BIN@
-SWIG_JAVA = @SWIG_JAVA@
-SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
-SWIG_SCILAB = @SWIG_SCILAB@
-TCLTK_LIBS = @TCLTK_LIBS@
-TCL_INC_PATH = @TCL_INC_PATH@
-TK_INC_PATH = @TK_INC_PATH@
-UMFPACK_ENABLE = @UMFPACK_ENABLE@
-UMFPACK_LIB = @UMFPACK_LIB@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WITH_OCAML = @WITH_OCAML@
-WITH_TKSCI = @WITH_TKSCI@
-XCOS_ENABLE = @XCOS_ENABLE@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
-XML_APIS_EXT = @XML_APIS_EXT@
-XML_CONFIG = @XML_CONFIG@
-XML_FLAGS = @XML_FLAGS@
-XML_LIBS = @XML_LIBS@
-XML_VERSION = @XML_VERSION@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-cxx_present = @cxx_present@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-#### Target ######
-modulename = uiwidget
-
-#### uiwidget : Conf files ####
-libsciuiwidget_la_rootdir = $(mydatadir)
-libsciuiwidget_la_root_DATA = license.txt 
-
-#### scinotes : init scripts & configuration files ####
-libsciuiwidget_la_etcdir = $(mydatadir)/etc
-libsciuiwidget_la_etc_DATA = etc/uiwidget.quit \
-                            etc/uiwidget.start
-
-UIWIDGET_JNI_SOURCES = src/jni/UIWidget.cpp \
-                      src/jni/UserData_wrap.c
-
-UIWIDGET_C_SOURCES = 
-UIWIDGET_CXX_SOURCES = src/cpp/UIWidgetTools.cpp \
-                      src/cpp/UserDataHandler.cpp
-
-GATEWAY_C_SOURCES = sci_gateway/c/gw_uiwidget.c
-GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_uiwidget.cpp \
-                     sci_gateway/cpp/sci_uiget.cpp \
-                     sci_gateway/cpp/sci_uiset.cpp \
-                     sci_gateway/cpp/sci_createUIWidgetHandle.cpp
-
-libsciuiwidget_la_CPPFLAGS = -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
-    -I$(srcdir)/src/c/ \
-    -I$(srcdir)/src/jni/ \
-    -I$(top_srcdir)/libs/MALLOC/includes/ \
-    -I$(top_srcdir)/modules/commons/src/jni/ \
-    -I$(top_srcdir)/modules/core/includes/ \
-    -I$(top_srcdir)/modules/api_scilab/includes/ \
-    -I$(top_srcdir)/modules/localization/includes/ \
-    -I$(top_srcdir)/modules/output_stream/includes/ \
-    -I$(top_srcdir)/modules/string/includes/ \
-    -I$(top_srcdir)/modules/fileio/includes/ \
-    -I$(top_srcdir)/modules/jvm/includes/ \
-    -I$(top_srcdir)/modules/types/includes/ \
-    $(JAVA_JNI_INCLUDE) \
-    $(UIWIDGET_FLAGS) \
-    $(AM_CPPFLAGS)
-
-pkglib_LTLIBRARIES = libsciuiwidget.la 
-noinst_LTLIBRARIES = libsciuiwidget-algo.la 
-libsciuiwidget_la_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS) $(AM_LDFLAGS)
-libsciuiwidget_algo_la_SOURCES = $(UIWIDGET_C_SOURCES) $(UIWIDGET_JNI_SOURCES) $(UIWIDGET_CXX_SOURCES)
-libsciuiwidget_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES) 
-libsciuiwidget_algo_la_CPPFLAGS = $(libsciuiwidget_la_CPPFLAGS)
-libsciuiwidget_la_LIBADD = libsciuiwidget-algo.la
-
-# For the code check (splint)
-CHECK_SRC = $(UIWIDGET_C_SOURCES) $(GATEWAY_C_SOURCES)
-INCLUDE_FLAGS = $(libsciuiwidget_la_CPPFLAGS)
-
-#### uiwidget : include files ####
-libsciuiwidget_la_includedir = $(pkgincludedir)
-
-#### uiwidget : gateway declaration ####
-libsciuiwidget_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libsciuiwidget_la_sci_gateway_DATA = sci_gateway/uiwidget_gateway.xml
-@BUILD_HELP_TRUE@@GUI_TRUE@USEANT = 1
-
-# Where all the Scilab stuff is installed (macros, help, ...)
-mydatadir = $(pkgdatadir)/modules/$(modulename)
-
-# Set AM_* SCI detected settings
-AM_CPPFLAGS = $(SCI_CPPFLAGS)
-AM_CFLAGS = $(SCI_CFLAGS)
-AM_CXXFLAGS = $(SCI_CXXFLAGS)
-# append includes to AM_FFLAGS to manage fortran includes
-AM_FFLAGS = $(SCI_FFLAGS) -I$(top_srcdir)/modules/core/includes/
-
-# Tag shared libraries with the Scilab version
-AM_LDFLAGS = $(SCI_LDFLAGS) -version-number $(SCILAB_LIBRARY_VERSION)
-
-# splint options
-SPLINT_OPTIONS = -weak -booltype BOOL
-
-########################### JAVA ######################################
-#### We are delegating java compilation to ant... Thanks to that
-#### the procedure will be the same with Microsoft Windows (C)
-#### and Linux/Unix
-#######################################################################
-TARGETS_ALL = $(am__append_1)
-
-################ MACROS ######################
-# Rule to build a macro
-# NOT USED  AT THE MOMENT
-SUFFIXES = .sci 
-
-########### INSTALL DOCUMENTATION ###################
-
-# Install documentation files into the right target
-# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
-# automake needs the html files to be present which is not the case when
-# we are building Scilab
-
-# Where it should be installed
-pkgdocdir = $(mydatadir)
-
-# What is the mask of the help source
-DOCMASKXML = *.xml
-
-# What is the mask of the MathML sources
-DOCMASKMML = *.mml
-
-########### INSTALL DATA ###################
-# Install macros, help & demos
-# Where it should be installed
-pkgmacrosdir = $(mydatadir)
-# Which directory we process
-MACRODIRS = macros/
-# Mask of the Scilab sources macros
-MACROMASK = *.sci
-# Mask of the Scilab executable sources macros
-MACROBUILDMASK = *.sce
-# Mask of the Scilab compiled macros
-MACROBINMASK = *.bin
-# List of the standard directory for tests
-TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
-# Where the demos should be installed
-pkgdemosdir = $(mydatadir)
-# List of the standard directory for demos
-DEMOS_DIR = demos
-# List of the standard directory for examples
-EXAMPLES_DIR = examples
-# Where to export JAVA archives (.jar)
-JARDIR = jar/
-# JAR files mask
-JARMASK = *.jar
-# Chapter file 
-HELP_CHAPTERDIR = help/
-HELP_CHAPTERFILE = addchapter.sce
-HELP_CHAPTERLANG = en_US fr_FR pt_BR
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/uiwidget/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign modules/uiwidget/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-$(top_srcdir)/Makefile.incl.am:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-       @list='$(noinst_LTLIBRARIES)'; \
-       locs=`for p in $$list; do echo $$p; done | \
-             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-             sort -u`; \
-       test -z "$$locs" || { \
-         echo rm -f $${locs}; \
-         rm -f $${locs}; \
-       }
-
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-       }
-
-uninstall-pkglibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-       done
-
-clean-pkglibLTLIBRARIES:
-       -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-       @list='$(pkglib_LTLIBRARIES)'; \
-       locs=`for p in $$list; do echo $$p; done | \
-             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-             sort -u`; \
-       test -z "$$locs" || { \
-         echo rm -f $${locs}; \
-         rm -f $${locs}; \
-       }
-
-libsciuiwidget-algo.la: $(libsciuiwidget_algo_la_OBJECTS) $(libsciuiwidget_algo_la_DEPENDENCIES) $(EXTRA_libsciuiwidget_algo_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(CXXLINK)  $(libsciuiwidget_algo_la_OBJECTS) $(libsciuiwidget_algo_la_LIBADD) $(LIBS)
-
-libsciuiwidget.la: $(libsciuiwidget_la_OBJECTS) $(libsciuiwidget_la_DEPENDENCIES) $(EXTRA_libsciuiwidget_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(libsciuiwidget_la_LINK) -rpath $(pkglibdir) $(libsciuiwidget_la_OBJECTS) $(libsciuiwidget_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_algo_la-UIWidget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_algo_la-UIWidgetTools.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_algo_la-UserDataHandler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_algo_la-UserData_wrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_la-gw_uiwidget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_la-sci_createUIWidgetHandle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_la-sci_uiget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_la-sci_uiset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciuiwidget_la-sci_uiwidget.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libsciuiwidget_algo_la-UserData_wrap.lo: src/jni/UserData_wrap.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsciuiwidget_algo_la-UserData_wrap.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_algo_la-UserData_wrap.Tpo -c -o libsciuiwidget_algo_la-UserData_wrap.lo `test -f 'src/jni/UserData_wrap.c' || echo '$(srcdir)/'`src/jni/UserData_wrap.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_algo_la-UserData_wrap.Tpo $(DEPDIR)/libsciuiwidget_algo_la-UserData_wrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/jni/UserData_wrap.c' object='libsciuiwidget_algo_la-UserData_wrap.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) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsciuiwidget_algo_la-UserData_wrap.lo `test -f 'src/jni/UserData_wrap.c' || echo '$(srcdir)/'`src/jni/UserData_wrap.c
-
-libsciuiwidget_la-gw_uiwidget.lo: sci_gateway/c/gw_uiwidget.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsciuiwidget_la-gw_uiwidget.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_la-gw_uiwidget.Tpo -c -o libsciuiwidget_la-gw_uiwidget.lo `test -f 'sci_gateway/c/gw_uiwidget.c' || echo '$(srcdir)/'`sci_gateway/c/gw_uiwidget.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_la-gw_uiwidget.Tpo $(DEPDIR)/libsciuiwidget_la-gw_uiwidget.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/gw_uiwidget.c' object='libsciuiwidget_la-gw_uiwidget.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) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsciuiwidget_la-gw_uiwidget.lo `test -f 'sci_gateway/c/gw_uiwidget.c' || echo '$(srcdir)/'`sci_gateway/c/gw_uiwidget.c
-
-.cpp.o:
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-libsciuiwidget_algo_la-UIWidget.lo: src/jni/UIWidget.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_algo_la-UIWidget.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_algo_la-UIWidget.Tpo -c -o libsciuiwidget_algo_la-UIWidget.lo `test -f 'src/jni/UIWidget.cpp' || echo '$(srcdir)/'`src/jni/UIWidget.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_algo_la-UIWidget.Tpo $(DEPDIR)/libsciuiwidget_algo_la-UIWidget.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/jni/UIWidget.cpp' object='libsciuiwidget_algo_la-UIWidget.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) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_algo_la-UIWidget.lo `test -f 'src/jni/UIWidget.cpp' || echo '$(srcdir)/'`src/jni/UIWidget.cpp
-
-libsciuiwidget_algo_la-UIWidgetTools.lo: src/cpp/UIWidgetTools.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_algo_la-UIWidgetTools.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_algo_la-UIWidgetTools.Tpo -c -o libsciuiwidget_algo_la-UIWidgetTools.lo `test -f 'src/cpp/UIWidgetTools.cpp' || echo '$(srcdir)/'`src/cpp/UIWidgetTools.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_algo_la-UIWidgetTools.Tpo $(DEPDIR)/libsciuiwidget_algo_la-UIWidgetTools.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/cpp/UIWidgetTools.cpp' object='libsciuiwidget_algo_la-UIWidgetTools.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) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_algo_la-UIWidgetTools.lo `test -f 'src/cpp/UIWidgetTools.cpp' || echo '$(srcdir)/'`src/cpp/UIWidgetTools.cpp
-
-libsciuiwidget_algo_la-UserDataHandler.lo: src/cpp/UserDataHandler.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_algo_la-UserDataHandler.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_algo_la-UserDataHandler.Tpo -c -o libsciuiwidget_algo_la-UserDataHandler.lo `test -f 'src/cpp/UserDataHandler.cpp' || echo '$(srcdir)/'`src/cpp/UserDataHandler.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_algo_la-UserDataHandler.Tpo $(DEPDIR)/libsciuiwidget_algo_la-UserDataHandler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/cpp/UserDataHandler.cpp' object='libsciuiwidget_algo_la-UserDataHandler.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) $(libsciuiwidget_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_algo_la-UserDataHandler.lo `test -f 'src/cpp/UserDataHandler.cpp' || echo '$(srcdir)/'`src/cpp/UserDataHandler.cpp
-
-libsciuiwidget_la-sci_uiwidget.lo: sci_gateway/cpp/sci_uiwidget.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_la-sci_uiwidget.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_la-sci_uiwidget.Tpo -c -o libsciuiwidget_la-sci_uiwidget.lo `test -f 'sci_gateway/cpp/sci_uiwidget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiwidget.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_la-sci_uiwidget.Tpo $(DEPDIR)/libsciuiwidget_la-sci_uiwidget.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uiwidget.cpp' object='libsciuiwidget_la-sci_uiwidget.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) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_la-sci_uiwidget.lo `test -f 'sci_gateway/cpp/sci_uiwidget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiwidget.cpp
-
-libsciuiwidget_la-sci_uiget.lo: sci_gateway/cpp/sci_uiget.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_la-sci_uiget.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_la-sci_uiget.Tpo -c -o libsciuiwidget_la-sci_uiget.lo `test -f 'sci_gateway/cpp/sci_uiget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiget.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_la-sci_uiget.Tpo $(DEPDIR)/libsciuiwidget_la-sci_uiget.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uiget.cpp' object='libsciuiwidget_la-sci_uiget.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) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_la-sci_uiget.lo `test -f 'sci_gateway/cpp/sci_uiget.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiget.cpp
-
-libsciuiwidget_la-sci_uiset.lo: sci_gateway/cpp/sci_uiset.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_la-sci_uiset.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_la-sci_uiset.Tpo -c -o libsciuiwidget_la-sci_uiset.lo `test -f 'sci_gateway/cpp/sci_uiset.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiset.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_la-sci_uiset.Tpo $(DEPDIR)/libsciuiwidget_la-sci_uiset.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uiset.cpp' object='libsciuiwidget_la-sci_uiset.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) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_la-sci_uiset.lo `test -f 'sci_gateway/cpp/sci_uiset.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uiset.cpp
-
-libsciuiwidget_la-sci_createUIWidgetHandle.lo: sci_gateway/cpp/sci_createUIWidgetHandle.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciuiwidget_la-sci_createUIWidgetHandle.lo -MD -MP -MF $(DEPDIR)/libsciuiwidget_la-sci_createUIWidgetHandle.Tpo -c -o libsciuiwidget_la-sci_createUIWidgetHandle.lo `test -f 'sci_gateway/cpp/sci_createUIWidgetHandle.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_createUIWidgetHandle.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libsciuiwidget_la-sci_createUIWidgetHandle.Tpo $(DEPDIR)/libsciuiwidget_la-sci_createUIWidgetHandle.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_createUIWidgetHandle.cpp' object='libsciuiwidget_la-sci_createUIWidgetHandle.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) $(libsciuiwidget_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciuiwidget_la-sci_createUIWidgetHandle.lo `test -f 'sci_gateway/cpp/sci_createUIWidgetHandle.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_createUIWidgetHandle.cpp
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-install-libsciuiwidget_la_etcDATA: $(libsciuiwidget_la_etc_DATA)
-       @$(NORMAL_INSTALL)
-       @list='$(libsciuiwidget_la_etc_DATA)'; test -n "$(libsciuiwidget_la_etcdir)" || list=; \
-       if test -n "$$list"; then \
-         echo " $(MKDIR_P) '$(DESTDIR)$(libsciuiwidget_la_etcdir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(libsciuiwidget_la_etcdir)" || exit 1; \
-       fi; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libsciuiwidget_la_etcdir)'"; \
-         $(INSTALL_DATA) $$files "