diff options
| -rw-r--r-- | generic/tkConsole.c | 6 | ||||
| -rw-r--r-- | generic/tkTextBTree.c | 2 | ||||
| -rw-r--r-- | library/console.tcl | 2 | ||||
| -rw-r--r-- | library/listbox.tcl | 2 | ||||
| -rw-r--r-- | library/text.tcl | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 8bfbe9b..a6a8cbf 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -318,7 +318,7 @@ Tk_InitConsoleChannels( * Tk_CreateConsoleWindow -- * * Initialize the console. This code actually creates a new application - * and associated interpreter. This effectivly hides the implementation + * and associated interpreter. This effectively hides the implementation * from the main application. * * Results: @@ -344,9 +344,13 @@ Tk_CreateConsoleWindow( /* Init an interp with Tcl and Tk */ Tcl_Interp *consoleInterp = Tcl_CreateInterp(); if (Tcl_Init(consoleInterp) != TCL_OK) { + Tcl_Obj *result_obj = Tcl_GetObjResult(consoleInterp); + Tcl_SetObjResult(interp, result_obj); goto error; } if (Tk_Init(consoleInterp) != TCL_OK) { + Tcl_Obj *result_obj = Tcl_GetObjResult(consoleInterp); + Tcl_SetObjResult(interp, result_obj); goto error; } diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index c20c546..81e31dc 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -799,6 +799,7 @@ RemovePixelClient( nodePtr->numPixels[treePtr->pixelReferences-1]; } if (treePtr->pixelReferences == 1) { + ckfree(nodePtr->numPixels); nodePtr->numPixels = NULL; } else { nodePtr->numPixels = ckrealloc(nodePtr->numPixels, @@ -1439,6 +1440,7 @@ TkBTreeDeleteIndexRange( prevNodePtr->nextPtr = curNodePtr->nextPtr; } parentPtr->numChildren--; + DeleteSummaries(curNodePtr->summaryPtr); ckfree(curNodePtr->numPixels); ckfree(curNodePtr); curNodePtr = parentPtr; diff --git a/library/console.tcl b/library/console.tcl index ba68ccc..355a43b 100644 --- a/library/console.tcl +++ b/library/console.tcl @@ -286,6 +286,7 @@ proc ::tk::ConsoleHistory {cmd} { } .console delete promptEnd end .console insert promptEnd $cmd {input stdin} + .console see end } next { incr HistNum @@ -302,6 +303,7 @@ proc ::tk::ConsoleHistory {cmd} { } .console delete promptEnd end .console insert promptEnd $cmd {input stdin} + .console see end } reset { set HistNum 1 diff --git a/library/listbox.tcl b/library/listbox.tcl index 17c03c0..1b35b3d 100644 --- a/library/listbox.tcl +++ b/library/listbox.tcl @@ -206,7 +206,7 @@ if {"x11" eq [tk windowingsystem]} { # Support for mousewheels on Linux/Unix commonly comes through mapping # the wheel to the extended buttons. If you have a mousewheel, find # Linux configuration info at: - # http://www.inria.fr/koala/colas/mouse-wheel-scroll/ + # http://linuxreviews.org/howtos/xfree/mouse/ bind Listbox <4> { if {!$tk_strictMotif} { %W yview scroll -5 units diff --git a/library/text.tcl b/library/text.tcl index 2bf1b2b..9eb6e31 100644 --- a/library/text.tcl +++ b/library/text.tcl @@ -463,7 +463,7 @@ if {"x11" eq [tk windowingsystem]} { # Support for mousewheels on Linux/Unix commonly comes through mapping # the wheel to the extended buttons. If you have a mousewheel, find # Linux configuration info at: - # http://www.inria.fr/koala/colas/mouse-wheel-scroll/ + # http://linuxreviews.org/howtos/xfree/mouse/ bind Text <4> { if {!$tk_strictMotif} { %W yview scroll -50 pixels |