Changeset 9345 for trunk/src/user32

Timestamp:

Oct 15, 2002, 11:18:12 AM (23 years ago)

Author:

sandervl

Message:

PF: Disable close button & close item in system menu for windows with SC_NOCLOSE class style

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (8 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.49 2002-07-15 10:16:28 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.50 2002-10-15 09:18:09 sandervl Exp $*/
 /*
  * Menu functions
@@ -2889 +2889 @@
 #ifdef __WIN32OS2__
                         //double click on system menu -> close application
-                        PostMessageA(hwnd, WM_SYSCOMMAND,SC_CLOSE, msg.lParam);
+                        if (!(GetClassLongA(hwnd, GCL_STYLE) & CS_NOCLOSE))
+                          PostMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, msg.lParam);
 #endif
                         fEndMenu = TRUE;

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.128 2002-09-17 10:24:02 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.129 2002-10-15 09:18:10 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -103 +103 @@
     if(fOS2Look && *hwndFrame) {
         FCData.flCreateFlags = dwOSFrameStyle;
-//        FCData.flCreateFlags = FCF_TITLEBAR|FCF_SYSMENU|FCF_MINMAX;
         WinCreateFrameControls(*hwndFrame, &FCData, NULL);
     }
@@ -156 +155 @@
 //******************************************************************************
 BOOL OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, 
-                                   DWORD dwExStyle, HICON hSysMenuIcon)
+                                   DWORD dwExStyle, HICON hSysMenuIcon, BOOL drawCloseButton)
 {
   SWP  swp[3];
@@ -186 +185 @@
           i++;
       }
+
   }
   else
@@ -209 +209 @@
               swp[i].cx -= minmaxwidth/2;
           }
-          //there is no close button in warp 3
-          if((dwStyle & WS_SYSMENU_W) && !fVersionWarp3) {
+          //there is no close button in warp 3 and sometimes we do not 
+          //have close button as well
+          if((dwStyle & WS_SYSMENU_W) && !fVersionWarp3 && drawCloseButton) {
               swp[i].cx -= minmaxwidth/2;
           }
@@ -238 +239 @@
               swp[i].cx += minmaxwidth/2;
           }
-          //there is no close button in warp 3
-          if((dwStyle & WS_SYSMENU_W) && !fVersionWarp3) {
+          //there is no close button in warp 3 and sometimes we do not have
+          //close button as well
+          if((dwStyle & WS_SYSMENU_W) && !fVersionWarp3 && drawCloseButton) {
               swp[i].cx += minmaxwidth/2;
           }
@@ -975 +977 @@
   // the first entry returned is always the window list itself
   if (WinQuerySwitchList(0, &swblk, sizeof(SWBLOCK)) > 0)
-    WinSetActiveWindow(HWND_DESKTOP, swblk.aswentry[0].swctl.hwnd);
+     WinSetActiveWindow(HWND_DESKTOP, swblk.aswentry[0].swctl.hwnd);
+//      WinShowWindow(swblk.aswentry[0].swctl.hwnd, TRUE);
 }
 //******************************************************************************
@@ -1082 +1085 @@
             if (WinQueryActiveWindow(HWND_DESKTOP) == hwndFrame)
               WinSendMsg(WinWindowFromID(hwndFrame, FID_TITLEBAR), TBM_SETHILITE, (MPARAM)1, 0);
+
        }
    } // os2look
+}
+
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibChangeCloseButtonState(HWND hwndFrame, BOOL State)
+{
+    return WinEnableMenuItem(WinWindowFromID(hwndFrame, FID_SYSMENU), SC_CLOSE, State);
 }
 //******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.68 2002-09-12 09:30:06 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.69 2002-10-15 09:18:10 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -48 +48 @@
 DWORD OSLibQueryWindowStyle(HWND hwnd);
 
-BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, DWORD dwExStyle, HICON hSysMenuIcon);
+BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, DWORD dwExStyle, HICON hSysMenuIcon, BOOL drawCloseButton);
+BOOL  OSLibChangeCloseButtonState(HWND hwndFrame, BOOL State);
 
 #define OSLIB_QWL_USER -4

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.341 2002-10-11 14:58:36 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.342 2002-10-15 09:18:10 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1360 +1360 @@
   {
       RECT rect = {0};
+      BOOL fCloseButton;
+
+      fCloseButton = !(windowClass && (windowClass->getClassLongA(GCL_STYLE) & CS_NOCLOSE));
+
       int  height  = getWindowHeight();
       RECTLOS2 rectOS2;
@@ -1373 +1377 @@
       rectOS2.yBottom = height - rect.top;
       rectOS2.yTop    = height - rect.bottom;
-      OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2, dwStyle, dwExStyle, IconForWindow(ICON_SMALL));
+
+      //@@PF Disable close button as well when needed by application 
+      OSLibChangeCloseButtonState(getOS2FrameWindowHandle(), fCloseButton);
+      OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2,
+                                    dwStyle, dwExStyle, IconForWindow(ICON_SMALL),
+                                    fCloseButton);
   }
   return rc;

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.43 2002-08-15 15:45:46 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.44 2002-10-15 09:18:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1240 +1240 @@
 
     case HTSYSMENU:
-      if (!(GetClassWord(Win32Hwnd,GCW_STYLE) & CS_NOCLOSE))
+      if (!(GetClassLongA(getWindowHandle(),GCL_STYLE) & CS_NOCLOSE))
         SendMessageA(getWindowHandle(), WM_SYSCOMMAND,SC_CLOSE,lParam);
       break;