X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxDirectorySelector.cxx;h=848bb759ded78e7912b8402497052327dc586fcc;hb=a16b50b85de5ca6a4dfdfbc5656b490e0d358f52;hp=813a9114a73f25923247282b7613096817c8205e;hpb=888f2592d143847b6598d947cd037162c4fb90c6;p=bbtk.git diff --git a/packages/wx/src/bbwxDirectorySelector.cxx b/packages/wx/src/bbwxDirectorySelector.cxx index 813a911..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 12:47:18 $ - Version: $Revision: 1.1 $ - - 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,10 +38,10 @@ #include "bbwxDirectorySelector.h" +#include "bbtkWx.h" #include "bbwxPackage.h" - -#include - + +#include namespace bbwx { @@ -36,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() @@ -44,20 +57,18 @@ namespace bbwx bbtkDebugMessageInc("Core",9,"DirectorySelector::Process() [" <ShowModal(); - - if (FD->GetReturnCode()==wxID_OK) + if (FD->ShowModal()==wxID_OK) { bbSetOutputOut( bbtk::wx2std (FD->GetPath()) ); bbSetInputDefaultDir( bbtk::wx2std (FD->GetPath()) ); } else - { + { bbSetOutputOut(""); bbSetInputDefaultDir(""); }