From 66ece007d032dc2394213dfd2a10fcb7a8045b1b Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Thu, 19 Jun 2014 08:04:17 +0800 Subject: [PATCH] Use the rich-edit control version 4.1 since this is available even on XP Based on TortoiseSVN revision 25594 Signed-off-by: Sup Yut Sum --- src/Resources/TortoiseProcENG.rc | 6 +++--- src/TortoiseProc/TortoiseProc.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 3f6943a96..508a7fe94 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -212,7 +212,7 @@ BEGIN PUSHBUTTON "",IDC_LOG_JUMPDOWN,400,7,14,14,WS_TABSTOP | BS_ICON CONTROL "",IDC_LOGLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,24,407,57 CONTROL "",IDC_SPLITTERTOP,"Static",SS_BLACKFRAME,7,81,407,5 - CONTROL "",IDC_MSGVIEW,"RichEdit20W",ES_MULTILINE | ES_READONLY | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,86,407,96 + CONTROL "",IDC_MSGVIEW,"RichEdit50W",ES_MULTILINE | ES_READONLY | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,86,407,96 CONTROL "",IDC_PIC_AUTHOR,"Static",SS_BLACKFRAME,361,86,53,49 CONTROL "",IDC_SPLITTERBOTTOM,"Static",SS_BLACKFRAME,7,182,407,4 CONTROL "",IDC_LOGMSG,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,187,407,58 @@ -1032,7 +1032,7 @@ BEGIN EDITTEXT IDC_TESTRESULT,7,214,316,83,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL LTEXT "",IDC_TIMINGLABEL,7,308,202,8 PUSHBUTTON "Exit",IDCANCEL,273,302,50,14 - CONTROL "",IDC_AUTOTEXTCONTENT,"RichEdit20W",WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x1004,7,22,316,129 + CONTROL "",IDC_AUTOTEXTCONTENT,"RichEdit50W",WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x1004,7,22,316,129 END IDD_SETTINGS_CONFIG DIALOGEX 0, 0, 300, 217 @@ -1095,7 +1095,7 @@ BEGIN PUSHBUTTON "Abort",IDCANCEL,266,168,50,14,WS_DISABLED CONTROL "",IDC_TITLE_ANIMATE,"SysAnimate32",ACS_TRANSPARENT | ACS_AUTOPLAY | WS_TABSTOP,6,7,318,38,WS_EX_TRANSPARENT CONTROL "",IDC_RUN_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,63,318,14 - CONTROL "",IDC_LOG,"RichEdit20W",WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1804,6,87,318,67 + CONTROL "",IDC_LOG,"RichEdit50W",WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1804,6,87,318,67 LTEXT "Static",IDC_CURRENT,6,48,318,8 PUSHBUTTON "Button1",IDC_PROGRESS_BUTTON1,6,168,123,14 END diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index 335237b83..fb58c8971 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2008-2014 - TortoiseGit -// Copyright (C) 2003-2008 - TortoiseSVN +// Copyright (C) 2003-2008, 2012-2014 - TortoiseSVN // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -244,7 +244,7 @@ BOOL CTortoiseProcApp::InitInstance() InitCommonControlsEx(&used); AfxOleInit(); AfxEnableControlContainer(); - AfxInitRichEdit2(); + AfxInitRichEdit5(); CWinAppEx::InitInstance(); SetRegistryKey(_T("TortoiseGit")); AfxGetApp()->m_pszProfileName = _tcsdup(_T("TortoiseProc")); // w/o this ResizableLib will store data under TortoiseGitProc which is not compatible with older versions -- 2.11.4.GIT