diff --git a/docs/notework.txt b/docs/notework.txt index ee50be8..e9f99b0 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -12,6 +12,8 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ ++ Added ShowDeleted indicator to status line. + - Fixed few bugs in Undo feature. + Added support for AdeptXBBS for non-OS/2 systems. diff --git a/golded3/geread.cpp b/golded3/geread.cpp index 5410931..a01e506 100644 --- a/golded3/geread.cpp +++ b/golded3/geread.cpp @@ -264,22 +264,24 @@ void Reader() { if(AA->isreadmark or AA->isreadpm) { GTag& tag = AA->isreadpm ? AA->PMrk : AA->Mark; uint mtemp = tag.Find(msg->msgno); - sprintf(buf2, "%s [%s%s%s]", + sprintf(buf2, "%s [%s%s%s%s]", LNG->ReadMarked, AA->Viewhidden() ? "H" : "", AA->Viewkludge() ? "K" : "", - AA->Twitmode() == TWIT_IGNORE ? "Ti" : AA->Twitmode() == TWIT_SKIP ? "Ts" : AA->Twitmode() == TWIT_BLANK ? "Tb" : AA->Twitmode() == TWIT_KILL ? "Tk" : "" + AA->Twitmode() == TWIT_IGNORE ? "Ti" : AA->Twitmode() == TWIT_SKIP ? "Ts" : AA->Twitmode() == TWIT_BLANK ? "Tb" : AA->Twitmode() == TWIT_KILL ? "Tk" : "", + CFG->showdeleted ? "D" : "" ); sprintf(buf, buf2, mtemp, tag.Count(), tag.Count()-mtemp ); } else { - sprintf(buf2, "%s [%s%s%s]", + sprintf(buf2, "%s [%s%s%s%s]", LNG->ReadAll, AA->Viewhidden() ? "H" : "", AA->Viewkludge() ? "K" : "", - AA->Twitmode() == TWIT_IGNORE ? "Ti" : AA->Twitmode() == TWIT_SKIP ? "Ts" : AA->Twitmode() == TWIT_BLANK ? "Tb" : AA->Twitmode() == TWIT_KILL ? "Tk" : "" + AA->Twitmode() == TWIT_IGNORE ? "Ti" : AA->Twitmode() == TWIT_SKIP ? "Ts" : AA->Twitmode() == TWIT_BLANK ? "Tb" : AA->Twitmode() == TWIT_KILL ? "Tk" : "", + CFG->showdeleted ? "D" : "" ); sprintf(buf, buf2, AA->lastread(), AA->Msgn.Count(), AA->Msgn.Count()-AA->lastread() diff --git a/goldlib/gall/gutlwin.cpp b/goldlib/gall/gutlwin.cpp index 1babf45..1fc0f8e 100644 --- a/goldlib/gall/gutlwin.cpp +++ b/goldlib/gall/gutlwin.cpp @@ -134,14 +134,18 @@ int g_init_os(int flags) { GetConsoleTitle(ge_win_coldtitle, sizeof(ge_win_coldtitle)); if(WinVer.dwPlatformId == VER_PLATFORM_WIN32_NT) { for(i = 0; i < 256; i++) { +#ifndef __MSVCRT__ tu[i] = (toupper)(i); tl[i] = (tolower)(i); +#endif if(i >= ' ') { CHAR chr = (CHAR)i; MultiByteToWideChar(CP_OEMCP, 0, &chr, 1, oem2unicode+i, 1); } } +#ifndef __MSVCRT__ return 0; +#endif } // Due to Win9x doesn't have proper locale support we should rebuild // tolower/toupper tables