X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwx%2Fsrc%2FbbwxInputText.cxx;h=da4870e0a8ee6a7fb3589faf36b40ee9eb726fd1;hb=9bf93d26c92029689cb5da02822edb68d5835864;hp=66058c39062b91b7dfaa87d00eaa4beb6b34e020;hpb=315c4b62d90c40f8cccd821a5ba961bf51367bb0;p=bbtk.git

diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx
index 66058c3..da4870e 100644
--- a/packages/wx/src/bbwxInputText.cxx
+++ b/packages/wx/src/bbwxInputText.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/07/22 12:30:31 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -48,7 +53,7 @@ namespace bbwx
   {
   public:
     InputTextWidget(InputText* box, wxWindow *parent,
-		    wxString In, wxString title);
+		    wxString In, wxString title );
     ~InputTextWidget();
 
     std::string GetValue();
@@ -72,13 +77,16 @@ namespace bbwx
   InputTextWidget::InputTextWidget(InputText* box,
 				   wxWindow *parent, 
 				   wxString In, 
-				   wxString title)
+				   wxString title )
     : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
       mBox(box)
   {
     wxPanel			*panel	= this;
-    
-    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(800,20),wxTE_PROCESS_ENTER);
+
+//wxTE_PROCESS_ENTER
+//wxTE_MULTILINE    
+//wxTE_PASSWORD
+    mwxTextCtrl = new wxTextCtrl( panel, -1, In,wxDefaultPosition, wxSize(80,80) , wxTE_PROCESS_ENTER);
     Connect( mwxTextCtrl->GetId(),  wxEVT_COMMAND_TEXT_ENTER, 
 	     (wxObjectEventFunction) 
 	     (wxEventFunction)
@@ -97,7 +105,7 @@ namespace bbwx
     wxFlexGridSizer *sizer	= new wxFlexGridSizer(1);
     mwxTitle = new wxStaticText(panel, -1, title ); 
     sizer-> Add( mwxTitle ); 
-    sizer-> Add( mwxTextCtrl, 1, wxGROW ); 
+    sizer-> Add( mwxTextCtrl, 1, wxEXPAND ); 
     sizer-> AddGrowableCol(0);
     
     panel-> SetSizer(sizer);
@@ -166,7 +174,7 @@ namespace bbwx
 		firsttime=true;
 		bbSetInputTitle("");
 		bbSetInputIn("");
-		bbSetOutputWidget(0);
+		bbSetOutputWidget(NULL);
 		bbSetInputReactiveOnKeystroke(2);
 	}
 	
@@ -204,10 +212,12 @@ namespace bbwx
   void InputText::CreateWidget(wxWindow* parent)
   {
     bbSetOutputWidget
-      ( (wxWindow*) new InputTextWidget(this, //bbGetWxParent(),
-					parent,
-					bbtk::std2wx ( bbGetInputIn() ) , 
-					bbtk::std2wx ( bbGetInputTitle() ) ) );	
+     ( (wxWindow*) new InputTextWidget(	this, //bbGetWxParent(),
+										parent,
+										bbtk::std2wx ( bbGetInputIn() ) , 
+										bbtk::std2wx ( bbGetInputTitle() ) 
+									  ) 
+	 );	
   }
 
 }//namespace bbtk