X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=401ac4130637bbde28941572f8f28ab7a03b47bc;hb=daa4b4dd18d9320341aed677d97e78f890fa88a3;hp=781d025850ac84431b22e70779d299bc0e23d4ad;hpb=857e5e5bd003d20cb8bc4539b6fca4ca9d50929c;p=bbtk.git diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 781d025..401ac41 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/05/15 08:02:36 $ - Version: $Revision: 1.20 $ + Date: $Date: 2008/06/27 08:12:46 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -226,13 +226,19 @@ namespace bbtk bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow(" <bbGetFullName()<<")"<bbUserOnShow(); - // wxFrame::SetFocus(); } //========================================================================= @@ -476,7 +482,8 @@ namespace bbtk if ((caller==0) || ((caller!=0) && (caller->GetBlackBoxTo() != to))&& - (!bbGetUpdateTransferedToParent())) + (!bbGetUpdateTransferedToParent())&& + (to->bbGetStatus()!=UPDATING)) { bbtkDebugMessage("process",3, " ... Transfering update order to parent"