Fix compilation with older (before C99) C compilers.

[wxWidgets.git] / src / mac / carbon / radiobut.cpp

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 32ad08047ec36a54ca5b90eed613b63db1de193f..1a31f44a25c95782a9389569d86de5d55905c2d9 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -39,8 +39,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     

+    m_peer = new wxMacControl() ;

     verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
     verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 

-        0 , false /* no autotoggle */ , (ControlRef*) &m_macControl ) ) ;
+        0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
+    

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 


@@ -54,7 +56,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
   {
     /* search backward for last group start */
     wxRadioButton *chief = (wxRadioButton*) NULL;
   {
     /* search backward for last group start */
     wxRadioButton *chief = (wxRadioButton*) NULL;

-    wxWindowList::Node *node = parent->GetChildren().GetLast();
+    wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();

     while (node)
     {
       wxWindow *child = node->GetData();
     while (node)
     {
       wxWindow *child = node->GetData();


@@ -73,10 +75,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;

-      if ( GetControl32BitValue( (ControlRef) m_macControl ) == val )
+      if ( m_peer->GetValue() == val )

         return ;
         
         return ;
         

-   ::SetControl32BitValue( (ControlRef) m_macControl , val ) ;
+   m_peer->SetValue( val ) ;

    if (val) 
    {
            cycle=this->NextInCycle();
    if (val) 
    {
            cycle=this->NextInCycle();


@@ -92,7 +94,7 @@ void wxRadioButton::SetValue(bool val)
 
 bool wxRadioButton::GetValue() const
 {
 
 bool wxRadioButton::GetValue() const
 {

-    return ::GetControl32BitValue( (ControlRef) m_macControl ) ;
+    return m_peer->GetValue() ;

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