diff --git a/collects/scribblings/gui/canvas-class.scrbl b/collects/scribblings/gui/canvas-class.scrbl index e64cfb9645..1c05ac8df4 100644 --- a/collects/scribblings/gui/canvas-class.scrbl +++ b/collects/scribblings/gui/canvas-class.scrbl @@ -111,7 +111,7 @@ When tab-focus is enabled for a canvas, Tab, arrow, and Enter keyboard @defmethod[(get-scroll-page [which (one-of/c 'horizontal 'vertical)]) - (integer-in 1 10000)]{ + (integer-in 1 1000000000)]{ Get the current page step size of a manual scrollbar. The result is @scheme[0] if the scrollbar is not active or it is automatic. @@ -126,7 +126,7 @@ See also @defmethod[(get-scroll-pos [which (one-of/c 'horizontal 'vertical)]) - (integer-in 0 10000)]{ + (integer-in 0 1000000000)]{ Gets the current value of a manual scrollbar. The result is always @scheme[0] if the scrollbar is not active or it is automatic. @@ -141,7 +141,7 @@ See also @defmethod[(get-scroll-range [which (one-of/c 'horizontal 'vertical)]) - (integer-in 0 10000)]{ + (integer-in 0 1000000000)]{ Gets the current maximum value of a manual scrollbar. The result is always @scheme[0] if the scrollbar is not active or it is automatic. @@ -183,8 +183,8 @@ Gets the size in device units of the scrollable canvas area (as } -@defmethod[(init-auto-scrollbars [horiz-pixels (or/c (integer-in 1 10000) false/c)] - [vert-pixels (or/c (integer-in 1 10000) false/c)] +@defmethod[(init-auto-scrollbars [horiz-pixels (or/c (integer-in 1 1000000000) false/c)] + [vert-pixels (or/c (integer-in 1 1000000000) false/c)] [h-value (real-in 0.0 1.0)] [v-value (real-in 0.0 1.0)]) void?]{ @@ -222,12 +222,12 @@ See also } -@defmethod[(init-manual-scrollbars [h-length (or/c (integer-in 0 10000) false/c)] - [v-length (or/c (integer-in 0 10000) false/c)] - [h-page (integer-in 1 10000)] - [v-page (integer-in 1 10000)] - [h-value (integer-in 0 10000)] - [v-value (integer-in 0 10000)]) +@defmethod[(init-manual-scrollbars [h-length (or/c (integer-in 0 1000000000) false/c)] + [v-length (or/c (integer-in 0 1000000000) false/c)] + [h-page (integer-in 1 1000000000)] + [v-page (integer-in 1 1000000000)] + [h-value (integer-in 0 1000000000)] + [v-value (integer-in 0 1000000000)]) void?]{ Enables and initializes manual scrollbars for the canvas. A @@ -319,7 +319,7 @@ See also @defmethod[(set-scroll-page [which (one-of/c 'horizontal 'vertical)] - [value (integer-in 1 10000)]) + [value (integer-in 1 1000000000)]) void?]{ Set the current page step size of a manual scrollbar. (This method has @@ -336,7 +336,7 @@ See also @defmethod[(set-scroll-pos [which (one-of/c 'horizontal 'vertical)] - [value (integer-in 0 10000)]) + [value (integer-in 0 1000000000)]) void?]{ Sets the current value of a manual scrollbar. (This method has no @@ -356,7 +356,7 @@ See also @defmethod[(set-scroll-range [which (one-of/c 'horizontal 'vertical)] - [value (integer-in 0 10000)]) + [value (integer-in 0 1000000000)]) void?]{ Sets the current maximum value of a manual scrollbar. (This method has diff --git a/collects/scribblings/reference/read.scrbl b/collects/scribblings/reference/read.scrbl index 28631f41bf..ed8ef1c56e 100644 --- a/collects/scribblings/reference/read.scrbl +++ b/collects/scribblings/reference/read.scrbl @@ -29,7 +29,7 @@ See @secref["reader"] for information on the default reader in @defproc[(read/recursive [in input-port? (current-input-port)] [start (or/c char? #f) #f] [readtable (or/c readtable? #f) (current-readtable)] - [graph? any/c #f]) + [graph? any/c #t]) any]{ Similar to calling @scheme[read], but normally used during the dynamic @@ -77,7 +77,7 @@ See @secref["readtables"] for an extended example that uses [in input-port? (current-input-port)] [start (or/c char? #f) #f] [readtable (or/c readtable? #f) (current-readtable)] - [graph? any/c #f]) + [graph? any/c #t]) any]{ Analogous to calling @scheme[read/recursive], but the resulting value @@ -317,7 +317,7 @@ Like @scheme[read-syntax], but for Honu mode (see @defproc[(read-honu/recursive [in input-port? (current-input-port)] [start (or/c char? #f) #f] [readtable (or/c readtable? #f) (current-readtable)] - [graph? any/c #f]) + [graph? any/c #t]) any]{ Like @scheme[read/recursive], but for Honu mode (see diff --git a/src/mred/wxs/wxs_cnvs.cxx b/src/mred/wxs/wxs_cnvs.cxx index ceb6de052a..7011405390 100644 --- a/src/mred/wxs/wxs_cnvs.cxx +++ b/src/mred/wxs/wxs_cnvs.cxx @@ -874,7 +874,7 @@ static Scheme_Object *os_wxCanvasSetScrollPage(int n, Scheme_Object *p[]) x0 = WITH_VAR_STACK(unbundle_symset_orientation(p[POFFSET+0], "set-scroll-page in canvas%")); - x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 1, 10000, "set-scroll-page in canvas%")); + x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 1, 1000000000, "set-scroll-page in canvas%")); WITH_VAR_STACK(((wxCanvas *)((Scheme_Class_Object *)p[0])->primdata)->SetScrollPage(x0, x1)); @@ -898,7 +898,7 @@ static Scheme_Object *os_wxCanvasSetScrollRange(int n, Scheme_Object *p[]) x0 = WITH_VAR_STACK(unbundle_symset_orientation(p[POFFSET+0], "set-scroll-range in canvas%")); - x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 0, 10000, "set-scroll-range in canvas%")); + x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 0, 1000000000, "set-scroll-range in canvas%")); WITH_VAR_STACK(((wxCanvas *)((Scheme_Class_Object *)p[0])->primdata)->SetScrollRange(x0, x1)); @@ -922,7 +922,7 @@ static Scheme_Object *os_wxCanvasSetScrollPos(int n, Scheme_Object *p[]) x0 = WITH_VAR_STACK(unbundle_symset_orientation(p[POFFSET+0], "set-scroll-pos in canvas%")); - x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 0, 10000, "set-scroll-pos in canvas%")); + x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 0, 1000000000, "set-scroll-pos in canvas%")); WITH_VAR_STACK(((wxCanvas *)((Scheme_Class_Object *)p[0])->primdata)->SetScrollPos(x0, x1)); @@ -1146,18 +1146,18 @@ static Scheme_Object *os_wxCanvasSetScrollbars(int n, Scheme_Object *p[]) VAR_STACK_PUSH(0, p); - x0 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+0], 0, 10000, "set-scrollbars in canvas%")); - x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 0, 10000, "set-scrollbars in canvas%")); - x2 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+2], 0, 10000, "set-scrollbars in canvas%")); - x3 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+3], 0, 10000, "set-scrollbars in canvas%")); - x4 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+4], 1, 10000, "set-scrollbars in canvas%")); - x5 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+5], 1, 10000, "set-scrollbars in canvas%")); + x0 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+0], 0, 1000000000, "set-scrollbars in canvas%")); + x1 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+1], 0, 1000000000, "set-scrollbars in canvas%")); + x2 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+2], 0, 1000000000, "set-scrollbars in canvas%")); + x3 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+3], 0, 1000000000, "set-scrollbars in canvas%")); + x4 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+4], 1, 1000000000, "set-scrollbars in canvas%")); + x5 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+5], 1, 1000000000, "set-scrollbars in canvas%")); if (n > (POFFSET+6)) { - x6 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+6], 0, 10000, "set-scrollbars in canvas%")); + x6 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+6], 0, 1000000000, "set-scrollbars in canvas%")); } else x6 = 0; if (n > (POFFSET+7)) { - x7 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+7], 0, 10000, "set-scrollbars in canvas%")); + x7 = WITH_VAR_STACK(objscheme_unbundle_integer_in(p[POFFSET+7], 0, 1000000000, "set-scrollbars in canvas%")); } else x7 = 0; if (n > (POFFSET+8)) { diff --git a/src/mred/wxs/wxs_cnvs.xc b/src/mred/wxs/wxs_cnvs.xc index c82e6b5dd6..4b2e29e6e2 100644 --- a/src/mred/wxs/wxs_cnvs.xc +++ b/src/mred/wxs/wxs_cnvs.xc @@ -80,7 +80,7 @@ static void wxSetResizeCorner(wxCanvas *c, Bool v) // @ "get-scroll-units" : void GetScrollUnitsPerPage(int*,int*); : : / PANELREDIRECT[ FillZero(x0,x1); READY_TO_RETURN; return scheme_void] @ "get-virtual-size" : void GetVirtualSize(int*,int*); : : / PANELREDIRECT[FillZero(x0,x1); READY_TO_RETURN; return scheme_void] -@ "set-scrollbars" : void SetScrollbars(rint[0|10000],rint[0|10000],rint[0|10000],rint[0|10000],rint[1|10000],rint[1|10000],rint[0|10000]=0,rint[0|10000]=0,bool=TRUE); : : / PANELREDIRECT[READY_TO_RETURN; return scheme_void] +@ "set-scrollbars" : void SetScrollbars(rint[0|1000000000],rint[0|1000000000],rint[0|1000000000],rint[0|1000000000],rint[1|1000000000],rint[1|1000000000],rint[0|1000000000]=0,rint[0|1000000000]=0,bool=TRUE); : : / PANELREDIRECT[READY_TO_RETURN; return scheme_void] @ "show-scrollbars" : void EnableScrolling(bool,bool) @ m "set-resize-corner" : void wxSetResizeCorner(bool) @ "view-start" : void ViewStart(int*,int*); : : / PANELREDIRECT[FillZero(x0,x1); READY_TO_RETURN; return scheme_void] @@ -91,9 +91,9 @@ static void wxSetResizeCorner(wxCanvas *c, Bool v) @ "get-scroll-range" : int GetScrollRange(SYM[orientation]); @ "get-scroll-page" : int GetScrollPage(SYM[orientation]); -@ "set-scroll-pos" : void SetScrollPos(SYM[orientation], rint[0|10000]); -@ "set-scroll-range" : void SetScrollRange(SYM[orientation], rint[0|10000]); -@ "set-scroll-page" : void SetScrollPage(SYM[orientation], rint[1|10000]); +@ "set-scroll-pos" : void SetScrollPos(SYM[orientation], rint[0|1000000000]); +@ "set-scroll-range" : void SetScrollRange(SYM[orientation], rint[0|1000000000]); +@ "set-scroll-page" : void SetScrollPage(SYM[orientation], rint[1|1000000000]); @ v "on-scroll" : void OnScroll(wxScrollEvent!); : JMPDECL/SETJMP/RESETJMP : / PANELREDIRECT[READY_TO_RETURN; return scheme_void]