summaryrefslogtreecommitdiffstats
path: root/generic/tkPack.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-01-21 03:54:41 (GMT)
committerhobbs <hobbs>2000-01-21 03:54:41 (GMT)
commit77936f61de844b8c795063558eda7de3508cdd7b (patch)
treeae734edf048def5a9ec5f3c9eca846a6753fbd01 /generic/tkPack.c
parent45572469ec5bc7b41c213ee56f0a7db17bfc8cb8 (diff)
downloadtk-77936f61de844b8c795063558eda7de3508cdd7b.zip
tk-77936f61de844b8c795063558eda7de3508cdd7b.tar.gz
tk-77936f61de844b8c795063558eda7de3508cdd7b.tar.bz2
* generic/tkInt.h: moved new TkDisplay useInputMethods structure
element to end to not disturb position of previous elements in the structure (as compared to Tk <=8.2). * generic/tkCanvLine.c (LineCoords): fixed segfault when too few coords were passed to a line with certain options set (it should always have thrown an error anyway). [Bug: 4042] * tests/text.test: * generic/tkText.c: fixed missing " in error case and missing 'dump' in subcommand listing [Bug: 4036] * generic/tkListbox.c: adjusted use of basic string concatenation in (non-K&R behavior) [Bug: 4027] Swapped bg/fg class for -select(bg|fg) for listbox and their items [Bug: 4039]
Diffstat (limited to 'generic/tkPack.c')
-rw-r--r--generic/tkPack.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tkPack.c b/generic/tkPack.c
index b5bb7be..b1ac35d 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkPack.c,v 1.4 1999/09/21 06:42:30 hobbs Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.5 2000/01/21 03:54:42 hobbs Exp $
*/
#include "tkPort.h"
@@ -1313,7 +1313,6 @@ PackStructureProc(clientData, eventPtr)
XEvent *eventPtr; /* Describes what just happened. */
{
register Packer *packPtr = (Packer *) clientData;
- TkDisplay *dispPtr;
if (eventPtr->type == ConfigureNotify) {
if ((packPtr->slavePtr != NULL)
@@ -1345,7 +1344,7 @@ PackStructureProc(clientData, eventPtr)
slavePtr->nextPtr = NULL;
}
if (packPtr->tkwin != NULL) {
- dispPtr = ((TkWindow *) packPtr->tkwin)->dispPtr;
+ TkDisplay *dispPtr = ((TkWindow *) packPtr->tkwin)->dispPtr;
Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->packerHashTable,
(char *) packPtr->tkwin));
}