comparison src/glyphs-msw.c @ 1913:7473844a83d3

[xemacs-hg @ 2004-02-17 15:20:41 by james] Check in_display instead of passing fallible in_redisplay parameters.
author james
date Tue, 17 Feb 2004 15:20:57 +0000
parents 543769b89fed
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
1912:2c839fb06642 1913:7473844a83d3
2034 GWL_STYLE); 2034 GWL_STYLE);
2035 2035
2036 if (CONSP (item)) 2036 if (CONSP (item))
2037 item = XCAR (item); 2037 item = XCAR (item);
2038 2038
2039 if (gui_item_active_p (item, 1)) 2039 if (gui_item_active_p (item))
2040 qxeSetWindowLong (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p), 2040 qxeSetWindowLong (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
2041 GWL_STYLE, style & ~WS_DISABLED); 2041 GWL_STYLE, style & ~WS_DISABLED);
2042 else 2042 else
2043 qxeSetWindowLong (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p), 2043 qxeSetWindowLong (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p),
2044 GWL_STYLE, style | WS_DISABLED); 2044 GWL_STYLE, style | WS_DISABLED);
2225 Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii); 2225 Lisp_Object gui = IMAGE_INSTANCE_WIDGET_ITEM (ii);
2226 Lisp_Gui_Item *pgui = XGUI_ITEM (gui); 2226 Lisp_Gui_Item *pgui = XGUI_ITEM (gui);
2227 2227
2228 CHECK_MSWINDOWS_DEVICE (device); 2228 CHECK_MSWINDOWS_DEVICE (device);
2229 2229
2230 if (!gui_item_active_p (gui, 0)) 2230 if (!gui_item_active_p (gui))
2231 flags |= WS_DISABLED; 2231 flags |= WS_DISABLED;
2232 2232
2233 style = pgui->style; 2233 style = pgui->style;
2234 2234
2235 if (!NILP (pgui->callback) || !NILP (pgui->callback_ex)) 2235 if (!NILP (pgui->callback) || !NILP (pgui->callback_ex))
2370 pointer_bg, dest_mask, domain, 2370 pointer_bg, dest_mask, domain,
2371 "BUTTON", flags, 0); 2371 "BUTTON", flags, 0);
2372 2372
2373 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii); 2373 wnd = WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii);
2374 /* set the checked state */ 2374 /* set the checked state */
2375 if (gui_item_selected_p (gui, 0)) 2375 if (gui_item_selected_p (gui))
2376 qxeSendMessage (wnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); 2376 qxeSendMessage (wnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
2377 else 2377 else
2378 qxeSendMessage (wnd, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); 2378 qxeSendMessage (wnd, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
2379 /* add the image if one was given */ 2379 /* add the image if one was given */
2380 if (!NILP (glyph) && IMAGE_INSTANCEP (glyph) 2380 if (!NILP (glyph) && IMAGE_INSTANCEP (glyph)
2396 { 2396 {
2397 /* This function can GC if IN_REDISPLAY is false. */ 2397 /* This function can GC if IN_REDISPLAY is false. */
2398 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2398 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2399 2399
2400 /* buttons checked or otherwise */ 2400 /* buttons checked or otherwise */
2401 if (gui_item_selected_p (IMAGE_INSTANCE_WIDGET_ITEM (ii), 1)) 2401 if (gui_item_selected_p (IMAGE_INSTANCE_WIDGET_ITEM (ii)))
2402 qxeSendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii), 2402 qxeSendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii),
2403 BM_SETCHECK, (WPARAM)BST_CHECKED, 0); 2403 BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
2404 else 2404 else
2405 qxeSendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii), 2405 qxeSendMessage (WIDGET_INSTANCE_MSWINDOWS_HANDLE (ii),
2406 BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); 2406 BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
2638 /* add items to the tab */ 2638 /* add items to the tab */
2639 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii))) 2639 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)))
2640 { 2640 {
2641 int idx = add_tab_item (image_instance, wnd, XCAR (rest), domain, i); 2641 int idx = add_tab_item (image_instance, wnd, XCAR (rest), domain, i);
2642 assert (idx == i); 2642 assert (idx == i);
2643 if (gui_item_selected_p (XCAR (rest), 0)) 2643 if (gui_item_selected_p (XCAR (rest)))
2644 selected = i; 2644 selected = i;
2645 i++; 2645 i++;
2646 } 2646 }
2647 qxeSendMessage (wnd, TCM_SETCURSEL, selected, 0); 2647 qxeSendMessage (wnd, TCM_SETCURSEL, selected, 0);
2648 } 2648 }
2678 XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)) : 2678 XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)) :
2679 XCDR (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii))); 2679 XCDR (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii)));
2680 2680
2681 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii))) 2681 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)))
2682 { 2682 {
2683 if (gui_item_equal_sans_selected (XCAR (rest), selected, 0, 1)) 2683 if (gui_item_equal_sans_selected (XCAR (rest), selected, 0))
2684 { 2684 {
2685 Lisp_Object old_selected = 2685 Lisp_Object old_selected =
2686 gui_item_list_find_selected 2686 gui_item_list_find_selected
2687 (XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii))); 2687 (XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii)));
2688 2688
2713 /* add items to the tab */ 2713 /* add items to the tab */
2714 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii))) 2714 LIST_LOOP (rest, XCDR (IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (ii)))
2715 { 2715 {
2716 add_tab_item (image_instance, wnd, XCAR (rest), 2716 add_tab_item (image_instance, wnd, XCAR (rest),
2717 IMAGE_INSTANCE_FRAME (ii), i); 2717 IMAGE_INSTANCE_FRAME (ii), i);
2718 if (gui_item_selected_p (XCAR (rest), 1)) 2718 if (gui_item_selected_p (XCAR (rest)))
2719 selected_idx = i; 2719 selected_idx = i;
2720 i++; 2720 i++;
2721 } 2721 }
2722 qxeSendMessage (wnd, TCM_SETCURSEL, selected_idx, 0); 2722 qxeSendMessage (wnd, TCM_SETCURSEL, selected_idx, 0);
2723 } 2723 }