X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.h;h=ddd35779880b48ef216d4b6c9a2c8d43f55f3890;hb=bdbe8432a23b398ce457f38d647e9298a7cf560a;hp=9b22db3c6d65bb079b2c3b77f21fb9d7526ef2ff;hpb=5934ccb7ca0fabdbe6c1907b2aea3696e19a0251;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index 9b22db3..ddd3577 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/22 14:30:25 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/05/15 08:02:36 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,6 +69,7 @@ namespace bbtk
     BBTK_DECLARE_INPUT(WinHeight,int);
     BBTK_DECLARE_INPUT(WinDialog,bool);
     BBTK_DECLARE_INPUT(WinHide,Void);
+    BBTK_DECLARE_INPUT(WinClose,Void);
     BBTK_DECLARE_OUTPUT(Widget, wxWindow*);//WxBlackBoxWidget*);
 
   public:
@@ -154,6 +155,8 @@ namespace bbtk
     void bbShowWindow();
     /// Hides the WxBlackBoxWindow associated to the box (if exists)
     void bbHideWindow();
+    /// Closes (destroys) the WxBlackBoxWindow associated to the box (if exists)
+    void bbCloseWindow();
     //==================================================================
 
   private:
@@ -203,10 +206,10 @@ namespace bbtk
   public:								\
   inline void bbUserCreateWidget()					\
   {									\
-    bbtkDebugMessageInc("Process",1,"=> "<<bbGetTypeName()<<"::bbUserCreateWidget() [" \
+    bbtkDebugMessageInc("process",1,"**> Creating widget for ["		\
 			<<bbGetFullName()<<"]"<<std::endl);		\
     CALLBACK();								\
-    bbtkDebugMessageDec("Process",1,"<= "<<bbGetTypeName()<<"::bbUserCreateWidget() [" \
+    bbtkDebugMessageInc("process",2,"<** Creating widget for ["		\
 			<<bbGetFullName()<<"]"<<std::endl);		\
   }
   
@@ -222,13 +225,15 @@ namespace bbtk
 	     "Title of the window (*)",
 	     std::string,"");
   BBTK_INPUT(WxBlackBox,WinWidth,
-	     "Width of the window (* : only used if the widget is not inserted in another widget)",int,"");
+	     "Width of the window (* : only used if the widget is not connected to a Layout box)",int,"");
   BBTK_INPUT(WxBlackBox,WinHeight,
 	     "Height of the window (*)",int,"");
   BBTK_INPUT(WxBlackBox,WinDialog,
 	     "Set to 'true' to create a dialog window, i.e. which blocks the pipeline until it is closed (modal) (*)",bool,"");
   BBTK_INPUT(WxBlackBox,WinHide,
-	     "Any signal received hides the window (*)",Void,"");
+	     "Any signal received hides the window (*)",Void,"signal");
+  BBTK_INPUT(WxBlackBox,WinClose,
+	     "Any signal received closes the window (*)",Void,"signal");
   BBTK_OUTPUT(WxBlackBox,Widget,"Output widget",wxWindow*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(WxBlackBox);
   //=================================================================
@@ -250,6 +255,7 @@ namespace bbtk
     virtual ~WxBlackBoxWindow();
     virtual void bbShow();
     virtual void bbHide();
+    virtual void bbClose();
     bool bbIsShown() { return mShown; }
     virtual WxBlackBox::Pointer bbGetBlackBox() { return mBox.lock(); }
     virtual wxDialog* bbGetDialog() { return 0; } 
@@ -270,6 +276,7 @@ namespace bbtk
     ~WxBlackBoxDialog();
     void bbShow();  
     void bbHide();
+    void bbClose();
     wxDialog* bbGetDialog() { return this; } 
   };
   //==================================================================
@@ -284,6 +291,7 @@ namespace bbtk
     ~WxBlackBoxFrame();
     void bbShow();
     void bbHide();
+    void bbClose();
     wxFrame* bbGetFrame() { return this; } 
   };
   //==================================================================