Added new __WXMOTIF20__ macro, which is true if the Motif version
is 2.0 or higher. Now Motif 2.0 or better (but not Lesstif) uses XmRenderTable instead of the deprecated XmFontList. This allows underlined text in controls. Miscellaneous cleanup; used wxXmString in some more places. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1249,14 +1249,11 @@ void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, boo
|
||||
|
||||
extern void wxDoChangeFont(WXWidget widget, wxFont& font)
|
||||
{
|
||||
// lesstif 0.87 hangs here, but 0.93 does not
|
||||
#if !defined(LESSTIF_VERSION) \
|
||||
|| (defined(LesstifVersion) && LesstifVersion >= 93)
|
||||
|
||||
// Lesstif 0.87 hangs here, but 0.93 does not
|
||||
#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
|
||||
Widget w = (Widget)widget;
|
||||
XmFontList fontList = (XmFontList)font.GetFontList(1.0, XtDisplay(w));
|
||||
XtVaSetValues( w,
|
||||
XmNfontList, fontList,
|
||||
wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
|
||||
NULL );
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user