New widget pipeline processing : should be almost ok

[bbtk.git] / packages / wx / src / bbwxCommandButton.cxx

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index 5cff6c8615f250d69752a41eb5720c7115466a55..b56228f3d35c5f6209299166a72f6bd3f0b83b20 100644 (file)
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/26 07:37:11 $
-  Version:   $Revision: 1.9 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de 
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/11/25 11:31:03 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  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/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  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. 
+*
+*  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.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief 
@@ -98,7 +111,7 @@ namespace bbwx
       std::string commandstr(mBox->bbGetInputIn());
     
     // bbtk::Interpreter::mGlobalInterpreter->InterpretLine( commandstr );
-    int i;
+    unsigned int i;
     bool ok=true;
     int pos1=0,pos2;
     pos2 = commandstr.find(";",pos1);
@@ -165,13 +178,18 @@ namespace bbwx
     lstColour.push_back(0.75);
     lstColour.push_back(0.75);
     bbSetInputColour(lstColour);
+    bbSetOutputWidget(0);
   }
   
   
   void CommandButton::Process() 
   { 
-    UpdateColour();
-    UpdateLabel();
+    CommandButtonWidget* w = (CommandButtonWidget*)bbGetOutputWidget();
+    if (w) 
+      {
+       UpdateColour();
+       UpdateLabel();
+      }
   }
   
   void CommandButton::UpdateColour()
@@ -203,11 +221,12 @@ namespace bbwx
    * 
    * 
    */  
-  void CommandButton::CreateWidget() 
+  void CommandButton::CreateWidget(wxWindow* parent) 
   { 
     bbSetOutputWidget
-      ( new CommandButtonWidget ( this, bbGetWxParent(), 
-                                 bbtk::std2wx(bbGetInputLabel()) ) );
+      ( new CommandButtonWidget ( this, //bbGetWxParent(), 
+                                                                parent,
+                                                                bbtk::std2wx(bbGetInputLabel()) ) );
     UpdateColour();
   }