Fixes

[bbtk.git] / packages / wx / src / bbwxColourSelectorButton.h

diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h
index 8c6dd577872f47fc979d069e3e807e2f034faf2f..029daa168ccbc1e441ef7bb55152bdc83fb2b144 100644 (file)
--- a/packages/wx/src/bbwxColourSelectorButton.h
+++ b/packages/wx/src/bbwxColourSelectorButton.h
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/09/10 12:01:47 $
-  Version:   $Revision: 1.6 $
-                                                                                
-  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/05/15 14:58:03 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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
@@ -28,8 +41,7 @@
  * \class bbwx::ColourSelectorButton
  * \brief 
 
- * \class bbwx::wxColourPickerCtrlWidget
- * \brief 
+
  */
 
 #ifdef _USE_WXWIDGETS_
@@ -42,8 +54,7 @@
 
 // Include wxBlackBox definition
 #include "bbtkWxBlackBox.h"
-
-#include <wx/clrpicker.h>
+#include "bbwx_EXPORT.h"
 
 // Namespace of the package "wx" is "bbwx" 
 // Namespace associated to packages should be of the form :
@@ -51,30 +62,10 @@
 namespace bbwx
 {
 
-  //=================================================================
-class ColourSelectorButton;
-
-class wxColourPickerCtrlWidget :public wxPanel
-{
 
-public:
-   wxColourPickerCtrlWidget( ColourSelectorButton* box,
-                             wxWindow *parent,
-                             unsigned char  cr,
-                             unsigned char  cg,
-                             unsigned char  cb  );
-
-   ~wxColourPickerCtrlWidget();
-   void OnColorChange(wxColourPickerEvent& e);
-   void UpdateBox();
-private:
-   wxColourPickerCtrl *picker;
-   ColourSelectorButton *mBox;
-};
-
-//------------------------------------------------------------------------
-// The black box
-  class /*BBTK_EXPORT*/ ColourSelectorButton : public bbtk::WxBlackBox
+  //------------------------------------------------------------------------
+  // The black box
+  class bbwx_EXPORT ColourSelectorButton : public bbtk::WxBlackBox
   {
     BBTK_BLACK_BOX_INTERFACE(ColourSelectorButton,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
@@ -82,17 +73,14 @@ private:
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
     void Process();
-    void CreateWidget();
-
+    void CreateWidget(wxWindow*);
   protected:
-    virtual void bbUserConstructor();
 
-  private:
-     wxColourPickerCtrlWidget* pickerWidget;
   };
+  //=================================================================
 
   //=================================================================
-  // UserBlackBox description
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColourSelectorButton,bbtk::WxBlackBox);
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_NAME("ColourSelectorButton");
@@ -106,4 +94,4 @@ private:
 }//namespace bbtk
 #endif  // __bbtkWxColourSelector_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS