X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.h;h=e0418a101c308dd92639adb203c58fa14b8955af;hb=6ea571ab3b7a539aaaca066db3941f5017920209;hp=fcd35bebf7e314d01885953a86e50c745aa01fe4;hpb=aeafe748c859675cf481bd9e5e5a5afa84a3fa52;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index fcd35be..e0418a1 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/28 14:32:54 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/02/08 10:05:38 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@
 
 
 #include "bbtkWx.h"
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 
 
 namespace bbtk
@@ -60,9 +60,9 @@ namespace bbtk
 
   //==================================================================
   /// Widget black boxes
-  class BBTK_EXPORT WxBlackBox : public bbtk::UserBlackBox  
+  class BBTK_EXPORT WxBlackBox : public bbtk::AtomicBlackBox  
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::UserBlackBox);
+    BBTK_USER_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::AtomicBlackBox);
     //   BBTK_DECLARE_INPUT(WinParent,WxParentToChildData*);
     BBTK_DECLARE_INPUT(WinTitle,std::string);
     BBTK_DECLARE_INPUT(WinWidth,int);
@@ -79,30 +79,10 @@ namespace bbtk
     Window* bbGetWindow() { return bbmWindow; }
 
     /// Returns the Parent Window that must be used to create the widget 
-    wxWindow* bbGetWxParent() { return bbGlobalGetTopWindow(); }
+    wxWindow* bbGetWxParent() { return Wx::GetTopWindow(); }
 
 
-    /// Returns the global parent of all bbtk windows
-    static wxWindow* bbGlobalGetTopWindow();
-    /// Sets the global parent of all bbtk windows
-    static void bbGlobalSetTopWindow(wxWindow*);
-
-	static void bbGlobalIncNbWindowsAlive() { WxBlackBox::bbmgNbWindowsAlive++; }
-    static void bbGlobalDecNbWindowsAlive();
-    static int  bbGlobalGetNbWindowsAlive() { return WxBlackBox::bbmgNbWindowsAlive; }
-    static bool bbGlobalIsSomeWindowAlive() { return (WxBlackBox::bbmgNbWindowsAlive>0);}
-
-    static void bbGlobalDecNbWindowsShown();
-    static void bbGlobalIncNbWindowsShown() { WxBlackBox::bbmgNbWindowsShown++; }
-	static int  bbGlobalGetNbWindowsShown() { return WxBlackBox::bbmgNbWindowsShown; }
-	static bool bbGlobalIsSomeWindowShown() { return (WxBlackBox::bbmgNbWindowsShown>0);}
-
-
-  private:
-    static wxWindow* bbmgTopWindow;
-    static int bbmgNbWindowsAlive;
-    static int bbmgNbWindowsShown;
-
+ 
   protected:
     
   
@@ -186,22 +166,22 @@ namespace bbtk
   //======================================================================
 
   //=================================================================
-  // UserBlackBox description
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(WxBlackBox,bbtk::UserBlackBox);
+  // WxBlackBoxDescriptor declaration
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(WxBlackBox,bbtk::AtomicBlackBox);
   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 (* : only used if the widget is not inserted in another widget)",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);
   //=================================================================