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

diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h
index 1047e7d..447d9e2 100644
--- a/kernel/src/bbtkSystem.h
+++ b/kernel/src/bbtkSystem.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkSystem.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,30 +71,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 +102,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 +179,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