diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2003-01-22 14:32:59 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2003-01-22 14:32:59 (GMT) |
| commit | 52da74a40ec7d58b961beb5f30fa40976bd71587 (patch) | |
| tree | d36caa6a34005845deeb4fa8eb884defa7bafe80 /generic/tkIntDecls.h | |
| parent | b2bfe80a4f86bf9cd9235f5cd97e3de7181ec0e9 (diff) | |
| download | tk-52da74a40ec7d58b961beb5f30fa40976bd71587.zip tk-52da74a40ec7d58b961beb5f30fa40976bd71587.tar.gz tk-52da74a40ec7d58b961beb5f30fa40976bd71587.tar.bz2 | |
* generic/tkImage.c (Tk_ImageObjCmd): Added check to make sure
that you're not creating an image named the same as .'s command,
which refixes 220891, even when the name of the command has been
changed with 'rename'. The error message is better too.
* generic/tkFrame.c (TkToplevelWindowForCommand): Added way of
mapping from command names to tkwins-for-toplevels.
* tests/image.test (image-1.10,image-1.11): Updated to match new
error message and added test for the rename case.
* generic/tclInt.decls: Made TkToplevelWindowForCommand exported
privately.
Diffstat (limited to 'generic/tkIntDecls.h')
| -rw-r--r-- | generic/tkIntDecls.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 88ca960..d50dab4 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkIntDecls.h,v 1.21 2002/08/31 06:12:20 das Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.22 2003/01/22 14:33:00 dkf Exp $ */ #ifndef _TKINTDECLS @@ -556,6 +556,9 @@ EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, EXTERN void TkStylePkgInit _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 147 */ EXTERN void TkStylePkgFree _ANSI_ARGS_((TkMainInfo * mainPtr)); +/* 148 */ +EXTERN Tk_Window TkToplevelWindowForCommand _ANSI_ARGS_(( + Tcl_Interp * interp, CONST char * cmdName)); typedef struct TkIntStubs { int magic; @@ -830,6 +833,7 @@ typedef struct TkIntStubs { #endif /* MAC_OSX_TK */ void (*tkStylePkgInit) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 146 */ void (*tkStylePkgFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 147 */ + Tk_Window (*tkToplevelWindowForCommand) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * cmdName)); /* 148 */ } TkIntStubs; #ifdef __cplusplus @@ -1535,6 +1539,10 @@ extern TkIntStubs *tkIntStubsPtr; #define TkStylePkgFree \ (tkIntStubsPtr->tkStylePkgFree) /* 147 */ #endif +#ifndef TkToplevelWindowForCommand +#define TkToplevelWindowForCommand \ + (tkIntStubsPtr->tkToplevelWindowForCommand) /* 148 */ +#endif #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ |