Another ugly bug fixed in pipeline executing (bad transfer to parent in some cases...

[bbtk.git] / kernel / src / bbtkWxBlackBox.cxx

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index de9ce1d4e7d124aef64cfc615f8b426baa3cf33e..763fcb501bcdc6fe8a3e7505d1594865c82f9c96 100644 (file)
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:14 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.28 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -419,7 +419,7 @@ namespace bbtk
   void WxBlackBox::bbExecute(bool force)
   {
     bbtkDebugMessageInc("process",2,
-                       "=> WxBlackBox::bbExecute() ["
+                       "=> WxBlackBox::bbExecute("<<(int)force<<") ["
                        <<bbGetFullName()<<"]"<<std::endl);
 
     // If the output 'Widget' is connected then 
@@ -459,8 +459,7 @@ namespace bbtk
                     "=> WxBlackBox::bbBackwardUpdate("
                     <<(caller?caller->GetFullName():"0")<<") ["
                     <<bbGetFullName()<<"]"<<std::endl);
-    // If the caller's box to is not the box to connected to the 
-    // output 'Widget'
+
     if ( ! (( bbGetStatus() == MODIFIED ) ||
            ( bbBoxProcessModeIsAlways() )) )
       {
@@ -472,6 +471,9 @@ namespace bbtk
        return bbGetStatus();
       }
  
+    // If the caller's box to is not the box to connected to the 
+    // output 'Widget'
+
     BlackBox::OutputConnectorMapType::const_iterator i 
       = bbGetOutputConnectorMap().find("Widget") ;
     if ( i->second->GetConnectionVector().size() != 0 )
@@ -500,7 +502,7 @@ namespace bbtk
            ((caller!=0) && 
             (caller->GetBlackBoxTo() != to))&&
            (!bbGetUpdateTransferedToParent())&&
-           (to->bbGetStatus()!=UPDATING))
+           (!to->bbGetExecuting()))
          {
            bbtkDebugMessage("process",3,
                             "   ... Transfering update order to parent"
@@ -664,7 +666,7 @@ namespace bbtk
       }
   
 
-    bbtkDebugMessage("wx",1,"<= WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessage("wx",2,"<= WxBlackBox::bbShowWindow() ["
                        <<bbGetFullName()<<"]"<<std::endl);
 
   }
@@ -681,7 +683,7 @@ namespace bbtk
 
     if (bbGetWindow()!=0) bbGetWindow()->bbHide();
 
-    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbHideWindow() ["
                        <<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -695,7 +697,7 @@ namespace bbtk
 
     if (bbGetWindow()!=0) bbGetWindow()->bbClose();
 
-    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbCloseWindow() ["
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbCloseWindow() ["
                        <<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================