#3499 Export to JavaScript

[bbtk.git] / packages / wx / src / bbwxSlider.cxx

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index e467c5f688a0551532d96428758b1f3d408e84cc..b0022b214bbb7ac2ef71d008525ab1fcadb28727 100644 (file)
--- 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,7 +162,7 @@ namespace bbwx
     mwxSlider = new wxSlider( panel, 
                              -1, 0 , 0, 500 , 
                              wxDefaultPosition, 
-                             wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+                  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 );
   }