changes to types that match recent push to racket/draw

related to racket/htdp#105

Author: rfindler

typed-racket-more/typed/racket/draw.rkt

@@ -161,6 +161,7 @@
             [-LoadFileKind (Un (-inst (parse-type #'Color%)) (-val #f)) Univ]
             #:backing-scale -Real #f
             #:try-@2x? Univ #f
+            #:get-data-from-file? Univ #f
             (-inst (parse-type #'Bitmap%)))]
  [recorded-datum->procedure
   (-> Univ (-> (-inst (parse-type #'DC<%>)) -Void))]

typed-racket-more/typed/racket/private/gui-types.rkt

@@ -63,24 +63,30 @@
                  (List (U Path-String Input-Port)
                        Any (Option (Instance Color%)) Any
                        Real)
+                 (List (U Path-String Input-Port)
+                       Any (Option (Instance Color%)) Any
+                       Real
+                       Any)
                  (List Bytes Integer Integer)))
    [get-argb-pixels
     (->* [Real Real Exact-Nonnegative-Integer Exact-Nonnegative-Integer Bytes]
          [Any Any #:unscaled? Any]
          Void)]
    [get-backing-scale (-> Positive-Real)]
+   [get-data-from-file (-> (Option (Vector LoadFileKind (Option (Instance Color%)) Bytes)))]
    [get-depth (-> Exact-Nonnegative-Integer)]
    [get-handle (-> Any)]
    [get-height (-> Exact-Positive-Integer)]
    [get-loaded-mask (-> (Option (Instance Bitmap%)))]
    [get-width (-> Exact-Positive-Integer)]
    [has-alpha-channel? (-> Boolean)]
    [is-color? (-> Boolean)]
-   [load-file (case->
-               ((U String Path Input-Port) -> Boolean)
-               ((U String Path Input-Port) LoadFileKind -> Boolean)
-               ((U String Path Input-Port) LoadFileKind (Option (Instance Color%)) -> Boolean)
-               ((U String Path Input-Port) LoadFileKind (Option (Instance Color%)) Any -> Boolean))]
+   [load-file (->* ((U String Path Input-Port))
+                   (LoadFileKind
+                    (Option (Instance Color%))
+                    Any
+                    #:save-data-from-file? Any)
+                   Boolean)]
    [make-dc (-> (Instance Bitmap-DC%))]
    [ok? (-> Boolean)]
    [save-file (case->