X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxInputText.h;h=079e2bfa0e92c7b4454275670640e4266507398d;hb=4e639a77332569de9321dc84c7788811828d4711;hp=05a330ab801f57df6f1a58692ad447dcfdcd9a9e;hpb=e4149b56dda0cfb15427533e6f573f09cd3ff74b;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h
index 05a330a..079e2bf 100644
--- a/packages/wx/src/bbwxInputText.h
+++ b/packages/wx/src/bbwxInputText.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2011/06/17 16:19:42 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -28,7 +28,6 @@
 *  knowledge of the CeCILL-B license and that you accept its terms.
 * ------------------------------------------------------------------------ */                                                                         
 
-
 /**
  * \brief Short description in one line
  * 
@@ -44,7 +43,6 @@
  * \brief Pattern for the definition of a new type of Node 
  */
 
-
 #ifdef _USE_WXWIDGETS_
 
 
@@ -53,77 +51,48 @@
 
 #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_BLACK_BOX_INTERFACE(InputText,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_INPUT(Title,std::string);
+    BBTK_DECLARE_INPUT(ReactiveOnKeystroke,int);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
     void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
     void CreateWidget(wxWindow*);
     
+  private:
+	  bool firsttime;
   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,Title,"Title of the input zone (default '') ",
-	     std::string,"");
+  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ", std::string,"");
+  BBTK_INPUT(InputText,ReactiveOnKeystroke,"0 not event generated, 1 Enter event genereated, 2 All keys, (default '2') ", int,"");
 
   BBTK_OUTPUT(InputText,Out,"Current text",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(InputText);
+ 
   //=================================================================
 
-
-
 }
 
 
@@ -131,4 +100,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbWxInputText_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS