]> Creatis software - bbtk.git/commitdiff
spaces
authorEduardo DAVILA <davila@localhost.localdomain>
Mon, 4 Dec 2017 21:32:11 +0000 (22:32 +0100)
committerEduardo DAVILA <davila@localhost.localdomain>
Mon, 4 Dec 2017 21:32:11 +0000 (22:32 +0100)
packages/wx/src/bbwxCommandButton.cxx

index e2d9ac08dd10636453ce59e6460a581036f26f74..206d90c4774c8690ceef2572c61fd86231229001 100644 (file)
@@ -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()