From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Mon, 16 Apr 2012 18:48:43 +0000 (-0400)
Subject: Only create toolbar when not using ribbon UI
X-Git-Tag: krb5-1.11-alpha1~294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fc182b343517278ba7c8dd5b338068c74d032c6;p=thirdparty%2Fkrb5.git

Only create toolbar when not using ribbon UI

When we do create the toolbar, dock it.

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7250 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
---

diff --git a/src/windows/leash/MainFrm.cpp b/src/windows/leash/MainFrm.cpp
index 15c01579cd..5346502925 100644
--- a/src/windows/leash/MainFrm.cpp
+++ b/src/windows/leash/MainFrm.cpp
@@ -130,9 +130,9 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 #endif
 */
-
-	if (!m_wndToolBar.Create(this) ||
-		!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
+	if ((!CLeashApp::m_useRibbon) &&
+		(!m_wndToolBar.Create(this) ||
+		 !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)))
 	{
 		MessageBox("There is problem creating the Leash Toolbar!",
                    "Error", MB_OK);
@@ -154,11 +154,13 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	//m_wndToolBar.SetPaneStyle(m_wndToolBar.GetPaneStyle() |
 	//	                     CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
 
+    if (!CLeashApp::m_useRibbon) {
 	// TODO: Delete these three lines if you don't want the toolbar to
 	//  be dockable
-//	m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
-//	EnableDocking(CBRS_ALIGN_ANY);
-	//DockControlBar(&m_wndToolBar);
+	m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
+	EnableDocking(CBRS_ALIGN_ANY);
+	DockPane(&m_wndToolBar);
+    }
 
 	return 0;
 }