Change some eq?s in snip handling code.

Author: samth

gui-lib/mred/private/wxme/editor-snip.rkt

@@ -99,7 +99,7 @@
 
   (def/override (set-admin [(make-or-false snip-admin%) a])
 
-    (when (not (eq? a s-admin))
+    (when (not (object-or-false=? a s-admin))
       (super set-admin a)
       (when editor
         (if a
@@ -125,7 +125,7 @@
     (void))
 
   (def/public (set-editor [editor<%> b])
-    (unless (eq? editor b)
+    (unless (object-or-false=? editor b)
       (when (and editor s-admin)
         (send editor set-admin #f))
       (set! editor b)

gui-lib/mred/private/wxme/mline.rkt

@@ -1148,7 +1148,7 @@ Debugging tools:
                                   w h)))
                (let ([maxspace (max maxspace (- maxantidescent maxbase))]
                      [maxdescent (max maxdescent (- maxantispace maxbase))])
-                 (unless (eq? (mline-scroll-snip mline) scroll-snip)
+                 (unless (object-or-false=? (mline-scroll-snip mline) scroll-snip)
                    (set! sizing-changed? #t)
                    (set-mline-scroll-snip! mline scroll-snip))
                  (unless (= (mline-last-h mline) last-h)

gui-lib/mred/private/wxme/pasteboard.rkt

@@ -237,7 +237,7 @@
                              ;; find snip:
                              (let ([snip (find-snip x y)])
                                (and snip
-                                    (object-or-false=? snip s-caret-snip)
+                                    (eq? 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 (object-or-false=? snip prev-mouse-snip)))
+                     (not (eq? 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 (object-or-false=? snip s-caret-snip)))
+                     (not (eq? 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?))
-                       (object-or-false=? snip s-caret-snip)))
+                       (eq? 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 (object=? (snip->style snip)
-                              (send s-style-list basic-style))
+              (when (eq? (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 (object-or-false=? (send snip get-admin) a))
+      (if (not (eq? (send snip get-admin) a))
           ;; something went wrong
           (cond
            [(and (not a)
-                 (object-or-false=? (snip->admin snip) orig-admin))
+                 (eq? (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 (object-or-false=? snip s-caret-snip)
+                              (if (eq? snip s-caret-snip)
                                   show-caret
                                   'no-caret))
 
@@ -1799,7 +1799,7 @@
         (do-buffer-paste cb time #f)
 
         (if (and s-admin
-                 (not (object-or-false=? snips start)))
+                 (not (eq? 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 (object-or-false=? snip start)
+                  (if (eq? 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 (object-or-false=? snip start)
+              (unless (eq? snip start)
                 (add-selected snip)
                 (loop (snip->next snip))))))))
 

gui-lib/mred/private/wxme/text.rkt

@@ -4298,9 +4298,9 @@
                      (set-snip-line! naya line)
 
                      (when line
-                       (when (eq? (mline-snip line) snip)
+                       (when (object-or-false=? (mline-snip line) snip)
                          (set-mline-snip! line naya))
-                       (when (eq? (mline-last-snip line) snip)
+                       (when (object-or-false=? (mline-last-snip line) snip)
                          (set-mline-last-snip! line naya)))
 
                      (send snip set-s-admin #f)