Fix window close issues

Stop filtering out SC_CLOSE. 'X' button works more reliably, also alt-F4.
Remove minimize box from style.

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

ticket: 7332
status: resolved

diff --git a/src/windows/leash/MainFrm.cpp b/src/windows/leash/MainFrm.cpp
index 54815868ab786b9ff0b68580114facb32e711ad6..1e22283197546cf768ade9935bc7abea70da7085 100644 (file)
--- a/src/windows/leash/MainFrm.cpp
+++ b/src/windows/leash/MainFrm.cpp
@@ -186,10 +186,6 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 
 BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
 {
-    if ( pMsg->message == WM_SYSCOMMAND && (pMsg->wParam & 0xfff0) == SC_CLOSE )
-    {
-        return TRUE;
-    }
     return CLeashFrame::PreTranslateMessage(pMsg);
 }
 
@@ -197,7 +193,7 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
        // Use the specific class name we established earlier
     // Remove the Minimize and Maximize buttons
-//    cs.style &= ~WS_MINIMIZEBOX;
+    cs.style &= ~WS_MINIMIZEBOX;
     cs.style &= ~WS_MAXIMIZEBOX;
     // Initialize the extended window style to display a TaskBar entry with WS_EX_APPWINDOW
     cs.dwExStyle |= WS_EX_APPWINDOW;