#3496 Linux Bug

diff --git a/packages/std/src/bbstdConcatStrings_tool.cxx b/packages/std/src/bbstdConcatStrings_tool.cxx
index d4a38a12a1992c77df2feede75a1f2e69bf4c590..baf010b95bae75ba17dee2577758464ab4b07482 100644 (file)
--- a/packages/std/src/bbstdConcatStrings_tool.cxx
+++ b/packages/std/src/bbstdConcatStrings_tool.cxx
@@ -28,12 +28,12 @@ void ConcatStrings_tool::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
-    if (bbGetInputType()==1)
+    if ((bbGetInputType()==1) && ( bbGetInputBox_ConcatString()!=NULL) )
     {
         bbGetInputBox_ConcatString()->bbSetOutputOut( bbGetInputIn1() );
         bbGetInputBox_ConcatString()->bbSignalOutputModification(std::string("Out"));
 //        bbGetInputBox_ConcatString()->bbSignalOutputModification();
-    } // if Type == 1
+    } // if Type == 1   &&  Box
 
     
 }

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 96b5ad7bec8094261d102fd5097ddb1a6bb8fc13..f0c3cc5d23de828a180d3a8ed0fd9fafb7ac11d2 100644 (file)
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -81,6 +81,7 @@ namespace bbwx
           sizer->Add( new wxStaticText(panel,-1,  _T("") ) ); 
     }
     //---------------------------------------------------------------------
+        
        if (mTypeForm==1)
        {
                wxListBox *wxlistbox = new wxListBox ( panel , -1 , wxDefaultPosition,wxSize(sizeX,sizeY),0, NULL, wxLB_SINGLE );       
@@ -243,15 +244,17 @@ void ComboBox::Process()
 //     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) && ( iSelection<size) ) 
-    {
-       bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
-    } // if iSelection
-       w->VerifyDeselect(iSelection);
+       if (w!=NULL) {
+               w->FillItems( iSelection, bbGetInputIn() );
+               bbSetInputSelection( iSelection );
+               bbSetOutputOut( iSelection );
+               int size = bbGetInputIn().size();
+               if      (  (iSelection>=0) && ( iSelection<size) ) 
+               {
+                  bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
+               } // if iSelection
+               w->VerifyDeselect(iSelection);
+       } // if w
 }
 //===== 
 // 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)
@@ -272,6 +275,7 @@ void ComboBox::CreateWidget(wxWindow* parent)
           bbSetOutputOutString( bbGetInputIn()[ bbGetInputSelection() ] );
    } // if InputIn size
    bbSetOutputWidget( w );
+   
 }
 //===== 
 // 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)
@@ -297,9 +301,8 @@ void ComboBox::bbUserInitializeProcessing()
 //===== 
 void ComboBox::bbUserFinalizeProcessing()
 {
-
 }
-}
-// EO namespace bbwx
+
+}// EO namespace bbwx
 
 

diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx
index 375092be431d940e54e2b1ca3ff70daca73d049c..fed13e89d463834126593f8520968442d387db0b 100644 (file)
--- a/packages/wx/src/bbwxRadioButton.cxx
+++ b/packages/wx/src/bbwxRadioButton.cxx
@@ -242,11 +242,11 @@ namespace bbwx
     lstIn.push_back( bbtk::std2wx(bbGetInputIn7()) );
     lstIn.push_back( bbtk::std2wx(bbGetInputIn8()) );
     lstIn.push_back( bbtk::std2wx(bbGetInputIn9()) );
-
-
-       ( (RadioButtonWidget*)bbGetOutputWidget() )->AddElements(lstIn, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()) );
-
-
+    
+       if (bbGetOutputWidget()!=NULL) 
+       {
+               ( (RadioButtonWidget*)bbGetOutputWidget() )->AddElements(lstIn, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()) );     
+       } // if bbGetOutputWidget
   }
 
   /**

diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx
index eae91e794ff77795a26638d626b99b3e201452b5..43346351b95769625f7c77c4a719d26417d96950 100644 (file)
--- a/packages/wx/src/bbwxSlider.cxx
+++ b/packages/wx/src/bbwxSlider.cxx
@@ -449,20 +449,20 @@ namespace bbwx
     bbtkDebugMessage("process",3,
                     "Slider "<<bbGetName()<<" input="
                     <<bbGetInputIn()<<std::endl);
-
+    
+    if (bbGetOutputWidget()!=NULL)
+       {
 // desperate try // JPR
-      if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
-      {    
-                 ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
-      }
+       if ( bbGetInputMin() != ((SliderWidget*)bbGetOutputWidget())->GetMin() ||  bbGetInputMax() != ((SliderWidget*)bbGetOutputWidget())->GetMax() )       
+       {    
+                       ((SliderWidget*)bbGetOutputWidget())->SetRange(bbGetInputMin(),bbGetInputMax()) ;
+       }
 
-         ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
+               ((SliderWidget*)bbGetOutputWidget())->SetReactiveOnTrack( bbGetInputReactiveOnTrack() ) ;
          
-    bbSetOutputOut( bbGetInputIn() );
-    if (bbGetOutputWidget()!=0)
-      {
-       ((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
-      }
+       bbSetOutputOut( bbGetInputIn() );
+               ((SliderWidget*)bbGetOutputWidget())->SetValue(bbGetInputIn());
+       } // if bbGetOutputWidget
   }
 
 //--------------------------------------------------------------------------