[htoolkit-cvs] port/src/cbits/Win32 Action.c,1.2,1.3 Frame.c,1.28,1.29

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26018/src/cbits/Win32

Modified Files:
	Action.c Frame.c 
Log Message:
Enable/Disable menu items


Index: Action.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Action.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Action.c	16 May 2004 07:36:51 -0000	1.2
--- Action.c	16 May 2004 07:55:08 -0000	1.3
***************
*** 98,101 ****
--- 98,103 ----
  {
  	ToolHandle tool;
+ 	MenuHandle menu;
+ 	FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  
  	action->enabled = enabled;
***************
*** 108,111 ****
--- 110,121 ----
  		tool = tool->nextInAction;
  	}
+ 
+ 	menu = action->menuProxies;
+ 	while (menu)
+ 	{
+ 		EnableMenuItem(getParentHMENU(menu), getMenuPos(pFrameData->pActionsMap, menu), (enabled ? MF_ENABLED : MF_GRAYED) | MF_BYPOSITION);
+ 
+ 		menu = menu->nextInAction;
+ 	}
  }
  

Index: Frame.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Frame.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Frame.c	15 May 2004 15:00:32 -0000	1.28
--- Frame.c	16 May 2004 07:55:08 -0000	1.29
***************
*** 381,390 ****
  						osDrawBitmap(pt.x, pt.y, action->bitmap, &canvas);
  
! 						// Draw bounding frame
! 						if (action->checked)
! 							DrawEdge(lpDIS->hDC,&rcFrame,BDR_SUNKENINNER,BF_RECT);
! 						else
! 							if (lpDIS->itemState & ODS_SELECTED)
! 								DrawEdge(lpDIS->hDC,&rcFrame,BDR_RAISEDINNER,BF_RECT);
  					}
  					else
--- 381,393 ----
  						osDrawBitmap(pt.x, pt.y, action->bitmap, &canvas);
  
! 						if (action->enabled)
! 						{
! 							// Draw bounding frame
! 							if (action->checked)
! 								DrawEdge(lpDIS->hDC,&rcFrame,BDR_SUNKENINNER,BF_RECT);
! 							else
! 								if (lpDIS->itemState & ODS_SELECTED)
! 									DrawEdge(lpDIS->hDC,&rcFrame,BDR_RAISEDINNER,BF_RECT);
! 						}
  					}
  					else
***************
*** 419,425 ****
  							SelectObject(lpDIS->hDC, hFillBrush);
  
! 							MaskBlt(lpDIS->hDC, 
! 								rcFrame.left, 
! 								rcFrame.top, 
  								rcFrame.right-rcFrame.left,
  								rcFrame.bottom-rcFrame.top,
--- 422,428 ----
  							SelectObject(lpDIS->hDC, hFillBrush);
  
! 							MaskBlt(lpDIS->hDC,
! 								rcFrame.left,
! 								rcFrame.top,
  								rcFrame.right-rcFrame.left,
  								rcFrame.bottom-rcFrame.top,
***************
*** 437,441 ****
  					rc.left+=Spacing;
  
! 					if (lpDIS->itemState & ODS_GRAYED)
  					{
  						// This will give it a disable text look
--- 440,444 ----
  					rc.left+=Spacing;
  
! 					if (!action->enabled)
  					{
  						// This will give it a disable text look