Add primitives to support loading and setting of icons.

diff --git a/v7/src/microcode/pros2pm.c b/v7/src/microcode/pros2pm.c
index c89b7b2c464f430fa2ae21d98803dfdadf26d027..0297d0a4f2d971f780f30d8b67ff7ea1321ba0b5 100644 (file)
--- a/v7/src/microcode/pros2pm.c
+++ b/v7/src/microcode/pros2pm.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: pros2pm.c,v 1.12 1995/11/04 00:08:15 cph Exp $
+$Id: pros2pm.c,v 1.13 1995/11/04 01:42:27 cph Exp $
 
 Copyright (c) 1994-95 Massachusetts Institute of Technology
 
@@ -940,6 +940,23 @@ DEFINE_PRIMITIVE ("OS2-SET-POINTER", Prim_OS2_set_pointer, 2, 2, 0)
                                         (HWND_ARG (1)),
                                         (arg_ulong_integer (2)))));
 }
+
+DEFINE_PRIMITIVE ("OS2WIN-LOAD-ICON", Prim_OS2_window_load_icon, 3, 3, 0)
+{
+  PRIMITIVE_HEADER (3);
+  PRIMITIVE_RETURN
+    (ulong_to_integer (OS2_window_load_icon ((wid_argument (1)),
+                                            (arg_ulong_integer (2)),
+                                            (arg_ulong_integer (3)))));
+}
+
+DEFINE_PRIMITIVE ("OS2WIN-SET-ICON", Prim_OS2_window_set_icon, 2, 2, 0)
+{
+  PRIMITIVE_HEADER (2);
+  PRIMITIVE_RETURN
+    (BOOLEAN_TO_OBJECT
+     (OS2_window_set_icon ((wid_argument (1)), (arg_ulong_integer (2)))));
+}
 \f
 DEFINE_PRIMITIVE ("OS2WIN-OPEN-EVENT-QID", Prim_OS2_window_open_event_qid, 0, 0, 0)
 {

diff --git a/v7/src/runtime/os2winp.scm b/v7/src/runtime/os2winp.scm
index cc76d29a3a276aab0334627b0c5068bbc3d42545..46aa17397285871954fffe5e37082faf1c84825f 100644 (file)
--- a/v7/src/runtime/os2winp.scm
+++ b/v7/src/runtime/os2winp.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: os2winp.scm,v 1.10 1995/11/03 01:31:08 cph Exp $
+$Id: os2winp.scm,v 1.11 1995/11/04 01:44:33 cph Exp $
 
 Copyright (c) 1995 Massachusetts Institute of Technology
 
@@ -97,6 +97,7 @@ MIT in each case. |#
   (os2win-get-pos 1)
   (os2win-get-size 1)
   (os2win-invalidate 5)
+  (os2win-load-icon 3)
   (os2win-load-menu 3)
   (os2win-move-cursor 3)
   (os2win-open 2)
@@ -106,6 +107,7 @@ MIT in each case. |#
   (os2win-scroll 7)
   (os2win-set-capture 2)
   (os2win-set-grid 3)
+  (os2win-set-icon 2)
   (os2win-set-pos 3)
   (os2win-set-size 3)
   (os2win-set-state 2)
@@ -548,4 +550,22 @@ MIT in each case. |#
 (define-integrable SPTR_FILE 19)
 (define-integrable SPTR_FOLDER 20)
 (define-integrable SPTR_MULTFILE 21)
-(define-integrable SPTR_PROGRAM 22)
\ No newline at end of file
+(define-integrable SPTR_PROGRAM 22)
+
+;;; Constants for use with os2win-load-pointer.
+(define-integrable IDI_BCH     10)
+(define-integrable IDI_COFFEE  11)
+(define-integrable IDI_CONSES  12)
+(define-integrable IDI_EDWIN   13)
+(define-integrable IDI_ENVIR1  14)
+(define-integrable IDI_GRAPHICS        15)
+(define-integrable IDI_LAMBDA  16)
+(define-integrable IDI_LAMBDA2 17)
+(define-integrable IDI_LIAR1   18)
+(define-integrable IDI_LIAR2   19)
+(define-integrable IDI_LIAR3   20)
+(define-integrable IDI_MINCER  21)
+(define-integrable IDI_SHIELD1 22)
+(define-integrable IDI_SHIELD2 23)
+(define-integrable IDI_SHIELD3 24)
+(define-integrable IDI_SHIELD4 25)
\ No newline at end of file