X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FFileDiffDlg.h;h=163a1941ba7f2fb832568c5209e3308f83cfd758;hp=fec28334cff60adc42268f9faedd903365ea2beb;hb=a33464d77ee23f8002f1fc7c8010eb1e3c216194;hpb=8994cc7f92cb6ab08b0316fc398fc202601af707 diff --git a/src/TortoiseProc/FileDiffDlg.h b/src/TortoiseProc/FileDiffDlg.h index fec2833..163a194 100644 --- a/src/TortoiseProc/FileDiffDlg.h +++ b/src/TortoiseProc/FileDiffDlg.h @@ -39,6 +39,8 @@ * repository. It shows a list of files/folders which were changed in those * two revisions. */ +#define MSG_REF_LOADED (WM_USER+120) + class CFileDiffDlg : public CResizableStandAloneDialog { DECLARE_DYNAMIC(CFileDiffDlg) @@ -72,6 +74,7 @@ protected: virtual void OnCancel(); virtual BOOL OnInitDialog(); virtual BOOL PreTranslateMessage(MSG* pMsg); + afx_msg LRESULT OnRefLoad(WPARAM wParam, LPARAM lParam); afx_msg void OnNMDblclkFilelist(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnLvnGetInfoTipFilelist(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnNMCustomdrawFilelist(NMHDR *pNMHDR, LRESULT *pResult); @@ -125,6 +128,15 @@ private: static UINT ExportThreadEntry(LPVOID pVoid); UINT ExportThread(); + static UINT LoadRefThreadEntry(LPVOID pVoid) + { + return ((CFileDiffDlg *)pVoid)->LoadRefThread(); + }; + + UINT LoadRefThread(); + + STRING_VECTOR m_Reflist; + virtual BOOL Cancel() {return m_bCancelled;} CToolTips m_tooltips; @@ -158,6 +170,8 @@ private: bool m_bDoPegDiff; volatile LONG m_bThreadRunning; + volatile LONG m_bLoadingRef; + bool m_bCancelled; void Sort();