Clean Code

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

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index e2d9ac08dd10636453ce59e6460a581036f26f74..a927b074c8c7ad68d6c44be5fcec3100a2dbc404 100644 (file)
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -75,33 +75,27 @@ namespace bbwx
   CommandButtonWidget::CommandButtonWidget(CommandButton* box,
                                           wxWindow *parent, 
                                           wxString title )
-    : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
-      mBox(box)
-  { 
-
+//    : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box)
+    : wxPanel( parent, -1, wxDefaultPosition, wxSize(20,-1), 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
@@ -124,9 +118,7 @@ namespace bbwx
            {
              // If no executer : create a totally independant interpreter
              I = bbtk::Interpreter::New();
-           }
-         else 
-           {
+           } else {
              // If executer : create an interpreter using E
              I = bbtk::Interpreter::New(E);
            }
@@ -146,41 +138,37 @@ namespace bbwx
          {
            ok=false;
            ccommand=commandstr.substr(pos1,commandstr.length()-pos1 );
-         } 
-       else 
-         {
+         }  else  {
            ccommand=commandstr.substr(pos1,pos2-pos1);
          }
        for ( i=0 ; i < ccommand.length() ; i++)
          {
            if (ccommand[i]==39) // '
-             {
-               ccommand[i]=34;  // "
-             }
+           {
+                       ccommand[i]=34;  // "
+           }
          }             
        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 +223,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()