From 6033231a460168a3a2c865294c42538225465bb2 Mon Sep 17 00:00:00 2001
From: Mike MacHenry <dskippy@ccs.neu.edu>
Date: Tue, 5 Oct 2004 19:38:14 +0000
Subject: [PATCH] updating for 299 still

original commit: deacf5a03aa96119f2f3a69f910538e8fd42ac64
---
 collects/embedded-gui/embedded-gui.ss         | 26 +++++++------------
 .../embedded-gui/private/locked-pasteboard.ss |  4 +--
 .../private/really-resized-pasteboard.ss      |  4 +--
 .../private/tests/alignment-test.ss           |  8 +++---
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/collects/embedded-gui/embedded-gui.ss b/collects/embedded-gui/embedded-gui.ss
index 0cc7f0a8..95c38b12 100644
--- a/collects/embedded-gui/embedded-gui.ss
+++ b/collects/embedded-gui/embedded-gui.ss
@@ -1,6 +1,12 @@
 (module embedded-gui mzscheme
   
-  (require
+  (define-syntax (require/provide stx)
+    (syntax-case stx ()
+      [(_ filename ...)
+      #'(begin (require filename ...)
+               (provide (all-from filename) ...))]))
+  
+  (require/provide
    "private/grid-alignment.ss"
    "private/aligned-pasteboard.ss"
    "private/interface.ss"
@@ -13,20 +19,6 @@
    "private/verthoriz-alignment.ss"
    "private/snip-wrapper.ss"
    "private/single-line-text.ss"
-   "private/embedded-message.ss")
-
-  (provide
-   (all-from "private/grid-alignment.ss")
-   (all-from "private/aligned-pasteboard.ss")
-   (all-from "private/interface.ss")
-   (all-from "private/snip-lib.ss")
-   (all-from "private/button-snip.ss")
-   (all-from "private/stretchable-editor-snip.ss")
-   (all-from "private/tabbable-text.ss")
-   (all-from "private/fixed-width-label-snip.ss")
-   (all-from "private/grey-editor.ss")
-   (all-from "private/verthoriz-alignment.ss")
-   (all-from "private/snip-wrapper.ss")
-   (all-from "private/single-line-text.ss")
-   (all-from "private/embedded-message.ss"))
+   "private/embedded-message.ss"
+   "private/lines.ss")
   )
diff --git a/collects/embedded-gui/private/locked-pasteboard.ss b/collects/embedded-gui/private/locked-pasteboard.ss
index 1a4d060b..9c111040 100644
--- a/collects/embedded-gui/private/locked-pasteboard.ss
+++ b/collects/embedded-gui/private/locked-pasteboard.ss
@@ -23,8 +23,8 @@
       (define/override (on-default-event event) (void))
       ;; The rest of the methods I believe to be redundant but
       ;; are overriden anyway for consistancy.
-      (define/override (can-interactive-move? event) false)
-      (define/override (can-interactive-resize? snip) false)
+      (define/augment-final (can-interactive-move? event) false)
+      (define/augment-final (can-interactive-resize? snip) false)
       (define/override (get-dragable) false)
       (define/override (get-selection-visible) false)
       (super-new)))
diff --git a/collects/embedded-gui/private/really-resized-pasteboard.ss b/collects/embedded-gui/private/really-resized-pasteboard.ss
index 9d501c32..408c8fd3 100644
--- a/collects/embedded-gui/private/really-resized-pasteboard.ss
+++ b/collects/embedded-gui/private/really-resized-pasteboard.ss
@@ -55,14 +55,14 @@ get text deteleted from them, etc.
       |#
       (define/augment (after-insert snip before x y)
         (hash-table-put! snip-cache snip (snip-size snip))
-        (inner (void) snip before x y))
+        (inner (void) after-insert snip before x y))
       
       #|
       snip : snip% object
       |#
       (define/augment (after-delete snip)
         (hash-table-remove! snip-cache snip)
-        (inner (void) snip))
+        (inner (void) after-delete snip))
       
       #;((is-a?/c snip%) . -> . (cons/p natural-number? natural-number?))
       ;; The width and height of the given snip in this pasteboard.
diff --git a/collects/embedded-gui/private/tests/alignment-test.ss b/collects/embedded-gui/private/tests/alignment-test.ss
index b72744d1..fad9c219 100644
--- a/collects/embedded-gui/private/tests/alignment-test.ss
+++ b/collects/embedded-gui/private/tests/alignment-test.ss
@@ -3,6 +3,7 @@
  (lib "etc.ss")
  (lib "mred.ss" "mred")
  "../verthoriz-alignment.ss"
+ "../lines.ss"
  "../aligned-pasteboard.ss"
  "../snip-wrapper.ss")
 
@@ -14,21 +15,18 @@
 (define c (new editor-canvas% (editor p) (parent f)))
 (define a1 (new vertical-alignment% (parent p)))
 (define a2 (new horizontal-alignment% (parent a1)))
-;(define a3 (new horizontal-alignment% (parent a1)))
+;(new hline% (parent a1))
+(define a3 (new horizontal-alignment% (parent a1)))
 
 (new snip-wrapper%
      (snip (make-object string-snip% "One"))
      (parent a2))
-#|
 (new snip-wrapper%
      (snip (make-object string-snip% "Two"))
      (parent a2))
-(send a1 dump-sizes)
 (new snip-wrapper%
      (snip (make-object string-snip% "Three"))
      (parent a3))
-(send a1 dump-sizes)
 (new snip-wrapper%
      (snip (make-object string-snip% "Three"))
      (parent a3))
-|#
\ No newline at end of file