X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=bbaa71351b195a8788ac6174f1c4a036ec3397c5;hb=0edcd2a545e9147a244167d1c336e06c4731216a;hp=626138093b52915d63cbc9f04382c29b94ce31d8;hpb=b0f948e65655a106e7328784444554f34da7dcac;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 6261380..bbaa713 100644
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/10 10:01:15 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/10/06 09:05:07 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -42,7 +42,7 @@ namespace bbwx
 			     int vmin,
 			     int vmax,
 			     int value,
-              int reactiveontrack)
+                             int reactiveontrack)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
@@ -110,7 +110,13 @@ namespace bbwx
 	     (void (wxPanel::*)(wxScrollEvent&))
 	      &SliderWidget::OnSliderTrack ); 
     
+    Connect( mwxSlider->GetId(),  
+	     wxEVT_SCROLL_CHANGED, 
 
+	     (wxObjectEventFunction) 
+	     (void (wxPanel::*)(wxScrollEvent&))
+	      &SliderWidget::OnSliderTrack );
+	       
     // If asked : creation of the other little slider which allows to change 
     // the resolution of the main slider
     if (changeresolution==true){
@@ -260,12 +266,13 @@ namespace bbwx
     {
     // When user releases the slider 
     // we update the output of the box
+    
     mBox->bbSetOutputOut( mwxSlider->GetValue() );
     mBox->bbSetInputIn( mwxSlider->GetValue() );
     // and signal that the output has changed
     mBox->bbSignalOutputModification("Out");    
     }
-    RefreshLabels();  
+    RefreshLabels();
   }
   //-------------------------------------------------------------------------
 
@@ -326,7 +333,7 @@ namespace bbwx
   //--------------------------------------------------------------------------
 
   //--------------------------------------------------------------------------
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider);
   
   //--------------------------------------------------------------------------
@@ -356,7 +363,7 @@ namespace bbwx
     if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true)    { orientation=1; }
     
     
-    std::cout << "bbGetWxParent = "<<bbGetWxParent()<<std::endl;
+    //    std::cout << "bbGetWxParent = "<<bbGetWxParent()<<std::endl;
     SliderWidget *w =  new SliderWidget(this, 
 					bbGetWxParent(),
 					orientation , 
@@ -368,8 +375,8 @@ namespace bbwx
 					bbGetInputIn(),
 					bbGetInputReactiveOnTrack()
 					); 
-    std::cout << "w = "<<w<<std::endl;
-	  //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+    //    std::cout << "w = "<<w<<std::endl;
+    //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
 	  
     bbSetOutputWidget( w );
   }