From: Eduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Date: Thu, 25 Jul 2019 14:10:35 +0000 (+0200)
Subject: #3283 BBTK Bug New Normal  -  ComboBox update
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f0bdfa7f7bb578b0fd65248908bfb3bfd664f5fd;p=bbtk.git

#3283 BBTK Bug New Normal  -  ComboBox update
---

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 29d3782..c075b70 100644
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -164,12 +164,13 @@ void ComboBox::Process()
 {
 	int iSelection = bbGetInputSelection();
 	if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=bbGetInputIn().size()-1; }
+//	if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=0; }
 	ComboBoxWidget *w = (ComboBoxWidget*)bbGetOutputWidget();
 	w->FillItems( iSelection, bbGetInputIn() );
     bbSetInputSelection( iSelection );
     bbSetOutputOut( iSelection );
     int size = bbGetInputIn().size();
-    if 	(  (iSelection>0) && ( (size-1)<=iSelection) ) 
+    if 	(  (iSelection>=0) && ( iSelection<size) ) 
     { 
        bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
     } // if iSelection
diff --git a/packages/wx/src/bbwxComboBox.h b/packages/wx/src/bbwxComboBox.h
index 6b1e702..1f15781 100644
--- a/packages/wx/src/bbwxComboBox.h
+++ b/packages/wx/src/bbwxComboBox.h
@@ -39,13 +39,16 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ComboBox,bbtk::WxBlackBox);
 	BBTK_AUTHOR("Info-Dev");
 	BBTK_DESCRIPTION("No Description.");
 	BBTK_CATEGORY("__CategoryBlackBox__");
+
 	BBTK_INPUT(ComboBox,Title,"Title prepended to the text",std::string,"");
 	BBTK_INPUT(ComboBox,Selection,"i element to be selected (default 0)",int,"");
 	BBTK_INPUT(ComboBox,In,"Vector of strings",std::vector< std::string >,"");
 	BBTK_INPUT(ComboBox,Form,"0 Combobox, 1 List  (default 0)",int,"");
 	BBTK_INPUT(ComboBox,Deselect,"(default false) Just for List form",bool,"");
+
     BBTK_OUTPUT(ComboBox,Out,"i Item selected",int,"");
     BBTK_OUTPUT(ComboBox,OutString,"string Item selected",std::string,"");
+
 BBTK_END_DESCRIBE_BLACK_BOX(ComboBox);
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)