X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.h;h=878c83b79ea61bf91d09b1843ae9f9633341024d;hb=0e7db59ef7d65efd7477ab1f214f8a83c6ad3eb4;hp=2d9084c43f9102696717954adeb434957ea66d5e;hpb=3928b4ad06b5b5fd142f696f58a7828d064e2883;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index 2d9084c..878c83b 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 12:54:27 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2008/12/11 15:30:04 $
+  Version:   $Revision: 1.24 $
 ========================================================================*/
 
 
@@ -44,7 +44,7 @@
  */
 
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 
 
 #ifndef __bbtkWxBlackBox_h__
@@ -87,7 +87,7 @@ namespace bbtk
 
   public:
     /// Main processing method of the box. Overloaded to handle windows inclusion : if the output Widget is connected then the execution is transfered to the box to which it is connected (as the container window must be created and displayed - this box will be executed by the normal pipeline recursion mechanism)
-    virtual void bbExecute(bool force = false);
+    //   virtual void bbExecute(bool force = false);
 
 
     typedef WxBlackBoxWindow Window;
@@ -106,11 +106,6 @@ namespace bbtk
     /// Else returns 0;
     Window* bbGetContainingWindow();
 
-    /// Returns the parent wxWindow that must be used to create the widget 
-	  //
-	  // LG 24/11/08 : New widget pipeline
-	  //    wxWindow* bbGetWxParent();
-
     /// Returns true iff the 'containing window' exists and is shown 
     /// (see bbGetContainingWindow).
     bool bbIsShown();
@@ -126,8 +121,9 @@ namespace bbtk
     //==================================================================    
 
 
-   // LG 24/11/08 : New widget pipeline
+    //==================================================================    
     void bbCreateWidgetAndEventHandler(wxWindow* parent); 
+    //==================================================================    
 	  
   protected:
     
@@ -144,7 +140,6 @@ namespace bbtk
     //==================================================================    
     /// User callback for creating the widget associated to the box
     /// ** Must be defined **
-    // LG 24/11/08 : New widget pipeline
     virtual void bbUserCreateWidget(wxWindow* parent) 
     {
       bbtkError(bbGetTypeName()<<" is a WxBlackBox whose bbUserCreateWidget methods is not overloaded : is it a feature or a bug ?!?");
@@ -158,13 +153,6 @@ namespace bbtk
     wxWindow* bbCreateWidgetOfInput(const std::string& in, wxWindow* parent);
     //==================================================================    
 
-
-    //==================================================================
-    /// Main processing method of the box.
-    //  No more overloaded
-    //  virtual void bbBackwardUpdate( Connection::Pointer caller );
-    //==================================================================
-
  
 
     //==================================================================
@@ -179,7 +167,7 @@ namespace bbtk
     /// (does nothing if the box output 'Widget' is connected which 
     /// means that the box does not have its own window but is contained 
     /// into another window)
-    void bbShowWindow();
+    //    void bbShowWindow();
     /// Hides the WxBlackBoxWindow associated to the box (if exists)
     void bbHideWindow();
     /// Closes (destroys) the WxBlackBoxWindow associated to the box (if exists)
@@ -372,4 +360,4 @@ namespace bbtk
 
 #endif  //__bbtkWxBlackBox_h__
 
-#endif  //_USE_WXWIDGETS_
+#endif  //USE_WXWIDGETS