gui: correct handling of closebmp.bmp resource

winspool · May 28, 2024 · c9a8ffb · c9a8ffb
1 parent c138153
commit c9a8ffb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/bld/gui/h/gui.rc b/bld/gui/h/gui.rc
@@ -1,5 +1,11 @@
 /* UTF-8 encoding, ¥ */
 
+#ifdef RESX_GUI
+#ifndef __OS2__
+CLOSEBMP    BITMAP      "closebmp.bmp"
+#endif
+#endif
+
 STRINGTABLE
 BEGIN
     #define pick(c,e,j) (GUI_LITERAL_##c + RLE_ENGLISH * MSG_LANG_SPACING), [ e ]

diff --git a/bld/gui/sample/h/sample.rh b/bld/gui/sample/h/sample.rh
@@ -52,7 +52,5 @@
 #define MAIN            1038
 #define DLG             1039
 
-#define CLOSEBMP        1040
-
 #define STRMSG1         10001
 #define STRMSG2         10002
diff --git a/bld/gui/sample/res/sample.rc b/bld/gui/sample/res/sample.rc
@@ -31,8 +31,6 @@ END
 
 #ifdef RESX_GUI
 
-RC_ITEM( BITMAP, CLOSEBMP,      "closebmp.bmp" )
-
 RC_ITEM( BITMAP, MINIMIZE,      "min.bmp" )
 RC_ITEM( BITMAP, MAXIMIZE,      "max.bmp" )
 RC_ITEM( BITMAP, RESTORE,       "restore.bmp" )

diff --git a/bld/wv/master.mif b/bld/wv/master.mif
@@ -220,7 +220,6 @@ bitmaps_win = &
 bitmaps = &
     $(bitmaps_$(target_$(host_os))) &
     ../../res/splash.bmp &
-    ../../res/closebmp.bmp &
     ../../res/read1.bmp &
     ../../res/read2.bmp &
     ../../res/write1.bmp &

diff --git a/bld/wv/res/closebmp.bmp b/bld/wv/res/closebmp.bmp