#ifdefed out Ole... functions for Cygwin.

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 29223c6d9a4abdf4e747db0be2d822c1749ae711..d73b55569bb1b4ad1222e65653a8e1cc16d34db2 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -34,8 +34,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 wxRadioButton::wxRadioButton()
 {
-    m_labelWidget = (WXWidget) 0;
-    m_formWidget = (WXWidget) 0;
 }
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
@@ -47,6 +45,9 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 {
     SetName(name);
     SetValidator(validator);
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();
 
     if (parent) parent->AddChild(this);
 
@@ -63,74 +64,32 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     XmString text = XmStringCreateSimple ((char*) (const char*) label1);
 
-    Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
-                                       xmFormWidgetClass, parentWidget,
-                                       XmNmarginHeight, 0,
-                                       XmNmarginWidth, 0,
-                                       NULL);
-
-    m_formWidget = (WXWidget) formWidget;
-
-    Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) label1,
-#if wxUSE_GADGETS
-                                       xmLabelGadgetClass,
-                                           formWidget,
-#else
-                                           xmLabelWidgetClass, formWidget,
-#endif
-                                           XmNlabelString, text,
-                                           NULL);
-    m_labelWidget = (WXWidget) labelWidget;
-/* TODO
-      if (labelFont)
-       XtVaSetValues (labelWidget,
-                      XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)),
-                      NULL);
-*/
-
-    XmStringFree (text);
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
 
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
-                    xmToggleButtonGadgetClass, formWidget,
+                    xmToggleButtonGadgetClass, parentWidget,
 #else
-                    xmToggleButtonWidgetClass, formWidget,
+                    xmToggleButtonWidgetClass, parentWidget,
 #endif
+                    XmNfontList, fontList,
+                    XmNlabelString, text,
+                    XmNfillOnSelect, True,
+                    XmNindicatorType, XmONE_OF_MANY, // diamond-shape
                                                 NULL);
+    XmStringFree (text);
+
     XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
                     (XtCallbackProc) this);
 
     m_mainWidget = (WXWidget) radioButtonWidget;
 
-/* TODO
-  if (labelFont)
-   XtVaSetValues (radioButtonWidget,
-                  XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)),
-                  NULL);
-*/
-
-    if (labelWidget)
-           XtVaSetValues (labelWidget,
-                      XmNtopAttachment, XmATTACH_FORM,
-                      XmNleftAttachment, XmATTACH_FORM,
-                      XmNbottomAttachment, XmATTACH_FORM,
-                      XmNalignment, XmALIGNMENT_BEGINNING,
-                      NULL);
-    XtVaSetValues (radioButtonWidget,
-                    XmNleftOffset, 4,
-                    XmNtopAttachment, XmATTACH_FORM,
-                    XmNbottomAttachment, XmATTACH_FORM,
-          XmNleftAttachment, (Widget) m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM,
-                    XmNleftWidget, (Widget) m_labelWidget ? (Widget) m_labelWidget : formWidget,
-                    NULL);
-
     XtManageChild (radioButtonWidget);
 
     SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
+    AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
 
-    SetFont(* parent->GetFont());
-    ChangeColour(m_mainWidget);
+    ChangeBackgroundColour();
 
     return TRUE;
 }
@@ -154,6 +113,21 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
+void wxRadioButton::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxRadioButton::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
+}
+
+void wxRadioButton::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
+}
+
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                    XmToggleButtonCallbackStruct * cbs)
 {