Changeset 7079 for trunk/src

Timestamp:

Oct 16, 2001, 4:49:46 PM (24 years ago)

Author:

sandervl

Message:

custom build updates

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (4 diffs)
• oslibres.cpp (modified) (4 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.37 2001-09-20 12:57:15 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.38 2001-10-16 14:49:45 sandervl Exp $*/
 /*
  * Menu functions
@@ -198 +198 @@
 static BOOL isTimerSet               = FALSE;
 
+#ifdef __WIN32OS2__
+static BOOL fDisableOdinSysMenuItems = FALSE;
+#endif
+
 /***********************************************************************
  *           debug_print_menuitem
@@ -364 +368 @@
         menu->wFlags |= MF_SYSMENU | MF_POPUP;
         SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE);
+#ifdef __WIN32OS2__
+        if(fDisableOdinSysMenuItems) {
+            RemoveMenu(hMenu, 9, MF_BYPOSITION);
+            RemoveMenu(hMenu, 9, MF_BYPOSITION);
+            RemoveMenu(hMenu, 9, MF_BYPOSITION);
+            RemoveMenu(hMenu, 9, MF_BYPOSITION);
+            RemoveMenu(hMenu, 9, MF_BYPOSITION);
+        }
+#ifndef DEBUG
+        else {
+            RemoveMenu(hMenu, SC_PUTMARK, MF_BYCOMMAND);
+            RemoveMenu(hMenu, SC_DEBUGINT3, MF_BYCOMMAND);
+            RemoveMenu(hMenu, 11, MF_BYPOSITION);       //separator
+        }
+#endif
+#endif
     }
     else {
@@ -4882 +4902 @@
 //******************************************************************************
 //******************************************************************************
-
+#ifdef __WIN32OS2__
+void DisableOdinSysMenuItems()
+{
+    fDisableOdinSysMenuItems = TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+#endif

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.25 2001-10-15 17:09:03 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.26 2001-10-16 14:49:46 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -308 +308 @@
     if(lHits == GPI_ERROR) goto fail;
 
-//DEBUG_CURSOR
+//#define DEBUG_CURSOR
 #ifdef DEBUG_CURSOR
  {
@@ -457 +457 @@
         }
         if(hbmColor) {
-             dprintf2(("OSLibWinCreatePointer: using real color cursor/icon"));
-        }
-        else dprintf2(("OSLibWinCreatePointer: converted color cursor/icon to mono"));
+             dprintf2(("OSLibWinCreatePointer: using real color cursor/icon (fCursor %d)", fCursor));
+        }
+        else dprintf2(("OSLibWinCreatePointer: converted color cursor/icon to mono (fCursor %d)", fCursor));
     }
 
@@ -504 +504 @@
     }
 
-    pointerInfo.fPointer   = fCursor; //FALSE = icon
+    pointerInfo.fPointer   = !fCursor; //TRUE = icon
     pointerInfo.xHotspot   = pInfo->ptHotSpot.x;
     pointerInfo.yHotspot   = mapY(pInfo->nHeight, pInfo->ptHotSpot.y);