X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxCommandButton.cxx;h=e48681db7cfc3525e08e6396d5d4d36fdc2fbfb8;hb=26550d07aa8d312e33a18a19b8844ba249202336;hp=5c34cd5d140154c7f819001c750832345d833744;hpb=6c61e1295d4bedbd7b5abdb256173a2d6df80423;p=bbtk.git

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index 5c34cd5..e48681d 100644
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -3,14 +3,14 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/07 11:37:48 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/04/18 12:59:52 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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
+     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.
                                                                                 
@@ -27,6 +27,7 @@
 #include "bbwxCommandButton.h"
 #include "bbwxPackage.h"
 #include "bbtkInterpreter.h"
+#include "bbtkExecuter.h"
 
 
 
@@ -67,12 +68,10 @@ namespace bbwx
   void CommandButtonWidget::OnCommandButton( wxEvent& )
   {
     // Look for the interpreter
-      bbtk::Interpreter* I = 0;
+    bbtk::Interpreter::Pointer I;
       if (mBox->bbGetParent() != 0) 
 	{
-	  bbtk::Factory* f = 
-	    ((bbtk::ComplexBlackBoxDescriptor*)mBox->bbGetParent()
-	     ->bbGetDescriptor())->GetFactory();
+	  bbtk::Factory::Pointer f = boost::dynamic_pointer_cast<bbtk::ComplexBlackBoxDescriptor>(mBox->bbGetParent()->bbGetDescriptor())->GetFactory();
 	  if ((f != 0)&&
 	      (f->GetExecuter()))
 	    {
@@ -82,7 +81,7 @@ namespace bbwx
       if (I==0) 
 	{
 	  //	  bbtkError("ExecBbiCommand::DoProcess() : could not find interpreter");
-	  I = new bbtk::Interpreter();
+	  I = bbtk::Interpreter::New();
 	}
       
       std::string commandstr(mBox->bbGetInputIn());
@@ -106,13 +105,12 @@ namespace bbwx
 	  }
 	for ( i=0 ; i < ccommand.length() ; i++)
 	  {
-	    if (ccommand[i]==39)
+	    if (ccommand[i]==39) // '
 	      {
-		ccommand[i]=34;
+		ccommand[i]=34;  // "
 	      }
 	  }		
-	bool insideComment = false; // for multiline comment
-	I->InterpretLine( ccommand, insideComment );
+	I->InterpretLine( ccommand );
 	pos1=pos2+1;
 	pos2 = commandstr.find(";",pos2+1);
 	
@@ -145,7 +143,7 @@ namespace bbwx
   //-------------------------------------------------------------------------- 
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
 
   void CommandButton::bbUserConstructor() 
   {