diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-07-21 19:52:20 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-24 12:22:02 -0400 |
| commit | 813ae03da33fc77e1fe0706a5fbbfd4070b79b7a (patch) | |
| tree | 8d27710cd13a83cf8d7f84763ad5ee52161a83a9 /src/windows/leash | |
| parent | 7fc182b343517278ba7c8dd5b338068c74d032c6 (diff) | |
| download | krb5-813ae03da33fc77e1fe0706a5fbbfd4070b79b7a.tar.gz krb5-813ae03da33fc77e1fe0706a5fbbfd4070b79b7a.tar.xz krb5-813ae03da33fc77e1fe0706a5fbbfd4070b79b7a.zip | |
kfw remove status bar
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7251 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/leash')
| -rw-r--r-- | src/windows/leash/LeashView.cpp | 9 | ||||
| -rw-r--r-- | src/windows/leash/MainFrm.cpp | 9 | ||||
| -rw-r--r-- | src/windows/leash/MainFrm.h | 2 | ||||
| -rw-r--r-- | src/windows/leash/Makefile.in | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp index c30b3ec758..6a28727c89 100644 --- a/src/windows/leash/LeashView.cpp +++ b/src/windows/leash/LeashView.cpp @@ -2249,24 +2249,26 @@ BOOL CLeashView::PreTranslateMessage(MSG* pMsg) ticketStatusKrb5.Format("Kerb-5 Ticket Life: < 1 min"); } } - +#ifndef NO_STATUS_BAR if (CMainFrame::m_wndStatusBar) { CMainFrame::m_wndStatusBar.SetPaneInfo(1, 111112, SBPS_NORMAL, 130); CMainFrame::m_wndStatusBar.SetPaneText(1, ticketStatusKrb5, SBT_POPOUT); } +#endif } } else { // not installed ticketStatusKrb5.Format("Kerb-5: Not Available"); - +#ifndef NO_STATUS_BAR if (CMainFrame::m_wndStatusBar) { CMainFrame::m_wndStatusBar.SetPaneInfo(1, 111112, SBPS_NORMAL, 130); CMainFrame::m_wndStatusBar.SetPaneText(1, ticketStatusKrb5, SBT_POPOUT); } +#endif } //KRB5 @@ -2474,12 +2476,13 @@ BOOL CLeashView::PreTranslateMessage(MSG* pMsg) ticketStatusAfs.Format("AFS Token Life: < 1 min"); } } - +#ifndef NO_STATUS_BAR if (CMainFrame::m_wndStatusBar) { CMainFrame::m_wndStatusBar.SetPaneInfo(3, 111113, SBPS_NORMAL, 130); CMainFrame::m_wndStatusBar.SetPaneText(3, ticketStatusAfs, SBT_POPOUT); } +#endif } } #ifdef COMMENT diff --git a/src/windows/leash/MainFrm.cpp b/src/windows/leash/MainFrm.cpp index 5346502925..5f1c6e6622 100644 --- a/src/windows/leash/MainFrm.cpp +++ b/src/windows/leash/MainFrm.cpp @@ -33,7 +33,9 @@ static char THIS_FILE[] = __FILE__; #define MIN_RIGHT 530 #define MIN_BOTTOM 280 +#ifndef NO_STATUS_BAR CMFCStatusBar CMainFrame::m_wndStatusBar; +#endif CMFCToolBar CMainFrame::m_wndToolBar; CImageList CMainFrame::m_imageList; CImageList CMainFrame::m_disabledImageList; @@ -140,6 +142,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) return -1; // fail to create } +#ifndef NO_STATUS_BAR if (!m_wndStatusBar.Create(this) || !m_wndStatusBar.SetIndicators(indicators, (CLeashApp::m_hAfsDLL ? 4 : 3))) @@ -149,6 +152,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) TRACE0("Failed to create status bar\n"); return -1; // fail to create } +#endif + // TODO: Remove this if you don't want tool tips or a resizeable toolbar //m_wndToolBar.SetPaneStyle(m_wndToolBar.GetPaneStyle() | @@ -382,7 +387,7 @@ void CMainFrame::OnClose(void) LRESULT CMainFrame::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) { BOOL oldMin = m_isMinimum; - printf("CMainFrame::WindowProc() Msg: %x, WPARAM: %x, LPARAM: %x\n", message, wParam, lParam); + //printf("CMainFrame::WindowProc() Msg: %x, WPARAM: %x, LPARAM: %x\n", message, wParam, lParam); switch(message) { case WM_CLOSE: @@ -422,4 +427,4 @@ void CMainFrame::OnContextHelp() { } -*/
\ No newline at end of file +*/ diff --git a/src/windows/leash/MainFrm.h b/src/windows/leash/MainFrm.h index 749c2fa5e3..e3d356e95e 100644 --- a/src/windows/leash/MainFrm.h +++ b/src/windows/leash/MainFrm.h @@ -45,7 +45,9 @@ protected: // create from serialization only // Attributes public: static int m_whatSide; +#ifndef NO_STATUS_BAR static CMFCStatusBar m_wndStatusBar; +#endif static CMFCToolBar m_wndToolBar; static BOOL m_isMinimum; static BOOL m_isBeingResized; diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in index eb8a566ae2..97439fd5c0 100644 --- a/src/windows/leash/Makefile.in +++ b/src/windows/leash/Makefile.in @@ -66,7 +66,7 @@ LOCALINCLUDES= -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include RFLAGS = $(LOCALINCLUDES) RCFLAGS = $(RFLAGS) -D_WIN32 -DLEASH_APP -DEFINES = -DWINSOCK -DWIN32 -DWINDOWS -D_AFXDLL -D_MBCS -DNO_KRB4 +DEFINES = -DWINSOCK -DWIN32 -DWINDOWS -D_AFXDLL -D_MBCS -DNO_KRB4 -DNO_STATUS_BAR !ifdef NODEBUG DEFINES = $(DEFINES) !else |