X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.h;h=878c83b79ea61bf91d09b1843ae9f9633341024d;hb=10038b32bc97ccdd4cf6cec3a48cc7113840c5af;hp=e8acc44ab0c7cb55b56128cea2a06b3cc715ddc9;hpb=e4149b56dda0cfb15427533e6f573f09cd3ff74b;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index e8acc44..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/11/24 15:45:48 $
-  Version:   $Revision: 1.20 $
+  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();
@@ -125,9 +120,10 @@ namespace bbtk
     virtual void bbUserOnHide() {}
     //==================================================================    
 
-	  // LG 24/11/08 : New widget pipeline
-	  void bbCreateWidgetAndEventHandler(wxWindow* parent); 
 
+    //==================================================================    
+    void bbCreateWidgetAndEventHandler(wxWindow* parent); 
+    //==================================================================    
 	  
   protected:
     
@@ -136,7 +132,7 @@ namespace bbtk
     /// User callback called in the box contructor
     virtual void bbUserConstructor();
     /// User callback called in the box copy constructor
-    virtual void bbUserCopyConstructor();
+    virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
     /// User callback called in the box destructor
     virtual void bbUserDestructor();
     //==================================================================    
@@ -144,30 +140,24 @@ 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) 
+    virtual void bbUserCreateWidget(wxWindow* parent) 
     {
       bbtkError(bbGetTypeName()<<" is a WxBlackBox whose bbUserCreateWidget methods is not overloaded : is it a feature or a bug ?!?");
     }
     //==================================================================    
 
 
-	  wxWindow* bbCreateWidgetOfInput(const std::string& in, wxWindow* parent);
-
-
-    //==================================================================
-    /// Main processing method of the box.
-    virtual IOStatus bbBackwardUpdate( Connection::Pointer caller );
-    //==================================================================
-
+    //==================================================================    
+    // For layout widgets : creates and returns the widget 
+    // of the box connected to input in
+    wxWindow* bbCreateWidgetOfInput(const std::string& in, wxWindow* parent);
+    //==================================================================    
 
+ 
 
     //==================================================================
-    /// Overloaded processing method for WxBlackBoxes :
-    /// 1) if the widget is null then 
-    ///    calls the user defined widget creation method : bbUserCreateWidget()
-    /// 2) calls the user defined processing method : bbUserProcess()
-    /// 3) displays the window : bbShowWindow();
+    /// Overloaded processing method for WxBlackBoxes which handles 
+    /// the window creation if needed
     virtual void bbProcess();
     //==================================================================
 
@@ -177,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)
@@ -215,12 +205,13 @@ namespace bbtk
     /// on a contained window
     /// Is set to true before transfering update to parent 
     /// in order to not re-transfer a second time...
+    /*
     bool bbmUpdateTransferedToParent;
 
     bool bbGetUpdateTransferedToParent() const { return bbmUpdateTransferedToParent; }
     void bbSetUpdateTransferedToParent(bool b) 
     { bbmUpdateTransferedToParent = b; }
-
+    */
   };
   //=================================================================
  
@@ -369,4 +360,4 @@ namespace bbtk
 
 #endif  //__bbtkWxBlackBox_h__
 
-#endif  //_USE_WXWIDGETS_
+#endif  //USE_WXWIDGETS