From 93a21dd7cddd0079c302ab6f46e37322e340378a Mon Sep 17 00:00:00 2001
From: Daniel Feltey <dfeltey@gmail.com>
Date: Sun, 1 Mar 2015 20:06:20 -0500
Subject: [PATCH] =?UTF-8?q?Use=20object=3D=3F=20instead=20of=20eq=3F=20to?=
 =?UTF-8?q?=20handle=20equality=20for=20contracted=20objects?=

---
 gui-lib/mred/private/wxme/pasteboard.rkt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gui-lib/mred/private/wxme/pasteboard.rkt b/gui-lib/mred/private/wxme/pasteboard.rkt
index 69f8ea88..022ade20 100644
--- a/gui-lib/mred/private/wxme/pasteboard.rkt
+++ b/gui-lib/mred/private/wxme/pasteboard.rkt
@@ -237,7 +237,7 @@
                              ;; find snip:
                              (let ([snip (find-snip x y)])
                                (and snip
-                                    (eq? snip s-caret-snip)
+                                    (object-or-false=? snip s-caret-snip)
                                     (let-boxes ([x 0.0] [y 0.0])
                                         (get-snip-location snip x y)
                                       (let ([c (send snip adjust-cursor dc (- x scrollx) (- y scrolly) 
@@ -260,7 +260,7 @@
                         (values dc (+ x scrollx) (+ y scrolly) scrollx scrolly)))])
         (let ([snip (find-snip x y)])
           (when (and prev-mouse-snip
-                     (not (eq? snip prev-mouse-snip)))
+                     (not (object-or-false=? snip prev-mouse-snip)))
             (let ([loc (snip->loc prev-mouse-snip)])
               (send prev-mouse-snip on-event
                     dc (- (loc-x loc) scrollx) (- (loc-y loc) scrolly) 
@@ -269,7 +269,7 @@
           (set! prev-mouse-snip #f)
           (when (and snip
                      (has-flag? (snip->flags snip) HANDLES-ALL-MOUSE-EVENTS)
-                     (not (eq? snip s-caret-snip)))
+                     (not (object-or-false=? snip s-caret-snip)))
             (let ([loc (snip->loc snip)])
               (set! prev-mouse-snip snip)
               (send snip on-event
@@ -278,7 +278,7 @@
                     event)))
           (if (and s-caret-snip
                    (or (not (send event button-down?))
-                       (eq? snip s-caret-snip)))
+                       (object-or-false=? snip s-caret-snip)))
               (let ([loc (snip->loc s-caret-snip)])
                 (send s-caret-snip on-event
                       dc (- (loc-x loc) scrollx) (- (loc-y loc) scrolly) 
@@ -667,8 +667,8 @@
               (set-snip-loc! snip loc)
             
               (set-snip-style! snip (send s-style-list convert (snip->style snip)))
-              (when (eq? (snip->style snip)
-                         (send s-style-list basic-style))
+              (when (object=? (snip->style snip)
+                              (send s-style-list basic-style))
                 (let ([s (get-default-style)])
                   (when s
                     (set-snip-style! snip s))))
@@ -1098,11 +1098,11 @@
       ;; lock during set-admin! [???]
       (send snip set-admin a)
 
-      (if (not (eq? (send snip get-admin) a))
+      (if (not (object-or-false=? (send snip get-admin) a))
           ;; something went wrong
           (cond
            [(and (not a)
-                 (eq? (snip->admin snip) orig-admin))
+                 (object-or-false=? (snip->admin snip) orig-admin))
             ;; force admin to null
             (set-snip-admin! snip #f)
             snip]
@@ -1248,7 +1248,7 @@
                         
                         (send snip draw
                               dc x y dcx dcy dcr dcb dx dy 
-                              (if (eq? snip s-caret-snip)
+                              (if (object-or-false=? snip s-caret-snip)
                                   show-caret
                                   'no-caret))
 
@@ -1799,7 +1799,7 @@
         (do-buffer-paste cb time #f)
         
         (if (and s-admin
-                 (not (eq? snips start)))
+                 (not (object-or-false=? snips start)))
             (let ([dc (get-dc)])
               (when dc
                 ;; get top/left/bottom/right of pasted group:
@@ -1808,7 +1808,7 @@
                            [top +inf.0]
                            [right -inf.0]
                            [bottom -inf.0])
-                  (if (eq? snip start)
+                  (if (object-or-false=? snip start)
                       (let ([dx (- cx (/ (+ left right) 2))]
                             [dy (- cy (/ (+ top bottom) 2))])
                         ;; shift the pasted group to center:
@@ -1824,7 +1824,7 @@
                               (max (loc-b loc) bottom)))))))
             ;; just select them:
             (let loop ([snip snips])
-              (unless (eq? snip start)
+              (unless (object-or-false=? snip start)
                 (add-selected snip)
                 (loop (snip->next snip))))))))