From 8994cc7f92cb6ab08b0316fc398fc202601af707 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sat, 23 Jan 2010 20:28:14 +0800 Subject: [PATCH] Change Edit to ACEdit to use tag branch list Signed-off-by: Frank Li --- src/Resources/TortoiseProcENG.rc | Bin 453818 -> 453882 bytes src/TortoiseProc/FileDiffDlg.cpp | 5 ++++- src/TortoiseProc/FileDiffDlg.h | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index cb59e35e1c696a2511b87ff2ab2d3f9010c4e7d9..a215bd2414cddfc7333d545e47e09c249d0ef453 100644 GIT binary patch delta 76 zcmdmWQ~K9U>4q(g>o!kcV93NX`NuPn=_+iD2HWp#W)x#W6`KwelW4cu#t6hrK+Fup OEI`b<-DVqGof!b+As&7J delta 56 zcmex$Q+n4;>4q(g>o!k5P_DQA&t^smCJ<{nkR{b#vyBmmnShuXh*^M`b$iV=wmLHa DAO;## diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp index 522a638..1286648 100644 --- a/src/TortoiseProc/FileDiffDlg.cpp +++ b/src/TortoiseProc/FileDiffDlg.cpp @@ -157,6 +157,9 @@ BOOL CFileDiffDlg::OnInitDialog() CResizableStandAloneDialog::OnInitDialog(); CString temp; + this->m_ctrRev1Edit.Init(); + this->m_ctrRev2Edit.Init(); + m_tooltips.Create(this); m_tooltips.AddTool(IDC_SWITCHLEFTRIGHT, IDS_FILEDIFF_SWITCHLEFTRIGHT_TT); @@ -1090,7 +1093,7 @@ void CFileDiffDlg::OnBnClickedRev1btn() } -void CFileDiffDlg::ClickRevButton(CMenuButton *button, GitRev *rev, CEdit *edit) +void CFileDiffDlg::ClickRevButton(CMenuButton *button, GitRev *rev, CACEdit *edit) { int entry=button->GetCurrentEntry(); if(entry == 0) /* Browse Refence*/ diff --git a/src/TortoiseProc/FileDiffDlg.h b/src/TortoiseProc/FileDiffDlg.h index e3fbb2b..fec2833 100644 --- a/src/TortoiseProc/FileDiffDlg.h +++ b/src/TortoiseProc/FileDiffDlg.h @@ -30,7 +30,7 @@ #include "Tooltip.h" #include "ProgressDlg.h" #include "MenuButton.h" - +#include "ACEdit.h" #define IDT_FILTER 101 /** @@ -101,7 +101,7 @@ protected: void Filter(CString sFilterText); void CopySelectionToClipboard(); - void ClickRevButton(CMenuButton *button,GitRev *rev, CEdit *edit); + void ClickRevButton(CMenuButton *button,GitRev *rev, CACEdit *edit); void EnableInputControl(bool b=true); @@ -166,8 +166,8 @@ private: static BOOL m_bAscending; static int m_nSortedColumn; - CEdit m_ctrRev1Edit; - CEdit m_ctrRev2Edit; + CACEdit m_ctrRev1Edit; + CACEdit m_ctrRev2Edit; CString m_FileListText; public: -- 2.11.0