From 6854113d843828841e0a4d6977349a2483908768 Mon Sep 17 00:00:00 2001 From: Stas Degteff Date: Sat, 21 Jan 2006 00:57:09 +0000 Subject: [PATCH] Replace macro __GOLD_SPELL__ with GCFG_NOSPELLDLL; DLL-speller allowed only for Win32; external cpellcheck program is disabled if DLL-speller is enabled --- Config.def | 7 +++++-- golded3/gccfgg.cpp | 4 +++- golded3/gccfgg.h | 4 +++- golded3/gccfgg0.cpp | 4 +++- golded3/gccfgg3.cpp | 5 +++-- golded3/gccfgg7.cpp | 6 +++--- golded3/gckeys.cpp | 6 +++++- golded3/gckeys.h | 4 +++- golded3/gclang.cpp | 2 ++ golded3/gclang.h | 2 ++ golded3/gcmisc.cpp | 6 +++--- golded3/gcprot.h | 4 +++- golded3/geall.h | 8 ++++---- golded3/gecfgg.h | 8 +++++++- golded3/ged2.ico | Bin 16 -> 17 bytes golded3/gedw.ico | Bin 766 -> 767 bytes golded3/geedit.cpp | 20 +++++++++++--------- golded3/geedit.h | 11 +++++++---- golded3/geedit2.cpp | 6 ++++-- golded3/gekeys.h | 4 +++- golded3/gelang.h | 6 ++++-- golded3/gemnus.cpp | 16 ++++++++-------- golded3/gemnus.h | 2 +- golded3/getpls.cpp | 6 ++++++ goldlib/gall/gall.all | 1 + goldlib/gall/gdefs.h | 5 +++++ goldlib/gall/gespell.cpp | 10 +++++----- goldlib/gall/gespell.h | 6 +++--- goldlib/gcfg/gedacfg.cpp | 2 +- 29 files changed, 108 insertions(+), 57 deletions(-) diff --git a/Config.def b/Config.def index ac99185..7aeb713 100644 --- a/Config.def +++ b/Config.def @@ -1,3 +1,6 @@ +# +# Defines to exclude some code from Golded+ binary. +# # Uncomment to disable AdeptXBBS support #CPPFLAGS+=-DGCFG_NOXBBS # Uncomment to disable CrashMail support @@ -72,5 +75,5 @@ #CPPFLAGS+=-DGCFG_NOXMAIL # Uncomment to disable Synchronet BBS support #CPPFLAGS+=-DGCFG_NOSYNCHRONET -# Uncomment to enable MS Office spellchecker support (win32 only) -#CPPFLAGS+=-D__GOLD_SPELL__ +# Uncomment to disable MS Office spellchecker support (win32 only) +CPPFLAGS+=-DGCFG_NOSPELLDLL diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp index 8b2b06c..193f695 100644 --- a/golded3/gccfgg.cpp +++ b/golded3/gccfgg.cpp @@ -545,7 +545,9 @@ GoldedCfgEdit::GoldedCfgEdit() { str.push_back(""); cfg.external = str.size()-1; str.push_back(GOLDED_MSG); cfg.file = str.size()-1; str.push_back("<<"); cfg.hardline = str.size()-1; +#if defined(GCFG_NOSPELLDLL) str.push_back(""); cfg.spellchecker = str.size()-1; +#endif } @@ -767,7 +769,7 @@ CfgGed::CfgGed() { replylinkfloat = true; replylinklist = 0; replylinkshowalways = true; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) scheckerdeflang = 0xFFFF; scheckerenabled = NO; strcpy(scheckeruserdic, "user.dic"); diff --git a/golded3/gccfgg.h b/golded3/gccfgg.h index d052c94..67fe930 100644 --- a/golded3/gccfgg.h +++ b/golded3/gccfgg.h @@ -167,7 +167,9 @@ const word CRC_EDITREPLYRE = 0x5D23; const word CRC_EDITSAVEMENU = 0x7BC2; const word CRC_EDITSAVEUTIL = 0xF411; const word CRC_EDITSOFTCRXLAT = 0xA49A; +#if defined(GCFG_NOSPELLDLL) const word CRC_EDITSPELLCHECK = 0xE167; +#endif const word CRC_EDITUNDELETE = 0x4C34; const word CRC_EMPTYTEARLINE = 0x8D0A; const word CRC_ENCODEEMAILHEADERS=0xA843; @@ -320,7 +322,7 @@ const word CRC_REPLYLINKFLOAT = 0xA3EC; const word CRC_REPLYLINKLIST = 0x104F; const word CRC_REPLYLINKSHOWALWAYS = 0x2BCD; const word CRC_ROBOTNAME = 0x7393; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) const word CRC_SCHECKERDEFLANG = 0xBBEB; const word CRC_SCHECKERENABLED = 0x7394; const word CRC_SCHECKERUSERDIC = 0x0753; diff --git a/golded3/gccfgg0.cpp b/golded3/gccfgg0.cpp index 5bc6b6d..b714852 100644 --- a/golded3/gccfgg0.cpp +++ b/golded3/gccfgg0.cpp @@ -321,7 +321,9 @@ SwitchE: case CRC_EDITSAVEMENU : CfgEditsavemenu (); break; case CRC_EDITSAVEUTIL : CfgEditsaveutil (); break; case CRC_EDITSOFTCRXLAT : CfgEditsoftcrxlat (); break; +#if defined(GCFG_NOSPELLDLL) case CRC_EDITSPELLCHECK : CfgEditspellcheck (); break; +#endif case CRC_EDITUNDELETE : CfgEditundelete (); break; case CRC_ENDGROUP : CfgEndgroup (); break; case CRC_ENCODEEMAILHEADERS: CfgEncodeemailheaders(); break; @@ -520,7 +522,7 @@ SwitchR: SwitchS: switch(crc) { -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) case CRC_SCHECKERDEFLANG : CfgScheckerdeflang (); break; case CRC_SCHECKERENABLED : CfgScheckerenabled (); break; case CRC_SCHECKERUSERDIC : CfgScheckeruserdic (); break; diff --git a/golded3/gccfgg3.cpp b/golded3/gccfgg3.cpp index dfb1c9c..1b7600b 100644 --- a/golded3/gccfgg3.cpp +++ b/golded3/gccfgg3.cpp @@ -312,11 +312,12 @@ void CfgEditsoftcrxlat() { // ------------------------------------------------------------------ +#if defined(GCFG_NOSPELLDLL) void CfgEditspellcheck() { EDIT->SpellChecker(val); } - +#endif // ------------------------------------------------------------------ void CfgEditundelete() { @@ -325,7 +326,7 @@ void CfgEditundelete() { } // ------------------------------------------------------------------ - + void CfgEncodeemailheaders() { CFG->encodeemailheaders = make_bool(GetYesno(val)); diff --git a/golded3/gccfgg7.cpp b/golded3/gccfgg7.cpp index 7a8e05c..d8cd03d 100644 --- a/golded3/gccfgg7.cpp +++ b/golded3/gccfgg7.cpp @@ -222,7 +222,7 @@ void CfgRobotname() { // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) void CfgScheckerdeflang() { CFG->scheckerdeflang = atoi(val); @@ -425,7 +425,7 @@ void CfgSeqOutRun() { if(*p == '\0') { CFG->seqoutrun = s; - + if (veryverbose) STD_PRINTNL(" SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun); @@ -454,7 +454,7 @@ void CfgSeqOutRun() { return; } CFG->seqoutrun = s; - + if (veryverbose) STD_PRINTNL(" SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun); } diff --git a/golded3/gckeys.cpp b/golded3/gckeys.cpp index ae2adbf..f39cebd 100644 --- a/golded3/gckeys.cpp +++ b/golded3/gckeys.cpp @@ -119,7 +119,9 @@ CmdKey DefaultKeyset[] = { { Key_A_S , KK_EditSaveMsg , KT_E }, { Key_C_Z , KK_EditSaveMsg , KT_E }, { Key_F2 , KK_EditSaveMsg , KT_E }, +#if defined(GCFG_NOSPELLDLL) { Key_F9 , KK_EditSpellCheck , KT_E }, +#endif { Key_Tab , KK_EditTab , KT_E }, { Key_S_Tab , KK_EditTabReverse , KT_E }, { Key_A_3 , KK_EditToggleCase , KT_E }, @@ -675,7 +677,7 @@ tglobalkey globalkeys[] = { { CRC_READSHOWDEL , KK_ReadShowDel , KT_R }, // 0x8615 { CRC_K_ENTER , Key_Ent , 0 }, // 0x87BD { CRC_EDITGOTOPLINE , KK_EditGoTopLine , KT_E }, // 0x87C2 -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) { CRC_EDITSCHECKERMENU , KK_EditSCheckerMenu , KT_E }, // 0x881F #endif { CRC_HEADERTOGGLEARCSENT , KK_HeaderToggleArcsent , KT_H }, // 0x88A7 @@ -824,7 +826,9 @@ tglobalkey globalkeys[] = { { CRC_EDITBLOCKUP , KK_EditBlockUp , KT_E }, // 0xE004 { CRC_EDITGOBEGLINE , KK_EditGoBegLine , KT_E }, // 0xE045 { CRC_READGOTONEXTMSG , KK_ReadGotoNextMsg , KT_R }, // 0xE0F1 +#if defined(GCFG_NOSPELLDLL) { CRC_EDITSPELLCHECK , KK_EditSpellCheck , KT_E }, // 0xE167 +#endif { CRC_AREASCAN , KK_AreaScan , KT_A }, // 0xE440 { CRC_EDITGOWORDLEFT , KK_EditGoWordLeft , KT_E }, // 0xE48C { CRC_EDITSCODENORMAL , KK_EditSCodeNormal , KT_E }, // 0xE4CE diff --git a/golded3/gckeys.h b/golded3/gckeys.h index 2fcfb1c..32162bd 100644 --- a/golded3/gckeys.h +++ b/golded3/gckeys.h @@ -113,7 +113,7 @@ const word CRC_EDITQUITNOW = 0x80BA; const word CRC_EDITREFLOW = 0x13F9; const word CRC_EDITSAVEFILE = 0x64A4; const word CRC_EDITSAVEMSG = 0x660C; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) const word CRC_EDITSCHECKERMENU = 0x881F; #endif const word CRC_EDITSCODENORMAL = 0xE4CE; @@ -122,7 +122,9 @@ const word CRC_EDITSCODEITALIC = 0x487F; const word CRC_EDITSCODEUNDERLINE = 0xB1D9; const word CRC_EDITSCODEREVERSE = 0xFC0E; const word CRC_EDITSOUNDKILL = 0xA9A7; +#if defined(GCFG_NOSPELLDLL) const word CRC_EDITSPELLCHECK = 0xE167; +#endif const word CRC_EDITTAB = 0x8C26; const word CRC_EDITTABREVERSE = 0xF5B6; const word CRC_EDITTOGGLECASE = 0xC282; diff --git a/golded3/gclang.cpp b/golded3/gclang.cpp index 5464d36..c99bc8a 100644 --- a/golded3/gclang.cpp +++ b/golded3/gclang.cpp @@ -398,7 +398,9 @@ static LangCrc LangCrcs[] = { { CRC_IL_FOUNDPERSONAL , NULL , " Found %u personal mail%s in %u area%s " }, { CRC_IL_NOPERSONAL , NULL , " No personal mail found " }, { CRC_ST_ESCORCONTINUE , NULL , "ESC exits. Other keys: Tries to continue" }, +#if defined(GCFG_NOSPELLDLL) { CRC_MS_SPELLCHECKER , NULL , "SpellChecker: %s" }, +#endif { CRC_WT_INS , NULL , " Ins " }, { CRC_WT_DRAWSL , NULL , " DL1 " }, { CRC_WT_DRAWDL , NULL , " DL2 " }, diff --git a/golded3/gclang.h b/golded3/gclang.h index 6a490bc..fea782d 100644 --- a/golded3/gclang.h +++ b/golded3/gclang.h @@ -401,7 +401,9 @@ const word CRC_WT_GRP = 0xD2EA; const word CRC_IL_FOUNDPERSONAL = 0xA039; const word CRC_IL_NOPERSONAL = 0x2813; const word CRC_ST_ESCORCONTINUE = 0x4800; +#if defined(GCFG_NOSPELLDLL) const word CRC_MS_SPELLCHECKER = 0x69B4; +#endif const word CRC_WT_INS = 0x2F27; const word CRC_WT_DRAWSL = 0x264D; const word CRC_WT_DRAWDL = 0x314D; diff --git a/golded3/gcmisc.cpp b/golded3/gcmisc.cpp index 16d7f90..3696a84 100644 --- a/golded3/gcmisc.cpp +++ b/golded3/gcmisc.cpp @@ -225,7 +225,7 @@ const word CRC_STYLECODES = 0x4CB0; // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) const word CRC_SPELL = 0xB8AE; const word CRC_SCERROR = 0xAB65; #endif @@ -423,7 +423,7 @@ void GetColors(char* value) { case CRC_STYLECODES: wptr = &GC_STYLE_; break; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) case CRC_SPELL: wptr = &GC_SPELL_; break; @@ -591,7 +591,7 @@ void GetColors(char* value) { wptr->_ReverseBoldItalicUnderscore = attr; } break; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) case CRC_SCERROR: wptr->_SpellError = attr; break; diff --git a/golded3/gcprot.h b/golded3/gcprot.h index 60560d9..45ac770 100644 --- a/golded3/gcprot.h +++ b/golded3/gcprot.h @@ -165,7 +165,9 @@ void CfgEditreplyre (); void CfgEditsavemenu (); void CfgEditsaveutil (); void CfgEditsoftcrxlat (); +#if defined(GCFG_NOSPELLDLL) void CfgEditspellcheck (); +#endif void CfgEditundelete (); void CfgEmptytearline (); void CfgEncodeemailheaders(); @@ -306,7 +308,7 @@ void CfgReplylinklist (); void CfgReplylinkshowalways(); void CfgReplyto (); void CfgRobotname (); -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) void CfgScheckerdeflang (); void CfgScheckerenabled (); void CfgScheckeruserdic (); diff --git a/golded3/geall.h b/golded3/geall.h index c0885b8..c0c948d 100644 --- a/golded3/geall.h +++ b/golded3/geall.h @@ -546,7 +546,7 @@ enum { TAG_MARKQUIT }; - + // ------------------------------------------------------------------ // The Message Browser @@ -638,7 +638,7 @@ struct SaveUtil { #define GC_CFGB_ CFG->color[11] #define GC_STYLE_ CFG->color[12] #define GC_SHAD_ CFG->color[13] -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) #define GC_SPELL_ CFG->color[14] #endif @@ -693,7 +693,7 @@ struct SaveUtil { #define _ReverseItalicUnderscore c[14] #define _ReverseBoldItalicUnderscore c[15] -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) #define _SpellError c[0] #endif @@ -813,7 +813,7 @@ struct SaveUtil { #define C_STYLERUI_ GC_STYLE_._ReverseItalicUnderscore #define C_STYLERUIB GC_STYLE_._ReverseBoldItalicUnderscore -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) #define C_SCERROR GC_SPELL_._SpellError #endif diff --git a/golded3/gecfgg.h b/golded3/gecfgg.h index 33b9bed..8e01f2f 100644 --- a/golded3/gecfgg.h +++ b/golded3/gecfgg.h @@ -309,7 +309,7 @@ public: int replylinklist; bool replylinkshowalways; gstrarray robotname; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) word scheckerdeflang; int scheckerenabled; Path scheckeruserdic; @@ -467,7 +467,9 @@ protected: int external; int file; int hardline; +#if defined(GCFG_NOSPELLDLL) int spellchecker; +#endif } cfg; // ----------------------------------------------------------------- @@ -518,7 +520,9 @@ public: int ReplyRe() { return cfg.replyre; } bool SaveMenu() { return cfg.savemenu; } char SoftCrXlat() { return cfg.softcrxlat; } +#if defined(GCFG_NOSPELLDLL) const char* SpellChecker() { return str[cfg.spellchecker].c_str(); } +#endif int UnDelete() { return cfg.undelete; } // ----------------------------------------------------------------- @@ -549,7 +553,9 @@ public: void ReplyRe(int s) { cfg.replyre = s; } void SaveMenu(bool s) { cfg.savemenu = s; } void SoftCrXlat(char s) { cfg.softcrxlat = s; } +#if defined(GCFG_NOSPELLDLL) void SpellChecker(char* s) { str[cfg.spellchecker] = s; } +#endif void UnDelete(int s) { cfg.undelete = s; } }; diff --git a/golded3/ged2.ico b/golded3/ged2.ico index 2f28f20e1466692053ba37c12ef4748d065095fc..ca53f625d06da82afb0859a07b7b1facdfc48af2 100644 GIT binary patch literal 17 UcmZ>A)L>v>r~qORaQ5T^01;>bx&QzG literal 16 TcmZ>A)L>v>r~qORaP|ZM53T{Q diff --git a/golded3/gedw.ico b/golded3/gedw.ico index 81a2087cd0bddd4bc13ac5daf78c48ee8cda16cb..85ba2039645847201a028e4a350b35cc57738fa9 100644 GIT binary patch delta 9 Qcmeyz`k!^fKPE;l02itxt.c_str(), __row, -1, __line); @@ -652,7 +652,7 @@ void IEclass::refresh(Line* __currline, uint __row) { } // If we ran out of lines, blank the rest -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) if (__row <= maxrow) editwin.fill(__row, mincol, __row, maxcol, _box_table(W_BREAD, 1), C_READB|ACSET); if (++__row <= maxrow) @@ -2084,7 +2084,7 @@ void IEclass::SaveMsg() { // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) void IEclass::SCheckerMenu() { if (!schecker.IsLoaded()) @@ -2783,11 +2783,13 @@ noselecting: case KK_EditReflow: Reflow(); break; case KK_EditSaveFile: SaveFile(); break; case KK_EditSaveMsg: SaveMsg(); break; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) case KK_EditSCheckerMenu: SCheckerMenu(); break; #endif case KK_EditSoundkill: Soundkill(); break; +#if defined(GCFG_NOSPELLDLL) case KK_EditSpellCheck: SpellCheck(); break; +#endif case KK_EditTab: Tab(); break; case KK_EditTabReverse: ReTab(); break; case KK_EditToggleCase: ToggleCase(); break; @@ -2838,7 +2840,7 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) { msgmode = __mode; currline = __msg->lin; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) if (CFG->scheckerenabled) { schecker.Init(); diff --git a/golded3/geedit.h b/golded3/geedit.h index c67840b..2ed8071 100644 --- a/golded3/geedit.h +++ b/golded3/geedit.h @@ -282,9 +282,9 @@ protected: int selecting; // ---------------------------------------------------------------- - // Speller. + // Speller (DLL) -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) CSpellChecker schecker; #endif @@ -299,7 +299,7 @@ protected: void dispins (); void dispdl (); void displine (Line* __line, uint __row); -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) void dispstringsc (char *__buf, uint __beg, uint __end, uint __row, uint __col, char endchar); void dispstring (Line* line, uint __row); #else @@ -409,11 +409,14 @@ public: void ReTab (); void SaveFile (); void SaveMsg (); -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) void SCheckerMenu (); #endif void Soundkill (); +#if defined(GCFG_NOSPELLDLL) + // External spell check tool void SpellCheck (); +#endif void Tab (); void ToggleCase (); void ToggleCaseBlock(gkey key); diff --git a/golded3/geedit2.cpp b/golded3/geedit2.cpp index 8ce7f77..541dabc 100644 --- a/golded3/geedit2.cpp +++ b/golded3/geedit2.cpp @@ -1311,6 +1311,7 @@ void IEclass::editexport(Line* __exportline, int __endat) { // ------------------------------------------------------------------ +#if defined(GCFG_NOSPELLDLL) void IEclass::SpellCheck() { GFTRK("EditSpellCheck"); @@ -1329,6 +1330,7 @@ void IEclass::SpellCheck() { GFTRK(NULL); } +#endif // ------------------------------------------------------------------ @@ -1805,7 +1807,7 @@ void IEclass::DrawLines(gkey key) } } break; - + case KK_EditGoUp: if (!currline->prev) { lines[2] = 0; gonext = false; } @@ -1853,7 +1855,7 @@ void IEclass::DrawLines(gkey key) Undo->PushItem(EDIT_UNDO_INS_CHAR); currline->txt.insert(col, 1, new_chr); } - + setlinetype(currline); displine(currline, row); } diff --git a/golded3/gekeys.h b/golded3/gekeys.h index a5df001..22fa112 100644 --- a/golded3/gekeys.h +++ b/golded3/gekeys.h @@ -169,7 +169,9 @@ const gkey KK_EditReflow = 0xFEEE; const gkey KK_EditSaveFile = 0xFEEF; const gkey KK_EditSaveMsg = 0xFEF0; const gkey KK_EditSoundkill = 0xFEF1; +#if defined(GCFG_NOSPELLDLL) const gkey KK_EditSpellCheck = 0xFEF2; +#endif const gkey KK_EditTab = 0xFEF3; const gkey KK_EditTabReverse = 0xFEF4; const gkey KK_EditToggleCase = 0xFEF5; @@ -196,7 +198,7 @@ const gkey KK_EditSCodeBold = 0xFF09; const gkey KK_EditSCodeItalic = 0xFF0A; const gkey KK_EditSCodeUnderline = 0xFF0B; const gkey KK_EditSCodeReverse = 0xFF0C; -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) const gkey KK_EditSCheckerMenu = 0xFF0D; #endif const gkey KK_EditDrawLines = 0xFF0E; diff --git a/golded3/gelang.h b/golded3/gelang.h index 3253b50..207c458 100644 --- a/golded3/gelang.h +++ b/golded3/gelang.h @@ -385,7 +385,9 @@ struct LangGed { char* FoundPersonal; // IL_FOUNDPERSONAL char* NoPersonal; // IL_NOPERSONAL char* EscOrContinue; // ST_ESCORCONTINUE +#if defined(GCFG_NOSPELLDLL) char* SpellChecker; // MS_SPELLCHECKER +#endif char* Ins; // WT_INS char* DrawSL; // WT_DRAWSL char* DrawDL; // WT_DRAWDL @@ -464,8 +466,8 @@ struct LangGed { char* ArealistSelections1;// MI_ALSELECTIONS1 char* ArealistSelections2;// MI_ALSELECTIONS2 - char* Decode; // IL_DECODE - char* Preparing; // MI_PREPARING + char* Decode; // IL_DECODE + char* Preparing; // MI_PREPARING char* ExternUtil; // WT_EXTERNUTIL char* SelectExternUtil; // ST_EXTERNUTIL diff --git a/golded3/gemnus.cpp b/golded3/gemnus.cpp index 1d81f72..888c712 100644 --- a/golded3/gemnus.cpp +++ b/golded3/gemnus.cpp @@ -44,7 +44,7 @@ void GMnuAsk::AskInit(int __row, int __col, char* __title, int __help) { // ------------------------------------------------------------------ int GMnuYesNo::YesNo(int __row, int __col, char* __title, char* __yes, char* __no, int __help, int __yesno) { - + enum { TAG_ASKYES=100, TAG_ASKNO }; HandleGEvent(EVTT_ASKYESNO); @@ -292,7 +292,7 @@ int GMenuCMF::Run() { // ------------------------------------------------------------------ int GMenuDomarks::Run(char* dowhat) { - + enum { TAG_MARKED=100, TAG_CURRENT, TAG_QUIT }; static int _prevtag = TAG_CURRENT; @@ -414,7 +414,7 @@ int GMenuImportTxt::Run() { // ------------------------------------------------------------------ int GMenuMarkMsgs::Run() { - + static int _prevtag = TAG_MARKYOURMAIL; update_statusline(LNG->MarkingOptions); @@ -482,7 +482,7 @@ int GMenuEditfile::Run(GMsg* __msg) { for(;;) { update_statuslinef(LNG->Quotepct, "ST_QUOTEPCT", __msg->quotepct, __msg->quotepct > 80 ? "!!!" : ""); - + char _title[80]; sprintf(_title, LNG->SaveMsg, __msg->lines); AskInit(6, 0, _title, H_SaveMsg); @@ -953,7 +953,7 @@ int GMenuEditHeader::Run(int mode, GMsg* msg) { HeaderView->Use(AA, msg); HeaderView->Paint(); - + if(not gkbd.quitall) { switch(_tag) { case W_ESCPRESS: @@ -1070,7 +1070,7 @@ int GMenuConfirm::Run() { // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) int GMenuSChecker::Run(CSpellChecker &schecker, const char *word) { enum @@ -1139,7 +1139,7 @@ int GMenuSChecker::Run(CSpellChecker &schecker, const char *word) for (idx = 0; idx < langcount; idx++) Item(TAG_LANG+idx+1, langstr[idx].c_str()); - + End(); } @@ -1163,7 +1163,7 @@ int GMenuSChecker::Run(CSpellChecker &schecker, const char *word) { ItemSep(); Item(TAG_MORE + levels, "M More... ", 0); - + levels++; numrows = levels + 6; diff --git a/golded3/gemnus.h b/golded3/gemnus.h index 5d6bc5a..920f1ea 100644 --- a/golded3/gemnus.h +++ b/golded3/gemnus.h @@ -304,7 +304,7 @@ public: // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) class GMenuSChecker : public GMnu { public: diff --git a/golded3/getpls.cpp b/golded3/getpls.cpp index 7530757..11fdae4 100644 --- a/golded3/getpls.cpp +++ b/golded3/getpls.cpp @@ -117,7 +117,9 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa TPLTOKEN_COMMENT, TPLTOKEN_QUOTEBUF, TPLTOKEN_ATTRIB, +#if defined(GCFG_NOSPELLDLL) TPLTOKEN_SPELLCHECKER, +#endif TPLTOKEN_SETSUBJ, TPLTOKEN_SETFROM, TPLTOKEN_SETTO, @@ -156,7 +158,9 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa { CSTR_COMMA_SIZEOF_CSTR("comment") }, { CSTR_COMMA_SIZEOF_CSTR("quotebuf") }, { CSTR_COMMA_SIZEOF_CSTR("attrib") }, +#if defined(GCFG_NOSPELLDLL) { CSTR_COMMA_SIZEOF_CSTR("spellchecker") }, +#endif { CSTR_COMMA_SIZEOF_CSTR("setsubj") }, { CSTR_COMMA_SIZEOF_CSTR("setfrom") }, { CSTR_COMMA_SIZEOF_CSTR("setto") }, @@ -494,10 +498,12 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa } continue; +#if defined(GCFG_NOSPELLDLL) case TPLTOKEN_SPELLCHECKER: if(mode != MODE_QUOTEBUF) EDIT->SpellChecker(strskip_wht(ptr)); continue; +#endif case TPLTOKEN_SETSUBJ: case TPLTOKEN_FORCESUBJ: diff --git a/goldlib/gall/gall.all b/goldlib/gall/gall.all index 129c47f..dd80a96 100644 --- a/goldlib/gall/gall.all +++ b/goldlib/gall/gall.all @@ -143,6 +143,7 @@ gutlwinm cpp all bcx cyg gutlunix cpp all lnx gutlbeos cpp all be be_lock c all be +gespell cpp all cyg ## Low-level text video gvidbase cpp all nov bcd bco bcx wcn wco wcx lnx emx djg rsx cyg be diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h index a3971e0..6cc89bf 100644 --- a/goldlib/gall/gdefs.h +++ b/goldlib/gall/gdefs.h @@ -101,6 +101,11 @@ #define NL "\n" #endif +/* ------------------------------------------------------------------ +// Spellchecker using dynamic library load */ +#if !defined(GCFG_NOSPELLDLL) && !defined(__WIN32__) +#undef GCFG_NOSPELLDLL +#endif /* ------------------------------------------------------------------ // Special character constants */ diff --git a/goldlib/gall/gespell.cpp b/goldlib/gall/gespell.cpp index 0704511..e382462 100644 --- a/goldlib/gall/gespell.cpp +++ b/goldlib/gall/gespell.cpp @@ -24,7 +24,7 @@ // SpellChecker functions. // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) #if defined(_MSC_VER) /* C4786: 'identifier' : identifier was truncated to 'number' @@ -127,7 +127,7 @@ const dword SC_SO_FindExtraSpaces = 0x0080; // CSAPI to flag extra space const dword SC_SO_FindSpacesBeforePunc = 0x0100; // CSAPI to flag space preceeding certain punc const dword SC_SO_FindSpacesAfterPunc = 0x0200; // CSAPI to flag space after certain punc const dword SC_SO_RateSuggestions = 0x0400; - // All suggestions returned should be given some scaled value + // All suggestions returned should be given some scaled value // corresponding to liklihood of being correct alternative. // Scale is 1..255, 255 most likely correction and 1 least likely const dword SC_SO_FindInitialNumerals = 0x0800; // Flag words starting with number(s) @@ -139,7 +139,7 @@ const dword SC_SO_UseAllOpenUdr = 0x4000; // or all opened udr's with mdr's opened after this option is set. // This option does not allow exclusion dicts to be edited. (HM only) const dword SC_SO_SwapMdr = 0x8000; - // Keep the most recent 2 mdr's around. swap between them instead of actually + // Keep the most recent 2 mdr's around. swap between them instead of actually // closing and reopening mdr's. (HM only) const dword SC_SO_SglStepSugg = 0x10000; // Break after each suggestion task for faster return of control to the @@ -466,7 +466,7 @@ CSpellSuggestV &CSpellChecker::Suggest() { more = true; - if (!mLang->SpellSuggest(mText, more = true)) + if (!mLang->SpellSuggest(mText, more = true)) return mSuggest; else { @@ -494,6 +494,6 @@ CSpellSuggestV &CSpellChecker::Suggest() // ------------------------------------------------------------------ -#endif // #if defined(__GOLD_SPELL__) +#endif // #if !defined(GCFG_NOSPELLDLL) // ------------------------------------------------------------------ diff --git a/goldlib/gall/gespell.h b/goldlib/gall/gespell.h index 3a487d6..1a3a73d 100644 --- a/goldlib/gall/gespell.h +++ b/goldlib/gall/gespell.h @@ -30,13 +30,13 @@ // ------------------------------------------------------------------ -#if defined(__GOLD_SPELL__) +#if !defined(GCFG_NOSPELLDLL) // ------------------------------------------------------------------ #if defined(__WIN32__) - +#include // ------------------------------------------------------------------ @@ -227,7 +227,7 @@ public: // ------------------------------------------------------------------ -#endif //#if defined(__GOLD_SPELL__) +#endif //#if !defined(GCFG_NOSPELLDLL) // ------------------------------------------------------------------ diff --git a/goldlib/gcfg/gedacfg.cpp b/goldlib/gcfg/gedacfg.cpp index ccd4546..2e1a7c1 100644 --- a/goldlib/gcfg/gedacfg.cpp +++ b/goldlib/gcfg/gedacfg.cpp @@ -547,7 +547,7 @@ bool gareafile::ReadAreafile(word crc, char* parameters) { #ifndef GCFG_NOXMAIL case CRC_XMAIL: ReadXMail(parameters); break; #endif -#ifndef GCFG_NOXMAIL +#ifndef GCFG_NOSYNCHRONET case CRC_SBBS: ReadSynchronet(parameters); break; #endif default: return false;