# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1049146375 0
# Node ID 41b890c649e7349f0321d6d0b221b3bae804b1b8
# Parent  a3dee031d27ee7047038a5c1b788f8c68fdbfe1e
Fixed a container emphasis problem when no context menus are created.

diff -r a3dee031d27e -r 41b890c649e7 os2/dw.c
--- a/os2/dw.c	Mon Mar 31 10:24:51 2003 +0000
+++ b/os2/dw.c	Mon Mar 31 21:32:55 2003 +0000
@@ -1838,6 +1838,14 @@
 	return -1;
 }
 
+void _clear_emphasis(void)
+{
+	if(hwndEmph && pCoreEmph)
+		WinSendMsg(hwndEmph, CM_SETRECORDEMPHASIS, pCoreEmph, MPFROM2SHORT(FALSE, CRA_SOURCE));
+	hwndEmph = NULLHANDLE;
+	pCoreEmph = NULL;
+}
+
 MRESULT EXPENTRY _run_event(HWND hWnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
 	int result = -1;
@@ -2120,6 +2128,8 @@
 									}
 									else
 									{
+										if(pCoreEmph)
+											_clear_emphasis();
 										hwndEmph = tmp->window;
 										pCoreEmph = mp2;
 										WinSendMsg(tmp->window, CM_SETRECORDEMPHASIS, mp2, MPFROM2SHORT(TRUE, CRA_SOURCE));
@@ -2473,10 +2483,7 @@
 		_free_window_memory(hWnd);
 		break;
 	case WM_MENUEND:
-		if(hwndEmph && pCoreEmph)
-			WinSendMsg(hwndEmph, CM_SETRECORDEMPHASIS, pCoreEmph, MPFROM2SHORT(FALSE, CRA_SOURCE));
-		hwndEmph = NULLHANDLE;
-		pCoreEmph = NULL;
+		_clear_emphasis();
 		break;
 	}