X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxSlider.h;h=c3a763cb77987d0d8f9035bf2781135d4a7da0a3;hb=a35973b128a2f7130b619a2a11a35cfd418b21b6;hp=a79960acde9888ec64728fb518011e0267912189;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h
index a79960a..c3a763c 100644
--- a/packages/wx/src/bbwxSlider.h
+++ b/packages/wx/src/bbwxSlider.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:33 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2009/02/10 14:56:50 $
+  Version:   $Revision: 1.16 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -55,6 +55,7 @@
 // Include wxBlackBox definition
 #include "bbtkWxBlackBox.h"
 
+#include "bbwx_EXPORT.h"
 
 
 // Namespace of the package "wx" is "bbwx" 
@@ -63,65 +64,12 @@
 namespace bbwx
 {
   
-  //--------------------------------------------------------------------------
-  // Forward declaration of the box
-  class Slider;
-  
-  //--------------------------------------------------------------------------
-  // The widget created by the box 
-  class SliderWidget : public wxPanel 
-  {
-  public:
-    /// Ctor with the two first params the parent window and the creator box
-    /// which must be passed to the WxBlackBoxWidget constructor.
-    /// The other params initialize the widget 
-    SliderWidget(Slider* box, wxWindow *parent,
-		 int orientation,
-		 bool changeresolution,
-		 bool label, 
-		 wxString title,
-		 int vmin,
-		 int vmax,
-		 int value,
-       int track);
-    /// Dtor
-    ~SliderWidget();
-    /// Events callbacks
-    /// Called when the slider is moved
-    void OnSliderTrack(wxScrollEvent& event);
-    /// Called when the slider is released
-    void OnSliderRelease(wxScrollEvent& event);
-    /// Called when the little slider which controls the resolution
-    /// of the main slider is moved (if activated)
-    void OnResolutionOfSlider(wxScrollEvent& event);
-
-    // Accessors
-    int  GetValue() { return mwxSlider->GetValue(); }
-    void SetRange(int min, int max);
-    // Update the texts which display the min/max/current values of the slider
-    void RefreshLabels();
-	
-  private:
-    Slider*    mBox;
-    wxSlider   *mwxSlider;
-    wxSlider   *mResolutionOfSlider;
-    int        min;
-    int        max;
-    int        reactiveOnTrack;
-    wxStaticText	*label_vertical;
-    wxStaticText	*label_min;
-    wxStaticText	*label_max;
-  };
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
+   
 
   
-  
-  
   //------------------------------------------------------------------------
   // The black box
-  class /*BBTK_EXPORT*/ Slider : public bbtk::WxBlackBox
+  class bbwx_EXPORT Slider : public bbtk::WxBlackBox
   {
     
     BBTK_BLACK_BOX_INTERFACE(Slider,bbtk::WxBlackBox);
@@ -132,12 +80,12 @@ namespace bbwx
     BBTK_DECLARE_INPUT(Title,std::string);
     BBTK_DECLARE_INPUT(Orientation,std::string);
     BBTK_DECLARE_INPUT(ChangeResolution,bool);
-    BBTK_DECLARE_INPUT(ReactiveOnTrack,int);    
+    BBTK_DECLARE_INPUT(ReactiveOnTrack,bool);    
     BBTK_DECLARE_OUTPUT(Out,int);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
     void Process();
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
 
   protected:
     virtual void bbUserConstructor();
@@ -158,7 +106,7 @@ namespace bbwx
   BBTK_INPUT(Slider,Title,"Title shown above the slider (default '') ", std::string,"");
   BBTK_INPUT(Slider,Orientation, "Orientation : (default H)  0=H=HORIZONTAL, 1=V=VERTICAL ",std::string,"");
   BBTK_INPUT(Slider,ChangeResolution, "Can the user change the resolution of the slider ? (default FALSE) ",bool,"");
-  BBTK_INPUT(Slider,ReactiveOnTrack, "Slider sends info when track moves (default 0 = no)",int,"");  
+  BBTK_INPUT(Slider,ReactiveOnTrack, "Slider sends info when track moves (default : FALSE)",bool,"");  
   BBTK_OUTPUT(Slider,Out,"Current position of the slider",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Slider);
   //=================================================================