.

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

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index ca8ac024b7ee6d43798526212bb89b543e7f4a7b..5ad78e5b8110918aa62c4093daf11e9b7f730cf2 100644 (file)
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -46,8 +46,27 @@
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton);
-  
+
+
+   //--------------------------------------------------------------------------
+  class CommandButtonWidget : public wxPanel
+  {
+  public:
+    CommandButtonWidget(CommandButton* box, wxWindow *parent, 
+                       wxString title);
+    ~CommandButtonWidget();
+    void OnCommandButton( wxEvent& );
+    void SetLabel(wxString title);
+    void SetColour(wxColour color);
+       
+  private:
+    CommandButton* mBox;
+    wxButton   *mwxCommandButton;
+  }; 
+   
+  //--------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
+
   CommandButtonWidget::CommandButtonWidget(CommandButton* box,
                                           wxWindow *parent, 
                                           wxString title )
@@ -166,25 +185,41 @@ namespace bbwx
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------- 
 
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton);
   BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
 
-  void CommandButton::bbUserConstructor() 
-  { 
-    bbSetInputIn("");
-    bbSetInputLabel("");
-    std::vector<double> lstColour;
-    lstColour.push_back(0.75);
-    lstColour.push_back(0.75);
-    lstColour.push_back(0.75);
-    bbSetInputColour(lstColour);
-  }
-  
+//-----------------------------------------------------------------    
+       void CommandButton::bbUserSetDefaultValues()
+       {
+               bbSetInputIn("");
+               bbSetInputLabel("");
+               std::vector<double> lstColour;
+               lstColour.push_back(0.75);
+               lstColour.push_back(0.75);
+               lstColour.push_back(0.75);
+               bbSetInputColour(lstColour);
+               bbSetOutputWidget(0);
+       }
+       
+       //-----------------------------------------------------------------     
+       void CommandButton::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void CommandButton::bbUserFinalizeProcessing()
+       {
+       }
+       
   
   void CommandButton::Process() 
   { 
-    UpdateColour();
-    UpdateLabel();
+    CommandButtonWidget* w = (CommandButtonWidget*)bbGetOutputWidget();
+    if (w) 
+      {
+       UpdateColour();
+       UpdateLabel();
+      }
   }
   
   void CommandButton::UpdateColour()
@@ -205,6 +240,7 @@ namespace bbwx
     }
 
   } 
+       
   void CommandButton::UpdateLabel()
   {
     CommandButtonWidget* wxwidget = (CommandButtonWidget*)bbGetOutputWidget();