comparison os2/dw.c @ 2627:814c81cae51d

OS/2: Fix compilation after style standardization.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 01 Aug 2021 12:38:23 +0000
parents 401a3b9f21ba
children 9be24001d288
comparison
equal deleted inserted replaced
2626:401a3b9f21ba 2627:814c81cae51d
6291 */ 6291 */
6292 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y) 6292 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
6293 { 6293 {
6294 if(menu) 6294 if(menu)
6295 { 6295 {
6296 popup = parent; 6296 _dw_popup = parent;
6297 dw_window_set_data(*menu, "_dw_popup", DW_INT_TO_POINTER(1)); 6297 dw_window_set_data(*menu, "_dw_popup", DW_INT_TO_POINTER(1));
6298 WinPopupMenu(HWND_DESKTOP, parent, *menu, x, dw_screen_height() - y, 0, PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_VCONSTRAIN | PU_HCONSTRAIN); 6298 WinPopupMenu(HWND_DESKTOP, parent, *menu, x, dw_screen_height() - y, 0, PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_VCONSTRAIN | PU_HCONSTRAIN);
6299 *menu = 0; 6299 *menu = 0;
6300 } 6300 }
6301 } 6301 }
6720 LONG fore = _dw_foreground; 6720 LONG fore = _dw_foreground;
6721 int z, j, lim; 6721 int z, j, lim;
6722 6722
6723 dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0); 6723 dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
6724 6724
6725 dw_color_dw_foreground_set(DW_CLR_PALEGRAY); 6725 dw_color_foreground_set(DW_CLR_PALEGRAY);
6726 lim = pixmap->width/2; 6726 lim = pixmap->width/2;
6727 for(j=0;j<pixmap->height;j++) 6727 for(j=0;j<pixmap->height;j++)
6728 { 6728 {
6729 int mod = j%2; 6729 int mod = j%2;
6730 6730
9563 /* Create the color pointers, stretching it to the necessary size */ 9563 /* Create the color pointers, stretching it to the necessary size */
9564 dw_pixmap_stretch_bitblt(0, pntr, 0, 0, pntr->width, pntr->height, 0, src, 0, 0, src->width, src->height); 9564 dw_pixmap_stretch_bitblt(0, pntr, 0, 0, pntr->width, pntr->height, 0, src, 0, 0, src->width, src->height);
9565 dw_pixmap_stretch_bitblt(0, minipntr, 0, 0, minipntr->width, minipntr->height, 0, src, 0, 0, src->width, src->height); 9565 dw_pixmap_stretch_bitblt(0, minipntr, 0, 0, minipntr->width, minipntr->height, 0, src, 0, 0, src->width, src->height);
9566 9566
9567 /* Create the masks, all in black */ 9567 /* Create the masks, all in black */
9568 dw_color_dw_foreground_set(DW_CLR_BLACK); 9568 dw_color_foreground_set(DW_CLR_BLACK);
9569 dw_draw_rect(0, mask, DW_DRAW_FILL, 0, 0, mask->width, mask->height); 9569 dw_draw_rect(0, mask, DW_DRAW_FILL, 0, 0, mask->width, mask->height);
9570 dw_draw_rect(0, minimask, DW_DRAW_FILL, 0, 0, minimask->width, minimask->height); 9570 dw_draw_rect(0, minimask, DW_DRAW_FILL, 0, 0, minimask->width, minimask->height);
9571 #if 0 9571 #if 0
9572 /* If we have a background color... create masks */ 9572 /* If we have a background color... create masks */
9573 if(backrgb & DW_RGB_COLOR) 9573 if(backrgb & DW_RGB_COLOR)
10619 * Parameters: 10619 * Parameters:
10620 * red: red value. 10620 * red: red value.
10621 * green: green value. 10621 * green: green value.
10622 * blue: blue value. 10622 * blue: blue value.
10623 */ 10623 */
10624 void API dw_color_dw_foreground_set(unsigned long value) 10624 void API dw_color_foreground_set(unsigned long value)
10625 { 10625 {
10626 _dw_foreground = value; 10626 _dw_foreground = value;
10627 } 10627 }
10628 10628
10629 /* Sets the current background drawing color. 10629 /* Sets the current background drawing color.
10630 * Parameters: 10630 * Parameters:
10631 * red: red value. 10631 * red: red value.
10632 * green: green value. 10632 * green: green value.
10633 * blue: blue value. 10633 * blue: blue value.
10634 */ 10634 */
10635 void API dw_color_dw_background_set(unsigned long value) 10635 void API dw_color_background_set(unsigned long value)
10636 { 10636 {
10637 _dw_background = value; 10637 _dw_background = value;
10638 } 10638 }
10639 10639
10640 int DWSIGNAL _dw_color_cancel_func(HWND window, void *data) 10640 int DWSIGNAL _dw_color_cancel_func(HWND window, void *data)