X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxColourSelector.h;h=913c56af8a78a610f6e74404796d87be7dfa8fae;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=2b9b6f9a444489706271af2ac9a614d992d82b98;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxColourSelector.h b/packages/wx/src/bbwxColourSelector.h
index 2b9b6f9..913c56a 100644
--- a/packages/wx/src/bbwxColourSelector.h
+++ b/packages/wx/src/bbwxColourSelector.h
@@ -1,34 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbwxColourSelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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 Short description in one line
@@ -51,8 +55,10 @@
 #ifndef __bbWxColourSelector_h__
 #define __bbWxColourSelector_h__
 
-// Include wxBlackBox definition
-#include "bbtkWxBlackBox.h"
+// Include base BlackBox definition
+#include "bbtkAtomicBlackBox.h"
+// Include bbwx_EXPORT symbol definition
+#include "bbwx_EXPORT.h"
 
 // Namespace of the package "wx" is "bbwx" 
 // Namespace associated to packages should be of the form :
@@ -61,25 +67,20 @@ namespace bbwx
 {
 
   //=================================================================
-  class /*BBTK_EXPORT*/ ColourSelector : public bbtk::AtomicBlackBox
+  class bbwx_EXPORT ColourSelector : public bbtk::AtomicBlackBox
   {
     BBTK_BLACK_BOX_INTERFACE(ColourSelector,bbtk::AtomicBlackBox);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
-//    BBTK_CREATE_WIDGET(CreateWidget);
     void Process();
-//    void CreateWidget();
-
   protected:
-    virtual void bbUserConstructor();
- // private:
- //   wxColourSelector* mColorDialog;
+	  
   };
-
+  
   //=================================================================
   // UserBlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColourSelector,bbtk::AtomicBlackBox);
-  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
+  BBTK_CATEGORY("widget");
   BBTK_NAME("ColourSelector");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Colour Selector dialog (bbfication of wxColourSelector)");
@@ -88,6 +89,6 @@ namespace bbwx
   //=================================================================
 
 }//namespace bbtk
-#endif  // __bbtkWxColourSelector_h__
 
-#endif //_USE_WXWIDGETS_
+#endif  // __bbtkWxColourSelector_h__
+#endif //USE_WXWIDGETS