X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkSystem.h;h=7f7df45103a67e24d9b0712ddb44222397bcd6fd;hb=4234999264604da013c2574feef3816c75b3034e;hp=1047e7d7c8340a330b92664f572e322d07142885;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h
index 1047e7d..7f7df45 100644
--- a/kernel/src/bbtkSystem.h
+++ b/kernel/src/bbtkSystem.h
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkSystem.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  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:14 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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 contains all the OS depending stuff
@@ -71,30 +84,21 @@
 //-----------------------------------------------------------------------------
 // Micro$oft shared library related stuff
 //
-// all the classes should be defined as :
+// all the classes that must be visible outside the bbtk library 
+// should be defined as :
 // class BBTK_EXPORT ClassName 
 // instead of :
 // class ClassName
 
 
-#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) && defined(BUILD_SHARED_LIBS)
+#if defined(_WIN32) 
+//&& defined(BUILD_SHARED_LIBS)
 //#include "WWW.h"
-  #ifdef bbtk_EXPORTS
+  #ifdef BBTK_EXPORT_SYMBOLS
     #define BBTK_EXPORT __declspec( dllexport )
-  #else
+#else
     #define BBTK_EXPORT __declspec( dllimport )
   #endif
   #define BBTK_CDECL __cdecl
@@ -111,30 +115,6 @@
 
 
 
-// ----------------------------------------------------------------------------
-// wx headers
-// ----------------------------------------------------------------------------
-#include "bbtkWx.h"
-
-/*
-#ifdef _USE_WXWIDGETS_
-#include "wx/wxprec.h"
-#include <wx/datetime.h>
-#ifndef WX_PRECOMP
-#   include <wx/wx.h>
-#endif //WX_PRECOMP
-
-#include <wx/log.h>
-
-#ifdef __WXGTK__
-# include <locale.h>
-#endif //__WXGTK__
-
-#endif //_USE_WXWIDGETS_
-*/
-//-----------------------------------------------------------------------------
-
-
 
 
 //-----------------------------------------------------------------------------
@@ -212,4 +192,28 @@ typedef  unsigned int        uint32_t;
 
 //-----------------------------------------------------------------------------
 
+
+//-----------------------------------------------------------------------------
+namespace bbtk
+{
+ 
+  /// System related stuff
+  struct System
+  {
+    /// returns true iff the program has a tty
+    static int HasTTY(); 
+  };
+
+} // 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