=== MAJOR RELEASE ====

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

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index ca2409a243322f53553342fd5ff7742eaaf55442..5345a005150e3292de99bd7f5ff2ed35fba62cd7 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/02/08 14:58:31 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/04/18 12:59:53 $
+  Version:   $Revision: 1.11 $
                                                                                 
   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
 {
   
@@ -57,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;
@@ -225,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();
   }
   //-------------------------------------------------------------------------
   
@@ -334,14 +326,12 @@ 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);
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::bbUserConstructor() 
   { 
-    // bbSetInputWinTitle("Slider");
     bbSetInputIn(0);
     bbSetInputMin(0);
     bbSetInputMax(500);
@@ -351,8 +341,7 @@ namespace bbwx
     bbSetInputLabel(true);
     bbSetInputReactiveOnTrack(0);    
   }
-  //--------------------------------------------------------------------------
-
+  
   //--------------------------------------------------------------------------
   void Slider::Process() 
   {
@@ -362,37 +351,29 @@ 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 );
   }
   
-  //--------------------------------------------------------------------------  
-  /*
-  //--------------------------------------------------------------------------
-  bbtk::WxBlackBoxWidget* Slider::bbUserCreateWidget(wxWindow *parent)
-  {
-   
-
-  }
-  //--------------------------------------------------------------------------
-  */
-
 
 } //namespace bbwx