From 7398fb817080494ac72bba20bcbc3d3b741e7e48 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Mon, 22 Aug 2005 17:44:43 +0000 Subject: [PATCH] Compilation fix for Motif 1.2. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/filedlg.cpp | 21 +++++++++------------ src/motif/msgdlg.cpp | 21 +++++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp index b9925678ba..8173d408e9 100644 --- a/src/motif/filedlg.cpp +++ b/src/motif/filedlg.cpp @@ -182,18 +182,15 @@ int wxFileDialog::ShowModal() wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - if ( wxFont::GetFontTag() == (WXString) XmNfontList ) - { - XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++; - } - else - { - XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++; - } +#if __WXMOTIF20__ && !__WXLESSTIF__ + XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++; +#else + XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++; +#endif Widget fileSel = XmCreateFileSelectionDialog(parentWidget, "file_selector", args, ac); diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp index 8cb73db371..63ea92e899 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -173,18 +173,15 @@ int wxMessageDialog::ShowModal() wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - if ( wxFont::GetFontTag() == (WXString) XmNfontList ) - { - XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++; - } - else - { - XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++; - XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++; - } +#if __WXMOTIF20__ && !__WXLESSTIF__ + XtSetArg(args[ac], XmNbuttonRenderTable, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNlabelRenderTable, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNtextRenderTable, font.GetFontTypeC(dpy)); ac++; +#else + XtSetArg(args[ac], XmNbuttonFontList, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNlabelFontList, font.GetFontTypeC(dpy)); ac++; + XtSetArg(args[ac], XmNtextFontList, font.GetFontTypeC(dpy)); ac++; +#endif // do create message box -- 2.47.2