Commit a088037b authored by Peter Achten's avatar Peter Achten
Browse files

(PA) initial update bug SDI window removed.

parent aa501123
...@@ -3650,7 +3650,7 @@ SDIFrameProcedure (HWND hWin,UINT uMess,WPARAM wPara,LPARAM lPara) ...@@ -3650,7 +3650,7 @@ SDIFrameProcedure (HWND hWin,UINT uMess,WPARAM wPara,LPARAM lPara)
HWND_BOTTOM, /* this value is ignored (SWP_NOZORDER) */ HWND_BOTTOM, /* this value is ignored (SWP_NOZORDER) */
0,0, /* these values are ignored (SWP_NOMOVE) */ 0,0, /* these values are ignored (SWP_NOMOVE) */
(int)LOWORD (lPara),(int)HIWORD (lPara)-toolbarHeight, /* new width and height */ (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
); );
} }
} }
......
...@@ -11,7 +11,7 @@ from ostypes import HWND ...@@ -11,7 +11,7 @@ from ostypes import HWND
:: HMENU :== Int :: HMENU :== Int
WinCreatePopupMenuHandle :: !*OSToolbox -> (!HMENU,!*OSToolbox) WinCreatePopupMenuHandle :: !*OSToolbox -> (!HMENU,!*OSToolbox) // PA: check if this can be a C call
WinCreatePopupMenuHandle tb WinCreatePopupMenuHandle tb
# (rcci,tb) = IssueCleanRequest2 (ErrorCallback2 "CreatePopupMenuHandle ") (Rq0Cci CcRqCREATEPOPMENU) tb # (rcci,tb) = IssueCleanRequest2 (ErrorCallback2 "CreatePopupMenuHandle ") (Rq0Cci CcRqCREATEPOPMENU) tb
hmenu = case rcci.ccMsg of hmenu = case rcci.ccMsg of
......
...@@ -11,15 +11,6 @@ from ostypes import HWND, OSWindowPtr ...@@ -11,15 +11,6 @@ from ostypes import HWND, OSWindowPtr
// Types for menus and menu elements: // 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 :: OSMenu :== HMENU
:: OSMenuItem :== HITEM :: OSMenuItem :== HITEM
:: OSMenuSeparator :== HITEM :: OSMenuSeparator :== HITEM
...@@ -30,13 +21,6 @@ OSNoMenuItem :== 0 ...@@ -30,13 +21,6 @@ OSNoMenuItem :== 0
OSNoMenuSeparator :== 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: /* Enabling and disabling of menus and menu elements:
OS(Dis/En)ableMenu index menubar OS(Dis/En)ableMenu index menubar
(dis/en)ables the top-level menu at the zero based index position of the menubar. (dis/en)ables the top-level menu at the zero based index position of the menubar.
......
...@@ -11,15 +11,6 @@ from ostypes import OSWindowPtr, OSNoWindowPtr ...@@ -11,15 +11,6 @@ from ostypes import OSWindowPtr, OSNoWindowPtr
// Types for menus and menu elements: // 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 :: OSMenuHandle :== HMENU
:: OSMenu :== HMENU :: OSMenu :== HMENU
:: OSMenuItem :== HITEM :: OSMenuItem :== HITEM
...@@ -30,11 +21,6 @@ OSNoMenu :== 0 ...@@ -30,11 +21,6 @@ OSNoMenu :== 0
OSNoMenuItem :== 0 OSNoMenuItem :== 0
OSNoMenuSeparator :== 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: // Enabling and disabling menus and menu elements:
......
...@@ -20,15 +20,9 @@ StdMenuFatalError function error ...@@ -20,15 +20,9 @@ StdMenuFatalError function error
= FatalError function "StdMenu" 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: // 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 accessMenuHandles id f ioState
# (found,mDevice,ioState) = IOStGetDevice MenuDevice ioState # (found,mDevice,ioState) = IOStGetDevice MenuDevice ioState
| not found | not found
...@@ -38,7 +32,7 @@ accessMenuHandles id f ioState ...@@ -38,7 +32,7 @@ accessMenuHandles id f ioState
# ioState = IOStSetDevice (MenuSystemState {mHs & mMenus=msHs}) ioState # ioState = IOStSetDevice (MenuSystemState {mHs & mMenus=msHs}) ioState
= (result,ioState) = (result,ioState)
where 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] accessmenuhandles id f [mH:mHs]
# (menu_id,mH) = menuStateHandleGetMenuId mH # (menu_id,mH) = menuStateHandleGetMenuId mH
| id==menu_id | id==menu_id
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment