From 46578b120895aa5b2fd0be825e5673affd3b6d57 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 4 Nov 1995 02:25:38 +0000
Subject: [PATCH] Add primitive to destroy icons.

---
 v7/src/microcode/os2pm.c   | 8 +++++++-
 v7/src/microcode/os2pm.scm | 6 +++++-
 v7/src/microcode/pros2pm.c | 9 ++++++++-
 v7/src/runtime/os2winp.scm | 3 ++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/v7/src/microcode/os2pm.c b/v7/src/microcode/os2pm.c
index 272489187..91f42dd0d 100644
--- a/v7/src/microcode/os2pm.c
+++ b/v7/src/microcode/os2pm.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: os2pm.c,v 1.24 1995/11/04 02:10:56 cph Exp $
+$Id: os2pm.c,v 1.25 1995/11/04 02:23:44 cph Exp $
 
 Copyright (c) 1994-95 Massachusetts Institute of Technology
 
@@ -2392,6 +2392,12 @@ window_load_pointer (qid_t qid, HWND desktop, HMODULE module, ULONG id)
   return (WinLoadPointer (desktop, module, id));
 }
 
+static BOOL
+window_destroy_pointer (qid_t qid, HPOINTER pointer)
+{
+  return (WinLoadPointer (pointer));
+}
+
 static BOOL
 window_set_icon (window_t * window, HPOINTER icon)
 {
diff --git a/v7/src/microcode/os2pm.scm b/v7/src/microcode/os2pm.scm
index ae45cb1a0..1c9ad7342 100644
--- a/v7/src/microcode/os2pm.scm
+++ b/v7/src/microcode/os2pm.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: os2pm.scm,v 1.5 1995/11/04 02:11:13 cph Exp $
+$Id: os2pm.scm,v 1.6 1995/11/04 02:24:08 cph Exp $
 
 Copyright (c) 1995 Massachusetts Institute of Technology
 
@@ -1071,6 +1071,10 @@ MIT in each case. */
   (value ("HPOINTER" pointer))
   (arguments qid ("HWND" desktop) ("HMODULE" module) (ulong id)))
 
+(define-pm-procedure window_destroy_pointer
+  (value ("BOOL" successp))
+  (arguments qid ("HPOINTER" icon)))
+
 (define-pm-procedure window_set_icon
   (value ("BOOL" successp))
   (arguments window ("HPOINTER" icon)))
diff --git a/v7/src/microcode/pros2pm.c b/v7/src/microcode/pros2pm.c
index fcb5b2b1a..cb9ff66ae 100644
--- a/v7/src/microcode/pros2pm.c
+++ b/v7/src/microcode/pros2pm.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: pros2pm.c,v 1.16 1995/11/04 02:11:06 cph Exp $
+$Id: pros2pm.c,v 1.17 1995/11/04 02:25:07 cph Exp $
 
 Copyright (c) 1994-95 Massachusetts Institute of Technology
 
@@ -951,6 +951,13 @@ DEFINE_PRIMITIVE ("OS2WIN-LOAD-POINTER", Prim_OS2_window_load_pointer, 3, 3, 0)
 						(arg_ulong_integer (3)))));
 }
 
+DEFINE_PRIMITIVE ("OS2WIN-DESTROY-POINTER", Prim_OS2_window_destroy_pointer, 1, 1, 0)
+{
+  PRIMITIVE_HEADER (1);
+  PRIMITIVE_RETURN
+    (BOOLEAN_TO_OBJECT (OS2_window_destroy_pointer (arg_ulong_integer (1))));
+}
+
 DEFINE_PRIMITIVE ("OS2WIN-SET-ICON", Prim_OS2_window_set_icon, 2, 2, 0)
 {
   PRIMITIVE_HEADER (2);
diff --git a/v7/src/runtime/os2winp.scm b/v7/src/runtime/os2winp.scm
index 3b395422e..52e54e899 100644
--- a/v7/src/runtime/os2winp.scm
+++ b/v7/src/runtime/os2winp.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: os2winp.scm,v 1.12 1995/11/04 01:53:49 cph Exp $
+$Id: os2winp.scm,v 1.13 1995/11/04 02:25:38 cph Exp $
 
 Copyright (c) 1995 Massachusetts Institute of Technology
 
@@ -88,6 +88,7 @@ MIT in each case. |#
   (os2win-console-wid 0)
   (os2win-desktop-height 0)
   (os2win-desktop-width 0)
+  (os2win-destroy-pointer 1)
   (os2win-event-ready? 2)
   (os2win-focus? 1)
   (os2win-font-dialog 2)
-- 
2.25.1