Moved wxDateTime::TIME_T_FACTOR into datetime.cpp to

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 46906f1a93dddbc394c02f181a5529267095ea2b..9dc0df98d8c46a486a808c575ccdf3dfbe9c252e 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -72,9 +72,9 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     wxString label1(wxStripMenuCodes(label));
 
 
     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


@@ -82,12 +82,11 @@ 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);

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