wxColorDialogButton

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

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index 7039139bfb0be22fedd0688e1708f4ae6b35a071..3017b5ef0a27565123b16197d0067659fda94e45 100644 (file)
--- 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/01/22 15:41:35 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/13 15:09:37 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,16 +24,11 @@
  *  
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
-
-
 #include "bbwxSlider.h"
 #include "bbwxPackage.h"
-
-
-
+#include "bbtkUtilities.h"
 
 namespace bbwx
 {
@@ -56,12 +51,12 @@ namespace bbwx
     reactiveOnTrack(reactiveontrack)
   {
     wxPanel * panel = this;
-
+    
     label_min           = NULL;
     label_max           = NULL;
     label_vertical      = NULL;
     mResolutionOfSlider        = NULL;
-    
+
     int sizeX,sizeY;
     long wxlabels=0;
     long wxorientation=0;
@@ -224,8 +219,6 @@ namespace bbwx
     RefreshLabels();  
     // Insert the sizer in the main panel and refresh the layout
     panel->SetSizer(sizer);
-    //   panel->SetAutoLayout(true);
-    //    panel->Layout();
   }
   //-------------------------------------------------------------------------
   
@@ -335,8 +328,7 @@ namespace bbwx
   //--------------------------------------------------------------------------
   BBTK_USER_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider);
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::bbUserConstructor() 
   { 
@@ -344,13 +336,12 @@ namespace bbwx
     bbSetInputMin(0);
     bbSetInputMax(500);
     bbSetOutputOut(0);
-    bbSetInputOrientation(0);
+    bbSetInputOrientation("HORIZONTAL");
     bbSetInputChangeResolution(false);
     bbSetInputLabel(true);
     bbSetInputReactiveOnTrack(0);    
   }
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::Process() 
   {
@@ -359,31 +350,27 @@ namespace bbwx
 
   void Slider::CreateWidget()
   {
-    bbSetOutputWidget( new SliderWidget(this, 
-                                       bbGetWxParent(),
-                                       bbGetInputOrientation() , 
-                                       bbGetInputChangeResolution(), 
-                                       bbGetInputLabel(), 
-                                       bbtk::std2wx( bbGetInputTitle() ),
-                                       bbGetInputMin(), 
-                                       bbGetInputMax(),
-                                       bbGetInputIn(),
-                                       bbGetInputReactiveOnTrack()
-                                       )
-                      );
-  }
-  
-  //--------------------------------------------------------------------------  
-  /*
-  //--------------------------------------------------------------------------
-  bbtk::WxBlackBoxWidget* Slider::bbUserCreateWidget(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; }
+         
+         SliderWidget *w =  new SliderWidget(this, 
+                                               bbGetWxParent(),
+                                               orientation , 
+                                               bbGetInputChangeResolution(), 
+                                               bbGetInputLabel(), 
+                                               bbtk::std2wx( bbGetInputTitle() ),
+                                               bbGetInputMin(), 
+                                               bbGetInputMax(),
+                                               bbGetInputIn(),
+                                               bbGetInputReactiveOnTrack()
+                                               ); 
+         //    w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+         
+    bbSetOutputWidget( w );
   }
-  //--------------------------------------------------------------------------
-  */
-
+  
 
 } //namespace bbwx