(PA) initial update bug SDI window removed.

libraries/ObjectIO/ObjectIO/OS Windows/Windows_C_12/cCrossCall_12.c

@@ -3650,7 +3650,7 @@ SDIFrameProcedure (HWND hWin,UINT uMess,WPARAM wPara,LPARAM lPara)
 								  HWND_BOTTOM,												/* this value is ignored (SWP_NOZORDER)  */
 								  0,0,														/* these values are ignored (SWP_NOMOVE) */
 								  (int)LOWORD (lPara),(int)HIWORD (lPara)-toolbarHeight,	/* new width and height */
-								  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW
+								  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER
 								 );
 				}
 			}

libraries/ObjectIO/ObjectIO/OS Windows/menuCrossCall_12.icl

@@ -11,7 +11,7 @@ from	ostypes		import HWND
 ::	HMENU	:==  Int
 
 
-WinCreatePopupMenuHandle :: !*OSToolbox -> (!HMENU,!*OSToolbox)
+WinCreatePopupMenuHandle :: !*OSToolbox -> (!HMENU,!*OSToolbox)		// PA: check if this can be a C call
 WinCreatePopupMenuHandle tb
 	# (rcci,tb)	= IssueCleanRequest2 (ErrorCallback2 "CreatePopupMenuHandle ") (Rq0Cci CcRqCREATEPOPMENU) tb
 	  hmenu		= case rcci.ccMsg of

libraries/ObjectIO/ObjectIO/OS Windows/osmenu.dcl

@@ -11,15 +11,6 @@ from	ostypes				import HWND, OSWindowPtr
 
 
 //	Types for menus and menu elements:
-/*::	MenuBar
-	=	NoMenuBar
-	|	MenuBar OSMenuBar
-::	OSMenuBar
-	=	{	menuBar		:: !HMENU
-		,	menuWindow	:: !HWND
-		,	menuClient	:: !HWND		// If MDI: client window; otherwise: OSNoWindowPtr
-		}
-*/
 ::	OSMenu			:== HMENU
 ::	OSMenuItem		:== HITEM
 ::	OSMenuSeparator	:== HITEM
@@ -30,13 +21,6 @@ OSNoMenuItem		:== 0
 OSNoMenuSeparator	:== 0
 
 
-/*	Creation of a OSMenuBar:
-	OSMenuBarNew frameWindow clientWindow menu
-		creates an OSMenuBar instance that can be used to manipulate menus.
-PA---
-OSMenuBarNew		:: !HWND !HWND !HMENU -> OSMenuBar
-*/
-
 /*	Enabling and disabling of menus and menu elements:
 	OS(Dis/En)ableMenu index menubar
 		(dis/en)ables the top-level menu at the zero based index position of the menubar.

libraries/ObjectIO/ObjectIO/OS Windows/osmenu.icl

@@ -11,15 +11,6 @@ from	ostypes				import OSWindowPtr, OSNoWindowPtr
 
 
 //	Types for menus and menu elements:
-/*::	MenuBar
-	=	NoMenuBar
-	|	MenuBar OSMenuBar
-::	OSMenuBar
-	=	{	menuBar		:: !HMENU
-		,	menuWindow	:: !HWND
-		,	menuClient	:: !HWND		// If MDI: client window; otherwise: OSNoWindowPtr
-		}
-*/
 ::	OSMenuHandle	:== HMENU
 ::	OSMenu			:== HMENU
 ::	OSMenuItem		:== HITEM
@@ -30,11 +21,6 @@ OSNoMenu :== 0
 OSNoMenuItem :== 0
 OSNoMenuSeparator :== 0
 
-/* PA---
-OSMenuBarNew :: !HWND !HWND !HMENU -> OSMenuBar
-OSMenuBarNew frameWindow clientWindow menu
-	= {menuBar=menu, menuWindow=frameWindow, menuClient=clientWindow}
-*/
 
 //	Enabling and disabling menus and menu elements:
 

libraries/ObjectIO/ObjectIO/StdMenu.icl

@@ -20,15 +20,9 @@ StdMenuFatalError function error
 	= FatalError function "StdMenu" error
 
 
-::	DeltaMenuHandle pst
-	:==	!(MenuStateHandle pst) -> !*OSToolbox -> (!MenuStateHandle pst,!*OSToolbox)
-::	AccessMenuHandle x pst
-	:==	!(MenuStateHandle pst) -> (!x,!MenuStateHandle pst)
-
-
 //	General rules to access MenuHandles:
 
-accessMenuHandles :: !Id !(AccessMenuHandle x (PSt .l)) !(IOSt .l) -> (!Maybe x, !IOSt .l)
+accessMenuHandles :: !Id !((MenuStateHandle (PSt .l)) -> (x,!MenuStateHandle (PSt .l))) !(IOSt .l) -> (!Maybe x,!IOSt .l)
 accessMenuHandles id f ioState
 	# (found,mDevice,ioState)	= IOStGetDevice MenuDevice ioState
 	| not found
@@ -38,7 +32,7 @@ accessMenuHandles id f ioState
 	# ioState					= IOStSetDevice (MenuSystemState {mHs & mMenus=msHs}) ioState
 	= (result,ioState)
 where
-	accessmenuhandles :: !Id !(AccessMenuHandle x .pst) ![MenuStateHandle .pst] -> (!Maybe x,![MenuStateHandle .pst])
+	accessmenuhandles :: !Id !((MenuStateHandle .pst) -> (x,!MenuStateHandle .pst)) ![MenuStateHandle .pst] -> (!Maybe x,![MenuStateHandle .pst])
 	accessmenuhandles id f [mH:mHs]
 		# (menu_id,mH)			= menuStateHandleGetMenuId mH
 		| id==menu_id