X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxColourSelectorButton.h;h=8c6dd577872f47fc979d069e3e807e2f034faf2f;hb=ee6e5669242906f575db12c6408aa3e398d55bba;hp=4d51d1a8e1c73bb1853a9d5387876ffb77c7c285;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git

diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h
index 4d51d1a..8c6dd57 100644
--- a/packages/wx/src/bbwxColourSelectorButton.h
+++ b/packages/wx/src/bbwxColourSelectorButton.h
@@ -3,18 +3,19 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/08 06:59:32 $
-  Version:   $Revision: 1.2 $
+  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.
-                                                                                
-=========================================================================*//**
+                                                                  
+=========================================================================*/
+
 /**
  * \file 
  * \brief Short description in one line
@@ -50,14 +51,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,21 +68,15 @@ 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_USER_BLACK_BOX_INTERFACE(ColourSelectorButton,bbtk::WxBlackBox);
+  {
+    BBTK_BLACK_BOX_INTERFACE(ColourSelectorButton,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
@@ -89,27 +85,25 @@ private:
     void CreateWidget();
 
   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_