added carbon events for navigation keys, size corrections

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

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 8fd9b91adf5e82680212c86d5fdcde816269e585..7fcaaf579dc4e10a894437465532b75586b88d2f 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -21,7 +21,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 

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

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


@@ -35,7 +35,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 

                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;
                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;


@@ -68,12 +68,11 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
 void wxRadioButton::SetValue(bool val)
 {
 
 void wxRadioButton::SetValue(bool val)
 {

-       int i;

        wxRadioButton *cycle;
        wxRadioButton *cycle;

-         if ( GetControlValue( m_macControl ) == val )
+         if ( GetControlValue( (ControlHandle) m_macControl ) == val )

            return ;
            
            return ;
            

-   ::SetControlValue( m_macControl , val ) ;
+   ::SetControlValue( (ControlHandle) m_macControl , val ) ;

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


@@ -84,11 +83,12 @@ void wxRadioButton::SetValue(bool val)
                                }
                        }
                }
                                }
                        }
                }

+   MacRedrawControl() ;

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

-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControlValue( (ControlHandle) m_macControl ) ;

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


@@ -97,7 +97,7 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

-void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
     if ( GetValue() )
       return ;
 {
     if ( GetValue() )
       return ;