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

diff --git a/packages/wx/src/bbwxColourSelector.h b/packages/wx/src/bbwxColourSelector.h
index 2b9b6f9..77e4c6a 100644
--- a/packages/wx/src/bbwxColourSelector.h
+++ b/packages/wx/src/bbwxColourSelector.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelector.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.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -51,8 +51,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 +63,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 +85,6 @@ namespace bbwx
   //=================================================================
 
 }//namespace bbtk
-#endif  // __bbtkWxColourSelector_h__
 
-#endif //_USE_WXWIDGETS_
+#endif  // __bbtkWxColourSelector_h__
+#endif //USE_WXWIDGETS