X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIOutputMessages.cxx;h=a1e73eaefd9fa3d3300986516de6d0fc2b68b677;hb=fef49cf06296bb65a839585dba63f282a89d91fc;hp=bb1b4227748834633f58aa79d1d56d53e5bf0314;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIOutputMessages.cxx b/kernel/src/bbtkWxGUIOutputMessages.cxx index bb1b422..a1e73ea 100644 --- a/kernel/src/bbtkWxGUIOutputMessages.cxx +++ b/kernel/src/bbtkWxGUIOutputMessages.cxx @@ -1,20 +1,42 @@ - /*========================================================================= - +/* + # --------------------------------------------------------------------- + # + # 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: bbtkWxGUIOutputMessages.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 09:51:29 $ - 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: 2012/11/16 08:49:01 $ + Version: $Revision: 1.5 $ +=========================================================================*/ + + + + +/** * \brief Short description in one line * * Long description which @@ -54,15 +76,15 @@ 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); - sizer->Add ( mwxOutputText, 1, wxALL | wxGROW, 10); + mwxOutputTextAttr->SetFont(*mFixedFont); + sizer->Add ( mwxOutputText, 1, wxGROW); // Redirection of std::cout to mwxTextHistory and printf mRedirect_cout = @@ -79,7 +101,8 @@ namespace bbtk { delete mRedirect_cout; delete mRedirect_cerr; - + delete mwxOutputTextAttr; + delete mFixedFont; } void WxGUIOutputMessages::Print(const std::string& message,