kfw remove status bar

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
(cherry picked from commit 813ae03da33fc77e1fe0706a5fbbfd4070b79b7a)

ticket: 7251
status: resolved

diff --git a/src/windows/leash/LeashView.cpp b/src/windows/leash/LeashView.cpp
index c30b3ec758c91e10a82f065d26548bb343f3eb45..6a28727c893112a22bc0f313431995acec830e36 100644 (file)
--- 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 53465029252311baaee4763a20203f95a86961be..5f1c6e662275e2827506b3da5688aa7bca18ee4c 100644 (file)
--- 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 749c2fa5e30e7cb889cbf9e4b60ac532547b82ed..e3d356e95e127b8ae0d18ab58d3fb130c8bd4b55 100644 (file)
--- 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 eb8a566ae2785bb97669f8fc492c8d1e93e42825..97439fd5c0ff6ea7d031ff7790b600f61cd795d0 100644 (file)
--- 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