From 9977646e061d47114b16e044255e6175f95cfcbb Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Sun, 21 Aug 2022 21:47:17 -0400 Subject: [PATCH] Remove the macro XmStringGenerate. --- src/help.c | 2 +- src/main.h | 9 --------- src/preferences.c | 8 ++++---- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/help.c b/src/help.c index ee5c1b0..1b46155 100644 --- a/src/help.c +++ b/src/help.c @@ -36,7 +36,7 @@ void createAboutBox(Widget parent) %s\n\n\ Nebula IRC is distributed under BSD.",\ CLIENT_VERSION, sysState.systemInfo); - theXmString = XM_STRING_GEN_COMP(theString); + theXmString = XmStringGenerate(theString, XmFONTLIST_DEFAULT_TAG, XmCHARSET_TEXT, NULL); theXmString2 = XmStringCreateLocalized("About"); XtSetArg(args[0], XmNdialogTitle, theXmString2); diff --git a/src/main.h b/src/main.h index 6da5a52..24416fd 100644 --- a/src/main.h +++ b/src/main.h @@ -56,13 +56,4 @@ void rmvFdToSelectMask(int fd); void quitApplication(); void appendText(char *msg); -/* remember to check for XmFONTLIST_DEFAULT_TAG when used */ - -#ifdef HAVE_XMSTRINGGENERATE -#define XM_STRING_GEN_COMP(str)\ - XmStringGenerate(str, XmFONTLIST_DEFAULT_TAG, XmCHARSET_TEXT, NULL); -#else -#define XM_STRING_GEN_COMP(str)\ - XmStringCreateLtoR(str, XmFONTLIST_DEFAULT_TAG); -#endif #include "copyright.h" diff --git a/src/preferences.c b/src/preferences.c index 23cd9ab..2efb560 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -89,7 +89,8 @@ void helpButtStartupCbk() argcount = 0; theXmString = XmStringCreateLocalized("Help"); XtSetArg(args[argcount], XmNdialogTitle, theXmString); argcount++; - theXmString2 = XM_STRING_GEN_COMP("Set nickname and name you want to use.\n\nEnter the server you want to connect to."); + theXmString2 = XmStringGenerate("Set nickname and name you want to use.\n\nEnter the server you want to connect to.", + XmFONTLIST_DEFAULT_TAG, XmCHARSET_TEXT, NULL); XtSetArg(args[argcount], XmNmessageString, theXmString2); argcount++; XtSetArg(args[argcount], XmNautoUnmanage, True); argcount++; startupPrefsHelpDlgBox = XmCreateInformationDialog(startPrefDiag, "help", args, argcount); @@ -326,9 +327,8 @@ void helpButtPrefCbk() argcount = 0; theXmString = XmStringCreateLocalized("Help"); XtSetArg(args[argcount], XmNdialogTitle, theXmString); argcount++; - theXmString2 = XM_STRING_GEN_COMP("This panel sets the startup preferences.\n\ -Ok will save them to the user\'s defaults.\n\n\ -Set nickname and name you want to use.\nEnter the server you want to connect to."); + theXmString2 = XmStringGenerate("This panel provides easy access to preferences.\nOK will save them to your dotfile.", + XmFONTLIST_DEFAULT_TAG, XmCHARSET_TEXT, NULL); XtSetArg(args[argcount], XmNmessageString, theXmString2); argcount++; XtSetArg(args[argcount], XmNautoUnmanage, True); argcount++; startupPrefsHelpDlgBox = XmCreateInformationDialog(startPrefDiag, "help", args, argcount);