adding the notion of cyclic group of radiobutton

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/radiobut.h b/include/wx/mac/radiobut.h
index 8e8bf1313d37f062d16a793722c5f996ad76204a..9de7a224c5deb48eb953b44f80163231fb86b6dd 100644 (file)
--- a/include/wx/mac/radiobut.h
+++ b/include/wx/mac/radiobut.h
@@ -43,11 +43,17 @@ class WXDLLEXPORT wxRadioButton: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr);
 

-  virtual void SetLabel(const wxString& label);

   virtual void SetValue(bool val);
   virtual bool GetValue() const ;
 
   virtual void SetValue(bool val);
   virtual bool GetValue() const ;
 

+       virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ); 

   void Command(wxCommandEvent& event);
   void Command(wxCommandEvent& event);

+  wxRadioButton *AddInCycle(wxRadioButton *cycle);
+  inline wxRadioButton *NextInCycle() {return m_cycle;}
+
+  protected:
+  
+  wxRadioButton *m_cycle;  

 };
 
 // Not implemented
 };
 
 // Not implemented

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 65baab38b6731c39dd876d22546002a693ce1e41..0c712b61f9e9072b2dc10689b15e2a327496c448 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -2,7 +2,7 @@
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      AUTHOR
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      AUTHOR

-// Modified by:
+// Modified by: JS Lair (99/11/15) adding the cyclic groupe notion for radiobox

 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR


@@ -19,6 +19,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 

+#include <wx/mac/uma.h>
+

 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
            const wxPoint& pos,
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
            const wxPoint& pos,


@@ -26,43 +28,69 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+       Rect bounds ;
+       Str255 title ;
+       
+       m_cycle=NULL;
+       
+       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;

 
 

-    m_windowStyle = style ;
-
-    // TODO create radiobutton
-    return FALSE;
-}
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+               kControlRadioButtonProc , (long) this ) ;
+       
+       MacPostControlCreate() ;

 
 

-void wxRadioButton::SetLabel(const wxString& label)
-{
-    // TODO
+  return TRUE;

 }
 
 }
 

-void wxRadioButton::SetValue(bool value)
+void wxRadioButton::SetValue(bool val)

 {
 {

-    // TODO
+       int i;
+       wxRadioButton *cycle;
+       
+   ::SetControlValue( m_macControl , val ) ;
+   
+   if (val) {
+               cycle=this->NextInCycle();
+               if (cycle!=NULL) {
+                       while (cycle!=this) {
+                               cycle->SetValue(false);
+                               cycle=cycle->NextInCycle();
+                               }
+                       }
+               }

 }
 
 }
 

-// Get single selection, for single choice list items

 bool wxRadioButton::GetValue() const
 {
 bool wxRadioButton::GetValue() const
 {

-    // TODO
-    return FALSE;
+    return ::GetControlValue( m_macControl ) ;

 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {

-  SetValue ( (event.m_commandInt != 0) );
+  SetValue ( (event.GetInt() != 0) );

   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

+void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+       SetValue(true) ;
+}
+
+wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
+{
+       wxRadioButton *next,*current;
+               
+       if (cycle==NULL) {
+               m_cycle=this;
+               return(this);
+               }
+       else {
+               current=cycle;
+               while ((next=current->m_cycle)!=cycle) current=current->m_cycle;
+               m_cycle=cycle;
+               current->m_cycle=this;
+               return(cycle);
+       }
+}  

 
 

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 65baab38b6731c39dd876d22546002a693ce1e41..0c712b61f9e9072b2dc10689b15e2a327496c448 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -2,7 +2,7 @@
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      AUTHOR
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      AUTHOR

-// Modified by:
+// Modified by: JS Lair (99/11/15) adding the cyclic groupe notion for radiobox

 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR


@@ -19,6 +19,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 

+#include <wx/mac/uma.h>
+

 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
            const wxPoint& pos,
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
            const wxPoint& pos,


@@ -26,43 +28,69 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+       Rect bounds ;
+       Str255 title ;
+       
+       m_cycle=NULL;
+       
+       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;

 
 

-    m_windowStyle = style ;
-
-    // TODO create radiobutton
-    return FALSE;
-}
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+               kControlRadioButtonProc , (long) this ) ;
+       
+       MacPostControlCreate() ;

 
 

-void wxRadioButton::SetLabel(const wxString& label)
-{
-    // TODO
+  return TRUE;

 }
 
 }
 

-void wxRadioButton::SetValue(bool value)
+void wxRadioButton::SetValue(bool val)

 {
 {

-    // TODO
+       int i;
+       wxRadioButton *cycle;
+       
+   ::SetControlValue( m_macControl , val ) ;
+   
+   if (val) {
+               cycle=this->NextInCycle();
+               if (cycle!=NULL) {
+                       while (cycle!=this) {
+                               cycle->SetValue(false);
+                               cycle=cycle->NextInCycle();
+                               }
+                       }
+               }

 }
 
 }
 

-// Get single selection, for single choice list items

 bool wxRadioButton::GetValue() const
 {
 bool wxRadioButton::GetValue() const
 {

-    // TODO
-    return FALSE;
+    return ::GetControlValue( m_macControl ) ;

 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {

-  SetValue ( (event.m_commandInt != 0) );
+  SetValue ( (event.GetInt() != 0) );

   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

+void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+       SetValue(true) ;
+}
+
+wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
+{
+       wxRadioButton *next,*current;
+               
+       if (cycle==NULL) {
+               m_cycle=this;
+               return(this);
+               }
+       else {
+               current=cycle;
+               while ((next=current->m_cycle)!=cycle) current=current->m_cycle;
+               m_cycle=cycle;
+               current->m_cycle=this;
+               return(cycle);
+       }
+}