X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxStreamRedirector.h;h=f8207f1fbd87a76588620582f7d367bfc8f4e3db;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=7bd19f3a8e59d878e223385a384cfb4069b7ab2e;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkWxStreamRedirector.h b/kernel/src/bbtkWxStreamRedirector.h
index 7bd19f3..f8207f1 100644
--- a/kernel/src/bbtkWxStreamRedirector.h
+++ b/kernel/src/bbtkWxStreamRedirector.h
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkWxStreamRedirector.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:15 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 /**
@@ -45,7 +52,7 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 
 	
 #ifndef __bbtkWxStreamRedirector_h__
@@ -79,10 +86,9 @@ namespace bbtk
   /// Redirects std::cout to a wxTextCtrl and optionally to printf also
   class WxStreamRedirector   : public std::streambuf
   {	  
-    
+
   public:
-    
- 
+
     WxStreamRedirector(std::ostream& redirect,
 				 wxTextCtrl *text, 
 				 const wxColour& colour = *wxBLACK,
@@ -111,7 +117,7 @@ namespace bbtk
       delete[] pbase();
       m_ostr.rdbuf(m_sbufOld);
     }
-  
+
    virtual void writeString(const std::string &str) 
     {
       const wxTextAttr& style = mText->GetDefaultStyle();
@@ -124,8 +130,7 @@ namespace bbtk
 	  printf("%s",str.c_str());
 	}
     }
-    
-  
+
   private:
     wxTextCtrl* mText;
     // 
@@ -136,7 +141,7 @@ namespace bbtk
     std::streambuf *m_sbufOld;
     //
     wxColour mColour;
-    
+
   private:
     int	overflow(int c)
     {
@@ -156,7 +161,7 @@ namespace bbtk
       
       return 0;
     }
-    
+
     int	sync()
     {
       if (pbase() != pptr())
@@ -169,13 +174,11 @@ namespace bbtk
       return 0;
     }
   };
-  //================================================================
 
-  
+  //================================================================
 
 } // namespace bbtk
 
-
 #endif // __bbtkWxStreamRedirector_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS