X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkSystem.h;h=26baaba5379918b95e4ee45f5796d317b221b47f;hb=2655f6362d2e97439542ef6474f488e06310fc2b;hp=f9f22ebb87e45763dc3e3cca1d09aaf82b23490e;hpb=d33068ec2ab1ca79aaa44809df32dc9e39c9c0a3;p=bbtk.git diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h index f9f22eb..26baaba 100644 --- a/kernel/src/bbtkSystem.h +++ b/kernel/src/bbtkSystem.h @@ -3,17 +3,31 @@ Program: bbtk Module: $RCSfile: bbtkSystem.h,v $ Language: C++ - Date: $Date: 2008/04/23 08:34:06 $ - Version: $Revision: 1.4 $ - - 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/10 12:25:10 $ + Version: $Revision: 1.8 $ + + Copyright (c) CREATIS-LRMN + Centre de Recherche Et d'Application en Traitement de l'Image et du Signal + Authors : Laurent Guigues, Eduardo Davila, Jean-Pierre Roux + e-mail : creatools@creatis.insa-lyon.fr + + 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. + + =========================================================================*/ /** @@ -78,20 +92,6 @@ // class ClassName -/* -// Useless ? -#if defined(_WIN32) -//&& defined(BUILD_SHARED_LIBS) - #ifdef BBTK_EXPORTS2 - #define BBTK_EXPORT2 export - #else - #define BBTK_EXPORT2 - #endif -#else - #define BBTK_EXPORT2 -#endif // defined(_WIN32) && defined(BUILD_SHARED_LIBS) -*/ - #if defined(_WIN32) @@ -116,30 +116,6 @@ -// ---------------------------------------------------------------------------- -// wx headers -// ---------------------------------------------------------------------------- -#include "bbtkWx.h" - -/* -#ifdef _USE_WXWIDGETS_ -#include "wx/wxprec.h" -#include -#ifndef WX_PRECOMP -# include -#endif //WX_PRECOMP - -#include - -#ifdef __WXGTK__ -# include -#endif //__WXGTK__ - -#endif //_USE_WXWIDGETS_ -*/ -//----------------------------------------------------------------------------- - - //----------------------------------------------------------------------------- @@ -232,4 +208,13 @@ namespace bbtk } // namespace bbtk //----------------------------------------------------------------------------- + // file separator +#if defined(_WIN32) +#define VALID_FILE_SEPARATOR "\\" +#define INVALID_FILE_SEPARATOR "/" +#else +#define INVALID_FILE_SEPARATOR "\\" +#define VALID_FILE_SEPARATOR "/" +#endif + #endif