#3082 BBTK Bug New Normal - not compiling in CentOS 2.6

[bbtk.git] / packages / wx / src / bbwxComboBox.cxx

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 051cfea7f811e319419dd19f680f106263040d0f..5b8ab4529fd67dc9d3f18f03cab898b5fd70eae2 100644 (file)
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -25,7 +25,7 @@ namespace bbwx
                     std::vector< std::string > lstIn, 
                                        int typeForm );
        ~ComboBoxWidget();
-       void OnComboBox(int iSelection);
+       void OnComboBoxSelection(int iSelection);
        void OnComboBox(wxEvent& event);
        void FillItems( int iSelection, std::vector< std::string > lstIn);
 
@@ -108,7 +108,7 @@ namespace bbwx
 
 
   //--------------------------------------------------------------------------
-  void ComboBoxWidget::OnComboBox(int iSelection)
+  void ComboBoxWidget::OnComboBoxSelection(int iSelection)
   {
     mBox->bbSetInputSelection( iSelection );
     mBox->bbSetOutputOut( iSelection );
@@ -127,7 +127,7 @@ namespace bbwx
         } else {
                 iSelection = wxchoice->GetSelection();
         }
-        OnComboBox(iSelection);
+        OnComboBoxSelection(iSelection);
   }
 //--------------------------------------------------------------------------
   void ComboBoxWidget::FillItems(
@@ -169,10 +169,14 @@ void ComboBox::Process()
        w->FillItems( iSelection, bbGetInputIn() );
     bbSetInputSelection( iSelection );
     bbSetOutputOut( iSelection );
-    bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
+
+    int size = bbGetInputIn().size();
+    if         (  (iSelection>0) && ( (size-1)<=iSelection) ) 
+    { 
+       bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
+    }
 //    bbSignalOutputModification("Out");
 //    bbSignalOutputModification("OutString");
-
 }
 
 //=====