OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commit dialog support check conflict and mark resolve function.
[tortoisegit/TortoiseGitJp.git]
/
src
/
TortoiseGitBlame
/
OutputWnd.h
diff --git
a/src/TortoiseGitBlame/OutputWnd.h
b/src/TortoiseGitBlame/OutputWnd.h
index
868bcbb
..
f9eb5ef
100644
(file)
--- a/
src/TortoiseGitBlame/OutputWnd.h
+++ b/
src/TortoiseGitBlame/OutputWnd.h
@@
-1,6
+1,7
@@
\r
#pragma once
\r
\r
\r
#pragma once
\r
\r
+#include "GitBlameLogList.h"
\r
/////////////////////////////////////////////////////////////////////////////
\r
// COutputList window
\r
\r
/////////////////////////////////////////////////////////////////////////////
\r
// COutputList window
\r
\r
@@
-23,6
+24,17
@@
protected:
DECLARE_MESSAGE_MAP()
\r
};
\r
\r
DECLARE_MESSAGE_MAP()
\r
};
\r
\r
+class COutputWnd;
\r
+
\r
+class CGitMFCTabCtrl: public CMFCTabCtrl
\r
+{
\r
+protected:
\r
+ DECLARE_MESSAGE_MAP()
\r
+ afx_msg void OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult);
\r
+
\r
+ DECLARE_DYNCREATE(CGitMFCTabCtrl);
\r
+};
\r
+
\r
class COutputWnd : public CDockablePane
\r
{
\r
// Construction
\r
class COutputWnd : public CDockablePane
\r
{
\r
// Construction
\r
@@
-30,14
+42,15
@@
public:
COutputWnd();
\r
\r
// Attributes
\r
COutputWnd();
\r
\r
// Attributes
\r
-p
rotected
:
\r
+p
ublic
:
\r
CFont m_Font;
\r
\r
CFont m_Font;
\r
\r
- C
MFCTabCtrl
m_wndTabs;
\r
+ C
GitMFCTabCtrl
m_wndTabs;
\r
\r
\r
- COutputList m_wndOutputBuild;
\r
- COutputList m_wndOutputDebug;
\r
- COutputList m_wndOutputFind;
\r
+ CGitBlameLogList m_LogList;
\r
+// COutputList m_wndOutputBuild;
\r
+// COutputList m_wndOutputDebug;
\r
+// COutputList m_wndOutputFind;
\r
\r
protected:
\r
void FillBuildWindow();
\r
\r
protected:
\r
void FillBuildWindow();
\r
@@
-45,10
+58,12
@@
protected:
void FillFindWindow();
\r
\r
void AdjustHorzScroll(CListBox& wndListBox);
\r
void FillFindWindow();
\r
\r
void AdjustHorzScroll(CListBox& wndListBox);
\r
-
\r
+
\r
// Implementation
\r
public:
\r
virtual ~COutputWnd();
\r
// Implementation
\r
public:
\r
virtual ~COutputWnd();
\r
+ afx_msg void OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult);
\r
+ int LoadHistory(CString filename);
\r
\r
protected:
\r
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
\r
\r
protected:
\r
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
\r