X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=b436a6a7fbbd1ddff8ca356e7e8ff3f3a6420a29;hb=7c65d379590ab8cd9a6160e5544630260075835a;hp=1983cb36492145a13a5ac1f87b599f3d4339c65a;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 1983cb3..b436a6a 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -1,38 +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: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/05/28 08:12:06 $ - Version: $Revision: 1.41 $ + Date: $Date: 2012/11/16 08:49:01 $ + Version: $Revision: 1.45 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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_WXWIDGETS_ - - /** * \file * \brief @@ -47,16 +51,8 @@ //#include "bbtkData.h" //#include "bbtkFactory.h" - - - namespace bbtk { - - - - - //========================================================================= // WxFrame //========================================================================= @@ -148,10 +144,6 @@ namespace bbtk } //================================================================== - - - - //========================================================================= // WxDialog //========================================================================= @@ -177,7 +169,7 @@ namespace bbtk BEGIN_EVENT_TABLE(WxDialog, wxDialog) EVT_CLOSE(WxDialog::OnCloseWindow) END_EVENT_TABLE(); - //================================================================== + //========================================================================= //========================================================================= WxDialog::WxDialog(WxBlackBox::Pointer b, @@ -211,7 +203,7 @@ namespace bbtk SetSizer(sizer); Layout(); } - //========================================================================= + //================================================================== //================================================================== WxDialog::~WxDialog() { @@ -232,11 +224,6 @@ namespace bbtk //================================================================== - - - - - //========================================================================= // WxBlackBox //========================================================================= @@ -252,7 +239,6 @@ namespace bbtk void WxBlackBox::bbUserSetDefaultValues() { bbtkBlackBoxDebugMessage("widget",5,"WxBlackBox::bbUserSetDefaultValues()"<(), Wx::GetTopWindow(), std2wx( bbGetInputWinTitle() - + " - bbtk (c) CREATIS-LRMN"), + + " - bbtk (c) CREATIS"), wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) ); w->Show(false); @@ -306,11 +292,12 @@ namespace bbtk w = new WxFrame( GetThisPointer(), Wx::GetTopWindow(), std2wx( bbGetInputWinTitle() - + " - bbtk (c) CREATIS-LRMN"), + + " - bbtk (c) CREATIS"), wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) ); w->Show(); } + //================================================================== //================================================================== @@ -341,7 +328,7 @@ namespace bbtk bbGetWindow()->Show(); bbSetShown(true); } - } + } } //================================================================== @@ -365,10 +352,7 @@ namespace bbtk } //================================================================== - - }//namespace bbtk - #endif