reverted the change of r32940 which worked around a bug due to associating a dummy...

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 9e2ec2d4272f5693d444320bd70e5af95c2876c6..4ac378762e70128b379287e333063aadf6ff271f 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -1,104 +1,127 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobut.cpp
+// Name:        src/motif/radiobut.cpp

 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY

 #endif
 
 #include "wx/radiobut.h"
 #endif
 
 #include "wx/radiobut.h"

-#include "wx/utils.h"

 
 

-#include <Xm/Label.h>
-#include <Xm/LabelG.h>
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>

-#include <Xm/RowColumn.h>
-#include <Xm/Form.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 

-#include <wx/motif/private.h>
+#include "wx/motif/private.h"

 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,

-  XmToggleButtonCallbackStruct * cbs);
+                            XmToggleButtonCallbackStruct * cbs);

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)

-#endif

 
 wxRadioButton::wxRadioButton()
 {
 }
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
 wxRadioButton::wxRadioButton()
 {
 }
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,

-                  const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+                           const wxString& label,
+                           const wxPoint& pos,
+                           const wxSize& size, long style,
+                           const wxValidator& validator,
+                           const wxString& name)

 {
 {

-    SetName(name);
-    SetValidator(validator);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
-
-    m_windowStyle = style ;
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
+    PreCreation();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();

+    Display* dpy = XtDisplay(parentWidget);

 
 

-    wxString label1(wxStripMenuCodes(label));
-
-    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+    wxString label1(GetLabelText(label));

 
 

+    wxXmString text( label1 );

 
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
 
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS

-                    xmToggleButtonGadgetClass, parentWidget,
+        xmToggleButtonGadgetClass, parentWidget,

 #else
 #else

-                    xmToggleButtonWidgetClass, parentWidget,
+        xmToggleButtonWidgetClass, parentWidget,

 #endif
 #endif

-                    XmNlabelString, text,
-                    XmNfillOnSelect, True,
-                    XmNindicatorType, XmONE_OF_MANY, // diamond-shape
-                                                NULL);
-    XmStringFree (text);
+        wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+        XmNlabelString, text(),
+        XmNfillOnSelect, True,
+        XmNindicatorType, XmONE_OF_MANY, // diamond-shape
+        NULL);

 
 

-    XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
-                    (XtCallbackProc) this);
+    XtAddCallback (radioButtonWidget,
+                   XmNvalueChangedCallback,
+                   (XtCallbackProc)wxRadioButtonCallback,
+                   (XtPointer)this);

 
     m_mainWidget = (WXWidget) radioButtonWidget;
 
 
     m_mainWidget = (WXWidget) radioButtonWidget;
 

-    m_windowFont = parent->GetFont();
-    ChangeFont(FALSE);
-

     XtManageChild (radioButtonWidget);
 
     XtManageChild (radioButtonWidget);
 

-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, size.x, size.y);

 
 

-    ChangeBackgroundColour();
+    //copied from mac/radiobut.cpp (from here till "return true;")
+    m_cycle = this ;

 
 

-    return TRUE;
+    if (HasFlag(wxRB_GROUP))
+    {
+        AddInCycle( NULL ) ;
+    }
+    else
+    {
+        /* search backward for last group start */
+        wxRadioButton *chief = (wxRadioButton*) NULL;
+        wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
+        while (node)
+        {
+            wxWindow *child = node->GetData();
+            if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) )
+            {
+                chief = (wxRadioButton*) child;
+                if (child->HasFlag(wxRB_GROUP)) break;
+            }
+            node = node->GetPrevious();
+        }
+        AddInCycle( chief ) ;
+    }
+    return true;

 }
 
 void wxRadioButton::SetValue(bool value)
 {
 }
 
 void wxRadioButton::SetValue(bool value)
 {

-    m_inSetValue = TRUE;
-    XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE);
-    m_inSetValue = FALSE;
+    if (GetValue() == value)
+        return;
+
+    m_inSetValue = true;
+    XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, False);
+    m_inSetValue = false;
+
+    ClearSelections();

 }
 
 // Get single selection, for single choice list items
 }
 
 // Get single selection, for single choice list items


@@ -109,38 +132,102 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {

-  SetValue ( (event.m_commandInt != 0) );
-  ProcessCommand (event);
-}
-
-void wxRadioButton::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
+    SetValue ( (event.GetInt() != 0) );
+    ProcessCommand (event);

 }
 
 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 }
 
 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();

+
+    // What colour should this be?
+    wxColour colour = *wxBLACK;
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
+
+    XtVaSetValues ((Widget) GetMainWidget(),
+          XmNselectColor, selectPixel,
+          NULL);

 }
 
 }
 

-void wxRadioButton::ChangeForegroundColour()
+void wxRadioButtonCallback (Widget WXUNUSED(w), XtPointer clientData,
+                            XmToggleButtonCallbackStruct * cbs)

 {
 {

-    wxWindow::ChangeForegroundColour();
+    if (!cbs->set)
+        return;
+
+    wxRadioButton *item = (wxRadioButton *) clientData;
+    if (item->InSetValue())
+        return;
+
+    //based on mac/radiobut.cpp
+    wxRadioButton* old = item->ClearSelections();
+    item->SetValue(true);
+
+    if ( old )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED,
+                             old->GetId() );
+        event.SetEventObject(old);
+        event.SetInt( false );
+        old->ProcessCommand(event);
+    }
+    wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId() );
+    event2.SetEventObject(item);
+    event2.SetInt( true );
+    item->ProcessCommand(event2);

 }
 
 }
 

-void wxRadioButtonCallback (Widget w, XtPointer clientData,
-                   XmToggleButtonCallbackStruct * cbs)
+wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)

 {
 {

-  if (!cbs->set)
-    return;
-
-  wxRadioButton *item = (wxRadioButton *) clientData;
-  if (item->InSetValue())
-    return;
-
-  wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
-  event.SetEventObject(item);
+    if (cycle == NULL)
+    {
+        m_cycle = this;
+    }
+    else
+    {
+        wxRadioButton* current = cycle;
+        while ( current->m_cycle != cycle )
+            current = current->m_cycle;
+        m_cycle = cycle;
+        current->m_cycle = this;
+    }
+
+    return cycle;
+}

 
 

-  item->ProcessCommand (event);
+wxRadioButton* wxRadioButton::ClearSelections()
+{
+    wxRadioButton* cycle = NextInCycle();
+    wxRadioButton* old = 0;
+
+    if (cycle)
+    {
+        while (cycle != this)
+        {
+            if ( cycle->GetValue() )
+            {
+                old = cycle;
+                cycle->SetValue(false);
+            }
+            cycle = cycle->NextInCycle();
+        }
+    }
+
+    return old;

 }
 
 }
 

+void wxRadioButton::RemoveFromCycle()
+{
+    wxRadioButton* curr = NextInCycle();
+
+    while( curr )
+    {
+        if( curr->NextInCycle() == this )
+        {
+            curr->m_cycle = this->m_cycle;
+            return;
+        }
+
+        curr = curr->NextInCycle();
+    }
+}