[Remove] InitWaitBar. 66/5866/2
Bruno JOFRET [Tue, 10 Jan 2012 14:44:58 +0000 (15:44 +0100)]
Change-Id: I96b27b7bc57573a1fe840f92d90ba638c24003d8

scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/InitWaitBar.c [deleted file]
scilab/modules/gui/src/c/InitWaitBar.h [deleted file]
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters

index ba50588..157392e 100644 (file)
@@ -47,7 +47,6 @@ src/c/setMainWindowTitle.c \
 src/c/addmenu.c \
 src/c/CreateUIControl.c \
 src/c/CreateUimenu.c \
-src/c/InitWaitBar.c \
 src/c/CreateUIContextMenu.c \
 src/c/UicontrolStyleToString.c \
 src/c/checkColorRange.c \
index 7839386..59e13aa 100644 (file)
@@ -129,7 +129,6 @@ am__objects_1 = libscigui_algo_la-buildMainWindowTitle.lo \
        libscigui_algo_la-addmenu.lo \
        libscigui_algo_la-CreateUIControl.lo \
        libscigui_algo_la-CreateUimenu.lo \
-       libscigui_algo_la-InitWaitBar.lo \
        libscigui_algo_la-CreateUIContextMenu.lo \
        libscigui_algo_la-UicontrolStyleToString.lo \
        libscigui_algo_la-checkColorRange.lo \
@@ -653,7 +652,6 @@ src/c/setMainWindowTitle.c \
 src/c/addmenu.c \
 src/c/CreateUIControl.c \
 src/c/CreateUimenu.c \
-src/c/InitWaitBar.c \
 src/c/CreateUIContextMenu.c \
 src/c/UicontrolStyleToString.c \
 src/c/checkColorRange.c \
@@ -1150,7 +1148,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-GetUiobjectVisible.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-ImageRenderer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-InitUIMenu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-InitWaitBar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-InitializeGUI.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-Juigetfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigui_algo_la-Jxclick.Plo@am__quote@
@@ -1320,13 +1317,6 @@ libscigui_algo_la-CreateUimenu.lo: src/c/CreateUimenu.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscigui_algo_la_CFLAGS) $(CFLAGS) -c -o libscigui_algo_la-CreateUimenu.lo `test -f 'src/c/CreateUimenu.c' || echo '$(srcdir)/'`src/c/CreateUimenu.c
 
-libscigui_algo_la-InitWaitBar.lo: src/c/InitWaitBar.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscigui_algo_la_CFLAGS) $(CFLAGS) -MT libscigui_algo_la-InitWaitBar.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-InitWaitBar.Tpo -c -o libscigui_algo_la-InitWaitBar.lo `test -f 'src/c/InitWaitBar.c' || echo '$(srcdir)/'`src/c/InitWaitBar.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigui_algo_la-InitWaitBar.Tpo $(DEPDIR)/libscigui_algo_la-InitWaitBar.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/InitWaitBar.c' object='libscigui_algo_la-InitWaitBar.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscigui_algo_la_CFLAGS) $(CFLAGS) -c -o libscigui_algo_la-InitWaitBar.lo `test -f 'src/c/InitWaitBar.c' || echo '$(srcdir)/'`src/c/InitWaitBar.c
-
 libscigui_algo_la-CreateUIContextMenu.lo: src/c/CreateUIContextMenu.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscigui_algo_la_CFLAGS) $(CFLAGS) -MT libscigui_algo_la-CreateUIContextMenu.lo -MD -MP -MF $(DEPDIR)/libscigui_algo_la-CreateUIContextMenu.Tpo -c -o libscigui_algo_la-CreateUIContextMenu.lo `test -f 'src/c/CreateUIContextMenu.c' || echo '$(srcdir)/'`src/c/CreateUIContextMenu.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscigui_algo_la-CreateUIContextMenu.Tpo $(DEPDIR)/libscigui_algo_la-CreateUIContextMenu.Plo
diff --git a/scilab/modules/gui/src/c/InitWaitBar.c b/scilab/modules/gui/src/c/InitWaitBar.c
deleted file mode 100644 (file)
index 131d868..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Vincent COUVERT
- * Create Java object matching Scilab uicontrol
- *
- * 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
- *
- */
-
-#include "InitWaitBar.h"
-#include "BuildObjects.h"
-#include "ObjectStructure.h"
-#include "HandleManagement.h"
-
-sciPointObj *InitWaitBar(void)
-{
-  sciPointObj *pObj = (sciPointObj *) NULL;
-
-  if ((pObj = MALLOC (sizeof (sciPointObj))) == NULL)  return (sciPointObj *) NULL;
-
-  sciSetEntityType (pObj, SCI_WAITBAR);
-
-  if ((pObj->pfeatures = MALLOC ((sizeof (sciWaitbar)))) == NULL)
-    {
-      FREE(pObj);
-      return (sciPointObj *) NULL;
-    }
-
-       /* Allocate relationShip */
-       createDefaultRelationShip(pObj);
-
-  pWAITBAR_FEATURE(pObj)->hashMapIndex = 0;
-  pObj->pObservers = NULL;
-  pObj->pDrawer = NULL ;
-  //sciAddNewHandle(pObj);
-  return (sciPointObj *) pObj;
-}
-/*----------------------------------------------------------------------------*/
-
diff --git a/scilab/modules/gui/src/c/InitWaitBar.h b/scilab/modules/gui/src/c/InitWaitBar.h
deleted file mode 100644 (file)
index 29de1b9..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Vincent COUVERT
- * 
- * 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
- *
- */
-
-#include "ObjectStructure.h" /* sciPointObj */
-#include "SetProperty.h"
-#include "MALLOC.h"
-
-/**
- * This function creates WaitBar structure.
- *
- * @return  : pointer sciPointObj if ok , NULL if not
- */
-sciPointObj *InitWaitBar(void);
index c841597..091a56e 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     <ClCompile Include="iconifyMainWindow.c" />
     <ClCompile Include="InitializeGUI.c" />
     <ClCompile Include="..\cpp\InitUIMenu.cpp" />
-    <ClCompile Include="InitWaitBar.c" />
     <ClCompile Include="..\jni\Juigetfile.cpp" />
     <ClCompile Include="..\jni\Jxclick.cpp" />
     <ClCompile Include="..\jni\Jxgetmouse.cpp" />
     <ClInclude Include="..\..\includes\InitializeGUI.h" />
     <ClInclude Include="..\..\includes\InitUIMenu.h" />
     <ClInclude Include="..\cpp\InitUIMenu.hxx" />
-    <ClInclude Include="InitWaitBar.h" />
     <ClInclude Include="..\jni\Jxclick.hxx" />
     <ClInclude Include="..\jni\Jxgetmouse.hxx" />
     <ClInclude Include="..\..\includes\Label.h" />
index 216379d..524e1d8 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="..\cpp\InitUIMenu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="InitWaitBar.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\jni\Juigetfile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="..\cpp\InitUIMenu.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="InitWaitBar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\jni\Jxclick.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>