X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.h;h=8159ba8a7e7289a08932f14542c10e7dea69ed47;hb=7eba604321498f7ed6333b7cbe9bf2aceb4ec30e;hp=d074414dea09017946f65e00c0a89d94e0d3cc37;hpb=555854b9edeeb49fdd03fad2b1274e6d6db6d9f7;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index d074414..8159ba8 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/01/22 15:41:34 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/06 14:14:22 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -87,15 +87,15 @@ namespace bbtk
     /// Sets the global parent of all bbtk windows
     static void bbGlobalSetTopWindow(wxWindow*);
 
-    static void bbGlobalIncNbWindowsAlive() { bbmgNbWindowsAlive++; }
+	static void bbGlobalIncNbWindowsAlive() { WxBlackBox::bbmgNbWindowsAlive++; }
     static void bbGlobalDecNbWindowsAlive();
-    static int  bbGlobalGetNbWindowsAlive() { return bbmgNbWindowsAlive; }
-    static bool bbGlobalIsSomeWindowAlive() { return (bbmgNbWindowsAlive>0);}
+    static int  bbGlobalGetNbWindowsAlive() { return WxBlackBox::bbmgNbWindowsAlive; }
+    static bool bbGlobalIsSomeWindowAlive() { return (WxBlackBox::bbmgNbWindowsAlive>0);}
 
     static void bbGlobalDecNbWindowsShown();
-    static void bbGlobalIncNbWindowsShown() { bbmgNbWindowsShown++; }
-    static int  bbGlobalGetNbWindowsShown() { return bbmgNbWindowsShown; }
-    static bool bbGlobalIsSomeWindowShown() { return (bbmgNbWindowsShown>0);}
+    static void bbGlobalIncNbWindowsShown() { WxBlackBox::bbmgNbWindowsShown++; }
+	static int  bbGlobalGetNbWindowsShown() { return WxBlackBox::bbmgNbWindowsShown; }
+	static bool bbGlobalIsSomeWindowShown() { return (WxBlackBox::bbmgNbWindowsShown>0);}
 
 
   private:
@@ -189,19 +189,19 @@ namespace bbtk
   // UserBlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(WxBlackBox,bbtk::UserBlackBox);
   BBTK_NAME("WxBlackBox");
-  //  BBTK_INPUT_NOCOPY(WxBlackBox,WinParent,"Parent widget box",
-  //		    WxParentToChildData*);
+  BBTK_DESCRIPTION("Widget box. The inputs marked with (*) are only used if the widget is not inserted in another widget.\n");
+  BBTK_CATEGORY("widget");
   BBTK_INPUT(WxBlackBox,WinTitle,
-	     "Title of the window (only used if the box is the top window of a Parent-Child hierarchy)",
+	     "Title of the window (*)",
 	     std::string);
   BBTK_INPUT(WxBlackBox,WinWidth,
-	     "Width of the window (only used if the box is the top window of a Parent-Child hierarchy)",int);
+	     "Width of the window (*)",int);
   BBTK_INPUT(WxBlackBox,WinHeight,
-	     "Height of the window (only used if the box is the top window of a Parent-Child hierarchy)",int);
+	     "Height of the window (*)",int);
   BBTK_INPUT(WxBlackBox,WinDialog,
-	     "Set to 'true' to have a dialog window, i.e. which is modal (steals the focus until closed) (only used if the box is the top window of a Parent-Child hierarchy)",bool);
+	     "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 (only active if the box is the top window of a Parent-Child hierarchy)",Void);
+	     "Any signal received hides the window (*)",Void);
   BBTK_OUTPUT(WxBlackBox,Widget,"Output widget",wxWindow*);
   BBTK_END_DESCRIBE_BLACK_BOX(WxBlackBox);
   //=================================================================