X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.h;h=e6d5b4307f8400d1b8d684802855e1b38a546648;hb=577d0cb2396a5db3124e2277af2c6dfb80b633f1;hp=6cdb27e0c16688d0541d3cf4b36ff6b86f51c42a;hpb=888f2592d143847b6598d947cd037162c4fb90c6;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h
index 6cdb27e..e6d5b43 100644
--- a/packages/wx/src/bbwxInputText.h
+++ b/packages/wx/src/bbwxInputText.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:47:18 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2008/12/12 08:55:23 $
+  Version:   $Revision: 1.6 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -38,71 +53,43 @@
 
 #include "bbtkWxBlackBox.h"
 
-
+#include "bbwx_EXPORT.h"
 
 namespace bbwx
 {
   
   
-  
-  
-  class InputText;
-  
-  //--------------------------------------------------------------------------
-  class InputTextWidget : wxPanel
-  {
-  public:
-    InputTextWidget(InputText* box, wxWindow *parent,
-		    wxString In, wxString title);
-    ~InputTextWidget();
-
-    std::string GetValue();
-    void OnTextUpdate(wxCommandEvent& event);
-
-    void SetTitle(wxString);
-
-  private:
-    InputText    *mBox;
-    wxTextCtrl	 *mwxTextCtrl;
-    wxStaticText *mwxTitle;
-  };
-  
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-  //------------------------------------------------------------------------
-
-  
-  
-  
-  
-  class /*BBTK_EXPORT*/ InputText : public bbtk::WxBlackBox
+  //=================================================================
+  class bbwx_EXPORT InputText : public bbtk::WxBlackBox
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(InputText,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(InputText,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_INPUT(Title,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
     void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
+    void CreateWidget(wxWindow*);
     
   protected:
     virtual void bbUserConstructor();
   };
+  //=================================================================
   
  
   //=================================================================
-  // UserBlackBox description
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(InputText,bbtk::WxBlackBox);
   BBTK_NAME("InputText");
   BBTK_AUTHOR("laurent guigues at creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("A zone in which the user can enter a text (wxTextCtrl)");
-  BBTK_INPUT(InputText,In,"Initial text (default '')",std::string);
+  BBTK_INPUT(InputText,In,"Initial text (default '')",std::string,"");
 
-  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ",std::string);
+  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ",
+	     std::string,"");
 
-  BBTK_OUTPUT(InputText,Out,"Current text",std::string);
+  BBTK_OUTPUT(InputText,Out,"Current text",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(InputText);
   //=================================================================
 
@@ -115,4 +102,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbWxInputText_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS