From ca35bb0588533c9eac29b7d3ef8689c97ccfcfe7 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 14 Jan 2010 13:17:27 +0000 Subject: [PATCH] Disclaimers --- kernel/src/bbtkAny.h | 26 ++------------ kernel/src/bbtkAtomicBlackBox.h | 29 ++-------------- .../src/bbtkBlackBoxInputOutputDescriptor.h | 8 ++--- kernel/src/bbtkKWBlackBox.cxx | 13 ++----- kernel/src/bbtkPackage.cxx | 13 +++---- kernel/src/bbtkPimpl.h | 30 ++++++++++++++++ kernel/src/bbtkQt.h | 29 ++-------------- kernel/src/bbtkQtBlackBoxDialog.cxx | 30 ++++++++++++++++ kernel/src/bbtkQtBlackBoxDialog.h | 30 ++++++++++++++++ kernel/src/bbtkWidgetBlackBox.h | 5 +-- kernel/src/bbtkWidgetBlackBox.txx | 5 +-- kernel/src/bbtkWx.cxx | 5 +-- kernel/src/bbtkWx.h | 31 ++--------------- kernel/src/bbtkWxBlackBox.cxx | 34 ++++--------------- kernel/src/bbtkWxBlackBox.h | 5 +-- kernel/src/bbtkWxGUIScriptingInterface.cxx | 8 ++--- kernel/src/bbtkWxStreamRedirector.h | 22 +++++------- kernel/src/bbtkXML.h | 8 ++--- 18 files changed, 143 insertions(+), 188 deletions(-) diff --git a/kernel/src/bbtkAny.h b/kernel/src/bbtkAny.h index a343e79..35f2b2d 100644 --- a/kernel/src/bbtkAny.h +++ b/kernel/src/bbtkAny.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkAny.h,v $ Language: C++ - Date: $Date: 2009/03/30 14:42:16 $ - Version: $Revision: 1.7 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -29,28 +29,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 Defines the class any which can store any type of data (adapted from boost::any). diff --git a/kernel/src/bbtkAtomicBlackBox.h b/kernel/src/bbtkAtomicBlackBox.h index 8b45b91..7a98e5b 100644 --- a/kernel/src/bbtkAtomicBlackBox.h +++ b/kernel/src/bbtkAtomicBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBox.h,v $ Language: C++ - Date: $Date: 2009/05/14 14:43:33 $ - Version: $Revision: 1.10 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -28,31 +28,6 @@ * knowledge of the CeCILL-B license and that you accept its terms. * ------------------------------------------------------------------------ */ - -/* --------------------------------------------------------------------- - -* 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 class bbtk::AtomicBlackBox : ancestor of all user defined (concrete) black boxes which are atomic (vs. ComplexBlackBox objects which are made up of other (atomic or complex) boxes). diff --git a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h index 3e2aaf3..21b5c98 100644 --- a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h +++ b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxInputOutputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:12 $ - Version: $Revision: 1.5 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -20,8 +20,8 @@ * * 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 +* 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 diff --git a/kernel/src/bbtkKWBlackBox.cxx b/kernel/src/bbtkKWBlackBox.cxx index ea7f31f..11f2c32 100644 --- a/kernel/src/bbtkKWBlackBox.cxx +++ b/kernel/src/bbtkKWBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkKWBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/04/08 07:56:11 $ - Version: $Revision: 1.9 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -34,18 +34,12 @@ #ifdef USE_KWWIDGETS - - - - #include "bbtkKWBlackBox.h" #include "bbtkBlackBoxOutputConnector.h" #include "vtkKWBlackBoxDialog.h" - namespace bbtk { - //========================================================================= // KWBlackBox //========================================================================= @@ -80,8 +74,6 @@ namespace bbtk bbGetOutputWidget()->GetWidgetName(), bbGetInputWinWidth(), bbGetInputWinHeight()); - - } //================================================================== @@ -134,6 +126,5 @@ namespace bbtk }//namespace bbtk - #endif diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx index 8abe689..50c98ba 100644 --- a/kernel/src/bbtkPackage.cxx +++ b/kernel/src/bbtkPackage.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkPackage.cxx,v $ Language: C++ - Date: $Date: 2009/10/16 08:52:12 $ - Version: $Revision: 1.32 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.33 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -134,7 +134,7 @@ namespace bbtk { bbtkDebugMessage("package",5, " Descriptor has already been released" - <mDescriptorMap[*descname]; if ( (dyn==0) || (boost::dynamic_pointer_cast(desc)) ) @@ -244,10 +244,7 @@ namespace bbtk UnLoadDynamicLibrary(pack); // Unload orphan dl packages Package::UnLoadReleasedDynamicallyLoadedPackages(); - - - } #ifdef BBTK_COMPILE_DEBUG_MESSAGES diff --git a/kernel/src/bbtkPimpl.h b/kernel/src/bbtkPimpl.h index 68c725a..543048a 100644 --- a/kernel/src/bbtkPimpl.h +++ b/kernel/src/bbtkPimpl.h @@ -1,3 +1,33 @@ +/*========================================================================= + Program: bbtk + Module: $RCSfile: bbtkPimpl.h,v $ + Language: C++ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.2 $ +=========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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. +* ------------------------------------------------------------------------ */ + #ifndef __bbtkPimpl_h_INCLUDED__ #define __bbtkPimpl_h_INCLUDED__ diff --git a/kernel/src/bbtkQt.h b/kernel/src/bbtkQt.h index 68af65d..143be05 100644 --- a/kernel/src/bbtkQt.h +++ b/kernel/src/bbtkQt.h @@ -2,12 +2,11 @@ Program: bbtk Module: $RCSfile: bbtkQt.h,v $ Language: C++ - Date: $Date: 2009/04/08 07:56:11 $ - Version: $Revision: 1.1 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- - * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * @@ -28,30 +27,6 @@ * knowledge of the CeCILL-B license and that you accept its terms. * ------------------------------------------------------------------------ */ - -/* --------------------------------------------------------------------- - -* 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. -* ------------------------------------------------------------------------ */ - - #ifndef __bbtkQt_h_INCLUDED__ #define __bbtkQt_h_INCLUDED__ diff --git a/kernel/src/bbtkQtBlackBoxDialog.cxx b/kernel/src/bbtkQtBlackBoxDialog.cxx index 71eeb0a..2cf9e17 100644 --- a/kernel/src/bbtkQtBlackBoxDialog.cxx +++ b/kernel/src/bbtkQtBlackBoxDialog.cxx @@ -1,3 +1,33 @@ +/*========================================================================= + Program: bbtk + Module: $RCSfile: bbtkQtBlackBoxDialog.cxx,v $ + Language: C++ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.4 $ +=========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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. +* ------------------------------------------------------------------------ */ + #ifdef USE_QT #include "bbtkQtBlackBoxDialog.h" diff --git a/kernel/src/bbtkQtBlackBoxDialog.h b/kernel/src/bbtkQtBlackBoxDialog.h index ba2fb29..a86fe0e 100644 --- a/kernel/src/bbtkQtBlackBoxDialog.h +++ b/kernel/src/bbtkQtBlackBoxDialog.h @@ -1,3 +1,33 @@ +/*========================================================================= + Program: bbtk + Module: $RCSfile: bbtkQtBlackBoxDialog.h,v $ + Language: C++ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.4 $ +=========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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. +* ------------------------------------------------------------------------ */ + #ifndef __bbtkQtBlackBoxDialog_h_INCLUDED__ #define __bbtkQtBlackBoxDialog_h_INCLUDED__ diff --git a/kernel/src/bbtkWidgetBlackBox.h b/kernel/src/bbtkWidgetBlackBox.h index 045d8a5..7488fac 100644 --- a/kernel/src/bbtkWidgetBlackBox.h +++ b/kernel/src/bbtkWidgetBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBox.h,v $ Language: C++ - Date: $Date: 2009/06/10 11:36:51 $ - Version: $Revision: 1.6 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.7 $ ========================================================================*/ @@ -28,6 +28,7 @@ * 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. * ------------------------------------------------------------------------ */ + /** * \brief Short description in one line * diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx index 9211142..3da66eb 100644 --- a/kernel/src/bbtkWidgetBlackBox.txx +++ b/kernel/src/bbtkWidgetBlackBox.txx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBox.txx,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:06 $ - Version: $Revision: 1.5 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -27,6 +27,7 @@ * 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 diff --git a/kernel/src/bbtkWx.cxx b/kernel/src/bbtkWx.cxx index 9a14470..f361a14 100644 --- a/kernel/src/bbtkWx.cxx +++ b/kernel/src/bbtkWx.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWx.cxx,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:06 $ - Version: $Revision: 1.15 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.16 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -27,6 +27,7 @@ * 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. * ------------------------------------------------------------------------ */ + #include "bbtkWx.h" #include "bbtkMessageManager.h" diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h index 13bc15a..d810bbf 100644 --- a/kernel/src/bbtkWx.h +++ b/kernel/src/bbtkWx.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWx.h,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:06 $ - Version: $Revision: 1.11 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.12 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -26,30 +26,7 @@ * * 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. -* ------------------------------------------------------------------------ */ - - -/* --------------------------------------------------------------------- - -* 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. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ #ifndef __bbtkWx_h_INCLUDED__ @@ -153,8 +130,6 @@ namespace bbtk }; // struct Wx //================================================================== - - #ifdef USE_WXWIDGETS diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 08c58c9..a7d7442 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/05/28 14:22:11 $ - Version: $Revision: 1.42 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.43 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -28,11 +28,8 @@ * knowledge of the CeCILL-B license and that you accept its terms. * ------------------------------------------------------------------------ */ - #ifdef _USE_WXWIDGETS_ - - /** * \file * \brief @@ -47,16 +44,8 @@ //#include "bbtkData.h" //#include "bbtkFactory.h" - - - namespace bbtk { - - - - - //========================================================================= // WxFrame //========================================================================= @@ -148,10 +137,6 @@ namespace bbtk } //================================================================== - - - - //========================================================================= // WxDialog //========================================================================= @@ -177,7 +162,7 @@ namespace bbtk BEGIN_EVENT_TABLE(WxDialog, wxDialog) EVT_CLOSE(WxDialog::OnCloseWindow) END_EVENT_TABLE(); - //================================================================== + //========================================================================= //========================================================================= WxDialog::WxDialog(WxBlackBox::Pointer b, @@ -211,7 +196,7 @@ namespace bbtk SetSizer(sizer); Layout(); } - //========================================================================= + //================================================================== //================================================================== WxDialog::~WxDialog() { @@ -232,11 +217,6 @@ namespace bbtk //================================================================== - - - - - //========================================================================= // WxBlackBox //========================================================================= @@ -310,6 +290,7 @@ namespace bbtk bbGetInputWinHeight() ) ); w->Show(); } + //================================================================== //================================================================== @@ -340,7 +321,7 @@ namespace bbtk bbGetWindow()->Show(); bbSetShown(true); } - } + } } //================================================================== @@ -364,10 +345,7 @@ namespace bbtk } //================================================================== - - }//namespace bbtk - #endif diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h index afe6175..e55a751 100644 --- a/kernel/src/bbtkWxBlackBox.h +++ b/kernel/src/bbtkWxBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.h,v $ Language: C++ - Date: $Date: 2009/06/10 11:36:53 $ - Version: $Revision: 1.31 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.32 $ ========================================================================*/ @@ -28,6 +28,7 @@ * 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. * ------------------------------------------------------------------------ */ + /** * \brief Short description in one line * diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index c311ee2..327d79e 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2009/12/08 14:10:36 $ - Version: $Revision: 1.40 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.41 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -495,8 +495,8 @@ namespace bbtk void WxGUIScriptingInterface::OnMenuAbout(wxCommandEvent& WXUNUSED(event)) { m_mgr.Update(); - Refresh(); - wxMessageBox(_T(" bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008"), + Refresh(); + wxMessageBox(_T(" bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008\n\n http://www.creatis.insa-lyon.fr/creatools"), _T("About ..."), wxOK | wxICON_INFORMATION, this); } diff --git a/kernel/src/bbtkWxStreamRedirector.h b/kernel/src/bbtkWxStreamRedirector.h index 34f2858..c560f5d 100644 --- a/kernel/src/bbtkWxStreamRedirector.h +++ b/kernel/src/bbtkWxStreamRedirector.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxStreamRedirector.h,v $ Language: C++ - Date: $Date: 2008/12/11 15:30:04 $ - Version: $Revision: 1.3 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.4 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -79,10 +79,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 +110,7 @@ namespace bbtk delete[] pbase(); m_ostr.rdbuf(m_sbufOld); } - + virtual void writeString(const std::string &str) { const wxTextAttr& style = mText->GetDefaultStyle(); @@ -124,8 +123,7 @@ namespace bbtk printf("%s",str.c_str()); } } - - + private: wxTextCtrl* mText; // @@ -136,7 +134,7 @@ namespace bbtk std::streambuf *m_sbufOld; // wxColour mColour; - + private: int overflow(int c) { @@ -156,7 +154,7 @@ namespace bbtk return 0; } - + int sync() { if (pbase() != pptr()) @@ -169,13 +167,11 @@ namespace bbtk return 0; } }; - //================================================================ - + //================================================================ } // namespace bbtk - #endif // __bbtkWxStreamRedirector_h__ #endif //USE_WXWIDGETS diff --git a/kernel/src/bbtkXML.h b/kernel/src/bbtkXML.h index 2c63fe3..e45859d 100644 --- a/kernel/src/bbtkXML.h +++ b/kernel/src/bbtkXML.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkXML.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:15 $ - Version: $Revision: 1.4 $ + Date: $Date: 2010/01/14 13:17:27 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -28,7 +28,6 @@ * knowledge of the CeCILL-B license and that you accept its terms. * ------------------------------------------------------------------------ */ - #ifndef __bbtkXML_h_INCLUDED__ #define __bbtkXML_h_INCLUDED__ @@ -37,7 +36,6 @@ namespace bbtk { - void CleanString_0D(std::string& var) { int i,size=var.length(); @@ -72,7 +70,6 @@ namespace bbtk } //==================================================================== - std::string GetErrorMessage(XMLResults* res, const std::string& filename) { std::ostringstream str; @@ -81,7 +78,6 @@ namespace bbtk str << " file "<