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>
(cherry picked from commit 7fc182b343517278ba7c8dd5b338068c74d032c6)

ticket: 7250
status: resolved

diff --git a/src/windows/leash/MainFrm.cpp b/src/windows/leash/MainFrm.cpp
index 15c01579cd25de697c92b7f71b9861ee818c721c..53465029252311baaee4763a20203f95a86961be 100644 (file)
--- 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;
 }