From: <kr_...@us...> - 2003-08-17 22:10:10
|
Update of /cvsroot/htoolkit/port/src/cbits/Win32 In directory sc8-pr-cvs1:/tmp/cvs-serv27976/src/cbits/Win32 Modified Files: Menu.c Log Message: Generate "update" menu before popup menu tracking Index: Menu.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Menu.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Menu.c 17 Aug 2003 16:45:07 -0000 1.13 --- Menu.c 17 Aug 2003 22:10:05 -0000 1.14 *************** *** 1,527 **** ! #include "Menu.h" ! #include "Window.h" ! #include "Internals.h" ! #include "Handlers_stub.h" ! ! ! #define CHECK_MENU_TYPE(handle,mask,ret) \ ! if (((handle ? handle->type : MENU_SUBMENU) & (mask)) == 0) \ ! { \ ! printf("Invalid menu handle type."); \ [...1041 lines suppressed...] ! ! CHECK_MENU_TYPE_V(handle, MENU_ITEM); ! ! pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA); ! handle->bitmap = bitmap; ! ! memset(&mii,0,sizeof(mii)); ! mii.cbSize = sizeof(mii); ! mii.fMask = MIIM_FTYPE; ! mii.fType = bitmap ? MFT_OWNERDRAW : MFT_STRING; ! SetMenuItemInfo(getParentHMENU(handle), getMenuPos(pFrameData->pMenuHandlesMap, handle), TRUE, &mii); ! ! updateMenuBar(handle->parent); ! } ! ! int osGetMenuItemPos(MenuHandle handle) ! { ! FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA); ! return getMenuPos(pFrameData->pMenuHandlesMap, handle); ! } |