X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxRadioButton.cxx;h=904d9828d5675fb1c55285fda76c04b6278d2c21;hb=2441c154e1940e42455187049718d0a15d7fb81f;hp=ae79162bf0f38b5126484960cb43f3b671b4fe99;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx
index ae79162..904d982 100644
--- a/packages/wx/src/bbwxRadioButton.cxx
+++ b/packages/wx/src/bbwxRadioButton.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxRadioButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -44,8 +44,33 @@
 
 namespace bbwx
 {
-  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,RadioButton);
+    
+  
+  //--------------------------------------------------------------------------
+  // The widget created by the box 
+  class RadioButtonWidget : public wxPanel
+  {
+  public:
+    RadioButtonWidget( RadioButton* box, wxWindow *parent, 
+                      int In, 
+                      wxString title, 
+                      std::vector<wxString> lstIn );
+
+    ~RadioButtonWidget();
+
+    int GetValue();
+    void OnRadioButton(wxEvent& event);
+
+  private:
+    RadioButton      *mBox;
+    int	             MAX_RADIOBUTTON;
+    wxRadioButton    *mwxRadioButton[10];
+  };
   
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+  //------------------------------------------------------------------------
+
   //-------------------------------------------------------------------------
   RadioButtonWidget::RadioButtonWidget( RadioButton* box,
                wxWindow *parent,
@@ -151,27 +176,37 @@ namespace bbwx
   //--------------------------------------------------------------------------
   //--------------------------------------------------------------------------
 
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,RadioButton);
   BBTK_BLACK_BOX_IMPLEMENTATION(RadioButton,bbtk::WxBlackBox);
 
-
-  void RadioButton::bbUserConstructor() 
-  { 
-    bbSetInputIn(0);
-    bbSetOutputOut( bbGetInputIn() );
-    bbSetInputIn0("");
-    bbSetInputIn1("");
-    bbSetInputIn2("");
-    bbSetInputIn3("");
-    bbSetInputIn4("");
-    bbSetInputIn5("");
-    bbSetInputIn6("");
-    bbSetInputIn7("");
-    bbSetInputIn8("");
-    bbSetInputIn9("");
-  }
   
-
+	//-----------------------------------------------------------------	
+	void RadioButton::bbUserSetDefaultValues()
+	{
+		bbSetInputIn(0);
+		bbSetOutputOut( bbGetInputIn() );
+		bbSetInputIn0("");
+		bbSetInputIn1("");
+		bbSetInputIn2("");
+		bbSetInputIn3("");
+		bbSetInputIn4("");
+		bbSetInputIn5("");
+		bbSetInputIn6("");
+		bbSetInputIn7("");
+		bbSetInputIn8("");
+		bbSetInputIn9("");		
+	}
+	
+	//-----------------------------------------------------------------	
+	void RadioButton::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void RadioButton::bbUserFinalizeProcessing()
+	{
+	}
+	
   void RadioButton::Process() 
   { 
     bbtkDebugMessageInc("Core",9,"RadioButton::Process()"<<std::endl);
@@ -183,7 +218,7 @@ namespace bbwx
    *
    *
    */ 
- void RadioButton::CreateWidget()
+ void RadioButton::CreateWidget(wxWindow* parent)
   {
 
     std::vector<wxString> lstIn;
@@ -200,7 +235,8 @@ namespace bbwx
 
     RadioButtonWidget *w = new RadioButtonWidget(
                          this,
-                         bbGetWxParent(),
+//                         bbGetWxParent(),
+							parent,	
                          bbGetInputIn() ,
                          bbtk::std2wx(bbGetInputTitle()),
                          lstIn );