changeset 160:76bc6b4e8b79

Don't allow comboboxes to drop down when disabled.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 14 Nov 2002 18:49:20 +0000
parents 9c0f1f04f4c7
children c555d06b6c93
files os2/dw.c
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/os2/dw.c	Thu Nov 14 11:09:34 2002 +0000
+++ b/os2/dw.c	Thu Nov 14 18:49:20 2002 +0000
@@ -1717,9 +1717,17 @@
 		else if(SHORT1FROMMP(mp2) == '\r' && blah && blah->clickdefault)
 			_click_default(blah->clickdefault);
 		break;
+	case WM_BUTTON1DBLCLK:
+	case WM_BUTTON2DBLCLK:
+	case WM_BUTTON3DBLCLK:
+		if(dw_window_get_data(hWnd, "_dw_disabled"))
+			return (MRESULT)TRUE;
+		break;
 	case WM_BUTTON1DOWN:
 	case WM_BUTTON2DOWN:
 	case WM_BUTTON3DOWN:
+		if(_run_event(hWnd, msg, mp1, mp2) == TRUE)
+			return (MRESULT)TRUE;
 		_run_event(hWnd, WM_SETFOCUS, (MPARAM)FALSE, (MPARAM)TRUE);
 		break;
 	case WM_SETFOCUS:
@@ -4352,6 +4360,8 @@
 			hwnd = _find_entryfield(handle);
 			_dw_window_set_color(hwnd ? hwnd : handle, DW_CLR_BLACK, DW_CLR_PALEGRAY);
 			dw_signal_connect(hwnd ? hwnd : handle, "key_press_event", DW_SIGNAL_FUNC(_null_key), (void *)100);
+            if(val == 2)
+				dw_signal_connect(handle, "button_press_event", DW_SIGNAL_FUNC(_null_key), (void *)100);
 			dw_window_set_data(handle, "_dw_disabled", (void *)1);
 			if(hwnd)
 				dw_window_set_data(hwnd, "_dw_disabled", (void *)1);