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

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index fda48f4..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/02/12 20:08:12 $
-  Version:   $Revision: 1.7 $
+  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
@@ -24,18 +24,12 @@
  *  
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
-
-
 #include "bbwxSlider.h"
 #include "bbwxPackage.h"
 #include "bbtkUtilities.h"
 
-
-
-
 namespace bbwx
 {
   
@@ -48,7 +42,7 @@ namespace bbwx
 			     int vmin,
 			     int vmax,
 			     int value,
-              int reactiveontrack)
+                             int reactiveontrack)
     :  
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box),
@@ -116,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){
@@ -225,8 +225,6 @@ namespace bbwx
     RefreshLabels();  
     // Insert the sizer in the main panel and refresh the layout
     panel->SetSizer(sizer);
-    //   panel->SetAutoLayout(true);
-    //    panel->Layout();
   }
   //-------------------------------------------------------------------------
   
@@ -268,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();
   }
   //-------------------------------------------------------------------------
 
@@ -334,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);
   
   //--------------------------------------------------------------------------
@@ -359,22 +358,25 @@ namespace bbwx
   void Slider::CreateWidget()
   {
 
-	 int orientation=0;
-	 if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true)  { orientation=0; }
-	 if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true)    { orientation=1; }
-	  
-	  SliderWidget *w =  new SliderWidget(this, 
-	  					bbGetWxParent(),
-	  					orientation , 
-	  					bbGetInputChangeResolution(), 
-	  					bbGetInputLabel(), 
-	  					bbtk::std2wx( bbGetInputTitle() ),
-	  					bbGetInputMin(), 
-	  					bbGetInputMax(),
-	  					bbGetInputIn(),
-	  					bbGetInputReactiveOnTrack()
-	  					); 
-	  //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+    int orientation=0;
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|H|HORIZONTAL")==true)  { orientation=0; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|V|VERTICAL")==true)    { orientation=1; }
+    
+    
+    //    std::cout << "bbGetWxParent = "<<bbGetWxParent()<<std::endl;
+    SliderWidget *w =  new SliderWidget(this, 
+					bbGetWxParent(),
+					orientation , 
+					bbGetInputChangeResolution(), 
+					bbGetInputLabel(), 
+					bbtk::std2wx( bbGetInputTitle() ),
+					bbGetInputMin(), 
+					bbGetInputMax(),
+					bbGetInputIn(),
+					bbGetInputReactiveOnTrack()
+					); 
+    //    std::cout << "w = "<<w<<std::endl;
+    //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
 	  
     bbSetOutputWidget( w );
   }