From: Eduardo DAVILA Date: Mon, 4 Dec 2017 21:32:11 +0000 (+0100) Subject: spaces X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=bbtk.git;a=commitdiff_plain;h=5028ffe24ceaf78dca61c8e4ab67c36db771a7d8 spaces --- diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx index e2d9ac0..206d90c 100644 --- a/packages/wx/src/bbwxCommandButton.cxx +++ b/packages/wx/src/bbwxCommandButton.cxx @@ -78,30 +78,24 @@ namespace bbwx : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box) { - wxPanel *panel = this; - mwxCommandButton = new wxButton( panel, -1, title); Connect( mwxCommandButton->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&)) &CommandButtonWidget::OnCommandButton ); - wxFlexGridSizer *sizer = new wxFlexGridSizer(1); sizer -> Add( mwxCommandButton,1,wxGROW | wxALL,10 ); sizer -> AddGrowableCol(0); - panel -> SetSizer(sizer); panel -> SetAutoLayout(true); panel -> Layout(); - } CommandButtonWidget::~CommandButtonWidget() { } - void CommandButtonWidget::OnCommandButton( wxEvent& ) { // Look for the interpreter or the executer if no interpreter @@ -160,27 +154,25 @@ namespace bbwx } I->InterpretLine( ccommand ); pos1=pos2+1; - pos2 = commandstr.find(";",pos2+1); - + pos2 = commandstr.find(";",pos2+1); } - mBox->UpdateLabel(); mBox->UpdateColour(); mBox->bbSignalOutputModification(); } - - //-------------------------------------------------------------------------- - + //-------------------------------------------------------------------------- void CommandButtonWidget::SetLabel(wxString title) { mwxCommandButton->SetLabel(title); } + //-------------------------------------------------------------------------- - void CommandButtonWidget::SetColour(wxColour color) { mwxCommandButton->SetBackgroundColour(color); + mwxCommandButton->Refresh(); + mwxCommandButton->ClearBackground(); } @@ -235,15 +227,12 @@ namespace bbwx (bbGetInputColour()[2]==-1) ) { wxwidget->SetColour( wxwidget->GetParent()->GetBackgroundColour() ); - } - else - { + } else { int r=(int) (255*bbGetInputColour()[0]); int g=(int) (255*bbGetInputColour()[1]); int b=(int) (255*bbGetInputColour()[2]); wxwidget->SetColour( wxColour(r,g,b) ); } - } void CommandButton::UpdateLabel()