=== MAJOR RELEASE ====

[bbtk.git] / kernel / src / bbtkWxBlackBox.h

diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index d259a874be3b584c15bbea4c7a5dd3f5f34ee57f..92d711d3bc488bbbee1ae3a4ca3629a9d2237394 100644 (file)
--- 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/08 06:59:30 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2008/04/18 12:59:16 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -61,8 +61,8 @@ namespace bbtk
   //==================================================================
   /// Widget black boxes
   class BBTK_EXPORT WxBlackBox : public bbtk::AtomicBlackBox  
-  {
-    BBTK_USER_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::AtomicBlackBox);
+  { 
+    BBTK_BLACK_BOX_INTERFACE(WxBlackBox,bbtk::AtomicBlackBox);
     //   BBTK_DECLARE_INPUT(WinParent,WxParentToChildData*);
     BBTK_DECLARE_INPUT(WinTitle,std::string);
     BBTK_DECLARE_INPUT(WinWidth,int);
@@ -131,7 +131,7 @@ namespace bbtk
 
     //==================================================================
     /// Main processing method of the box.
-    virtual IOStatus bbBackwardUpdate( Connection* caller );
+    virtual IOStatus bbBackwardUpdate( Connection::Pointer caller );
     //==================================================================
 
 
@@ -237,16 +237,16 @@ namespace bbtk
   class BBTK_EXPORT WxBlackBoxWindow //: public wxWindow
   {
   public:
-    WxBlackBoxWindow(WxBlackBox* box);
+    WxBlackBoxWindow(WxBlackBox::Pointer box);
     virtual ~WxBlackBoxWindow();
     virtual void bbShow();
     virtual void bbHide();
     bool bbIsShown() { return mShown; }
-    virtual WxBlackBox* bbGetBlackBox() { return mBox; }
+    virtual WxBlackBox::Pointer bbGetBlackBox() { return mBox; }
     virtual wxDialog* bbGetDialog() { return 0; } 
     virtual wxFrame* bbGetFrame() { return 0; } 
   private:
-    WxBlackBox* mBox;
+    WxBlackBox::Pointer mBox;
     bool mShown;
   };
   //==================================================================
@@ -256,7 +256,7 @@ namespace bbtk
   class BBTK_EXPORT  WxBlackBoxDialog : public wxDialog, public WxBlackBoxWindow
   {
   public:
-    WxBlackBoxDialog(WxBlackBox* box, 
+    WxBlackBoxDialog(WxBlackBox::Pointer box, 
                     wxWindow *parent, wxString title, wxSize size);
     ~WxBlackBoxDialog();
     void bbShow();  
@@ -270,7 +270,7 @@ namespace bbtk
   class BBTK_EXPORT  WxBlackBoxFrame : public wxFrame, public WxBlackBoxWindow
   {
   public:
-    WxBlackBoxFrame(WxBlackBox* box,
+    WxBlackBoxFrame(WxBlackBox::Pointer box,
                    wxWindow *parent, wxString title, wxSize size);
     ~WxBlackBoxFrame();
     void bbShow();
@@ -280,33 +280,6 @@ namespace bbtk
   //==================================================================
 
 
-  /*
- //=================================================================
-  /// Class from which a user defined widget associated to a WxBlackBox 
-  /// should inherit
-  class BBTK_EXPORT  WxBlackBoxWidget
-  {
-  public:
-    /// Ctor with the WxBlackBox which created it 
-    WxBlackBoxWidget( WxBlackBox* box);
-    /// Dtor
-    virtual ~WxBlackBoxWidget();
-
-    /// Returns the WxBlackBox which created it
-    WxBlackBox* GetBlackBox() { return mBox; }
-    /// Returns the WxBlackBox which created it (const)
-    const WxBlackBox* GetBlackBox() const { return mBox; }
-
-    /// Returns the wxWindow associated to the widget
-    virtual wxWindow* GetWxWindow() { return 0; }
-
-    virtual bool IsDead() { return false; }
-
-  private:
-    WxBlackBox* mBox;
-  };  
-  //=================================================================
-  */
 
   //=================================================================
   // Handles the destroy events of a widget associated to a WxBlackBox 
@@ -315,7 +288,7 @@ namespace bbtk
   {
   public:
     /// Ctor with the box and widget 
-    WxBlackBoxWidgetEventHandler( WxBlackBox* box, wxWindow *widget );
+    WxBlackBoxWidgetEventHandler( WxBlackBox::Pointer box, wxWindow *widget );
     /// Dtor
     ~WxBlackBoxWidgetEventHandler();
     /// Returns true iff is the handler for that window  
@@ -327,37 +300,12 @@ namespace bbtk
     //bool IsDead() { return mDead; }
 
   private:
-    WxBlackBox* mBox;
+    WxBlackBox::Pointer mBox;
     wxWindow* mWindow;
     //bool mDead;
   };  
   //=================================================================
 
-  /*
-  //=================================================================
-  /// A WxBlackBoxWidget which is a wxPanel also
-  class BBTK_EXPORT  WxBlackBoxWidgetPanel :     
-                               public wxPanel,
-                               public WxBlackBoxWidget
-//                             public WxBlackBoxWidget,
-//                             public wxPanel
-  {
-  public:
-    /// Ctor with the parent and the WxBlackBox which created it 
-    WxBlackBoxWidgetPanel(WxBlackBox* box,  wxWindow *parent)
-      :
-      wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
-      WxBlackBoxWidget(box)
-    {}
-    
-    /// Returns the top panel of the widget    
-    wxWindow* GetWxWindow() { return (wxWindow*)(wxPanel*)(this); }
-    /// Returns the top panel of the widget    
-    wxPanel* GetPanel() { return (wxPanel*)(this); }
-
-  };  
-  //=================================================================
-  */
 
 
 } //namespace bbtk