*** empty log message ***

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

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index e48681db7cfc3525e08e6396d5d4d36fdc2fbfb8..aeea2152e8e346e1150336ae1f39bd94faf64e61 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/04/18 12:59:52 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/05/15 08:02:37 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de 
   l'Image). All rights reserved. See Doc/License.txt or
@@ -67,21 +67,32 @@ namespace bbwx
   
   void CommandButtonWidget::OnCommandButton( wxEvent& )
   {
-    // Look for the interpreter
+    // Look for the interpreter or the executer if no interpreter
     bbtk::Interpreter::Pointer I;
+    bbtk::VirtualExec::Pointer E;
       if (mBox->bbGetParent() != 0) 
        {
          bbtk::Factory::Pointer f = boost::dynamic_pointer_cast<bbtk::ComplexBlackBoxDescriptor>(mBox->bbGetParent()->bbGetDescriptor())->GetFactory();
          if ((f != 0)&&
              (f->GetExecuter()))
            {
-             I = f->GetExecuter()->GetInterpreter();
+             E = f->GetExecuter();
+             I = E->GetInterpreter();
            }
        }
       if (I==0) 
        {
-         //      bbtkError("ExecBbiCommand::DoProcess() : could not find interpreter");
-         I = bbtk::Interpreter::New();
+         //      bbtkError("CommandButton::DoProcess() : could not find interpreter");
+         if (E==0) 
+           {
+             // If no executer : create a totally independant interpreter
+             I = bbtk::Interpreter::New();
+           }
+         else 
+           {
+             // If executer : create an interpreter using E
+             I = bbtk::Interpreter::New(E);
+           }
        }
       
       std::string commandstr(mBox->bbGetInputIn());