From 0476f1d3892556c0aba6a68346a72e8400a68db7 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 23 Mar 2023 16:46:07 +0100 Subject: [PATCH] #3496 Linux Bug --- packages/wx/src/bbwxRadioButton.cxx | 26 +++++++++++++------------- packages/wx/src/bbwxSlider.cxx | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx index fed13e8..7b670ad 100644 --- a/packages/wx/src/bbwxRadioButton.cxx +++ b/packages/wx/src/bbwxRadioButton.cxx @@ -89,8 +89,11 @@ namespace bbwx wxPanel( parent, -1) , mBox(box) { - + AddElements( lstIn , In,title); + mBox->bbSetOutputOut( GetValue() ); + mBox->bbSetInputIn( GetValue() ); } + //------------------------------------------------------------------------- RadioButtonWidget::~RadioButtonWidget() @@ -104,15 +107,15 @@ namespace bbwx int result=-1; int i; for (i=0;iGetValue()==true) - { - result=i; - } - } - } + { + if ( mwxRadioButton[i]!=NULL) + { + if (mwxRadioButton[i]->GetValue()==true) + { + result=i; + } + } // if GetValue + } // if mwxRadioButton return result; } @@ -229,8 +232,6 @@ namespace bbwx { bbtkDebugMessageInc("Core",9,"RadioButton::Process()"< lstIn; lstIn.push_back( bbtk::std2wx(bbGetInputIn0()) ); lstIn.push_back( bbtk::std2wx(bbGetInputIn1()) ); @@ -242,7 +243,6 @@ namespace bbwx lstIn.push_back( bbtk::std2wx(bbGetInputIn7()) ); lstIn.push_back( bbtk::std2wx(bbGetInputIn8()) ); lstIn.push_back( bbtk::std2wx(bbGetInputIn9()) ); - if (bbGetOutputWidget()!=NULL) { ( (RadioButtonWidget*)bbGetOutputWidget() )->AddElements(lstIn, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()) ); diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 4334635..b0022b2 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -485,6 +485,7 @@ namespace bbwx ); // std::cout << "w = "<SetName( bbtk::std2wx( bbGetInputWinTitle() ) ); + bbSetOutputOut( bbGetInputIn() ); bbSetOutputWidget( w ); } -- 2.45.1