X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxColourSelectorButton.h;h=aef50a25df702588980f645ca9c26ac4db8e04de;hb=8cbad3dc345346d0473d93cdc06dc9eb5cbdbf23;hp=22dd10193913eadedb0866696affa9aedd387c39;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h
index 22dd101..aef50a2 100644
--- a/packages/wx/src/bbwxColourSelectorButton.h
+++ b/packages/wx/src/bbwxColourSelectorButton.h
@@ -1,20 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  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: 2008/11/25 11:17:25 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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
@@ -50,14 +64,15 @@
 namespace bbwx
 {
 
+  //=================================================================
 class ColourSelectorButton;
 
 class wxColourPickerCtrlWidget :public wxPanel
 {
 
 public:
-   wxColourPickerCtrlWidget( ColourSelectorButton* box, 
-                             wxWindow *parent, 
+   wxColourPickerCtrlWidget( ColourSelectorButton* box,
+                             wxWindow *parent,
                              unsigned char  cr,
                              unsigned char  cg,
                              unsigned char  cb  );
@@ -66,50 +81,43 @@ public:
    void OnColorChange(wxColourPickerEvent& e);
    void UpdateBox();
 private:
-   wxColourPickerCtrl *picker; 
+   wxColourPickerCtrl *picker;
    ColourSelectorButton *mBox;
 };
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-
-
 
 //------------------------------------------------------------------------
 // The black box
   class /*BBTK_EXPORT*/ ColourSelectorButton : public bbtk::WxBlackBox
-  {    
+  {
     BBTK_BLACK_BOX_INTERFACE(ColourSelectorButton,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
     void Process();
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
 
   protected:
-     virtual void bbUserConstructor();
- 
+    virtual void bbUserConstructor();
+    /*
   private:
      wxColourPickerCtrlWidget* pickerWidget;
+    */
   };
-   
+
   //=================================================================
   // UserBlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColourSelectorButton,bbtk::WxBlackBox);
+  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_NAME("ColourSelectorButton");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("A button which displays a colour picker dialog when clicked");
-  BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string,"color");
-  BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"color");
+  BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string,"colour");
+  BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"colour");
   BBTK_END_DESCRIBE_BLACK_BOX(ColourSelectorButton);
   //=================================================================
-  
-  
-}//namespace  bbwx
 
-#endif  // __bbwxColourSelectorButton_h_INCLUDED_H__
+}//namespace bbtk
+#endif  // __bbtkWxColourSelector_h__
 
 #endif //_USE_WXWIDGETS_