From e36d2ecc6e19254871f3958834135266b762ec94 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Tue, 22 Jun 2004 15:23:54 +0000
Subject: [PATCH] .

original commit: daab1fad4b0981b51ae49a606888f4e3346997f5
---
 collects/drscheme/private/syntax-browser.ss |  3 +--
 collects/framework/private/main.ss          |  4 ++--
 collects/framework/private/panel.ss         |  3 +--
 collects/mrlib/graph.ss                     | 22 ++++++++-------------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/collects/drscheme/private/syntax-browser.ss b/collects/drscheme/private/syntax-browser.ss
index 53cc4e3f..451e147b 100644
--- a/collects/drscheme/private/syntax-browser.ss
+++ b/collects/drscheme/private/syntax-browser.ss
@@ -379,7 +379,6 @@ needed to really make this work:
         (set-box/f! w arrow-snip-width)
         (set-box/f! h arrow-snip-height))
       
-      (rename [super-on-event on-event])
       (define/override (on-event dc x y editorx editory evt)
         (let ([snip-evt-x (- (send evt get-x) x)]
               [snip-evt-y (- (send evt get-y) y)])
@@ -420,7 +419,7 @@ needed to really make this work:
                           [(down down-click) 'down]
                           [else 'up-click]))]
             [else
-             (super-on-event dc x y editorx editory evt)])))
+             (super on-event dc x y editorx editory evt)])))
 
       (inherit get-admin)
       (define/private (set-state new-state)
diff --git a/collects/framework/private/main.ss b/collects/framework/private/main.ss
index 52285e90..cb5f966f 100644
--- a/collects/framework/private/main.ss
+++ b/collects/framework/private/main.ss
@@ -140,8 +140,8 @@
 		  '(define defmacro define-macro
                      define-syntax-set
 		     define-values
-                     define/public define/override define/private define/field
-                     define/override-final define/public-final
+                     define/public define/pubment define/private define/field
+                     define/override define/augment define/overment define/augride
                      define/contract
 		     define-signature 
                      define-syntax define-syntaxes
diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss
index d49b90c2..a9e98739 100644
--- a/collects/framework/private/panel.ss
+++ b/collects/framework/private/panel.ss
@@ -256,8 +256,7 @@
  	    (set! percentages (map make-percentage ps))
  	    (container-flow-modified))
  
- 	  (define/public (after-percentage-change)
- 	    (void))
+ 	  (define/pubment (after-percentage-change) (inner (void) after-percentage-change))
            
  	  (define/private (get-available-extent)
  	    (let-values ([(width height) (get-client-size)])
diff --git a/collects/mrlib/graph.ss b/collects/mrlib/graph.ss
index da9c747a..5b77c159 100644
--- a/collects/mrlib/graph.ss
+++ b/collects/mrlib/graph.ss
@@ -125,42 +125,37 @@
       (inherit find-first-snip find-next-selected-snip)
 
       (inherit dc-location-to-editor-location get-canvas)
-      (rename [super-on-event on-event])
       (field (currently-overs null))
       (define/override (on-event evt)
         (cond
           [(send evt leaving?)
            (change-currently-overs null)
-           (super-on-event evt)]
+           (super on-event evt)]
           [(or (send evt entering?)
                (send evt moving?))
            (let ([ex (send evt get-x)]
                  [ey (send evt get-y)])
              (let-values ([(x y) (dc-location-to-editor-location ex ey)])
                (change-currently-overs (find-snips-under-mouse x y))))
-           (super-on-event evt)]
+           (super on-event evt)]
           [else 
-           (super-on-event evt)]))
+           (super on-event evt)]))
       
-      (rename [super-on-interactive-move on-interactive-move])
       (define/override (on-interactive-move evt)
         (invalidate-selected-snips)
-        (super-on-interactive-move evt))
+        (super on-interactive-move evt))
       
-      (rename [super-after-interactive-move after-interactive-move])
       (define/override (after-interactive-move evt)
         (invalidate-selected-snips)
-        (super-on-interactive-move evt))
+        (super on-interactive-move evt))
       
-      (rename [super-interactive-adjust-move interactive-adjust-move])
       (define/override (interactive-adjust-move snip x y)
         (invalidate-to-children/parents snip)
-        (super-interactive-adjust-move snip x y))
+        (super interactive-adjust-move snip x y))
       
-      (rename [super-after-insert after-insert])
       (define/override (after-insert snip before x y)
         (invalidate-to-children/parents snip)
-        (super-after-insert snip before x y))
+        (super after-insert snip before x y))
       
       ;; invalidate-selected-snips : -> void
       ;; invalidates the region around the selected
@@ -263,7 +258,6 @@
       ;; on-paint : ... -> void
       ;; see docs, same as super
       ;; draws all of the lines and then draws all of the arrow heads
-      (rename [super-on-paint on-paint])
       (define/override (on-paint before? dc left top right bottom dx dy draw-caret)
         (when before?
           (let ([old-pen (send dc get-pen)]
@@ -274,7 +268,7 @@
             
             (send dc set-pen old-pen)
             (send dc set-brush old-brush)))
-        (super-on-paint before? dc left top right bottom dx dy draw-caret))
+        (super on-paint before? dc left top right bottom dx dy draw-caret))
       
       ;; draw-all-connections : ... boolean -> void
       ;; draws all of the connections between the snips