From dd79f9bae7b1dd9e25418a2ed69e467bb6c9f91f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 19 Sep 2010 10:51:26 -0600 Subject: [PATCH] clean up unused original commit: 23f0296cb944cbd253ed22fc0beb2ae4f2e04e29 --- collects/mred/mred.rkt | 4 --- collects/mred/private/kernel.rkt | 11 +++++++- collects/mred/private/misc.rkt | 3 +- collects/mred/private/mrmenu.rkt | 4 +-- collects/mred/private/wx/cocoa/platform.rkt | 20 ++----------- collects/mred/private/wx/cocoa/procs.rkt | 26 +++-------------- collects/mred/private/wx/gtk/platform.rkt | 20 ++----------- collects/mred/private/wx/gtk/procs.rkt | 25 +++-------------- collects/mred/private/wx/platform.rkt | 18 ++---------- collects/mred/private/wx/win32/platform.rkt | 20 ++----------- collects/mred/private/wx/win32/procs.rkt | 31 +++------------------ collects/mred/private/wxtextfield.rkt | 2 +- 12 files changed, 34 insertions(+), 150 deletions(-) diff --git a/collects/mred/mred.rkt b/collects/mred/mred.rkt index 65be0c5a..d4113ebf 100644 --- a/collects/mred/mred.rkt +++ b/collects/mred/mred.rkt @@ -42,10 +42,6 @@ "private/dynamic.ss" "private/check.ss") - ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - (wx:set-dialogs get-file put-file get-ps-setup-from-user message-box) - ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; These functions are re-implemented in scheme/gui/base ;; and racket/gui/base to attach those names, instead of diff --git a/collects/mred/private/kernel.rkt b/collects/mred/private/kernel.rkt index 114af2bf..61b01afc 100644 --- a/collects/mred/private/kernel.rkt +++ b/collects/mred/private/kernel.rkt @@ -7,11 +7,15 @@ "wx/common/cursor.rkt" "wx/common/gl-config.rkt" "wx/common/procs.rkt" + "wx/common/handlers.rkt" racket/class racket/draw) (define gl-context<%> (class->interface gl-context%)) +(define (key-symbol-to-integer k) + (error 'key-symbol-to-integer "not yet implemented")) + (provide (all-from-out "wx/platform.rkt") clipboard<%> gl-context<%> @@ -37,4 +41,9 @@ get-top-level-windows begin-busy-cursor is-busy? - end-busy-cursor) + end-busy-cursor + key-symbol-to-integer + application-file-handler + application-quit-handler + application-about-handler + application-pref-handler) diff --git a/collects/mred/private/misc.rkt b/collects/mred/private/misc.rkt index 964b66c7..4bc03500 100644 --- a/collects/mred/private/misc.rkt +++ b/collects/mred/private/misc.rkt @@ -10,7 +10,8 @@ play-sound timer%) - ;; Currently only used for PS print and preview + ;; Formerly used for PS print and preview: + #; (wx:set-executer (let ([orig-err (current-error-port)]) (lambda (prog . args) diff --git a/collects/mred/private/mrmenu.rkt b/collects/mred/private/mrmenu.rkt index 907e4250..6c42f9ff 100644 --- a/collects/mred/private/mrmenu.rkt +++ b/collects/mred/private/mrmenu.rkt @@ -466,6 +466,4 @@ (define (menu-or-bar-parent who p) (unless (or (is-a? p internal-menu<%>) (is-a? p menu-bar%)) - (raise-type-error (constructor-name who) "built-in menu-item-container<%> object" p))) - - (wx:set-menu-tester (lambda (m) (is-a? m popup-menu%)))) + (raise-type-error (constructor-name who) "built-in menu-item-container<%> object" p)))) diff --git a/collects/mred/private/wx/cocoa/platform.rkt b/collects/mred/private/wx/cocoa/platform.rkt index 1160f908..b912d0f3 100644 --- a/collects/mred/private/wx/cocoa/platform.rkt +++ b/collects/mred/private/wx/cocoa/platform.rkt @@ -10,7 +10,6 @@ "frame.rkt" "gauge.rkt" "gl-context.rkt" - "group-box.rkt" "group-panel.rkt" "item.rkt" "list-box.rkt" @@ -22,7 +21,6 @@ "printer-dc.rkt" "radio-box.rkt" "slider.rkt" - "tab-group.rkt" "tab-panel.rkt" "window.rkt" "procs.rkt") @@ -40,7 +38,6 @@ frame% gauge% gl-context% - group-box% group-panel% item% list-box% @@ -52,7 +49,6 @@ printer-dc% radio-box% slider% - tab-group% tab-panel% window% can-show-print-setup? @@ -72,34 +68,22 @@ fill-private-color cancel-quit get-control-font-size - key-symbol-to-integer - draw-tab-base - draw-tab - set-combo-box-font get-double-click-time run-printout file-creator-and-type send-event - set-executer - set-dialogs location->window - set-menu-tester - in-atomic-region shortcut-visible-in-label? unregister-collecting-blit register-collecting-blit find-graphical-system-path - check-for-break play-sound get-panel-background get-font-from-user get-color-from-user - application-pref-handler - application-about-handler - application-quit-handler - application-file-handler special-option-key special-control-key get-highlight-background-color get-highlight-text-color - make-screen-bitmap)) + make-screen-bitmap + check-for-break)) diff --git a/collects/mred/private/wx/cocoa/procs.rkt b/collects/mred/private/wx/cocoa/procs.rkt index 4f8a8f5c..c25e3801 100644 --- a/collects/mred/private/wx/cocoa/procs.rkt +++ b/collects/mred/private/wx/cocoa/procs.rkt @@ -24,23 +24,14 @@ get-font-from-user get-panel-background play-sound - check-for-break find-graphical-system-path register-collecting-blit unregister-collecting-blit shortcut-visible-in-label? - in-atomic-region - set-menu-tester - set-dialogs - set-executer send-event file-creator-and-type run-printout get-double-click-time - set-combo-box-font - draw-tab - draw-tab-base - key-symbol-to-integer get-control-font-size cancel-quit fill-private-color @@ -61,7 +52,8 @@ can-show-print-setup? get-highlight-background-color get-highlight-text-color - make-screen-bitmap) + make-screen-bitmap + check-for-break) (import-class NSScreen NSCursor) @@ -70,36 +62,26 @@ (define-unimplemented get-font-from-user) (define (get-panel-background) (make-object color% "gray")) (define-unimplemented play-sound) -(define-unimplemented check-for-break) (define-unimplemented find-graphical-system-path) (define (register-collecting-blit canvas x y w h on off on-x on-y off-x off-y) (send canvas register-collecting-blit x y w h on off on-x on-y off-x off-y)) (define (unregister-collecting-blit canvas) (send canvas unregister-collecting-blits)) (define (shortcut-visible-in-label? [x #f]) #f) -(define-unimplemented in-atomic-region) -(define (set-menu-tester proc) - (void)) -(define (set-dialogs . args) - (void)) -(define (set-executer proc) - (void)) (define-unimplemented send-event) (define (begin-refresh-sequence) (void)) (define (end-refresh-sequence) (void)) (define-unimplemented run-printout) (define (get-double-click-time) 500) -(define (set-combo-box-font f) (void)) -(define-unimplemented draw-tab) -(define-unimplemented draw-tab-base) -(define-unimplemented key-symbol-to-integer) (define (get-control-font-size) 13) (define (cancel-quit) (void)) (define-unimplemented fill-private-color) (define-unimplemented write-resource) (define-unimplemented get-resource) +(define (check-for-break) #f) + (define (display-origin xb yb all?) (set-box! xb 0) (if all? diff --git a/collects/mred/private/wx/gtk/platform.rkt b/collects/mred/private/wx/gtk/platform.rkt index f20c1811..ae282dda 100644 --- a/collects/mred/private/wx/gtk/platform.rkt +++ b/collects/mred/private/wx/gtk/platform.rkt @@ -10,7 +10,6 @@ "frame.rkt" "gauge.rkt" "gl-context.rkt" - "group-box.rkt" "group-panel.rkt" "item.rkt" "list-box.rkt" @@ -22,7 +21,6 @@ "printer-dc.rkt" "radio-box.rkt" "slider.rkt" - "tab-group.rkt" "tab-panel.rkt" "window.rkt" "procs.rkt") @@ -40,7 +38,6 @@ frame% gauge% gl-context% - group-box% group-panel% item% list-box% @@ -52,7 +49,6 @@ printer-dc% radio-box% slider% - tab-group% tab-panel% window% can-show-print-setup? @@ -72,34 +68,22 @@ fill-private-color cancel-quit get-control-font-size - key-symbol-to-integer - draw-tab-base - draw-tab - set-combo-box-font get-double-click-time run-printout file-creator-and-type send-event - set-executer - set-dialogs location->window - set-menu-tester - in-atomic-region shortcut-visible-in-label? unregister-collecting-blit register-collecting-blit find-graphical-system-path - check-for-break play-sound get-panel-background get-font-from-user get-color-from-user - application-pref-handler - application-about-handler - application-quit-handler - application-file-handler special-option-key special-control-key get-highlight-background-color get-highlight-text-color - make-screen-bitmap)) + make-screen-bitmap + check-for-break)) diff --git a/collects/mred/private/wx/gtk/procs.rkt b/collects/mred/private/wx/gtk/procs.rkt index 99cfbf55..8455301b 100644 --- a/collects/mred/private/wx/gtk/procs.rkt +++ b/collects/mred/private/wx/gtk/procs.rkt @@ -16,31 +16,19 @@ (provide special-control-key special-option-key - application-file-handler - application-quit-handler - application-about-handler - application-pref-handler get-color-from-user get-font-from-user get-panel-background play-sound - check-for-break find-graphical-system-path register-collecting-blit unregister-collecting-blit shortcut-visible-in-label? - in-atomic-region - set-menu-tester location->window - set-dialogs - set-executer send-event file-creator-and-type run-printout get-double-click-time - set-combo-box-font - draw-tab - draw-tab-base key-symbol-to-integer get-control-font-size cancel-quit @@ -62,7 +50,8 @@ can-show-print-setup? get-highlight-background-color get-highlight-text-color - make-screen-bitmap) + make-screen-bitmap + check-for-break) (define-unimplemented special-control-key) (define (special-option-key on?) (void)) @@ -70,18 +59,13 @@ (define-unimplemented get-font-from-user) (define (get-panel-background) (make-object color% "gray")) (define-unimplemented play-sound) -(define-unimplemented check-for-break) (define-unimplemented find-graphical-system-path) (define (register-collecting-blit canvas x y w h on off on-x on-y off-x off-y) (send canvas register-collecting-blit x y w h on off on-x on-y off-x off-y)) (define (unregister-collecting-blit canvas) (send canvas unregister-collecting-blits)) (define (shortcut-visible-in-label? [mbar? #f]) #t) -(define-unimplemented in-atomic-region) -(define (set-menu-tester proc) (void)) (define-unimplemented location->window) -(define (set-dialogs . args) (void)) -(define (set-executer e) (void)) (define-unimplemented send-event) (define file-creator-and-type (case-lambda @@ -89,9 +73,6 @@ [(path) (values #"????" #"????")])) (define-unimplemented run-printout) (define (get-double-click-time) 250) -(define (set-combo-box-font f) (void)) -(define-unimplemented draw-tab) -(define-unimplemented draw-tab-base) (define-unimplemented key-symbol-to-integer) (define (get-control-font-size) 10) ;; FIXME (define-unimplemented cancel-quit) @@ -140,3 +121,5 @@ (if (eq? 'unix (system-type)) (make-object x11-bitmap% w h #f) (make-object bitmap% w h #f #t))) + +(define (check-for-break) #f) diff --git a/collects/mred/private/wx/platform.rkt b/collects/mred/private/wx/platform.rkt index 53f1e0f0..2507a56f 100644 --- a/collects/mred/private/wx/platform.rkt +++ b/collects/mred/private/wx/platform.rkt @@ -18,7 +18,6 @@ frame% gauge% gl-context% - group-box% group-panel% item% list-box% @@ -30,7 +29,6 @@ printer-dc% radio-box% slider% - tab-group% tab-panel% window% can-show-print-setup? @@ -50,35 +48,23 @@ fill-private-color cancel-quit get-control-font-size - key-symbol-to-integer - draw-tab-base - draw-tab - set-combo-box-font get-double-click-time run-printout file-creator-and-type send-event - set-executer - set-dialogs location->window - set-menu-tester - in-atomic-region shortcut-visible-in-label? unregister-collecting-blit register-collecting-blit find-graphical-system-path - check-for-break play-sound get-panel-background get-font-from-user get-color-from-user - application-pref-handler - application-about-handler - application-quit-handler - application-file-handler special-option-key special-control-key get-highlight-background-color get-highlight-text-color - make-screen-bitmap) + make-screen-bitmap + check-for-break) ((dynamic-require platform-lib 'platform-values))) diff --git a/collects/mred/private/wx/win32/platform.rkt b/collects/mred/private/wx/win32/platform.rkt index 94abbf66..0e8ec5c9 100644 --- a/collects/mred/private/wx/win32/platform.rkt +++ b/collects/mred/private/wx/win32/platform.rkt @@ -9,7 +9,6 @@ "frame.rkt" "gauge.rkt" "gl-context.rkt" - "group-box.rkt" "group-panel.rkt" "item.rkt" "list-box.rkt" @@ -21,7 +20,6 @@ "printer-dc.rkt" "radio-box.rkt" "slider.rkt" - "tab-group.rkt" "tab-panel.rkt" "window.rkt" "procs.rkt") @@ -39,7 +37,6 @@ frame% gauge% gl-context% - group-box% group-panel% item% list-box% @@ -51,7 +48,6 @@ printer-dc% radio-box% slider% - tab-group% tab-panel% window% can-show-print-setup? @@ -71,34 +67,22 @@ fill-private-color cancel-quit get-control-font-size - key-symbol-to-integer - draw-tab-base - draw-tab - set-combo-box-font get-double-click-time run-printout file-creator-and-type send-event - set-executer - set-dialogs location->window - set-menu-tester - in-atomic-region shortcut-visible-in-label? unregister-collecting-blit register-collecting-blit find-graphical-system-path - check-for-break play-sound get-panel-background get-font-from-user get-color-from-user - application-pref-handler - application-about-handler - application-quit-handler - application-file-handler special-option-key special-control-key get-highlight-background-color get-highlight-text-color - make-screen-bitmap)) + make-screen-bitmap + check-for-break)) diff --git a/collects/mred/private/wx/win32/procs.rkt b/collects/mred/private/wx/win32/procs.rkt index ecb0535c..26ba0e07 100644 --- a/collects/mred/private/wx/win32/procs.rkt +++ b/collects/mred/private/wx/win32/procs.rkt @@ -4,32 +4,19 @@ (provide special-control-key special-option-key - application-file-handler - application-quit-handler - application-about-handler - application-pref-handler get-color-from-user get-font-from-user get-panel-background play-sound - check-for-break find-graphical-system-path register-collecting-blit unregister-collecting-blit shortcut-visible-in-label? - in-atomic-region - set-menu-tester location->window - set-dialogs - set-executer send-event file-creator-and-type run-printout get-double-click-time - set-combo-box-font - draw-tab - draw-tab-base - key-symbol-to-integer get-control-font-size cancel-quit fill-private-color @@ -50,36 +37,24 @@ can-show-print-setup? get-highlight-background-color get-highlight-text-color - make-screen-bitmap) + make-screen-bitmap + check-for-break) (define-unimplemented special-control-key) (define-unimplemented special-option-key) -(define-unimplemented application-file-handler) -(define-unimplemented application-quit-handler) -(define-unimplemented application-about-handler) -(define-unimplemented application-pref-handler) (define-unimplemented get-color-from-user) (define-unimplemented get-font-from-user) (define-unimplemented get-panel-background) (define-unimplemented play-sound) -(define-unimplemented check-for-break) (define-unimplemented find-graphical-system-path) (define-unimplemented register-collecting-blit) (define-unimplemented unregister-collecting-blit) (define-unimplemented shortcut-visible-in-label?) -(define-unimplemented in-atomic-region) -(define-unimplemented set-menu-tester) (define-unimplemented location->window) -(define-unimplemented set-dialogs) -(define-unimplemented set-executer) (define-unimplemented send-event) (define-unimplemented file-creator-and-type) (define-unimplemented run-printout) (define-unimplemented get-double-click-time) -(define-unimplemented set-combo-box-font) -(define-unimplemented draw-tab) -(define-unimplemented draw-tab-base) -(define-unimplemented key-symbol-to-integer) (define-unimplemented get-control-font-size) (define-unimplemented cancel-quit) (define-unimplemented fill-private-color) @@ -104,3 +79,5 @@ (define-unimplemented get-highlight-background-color) (define-unimplemented get-highlight-text-color) (define-unimplemented make-screen-bitmap) + +(define (check-for-break) #f) diff --git a/collects/mred/private/wxtextfield.rkt b/collects/mred/private/wxtextfield.rkt index f958b5a7..d7a618d7 100644 --- a/collects/mred/private/wxtextfield.rkt +++ b/collects/mred/private/wxtextfield.rkt @@ -160,7 +160,7 @@ (unless horiz? (send p alignment 'left 'top)) (unless multi? (stretchable-in-y #f)) ;; For Windows: - (wx:set-combo-box-font font) + ; (wx:set-combo-box-font font) (spacing 3)) (private-field [l (and label