Applied patch [ 869522 ] Cleaning of deprecated contrib

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 51b1241ba5792a0c27ae5c8bf880d9e9d52e30a0..b633e9cb20d2f0fa1e805e82889b4907cf1f0398 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "radiobut.h"
 #endif
 
 #pragma implementation "radiobut.h"
 #endif
 


@@ -17,18 +17,16 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/radiobut.h"
 #include "wx/utils.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #include "wx/radiobut.h"
 #include "wx/utils.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

-#include <Xm/Label.h>
-#include <Xm/LabelG.h>

 #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
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif


@@ -51,28 +49,16 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                            const wxValidator& validator,
                            const wxString& name)
 {
                            const wxValidator& validator,
                            const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    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;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     wxString label1(wxStripMenuCodes(label));
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     wxString label1(wxStripMenuCodes(label));
 

-    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+    wxXmString text( label1 );

 
 

-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));

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


@@ -80,42 +66,63 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 #else
         xmToggleButtonWidgetClass, parentWidget,
 #endif
 #else
         xmToggleButtonWidgetClass, parentWidget,
 #endif

-        XmNfontList, fontList,
-        XmNlabelString, text,
+        wxFont::GetFontTag(), fontType,
+        XmNlabelString, text(),

         XmNfillOnSelect, True,
         XmNindicatorType, XmONE_OF_MANY, // diamond-shape
         NULL);
         XmNfillOnSelect, True,
         XmNindicatorType, XmONE_OF_MANY, // diamond-shape
         NULL);

-    XmStringFree (text);

 
 

-#ifdef __VMS__
-#pragma message disable voiincconext
-       // VMS gives here the compiler warning:
-       // conversion from pointer to function to void* permitted
-       // as an extension
-#endif
-    XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
-        (XtCallbackProc) this);
-#ifdef __VMS__
-#pragma message enable voiincconext
-#endif
+    XtAddCallback (radioButtonWidget,
+                   XmNvalueChangedCallback,
+                   (XtCallbackProc)wxRadioButtonCallback,
+                   (XtPointer)this);

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

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

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 

+    //copied from mac/radiobut.cpp (from here till "return TRUE;")
+    m_cycle = this ;
+  
+    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)
 {
     return TRUE;
 }
 
 void wxRadioButton::SetValue(bool value)
 {

+    if (GetValue() == value)
+        return;
+

     m_inSetValue = TRUE;
     XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE);
     m_inSetValue = FALSE;
     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


@@ -130,28 +137,18 @@ void wxRadioButton::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxRadioButton::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-

 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
     // What colour should this be?
 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
     // What colour should this be?

-    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+    int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));

 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,
           NULL);
 }
 
 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,
           NULL);
 }
 

-void wxRadioButton::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-}
-

 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs)
 {
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs)
 {


@@ -162,9 +159,78 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData,
     if (item->InSetValue())
         return;
 
     if (item->InSetValue())
         return;
 

-    wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
-    event.SetEventObject(item);
+    //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);
+}

 
 

-    item->ProcessCommand (event);
+wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
+{
+    wxRadioButton* next;
+    wxRadioButton* 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* 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();
+    }
+}