Comments

[bbtk.git] / packages / wx / src / bbwxInputText.h

diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h
index f71adf17a4147dde30e5f095ba0228cb7c0fe74a..8df43ebf884fce3896c1d37b5be3b762b1aae993 100644 (file)
--- 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/10/17 08:18:32 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/12/02 15:13:25 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -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,44 +51,13 @@
 
 #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);
@@ -100,15 +67,15 @@ namespace bbwx
     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");
@@ -120,10 +87,9 @@ namespace bbwx
 
   BBTK_OUTPUT(InputText,Out,"Current text",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(InputText);
+ 
   //=================================================================
 
-
-
 }
 
 
@@ -131,4 +97,4 @@ namespace bbwx
 //namespace bbtk
 #endif  //__bbWxInputText_h__
 
-#endif //_USE_WXWIDGETS_
+#endif //USE_WXWIDGETS