Changeset 9345 for trunk/src/user32/oslibwin.cpp

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

File:

• trunk/src/user32/oslibwin.cpp (modified) (8 diffs)

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);
 }
 //******************************************************************************