X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxSlider.cxx;h=b0022b214bbb7ac2ef71d008525ab1fcadb28727;hb=103f8756e4e48f909eb4f6db115043d5b08c6f1d;hp=54c2daa05940057b107516e792f43c6ee432ec00;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 54c2daa..b0022b2 100644
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -151,6 +151,10 @@ namespace bbwx
 	wxorientation	= wxSL_VERTICAL;
       }
     
+      
+    wxSize  sizeSliderWidget(25,25);
+//  int  widthSliderWidget = wxDefaultSize;
+      
     //---------------------------------------------------------------------
     // 1) Creation of the components of the widget
     // Any top level sub-widget must have the panel returned by panel
@@ -158,8 +162,8 @@ namespace bbwx
     mwxSlider = new wxSlider( panel, 
 			      -1, 0 , 0, 500 , 
 			      wxDefaultPosition, 
-			      wxSize(sizeX,sizeY), 
-			      wxorientation  | wxlabels );
+                  sizeSliderWidget, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+
 
     //    mwxSlider->SetInitialSize(wxSize(sizeX,sizeY));
 
@@ -445,31 +449,28 @@ namespace bbwx
     bbtkDebugMessage("process",3,
 		     "Slider "<<bbGetName()<<" input="
 		     <<bbGetInputIn()<<std::endl);
-
+    
+    if (bbGetOutputWidget()!=NULL)
+	{
 // desperate try // JPR
-      if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
-      {    
-		  ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
-      }
+      	if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
+      	{    
+		  	((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
+      	}
 
-	  ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
+	  	((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
 	  
-    bbSetOutputOut( bbGetInputIn() );
-    if (bbGetOutputWidget()!=0)
-      {
-	((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
-      }
+    	bbSetOutputOut( bbGetInputIn() );
+		((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
+	} // if bbGetOutputWidget
   }
 
 //--------------------------------------------------------------------------
   void Slider::CreateWidget(wxWindow* parent)
   {
-
     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, 
 					parent, //bbGetWxParent(),
@@ -483,8 +484,8 @@ namespace bbwx
 					bbGetInputReactiveOnTrack()
 					); 
     //    std::cout << "w = "<<w<<std::endl;
-    //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
-	  
+    //	w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );	  
+   	bbSetOutputOut( bbGetInputIn() );
     bbSetOutputWidget( w );
   }