mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-14 14:11:40 -06:00
4.23
This commit is contained in:
committed by
Kornel Lesiński
parent
3c510ba80b
commit
ac2b563958
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "StdAfx.h"
|
||||
#include "MessagesDialog.h"
|
||||
#include "Common/StringConvert.h"
|
||||
#include "Windows/ResourceString.h"
|
||||
|
||||
#ifdef LANG
|
||||
@@ -39,18 +40,18 @@ void CMessagesDialog::AddMessageDirect(LPCTSTR message)
|
||||
_messageList.SetItem(&item);
|
||||
}
|
||||
|
||||
void CMessagesDialog::AddMessage(LPCTSTR message)
|
||||
void CMessagesDialog::AddMessage(LPCWSTR message)
|
||||
{
|
||||
CSysString s = message;
|
||||
UString s = message;
|
||||
while (!s.IsEmpty())
|
||||
{
|
||||
int pos = s.Find(TEXT('\n'));
|
||||
int pos = s.Find(L'\n');
|
||||
if (pos < 0)
|
||||
break;
|
||||
AddMessageDirect(s.Left(pos));
|
||||
AddMessageDirect(GetSystemString(s.Left(pos)));
|
||||
s.Delete(0, pos + 1);
|
||||
}
|
||||
AddMessageDirect(s);
|
||||
AddMessageDirect(GetSystemString(s));
|
||||
}
|
||||
|
||||
bool CMessagesDialog::OnInit()
|
||||
|
||||
@@ -12,10 +12,10 @@ class CMessagesDialog: public NWindows::NControl::CModalDialog
|
||||
{
|
||||
NWindows::NControl::CListView _messageList;
|
||||
void AddMessageDirect(LPCTSTR message);
|
||||
void AddMessage(LPCTSTR message);
|
||||
void AddMessage(LPCWSTR message);
|
||||
virtual bool OnInit();
|
||||
public:
|
||||
const CSysStringVector *Messages;
|
||||
const UStringVector *Messages;
|
||||
INT_PTR Create(HWND parentWindow = 0)
|
||||
{ return CModalDialog::Create(MAKEINTRESOURCE(IDD_DIALOG_MESSAGES), parentWindow); }
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user