From cb931058633894c8e1bab831be06b42358137469 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 12 Sep 2011 03:47:48 +0200 Subject: [PATCH] drop ObjectCombo Signed-off-by: Sven Strickroth --- src/TortoiseGitBlame/PropertiesWnd.cpp | 19 ++----------------- src/TortoiseGitBlame/PropertiesWnd.h | 1 - 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/TortoiseGitBlame/PropertiesWnd.cpp b/src/TortoiseGitBlame/PropertiesWnd.cpp index 5208b5d5f..4790391dc 100644 --- a/src/TortoiseGitBlame/PropertiesWnd.cpp +++ b/src/TortoiseGitBlame/PropertiesWnd.cpp @@ -67,14 +67,10 @@ void CPropertiesWnd::AdjustLayout() CRect rectClient,rectCombo; GetClientRect(rectClient); - m_wndObjectCombo.GetWindowRect(&rectCombo); - - int cyCmb = rectCombo.Size().cy; int cyTlb = m_wndToolBar.CalcFixedLayout(FALSE, TRUE).cy; - m_wndObjectCombo.SetWindowPos(NULL, rectClient.left, rectClient.top, rectClient.Width(), 200, SWP_NOACTIVATE | SWP_NOZORDER); - m_wndToolBar.SetWindowPos(NULL, rectClient.left, rectClient.top + cyCmb, rectClient.Width(), cyTlb, SWP_NOACTIVATE | SWP_NOZORDER); - m_wndPropList.SetWindowPos(NULL, rectClient.left, rectClient.top + cyCmb + cyTlb, rectClient.Width(), rectClient.Height() -(cyCmb+cyTlb), SWP_NOACTIVATE | SWP_NOZORDER); + m_wndToolBar.SetWindowPos(NULL, rectClient.left, rectClient.top, rectClient.Width(), 200, SWP_NOACTIVATE | SWP_NOZORDER); + m_wndPropList.SetWindowPos(NULL, rectClient.left, rectClient.top + cyTlb, rectClient.Width(), rectClient.Height() - cyTlb, SWP_NOACTIVATE | SWP_NOZORDER); } int CPropertiesWnd::OnCreate(LPCREATESTRUCT lpCreateStruct) @@ -88,17 +84,6 @@ int CPropertiesWnd::OnCreate(LPCREATESTRUCT lpCreateStruct) // Create combo: const DWORD dwViewStyle = WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_BORDER | CBS_SORT | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; - if (!m_wndObjectCombo.Create(dwViewStyle, rectDummy, this, 1)) - { - TRACE0("Failed to create Properties Combo \n"); - return -1; // fail to create - } - - m_wndObjectCombo.AddString(_T("Application")); - m_wndObjectCombo.AddString(_T("Properties Window")); - m_wndObjectCombo.SetFont(CFont::FromHandle((HFONT) GetStockObject(DEFAULT_GUI_FONT))); - m_wndObjectCombo.SetCurSel(0); - if (!m_wndPropList.Create(WS_VISIBLE | WS_CHILD, rectDummy, this, 2)) { TRACE0("Failed to create Properties Grid \n"); diff --git a/src/TortoiseGitBlame/PropertiesWnd.h b/src/TortoiseGitBlame/PropertiesWnd.h index f24ef1b25..9915ca092 100644 --- a/src/TortoiseGitBlame/PropertiesWnd.h +++ b/src/TortoiseGitBlame/PropertiesWnd.h @@ -54,7 +54,6 @@ public: protected: CFont m_fntPropList; - CComboBox m_wndObjectCombo; CPropertiesToolBar m_wndToolBar; CMFCPropertyGridCtrl m_wndPropList; -- 2.11.4.GIT