X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxDirectorySelector.cxx;h=848bb759ded78e7912b8402497052327dc586fcc;hb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;hp=b0c6d62fb4ee87432922e983f04f66ab2ede22f8;hpb=092f8037d02e3ddebe71594eb643428296625d99;p=bbtk.git

diff --git a/packages/wx/src/bbwxDirectorySelector.cxx b/packages/wx/src/bbwxDirectorySelector.cxx
index b0c6d62..848bb75 100644
--- a/packages/wx/src/bbwxDirectorySelector.cxx
+++ b/packages/wx/src/bbwxDirectorySelector.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxDirectorySelector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 13:52:44 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  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
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:32 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief 
@@ -25,6 +38,7 @@
 
 
 #include "bbwxDirectorySelector.h"
+#include "bbtkWx.h"
 #include "bbwxPackage.h"
  
 #include <wx/dirdlg.h>
@@ -35,7 +49,7 @@ namespace bbwx
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,DirectorySelector);
   
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(DirectorySelector,bbtk::AtomicBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(DirectorySelector,bbtk::AtomicBlackBox);
 
 
   void DirectorySelector::Process() 
@@ -48,9 +62,7 @@ namespace bbwx
 			bbtk::std2wx(bbGetInputMessage()),
 			bbtk::std2wx(bbGetInputDefaultDir()));
     
-    FD->ShowModal();
-    
-    if (FD->GetReturnCode()==wxID_OK)
+	if (FD->ShowModal()==wxID_OK)
       {
 	bbSetOutputOut( bbtk::wx2std (FD->GetPath()) );
   	bbSetInputDefaultDir( bbtk::wx2std (FD->GetPath()) );