removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 0d060bdb956755cb2ac482a3fdef6e435153d28b..c7101f60ade59ce07ed77eeee2beea64f21dd9b7 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -24,27 +24,31 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #include "wx/mac/uma.h"
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 #include "wx/mac/uma.h"
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,

-                  const wxString& label,
+           const wxString& label,

            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+    
+    m_label = label ;

 
 

-       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
-               kControlRadioButtonProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 
+          kControlRadioButtonProc , (long) this ) ;
+    
+    MacPostControlCreate(pos,size) ;

 
   m_cycle = this ;
   
   if (HasFlag(wxRB_GROUP))
   {
 
   m_cycle = this ;
   
   if (HasFlag(wxRB_GROUP))
   {

-         AddInCycle( NULL ) ;
+      AddInCycle( NULL ) ;

   }
   else
   {
   }
   else
   {


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

-       int i;
-       wxRadioButton *cycle;
-         if ( GetControlValue( (ControlHandle) m_macControl ) == val )
-           return ;
-           
-   ::SetControlValue( (ControlHandle) m_macControl , val ) ;
+    wxRadioButton *cycle;
+      if ( GetControl32BitValue( (ControlRef) m_macControl ) == val )
+        return ;
+        
+   ::SetControl32BitValue( (ControlRef) m_macControl , val ) ;

    if (val) 
    {
    if (val) 
    {

-               cycle=this->NextInCycle();
-               if (cycle!=NULL) {
-                       while (cycle!=this) {
-                               cycle->SetValue(false);
-                               cycle=cycle->NextInCycle();
-                               }
-                       }
-               }
+           cycle=this->NextInCycle();
+          if (cycle!=NULL) {
+               while (cycle!=this) {
+                   cycle->SetValue(false);
+                   cycle=cycle->NextInCycle();
+                   }
+               }
+           }

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

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

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


@@ -98,24 +101,24 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

-void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 

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

-         wxRadioButton *cycle, *old = NULL ;
+      wxRadioButton *cycle, *old = NULL ;

     cycle=this->NextInCycle();
     if (cycle!=NULL) {
     cycle=this->NextInCycle();
     if (cycle!=NULL) {

-         while (cycle!=this) {
-           if ( cycle->GetValue() ) {
-             old = cycle ;
-                   cycle->SetValue(false);
-                 }
-                 cycle=cycle->NextInCycle();
-               }
+          while (cycle!=this) {
+            if ( cycle->GetValue() ) {
+              old = cycle ;
+                cycle->SetValue(false);
+              }
+              cycle=cycle->NextInCycle();
+            }

     }
 
     }
 

-         SetValue(true) ;
+      SetValue(true) ;

 
     if ( old ) {
       wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );
 
     if ( old ) {
       wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );


@@ -131,18 +134,18 @@ void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpar
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {
 
 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);
-       }
+    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);
+      }

 }  
 }