re-indent

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

diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h
index 3606a218bdd0ce18acf059d6c3718b1e774a3a8e..029daa168ccbc1e441ef7bb55152bdc83fb2b144 100644 (file)
--- a/packages/wx/src/bbwxColourSelectorButton.h
+++ b/packages/wx/src/bbwxColourSelectorButton.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -41,8 +41,7 @@
  * \class bbwx::ColourSelectorButton
  * \brief 
 
- * \class bbwx::wxColourPickerCtrlWidget
- * \brief 
+
  */
 
 #ifdef _USE_WXWIDGETS_
@@ -55,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 :
@@ -64,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);
@@ -95,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");
@@ -119,4 +94,4 @@ private:
 }//namespace bbtk
 #endif  // __bbtkWxColourSelector_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS