# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1627821503 0
# Node ID 814c81cae51ded9a9d94b06e2ec4058b16379b33
# Parent  401a3b9f21ba41e385feb7d284d2b7eb8898c717
OS/2: Fix compilation after style standardization.

diff -r 401a3b9f21ba -r 814c81cae51d os2/dw.c
--- a/os2/dw.c	Sun Aug 01 12:17:07 2021 +0000
+++ b/os2/dw.c	Sun Aug 01 12:38:23 2021 +0000
@@ -6293,7 +6293,7 @@
 {
    if(menu)
    {
-      popup = parent;
+      _dw_popup = parent;
       dw_window_set_data(*menu, "_dw_popup", DW_INT_TO_POINTER(1));
       WinPopupMenu(HWND_DESKTOP, parent, *menu, x, dw_screen_height() - y, 0, PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_VCONSTRAIN | PU_HCONSTRAIN);
       *menu = 0;
@@ -6722,7 +6722,7 @@
 
     dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
 
-    dw_color_dw_foreground_set(DW_CLR_PALEGRAY);
+    dw_color_foreground_set(DW_CLR_PALEGRAY);
     lim = pixmap->width/2;
     for(j=0;j<pixmap->height;j++)
     {
@@ -9565,7 +9565,7 @@
     dw_pixmap_stretch_bitblt(0, minipntr, 0, 0, minipntr->width, minipntr->height, 0, src, 0, 0, src->width, src->height);
 
     /* Create the masks, all in black */
-    dw_color_dw_foreground_set(DW_CLR_BLACK);
+    dw_color_foreground_set(DW_CLR_BLACK);
     dw_draw_rect(0, mask, DW_DRAW_FILL, 0, 0, mask->width, mask->height);
     dw_draw_rect(0, minimask, DW_DRAW_FILL, 0, 0, minimask->width, minimask->height);
 #if 0
@@ -10621,7 +10621,7 @@
  *       green: green value.
  *       blue: blue value.
  */
-void API dw_color_dw_foreground_set(unsigned long value)
+void API dw_color_foreground_set(unsigned long value)
 {
    _dw_foreground = value;
 }
@@ -10632,7 +10632,7 @@
  *       green: green value.
  *       blue: blue value.
  */
-void API dw_color_dw_background_set(unsigned long value)
+void API dw_color_background_set(unsigned long value)
 {
    _dw_background = value;
 }