fixing NULL vs 0 warnings in gcc 4

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index eb8423fa8e7eb16744abec65707562cf5c26e7ed..3fd1a3fae2385821087c9abc8bdd50fa0c35cdfa 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/radiobut.h"
 
@@ -41,7 +41,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     
     m_peer = new wxMacControl() ;
     verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
-        0 , false /* no autotoggle */ , *m_peer ) );
+        0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
     
 
     MacPostControlCreate(pos,size) ;
@@ -56,7 +56,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
   {
     /* 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();
@@ -75,10 +75,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;
-      if ( GetControl32BitValue( *m_peer ) == val )
+      if ( m_peer->GetValue() == val )
         return ;
         
-   ::SetControl32BitValue( *m_peer , val ) ;
+   m_peer->SetValue( val ) ;
    if (val) 
    {
            cycle=this->NextInCycle();
@@ -94,7 +94,7 @@ void wxRadioButton::SetValue(bool val)
 
 bool wxRadioButton::GetValue() const
 {
-    return ::GetControl32BitValue( *m_peer ) ;
+    return m_peer->GetValue() ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)