missing commit

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 82baee26db9e7a8d547c7c92dcb8f1c2eddf12cd..3e9b9cb597f83e76cff80923aaf9c99be807ab68 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRadioBox
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxRadioBox
 // Author:      Julian Smart
 // Modified by:


@@ -9,18 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#include "wx/defs.h"
+#if wxUSE_RADIOBOX

 
 #include "wx/radiobox.h"
 
 #include "wx/radiobox.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -30,7 +29,6 @@
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/RowColumn.h>

-#include <Xm/Form.h>

 #include <Xm/Frame.h>
 #ifdef __VMS__
 #pragma message enable nosimpint
 #include <Xm/Frame.h>
 #ifdef __VMS__
 #pragma message enable nosimpint


@@ -44,18 +42,12 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 // Radio box item
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 // Radio box item

-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()

 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;

-    m_majorDim = 0 ;
-
-    m_formWidget = (WXWidget) 0;
-    m_frameWidget = (WXWidget) 0;

     m_labelWidget = (WXWidget) 0;
     m_labelWidget = (WXWidget) 0;

-    m_radioButtons = (WXWidget*) NULL;
-    m_radioButtonLabels = (wxString*) NULL;

 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,


@@ -64,228 +56,150 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
              int majorDim, long style,
              const wxValidator& val, const wxString& name)
 {
              int majorDim, long style,
              const wxValidator& val, const wxString& name)
 {

-    m_selectedButton = -1;
-    m_noItems = n;
-    m_formWidget = (WXWidget) 0;
-    m_frameWidget = (WXWidget) 0;
-    m_labelWidget = (WXWidget) 0;
-    m_radioButtons = (WXWidget*) NULL;
-    m_radioButtonLabels = (wxString*) NULL;
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    SetName(name);
-    SetValidator(val);
-
-    parent->AddChild(this);
-
-    m_windowStyle = (long&)style;
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    if( !CreateControl( parent, id, pos, size, style, val, name ) )
+        return false;
+    PreCreation();

 
 

+    m_noItems = (unsigned int)n;

     m_noRowsOrCols = majorDim;
 
     m_noRowsOrCols = majorDim;
 

-    if (majorDim==0)
-        m_majorDim = n ;
-    else
-        m_majorDim = majorDim ;
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);

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

+    Display* dpy = XtDisplay(parentWidget);

 
 

-    wxString label1(wxStripMenuCodes(title));
+    m_mainWidget = XtVaCreateWidget ("radioboxframe",
+                                     xmFrameWidgetClass, parentWidget,
+                                     XmNresizeHeight, True,
+                                     XmNresizeWidth, True,
+                                     NULL);

 
 

-    Widget formWidget = XtVaCreateManagedWidget (name.c_str(),
-                                        xmFormWidgetClass, parentWidget,
-                                        XmNmarginHeight, 0,
-                                        XmNmarginWidth, 0,
-                                        NULL);
+    wxString label1(GetLabelText(title));

 
 

-    m_formWidget = (WXWidget) formWidget;
-
-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
-    if (label1 != "")
+    if (!label1.empty())

     {
         wxXmString text(label1);
     {
         wxXmString text(label1);

-        (void)XtVaCreateManagedWidget(label1.c_str(),
+        m_labelWidget = (WXWidget)
+            XtVaCreateManagedWidget( label1.mb_str(),

 #if wxUSE_GADGETS
 #if wxUSE_GADGETS

-                                             style & wxCOLOURED ? xmLabelWidgetClass
-                                                                : xmLabelGadgetClass,
-                                             formWidget,
+                style & wxCOLOURED ? xmLabelWidgetClass
+                                   : xmLabelGadgetClass,
+                (Widget)m_mainWidget,
+#else
+                xmLabelWidgetClass, (Widget)m_mainWidget,
+#endif
+                wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+                XmNlabelString, text(),
+// XmNframeChildType is not in Motif 1.2, nor in Lesstif,
+// if it was compiled with 1.2 compatibility
+// TODO: check this still looks OK for Motif 1.2.
+#if (XmVersion > 1200)
+                XmNframeChildType, XmFRAME_TITLE_CHILD,

 #else
 #else

-                                             xmLabelWidgetClass, formWidget,
+                XmNchildType, XmFRAME_TITLE_CHILD,

 #endif
 #endif

-                                             XmNfontList, fontList,
-                                             XmNlabelString, text(),
-                                             NULL);
+                XmNchildVerticalAlignment, XmALIGNMENT_CENTER,
+                NULL);

     }
 
     }
 

-    Widget frameWidget = XtVaCreateManagedWidget ("frame",
-                                        xmFrameWidgetClass, formWidget,
-                                        XmNshadowType, XmSHADOW_IN,
-//                                        XmNmarginHeight, 0,
-//                                        XmNmarginWidth, 0,
-                                        NULL);
-
-    m_frameWidget = (WXWidget) frameWidget;
-

     Arg args[3];
 
     Arg args[3];
 

-    m_majorDim = (n + m_majorDim - 1) / m_majorDim;
-

     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));

-    XtSetArg (args[1], XmNnumColumns, m_majorDim);
-
-    Widget radioBoxWidget = XmCreateRadioBox (frameWidget, "radioBoxWidget", args, 2);
-    m_mainWidget = (WXWidget) radioBoxWidget;
+    XtSetArg (args[1], XmNnumColumns, GetMajorDim());
+    XtSetArg (args[2], XmNadjustLast, False);

 
 

+    Widget radioBoxWidget =
+        XmCreateRadioBox ((Widget)m_mainWidget, wxMOTIF_STR("radioBoxWidget"), args, 3);

 
 

-    if (m_labelWidget)
-            XtVaSetValues ((Widget) m_labelWidget,
-                       XmNtopAttachment, XmATTACH_FORM,
-                       XmNleftAttachment, XmATTACH_FORM,
-                       XmNalignment, XmALIGNMENT_BEGINNING,
-                       NULL);
-
-    XtVaSetValues (radioBoxWidget,
-            XmNtopAttachment, m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM,
-                     XmNtopWidget, m_labelWidget ? (Widget) m_labelWidget : formWidget,
-                     XmNbottomAttachment, XmATTACH_FORM,
-                     XmNleftAttachment, XmATTACH_FORM,
-                     XmNrightAttachment, XmATTACH_FORM,
-                     NULL);
+    m_radioButtons.reserve(n);
+    m_radioButtonLabels.reserve(n);

 
 

-    //    if (style & wxFLAT)
-    //        XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL);
-
-    m_radioButtons = new WXWidget[n];
-    m_radioButtonLabels = new wxString[n];

     int i;
     for (i = 0; i < n; i++)
     {
     int i;
     for (i = 0; i < n; i++)
     {

-        wxString str(wxStripMenuCodes(choices[i]));
-        m_radioButtonLabels[i] = str;
-        m_radioButtons[i] = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) str,
+        wxString str(GetLabelText(choices[i]));
+        m_radioButtonLabels.push_back(str);
+        Widget radioItem =  XtVaCreateManagedWidget (
+                                str.mb_str(),

 #if wxUSE_GADGETS
 #if wxUSE_GADGETS

-                            xmToggleButtonGadgetClass, radioBoxWidget,
+                                xmToggleButtonGadgetClass, radioBoxWidget,

 #else
 #else

-                                    xmToggleButtonWidgetClass, radioBoxWidget,
+                                xmToggleButtonWidgetClass, radioBoxWidget,

 #endif
 #endif

-                                    XmNfontList, fontList,
-                                                 NULL);
-        XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
-                     (XtPointer) this);
+                                wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+                                NULL);
+        m_radioButtons.push_back((WXWidget)radioItem);
+        XtAddCallback (radioItem, XmNvalueChangedCallback,
+                       (XtCallbackProc) wxRadioBoxCallback,
+                       (XtPointer) this);

     }
     }

-    SetSelection (0);

 
 

-    m_font = parent->GetFont();
-    ChangeFont(FALSE);
+    SetSelection (0);

 
 

-    //    XtManageChild((Widget) m_formWidget);
+    XtRealizeWidget((Widget)m_mainWidget);

     XtManageChild (radioBoxWidget);
     XtManageChild (radioBoxWidget);

+    XtManageChild ((Widget)m_mainWidget);

 
 

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

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

+bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
+             const wxPoint& pos, const wxSize& size,
+             const wxArrayString& choices,
+             int majorDim, long style,
+             const wxValidator& val, const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);
+}

 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    delete[] m_radioButtonLabels;
-    delete[] m_radioButtons;
-
-    DetachWidget(m_formWidget);

     DetachWidget(m_mainWidget);
     DetachWidget(m_mainWidget);

-
-    if (m_labelWidget)
-       XtDestroyWidget((Widget) m_labelWidget);

     XtDestroyWidget((Widget) m_mainWidget);
     XtDestroyWidget((Widget) m_mainWidget);

-    XtDestroyWidget((Widget) m_formWidget);

 
     m_mainWidget = (WXWidget) 0;
 
     m_mainWidget = (WXWidget) 0;

-    m_formWidget = (WXWidget) 0;
-    m_labelWidget = (WXWidget) 0;
-}
-
-wxString wxRadioBox::GetLabel(int item) const
-{
-    if (item < 0 || item >= m_noItems)
-        return wxEmptyString;
-
-    Widget widget = (Widget) m_radioButtons[item];
-    XmString text;
-    char *s;
-    XtVaGetValues (widget,
-                    XmNlabelString, &text,
-                    NULL);
-
-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-    {
-        // Should we free 'text'???
-        XmStringFree(text);
-        wxString str(s);
-        XtFree (s);
-        return str;
-    }
-    else
-    {
-        XmStringFree(text);
-        return wxEmptyString;
-    }

 }
 
 }
 

-void wxRadioBox::SetLabel(int item, const wxString& label)
+void wxRadioBox::SetString(unsigned int item, const wxString& label)

 {
 {

-    if (item < 0 || item >= m_noItems)
+    if (!IsValid(item))

         return;
 
         return;
 

-    Widget widget = (Widget) m_radioButtons[item];
-    if (label != "")
+    Widget widget = (Widget)m_radioButtons[item];
+    if (!label.empty())

     {
     {

-        wxString label1(wxStripMenuCodes(label));
-        XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+        wxString label1(GetLabelText(label));
+        wxXmString text( label1 );
+        m_radioButtonLabels[item] = label1;

         XtVaSetValues (widget,
         XtVaSetValues (widget,

-                        XmNlabelString, text,
+                        XmNlabelString, text(),

                         XmNlabelType, XmSTRING,
                         NULL);
                         XmNlabelType, XmSTRING,
                         NULL);

-        XmStringFree (text);

     }
 }
 
     }
 }
 

-int wxRadioBox::FindString(const wxString& s) const
-{
-    int i;
-    for (i = 0; i < m_noItems; i++)
-        if (s == m_radioButtonLabels[i])
-            return i;
-    return -1;
-}
-

 void wxRadioBox::SetSelection(int n)
 {
 void wxRadioBox::SetSelection(int n)
 {

-    if ((n < 0) || (n >= m_noItems))
+    if (!IsValid(n))

         return;
 
     m_selectedButton = n;
 
         return;
 
     m_selectedButton = n;
 

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

 
 

-    XmToggleButtonSetState ((Widget) m_radioButtons[n], TRUE, FALSE);
+    XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);

 
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
-        if (i != n)
-            XmToggleButtonSetState ((Widget) m_radioButtons[i], FALSE, FALSE);
+    for (unsigned int i = 0; i < m_noItems; i++)
+        if (i != (unsigned int)n)
+            XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);

 
 

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

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


@@ -295,71 +209,57 @@ int wxRadioBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const

 {
 {

-    if ((n < 0) || (n >= m_noItems))
+    if (!IsValid(n))

         return wxEmptyString;
     return m_radioButtonLabels[n];
 }
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
         return wxEmptyString;
     return m_radioButtonLabels[n];
 }
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    bool managed = XtIsManaged((Widget) m_formWidget);
+    bool managed = XtIsManaged((Widget) m_mainWidget);

 
     if (managed)
 
     if (managed)

-        XtUnmanageChild ((Widget) m_formWidget);
+        XtUnmanageChild ((Widget) m_mainWidget);

 
     int xx = x; int yy = y;
     AdjustForParentClientOrigin(xx, yy, sizeFlags);
 
     if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
 
     int xx = x; int yy = y;
     AdjustForParentClientOrigin(xx, yy, sizeFlags);
 
     if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

-        XtVaSetValues ((Widget) m_formWidget, XmNleftAttachment, XmATTACH_SELF,
-                   XmNx, xx, NULL);
+        XtVaSetValues ((Widget) m_mainWidget, XmNx, xx, NULL);

     if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

-        XtVaSetValues ((Widget) m_formWidget, XmNtopAttachment, XmATTACH_SELF,
-                   XmNy, yy, NULL);
+        XtVaSetValues ((Widget) m_mainWidget, XmNy, yy, NULL);

 
 

-    // Must set the actual RadioBox to be desired size MINUS label size
-    Dimension labelWidth = 0, labelHeight = 0, actualWidth = 0, actualHeight = 0;
+    if (width > 0)
+        XtVaSetValues ((Widget) m_mainWidget, XmNwidth, width, NULL);
+    if (height > 0)
+        XtVaSetValues ((Widget) m_mainWidget, XmNheight, height, NULL);

 
 

-    if (m_labelWidget)
-        XtVaGetValues ((Widget) m_labelWidget, XmNwidth, &labelWidth, XmNheight, &labelHeight, NULL);
-
-    actualWidth = width;
-    actualHeight = height - labelHeight;
-
-    if (width > -1)
-    {
-        XtVaSetValues ((Widget) m_mainWidget, XmNwidth, actualWidth, NULL);
-    }
-    if (height > -1)
-    {
-        XtVaSetValues ((Widget) m_mainWidget, XmNheight, actualHeight, NULL);
-    }

     if (managed)
     if (managed)

-        XtManageChild ((Widget) m_formWidget);
+        XtManageChild ((Widget) m_mainWidget);

 }
 
 // Enable a specific button
 }
 
 // Enable a specific button

-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)

 {
 {

-    if ((n < 0) || (n >= m_noItems))
-        return;
+    if (!IsValid(n))
+        return false;

 
     XtSetSensitive ((Widget) m_radioButtons[n], (Boolean) enable);
 
     XtSetSensitive ((Widget) m_radioButtons[n], (Boolean) enable);

+    return true;

 }
 
 // Enable all controls
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 }
 
 // Enable all controls
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

         XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
 
         XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
 

-    return TRUE;
+    return true;

 }
 
 bool wxRadioBox::Show(bool show)
 }
 
 bool wxRadioBox::Show(bool show)


@@ -369,21 +269,21 @@ bool wxRadioBox::Show(bool show)
 }
 
 // Show a specific button
 }
 
 // Show a specific button

-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(unsigned int n, bool show)

 {
   // This method isn't complete, and we try do do our best...
   // It's main purpose isn't for allowing Show/Unshow dynamically,
   // but rather to provide a way to design wxRadioBox such:
   //
 {
   // This method isn't complete, and we try do do our best...
   // It's main purpose isn't for allowing Show/Unshow dynamically,
   // but rather to provide a way to design wxRadioBox such:
   //

-  //        o Val1  o Val2   o Val3 
-  //        o Val4           o Val6 
-  //        o Val7  o Val8   o Val9 
+  //        o Val1  o Val2   o Val3
+  //        o Val4           o Val6
+  //        o Val7  o Val8   o Val9

   //
   // In my case, this is a 'direction' box, and the Show(5,False) is
   // coupled with an Enable(5,False)
   //
   //
   // In my case, this is a 'direction' box, and the Show(5,False) is
   // coupled with an Enable(5,False)
   //

-    if ((n < 0) || (n >= m_noItems))
-        return;
+    if (!IsValid(n))
+        return false;

 
     XtVaSetValues ((Widget) m_radioButtons[n],
         XmNindicatorOn, (unsigned char) show,
 
     XtVaSetValues ((Widget) m_radioButtons[n],
         XmNindicatorOn, (unsigned char) show,


@@ -391,20 +291,22 @@ void wxRadioBox::Show(int n, bool show)
 
     // Please note that this is all we can do: removing the label
     // if switching to unshow state. However, when switching
 
     // Please note that this is all we can do: removing the label
     // if switching to unshow state. However, when switching

-    // to the on state, it's the prog. resp. to call SetLabel(item,...)
+    // to the on state, it's the prog. resp. to call SetString(item,...)

     // after this call!!
     if (!show)
     // after this call!!
     if (!show)

-        wxRadioBox::SetLabel (n, " ");
+        wxRadioBox::SetString (n, " ");
+
+    return true;

 }
 
 // For single selection items only
 wxString wxRadioBox::GetStringSelection () const
 {
     int sel = GetSelection ();
 }
 
 // For single selection items only
 wxString wxRadioBox::GetStringSelection () const
 {
     int sel = GetSelection ();

-    if (sel > -1)
-        return this->GetString (sel);
+    if (sel != wxNOT_FOUND)
+        return this->GetString((unsigned int)sel);

     else
     else

-        return wxString("");
+        return wxEmptyString;

 }
 
 bool wxRadioBox::SetStringSelection (const wxString& s)
 }
 
 bool wxRadioBox::SetStringSelection (const wxString& s)


@@ -413,15 +315,15 @@ bool wxRadioBox::SetStringSelection (const wxString& s)
     if (sel > -1)
     {
         SetSelection (sel);
     if (sel > -1)
     {
         SetSelection (sel);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 void wxRadioBox::Command (wxCommandEvent & event)
 {
 }
 
 void wxRadioBox::Command (wxCommandEvent & event)
 {

-    SetSelection (event.m_commandInt);
+    SetSelection (event.GetInt());

     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 


@@ -429,16 +331,12 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);
 
 {
     wxWindow::ChangeFont(keepOriginalSize);
 

-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) GetTopWidget()));
-
-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         WXWidget radioButton = m_radioButtons[i];
 
         XtVaSetValues ((Widget) radioButton,
     {
         WXWidget radioButton = m_radioButtons[i];
 
         XtVaSetValues ((Widget) radioButton,

-                       XmNfontList, fontList,
-                       XmNtopAttachment, XmATTACH_FORM,
+                       wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay((Widget) GetTopWidget())),

                        NULL);
     }
 }
                        NULL);
     }
 }


@@ -447,16 +345,14 @@ void wxRadioBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
 {
     wxWindow::ChangeBackgroundColour();
 

-    DoChangeBackgroundColour((Widget) m_frameWidget, m_backgroundColour);
-
-    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+    wxColour colour = *wxBLACK;
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));

 
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         WXWidget radioButton = m_radioButtons[i];
 
     {
         WXWidget radioButton = m_radioButtons[i];
 

-        DoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(radioButton, m_backgroundColour, true);

 
         XtVaSetValues ((Widget) radioButton,
           XmNselectColor, selectPixel,
 
         XtVaSetValues ((Widget) radioButton,
           XmNselectColor, selectPixel,


@@ -468,12 +364,11 @@ void wxRadioBox::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();
 
 {
     wxWindow::ChangeForegroundColour();
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         WXWidget radioButton = m_radioButtons[i];
 
     {
         WXWidget radioButton = m_radioButtons[i];
 

-        DoChangeForegroundColour(radioButton, m_foregroundColour);
+        wxDoChangeForegroundColour(radioButton, m_foregroundColour);

     }
 }
 
     }
 }
 


@@ -485,18 +380,21 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
 
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
 
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;

-  int i;
+  unsigned int i;
+  const wxWidgetArray& buttons = item->GetRadioButtons();

   for (i = 0; i < item->GetCount(); i++)
   for (i = 0; i < item->GetCount(); i++)

-    if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
-      sel = i;
+    if (((Widget)buttons[i]) == w)
+      sel = (int)i;

   item->SetSel(sel);
 
   if (item->InSetValue())
     return;
 
   item->SetSel(sel);
 
   if (item->InSetValue())
     return;
 

-  wxCommandEvent event (wxEVT_COMMAND_RADIOBOX_SELECTED, item->GetId());
-  event.m_commandInt = sel;
+  wxCommandEvent event (wxEVT_RADIOBOX, item->GetId());
+  event.SetInt(sel);
+  event.SetString(item->GetStringSelection());

   event.SetEventObject(item);
   item->ProcessCommand (event);
 }
 
   event.SetEventObject(item);
   item->ProcessCommand (event);
 }
 

+#endif // wxUSE_RADIOBOX