X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIOutputMessages.cxx;h=274b5e8324d5554f67258d2aba5f17514a445f50;hb=ca57bbfa3922d84e77fc9dd2d5e731f6f0fe0c9c;hp=d7d13bc4102fa275275f3991f07ae690a5b3b5e7;hpb=2b7ac5ab18a67097a812e20a5ecba3dac63f29cc;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIOutputMessages.cxx b/kernel/src/bbtkWxGUIOutputMessages.cxx index d7d13bc..274b5e8 100644 --- a/kernel/src/bbtkWxGUIOutputMessages.cxx +++ b/kernel/src/bbtkWxGUIOutputMessages.cxx @@ -1,20 +1,35 @@ - /*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkWxGUIOutputMessages.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 15:27:57 $ - Version: $Revision: 1.2 $ - - 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: 2009/12/09 08:46:20 $ + 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. +* ------------------------------------------------------------------------ */ + + +/** * \brief Short description in one line * * Long description which @@ -54,14 +69,14 @@ namespace bbtk wxTE_READONLY | wxTE_MULTILINE ); - wxFont* FixedFont = new wxFont(10, + mFixedFont = new wxFont(10, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false); mwxOutputTextAttr = new wxTextAttr; - mwxOutputTextAttr->SetFont(*FixedFont); + mwxOutputTextAttr->SetFont(*mFixedFont); sizer->Add ( mwxOutputText, 1, wxGROW); // Redirection of std::cout to mwxTextHistory and printf @@ -79,7 +94,8 @@ namespace bbtk { delete mRedirect_cout; delete mRedirect_cerr; - + delete mwxOutputTextAttr; + delete mFixedFont; } void WxGUIOutputMessages::Print(const std::string& message,