=== MAJOR RELEASE ====

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

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index 9b39118b2bf63fc395bd1af88bc53673f7c8f08f..e48681db7cfc3525e08e6396d5d4d36fdc2fbfb8 100644 (file)
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/19 12:26:09 $
-  Version:   $Revision: 1.4 $
+  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
@@ -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());
@@ -111,8 +110,7 @@ namespace bbwx
                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() 
   {