From 88858d0db19bdfb6fbdb997cecd7c974abe730d1 Mon Sep 17 00:00:00 2001 From: elfmz Date: Tue, 15 Feb 2022 03:11:28 +0300 Subject: continue MSG() macro cleanup --- far2l/src/treelist.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'far2l/src/treelist.cpp') diff --git a/far2l/src/treelist.cpp b/far2l/src/treelist.cpp index 92cc3c55..e496270b 100644 --- a/far2l/src/treelist.cpp +++ b/far2l/src/treelist.cpp @@ -595,7 +595,7 @@ void TreeList::SaveTreeFile() if (!Success) { apiDeleteFile(strName); - Message(MSG_WARNING|MSG_ERRORTYPE,1,MSG(MError),MSG(MCannotSaveTree),strName,MSG(MOk)); + Message(MSG_WARNING|MSG_ERRORTYPE,1,MError,MCannotSaveTree,strName,MOk); } else if (FileAttributes != INVALID_FILE_ATTRIBUTES) // вернем атрибуты (если получится :-) apiSetFileAttributes(strName,FileAttributes); @@ -705,8 +705,7 @@ int TreeList::MsgReadTree(int TreeCount,int &FirstCall) { wchar_t NumStr[32]; _itow(TreeCount,NumStr,10); //BUGBUG - Message((FirstCall ? 0:MSG_KEEPBACKGROUND),0,MSG(MTreeTitle), - MSG(MReadingTree),NumStr); + Message((FirstCall ? 0:MSG_KEEPBACKGROUND),0,MTreeTitle,MReadingTree,NumStr); PreRedrawItem preRedrawItem=PreRedraw.Peek(); preRedrawItem.Param.Flags=TreeCount; PreRedraw.SetParam(preRedrawItem.Param); @@ -1809,8 +1808,7 @@ void TreeList::FlushCache() clearerr(TreeFile); fclose(TreeFile); apiDeleteFile(TreeCache.strTreeName); - Message(MSG_WARNING|MSG_ERRORTYPE,1,MSG(MError),MSG(MCannotSaveTree), - TreeCache.strTreeName,MSG(MOk)); + Message(MSG_WARNING|MSG_ERRORTYPE,1,MError,MCannotSaveTree,TreeCache.strTreeName,MOk); } else if (FileAttributes != INVALID_FILE_ATTRIBUTES) // вернем атрибуты (если получится :-) apiSetFileAttributes(TreeCache.strTreeName,FileAttributes); -- cgit v1.2.3