Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 9e2ec2d4272f5693d444320bd70e5af95c2876c6..d73b55569bb1b4ad1222e65653a8e1cc16d34db2 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -47,6 +47,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     SetValidator(validator);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();
 
     if (parent) parent->AddChild(this);
 
@@ -63,6 +64,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     XmString text = XmStringCreateSimple ((char*) (const char*) label1);
 
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
 
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
@@ -70,6 +72,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 #else
                     xmToggleButtonWidgetClass, parentWidget,
 #endif
+                    XmNfontList, fontList,
                     XmNlabelString, text,
                     XmNfillOnSelect, True,
                     XmNindicatorType, XmONE_OF_MANY, // diamond-shape
@@ -81,9 +84,6 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     m_mainWidget = (WXWidget) radioButtonWidget;
 
-    m_windowFont = parent->GetFont();
-    ChangeFont(FALSE);
-
     XtManageChild (radioButtonWidget);
 
     SetCanAddEventHandler(TRUE);