midfavila
/
Nebula
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the macro XmStringGenerate.

This commit is contained in:
Mid Favila 2022-08-21 21:47:17 -04:00
parent 48e0af8465
commit 9977646e06
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/help.c
View File

@ -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);

9
src/main.h
View File

@ -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"

8
src/preferences.c
View File

@ -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);