Various fixes for Textctrl and Popup Menus.

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 1f5bb9c67aaa622814c3df5e2608fe2eaf3d5feb..0d060bdb956755cb2ac482a3fdef6e435153d28b 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -13,16 +13,15 @@
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/radiobut.h"
+#include "wx/defs.h"
 
+#include "wx/radiobut.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
 
-BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
-   EVT_IDLE( wxRadioButton::OnIdle )
-END_EVENT_TABLE()
-
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
@@ -34,71 +33,47 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        
-       m_cycle=NULL;
-       
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;
 
-    return TRUE;
-}
-
-void wxRadioButton::OnIdle( wxIdleEvent &event )
-{
-    if (!m_cycle && HasFlag(wxRB_GROUP))
+  m_cycle = this ;
+  
+  if (HasFlag(wxRB_GROUP))
+  {
+         AddInCycle( NULL ) ;
+  }
+  else
+  {
+    /* search backward for last group start */
+    wxRadioButton *chief = (wxRadioButton*) NULL;
+    wxWindowList::Node *node = parent->GetChildren().GetLast();
+    while (node)
     {
-        // we are a stand-alone radiobutton and have
-        // the group flag indicating we have to collect
-        // the other radiobuttons belonging to this one
-        
-        bool reached_this = FALSE;
-        wxRadioButton *m_radioButtonCycle = NULL;
-        m_radioButtonCycle = AddInCycle( m_radioButtonCycle );
-        
-        wxWindow *parent = GetParent();
-        wxNode *node = parent->GetChildren().First();
-        while (node)
-        {
-            wxWindow *child = (wxWindow*) node->Data();
-            
-            node = node->Next();
-            
-            // start searching behind current radiobutton
-            if (!reached_this)
-            {
-                reached_this = (this == child);
-                continue;
-            }
-            
-            if (child->IsKindOf( CLASSINFO ( wxRadioButton ) ))
-            {
-                wxRadioButton *rb = (wxRadioButton*) child;
-                
-                // already reached next group
-                if (rb->HasFlag(wxRB_GROUP)) break;
-                
-                // part of a radiobox
-                if (rb->NextInCycle()) break;
-                
-                m_radioButtonCycle = rb->AddInCycle( m_radioButtonCycle );
-            } 
-        }
-    
+      wxWindow *child = node->GetData();
+      if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) )
+      {
+          chief = (wxRadioButton*) child;
+         if (child->HasFlag(wxRB_GROUP)) break;
+      }
+      node = node->GetPrevious();
     }
-    
-    event.Skip( TRUE );
+    AddInCycle( chief ) ;
+  }
+    return TRUE;
 }
 
 void wxRadioButton::SetValue(bool val)
 {
        int i;
        wxRadioButton *cycle;
-       
-   ::SetControlValue( m_macControl , val ) ;
-   
+         if ( GetControlValue( (ControlHandle) m_macControl ) == val )
+           return ;
+           
+   ::SetControlValue( (ControlHandle) m_macControl , val ) ;
    if (val) 
    {
                cycle=this->NextInCycle();
@@ -109,11 +84,12 @@ void wxRadioButton::SetValue(bool val)
                                }
                        }
                }
+   MacRedrawControl() ;
 }
 
 bool wxRadioButton::GetValue() const
 {
-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControlValue( (ControlHandle) m_macControl ) ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
@@ -122,12 +98,35 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
-void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
-       SetValue(true) ;
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
-    event.SetEventObject(this);
-    ProcessCommand(event);
+    if ( GetValue() )
+      return ;
+      
+         wxRadioButton *cycle, *old = NULL ;
+    cycle=this->NextInCycle();
+    if (cycle!=NULL) {
+         while (cycle!=this) {
+           if ( cycle->GetValue() ) {
+             old = cycle ;
+                   cycle->SetValue(false);
+                 }
+                 cycle=cycle->NextInCycle();
+               }
+    }
+
+         SetValue(true) ;
+
+    if ( old ) {
+      wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );
+      event.SetEventObject(old);
+      event.SetInt( false );
+      old->ProcessCommand(event);
+    }
+    wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event2.SetEventObject(this);
+    event2.SetInt( true );
+    ProcessCommand(event2);
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
@@ -140,7 +139,8 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
                }
        else {
                current=cycle;
-               while ((next=current->m_cycle)!=cycle) current=current->m_cycle;
+               while ((next=current->m_cycle)!=cycle) 
+                 current=current->m_cycle;
                m_cycle=cycle;
                current->m_cycle=this;
                return(cycle);