diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-04-16 14:48:43 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-24 12:21:44 -0400 |
| commit | 7fc182b343517278ba7c8dd5b338068c74d032c6 (patch) | |
| tree | 8105cb5762a0a7e5bcc2a3d242836015dabdb00e /src/windows | |
| parent | 9bb69f8f328c763fb5f91e7a0198232eea0c2beb (diff) | |
| download | krb5-7fc182b343517278ba7c8dd5b338068c74d032c6.tar.gz krb5-7fc182b343517278ba7c8dd5b338068c74d032c6.tar.xz krb5-7fc182b343517278ba7c8dd5b338068c74d032c6.zip | |
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
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/leash/MainFrm.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/windows/leash/MainFrm.cpp b/src/windows/leash/MainFrm.cpp index 15c01579c..534650292 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; } |