Rebase: Add Upstream and Branch ComboxBox

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / RebaseDlg.cpp

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index e3a658d..f9848b8 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -33,6 +33,9 @@ void CRebaseDlg::DoDataExchange(CDataExchange* pDX)
     DDX_Check(pDX, IDC_EDIT_ALL, m_bEditAll);\r
        DDX_Control(pDX, IDC_REBASE_SPLIT, m_wndSplitter);\r
        DDX_Control(pDX,IDC_COMMIT_LIST,m_CommitList);\r
+       DDX_Control(pDX,IDC_REBASE_COMBOXEX_BRANCH, this->m_BranchCtrl);\r
+       DDX_Control(pDX,IDC_REBASE_COMBOXEX_UPSTREAM,   this->m_UpstreamCtrl);\r
+\r
 }\r
 \r
 \r
@@ -55,7 +58,11 @@ void CRebaseDlg::AddRebaseAnchor()
        AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT);\r
        AddAnchor(IDC_PICK_ALL,TOP_LEFT);\r
        AddAnchor(IDC_SQUASH_ALL,TOP_LEFT);\r
-       AddAnchor(IDC_EDIT_ALL,TOP_LEFT);\r
+       AddAnchor(IDC_EDIT_ALL,TOP_LEFT);       \r
+       AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM,TOP_LEFT);\r
+       AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);\r
+       AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);\r
+       AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);\r
        \r
 }\r
 \r