diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 21:04:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 21:04:47 (GMT) |
| commit | 6543fa41fa55392ee287df3d24888f2662bb7b8d (patch) | |
| tree | 063bedd2c23caf56c700b120451a3e5f80fe1def /generic | |
| parent | 344dce41c2bb55fa7708a2257500ab98ef51829e (diff) | |
| parent | 2b6251c4c824d5477da8fa35609508dde84084f7 (diff) | |
| download | tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.zip tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.tar.gz tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.decls | 8 | ||||
| -rw-r--r-- | generic/tkBind.c | 2 | ||||
| -rw-r--r-- | generic/tkColor.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.decls | 2 | ||||
| -rw-r--r-- | generic/tkMain.c | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/generic/tk.decls b/generic/tk.decls index f37be47..2671421 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -746,7 +746,6 @@ declare 194 { declare 195 { void Tk_FreeConfigOptions(char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) - } declare 196 { void Tk_FreeSavedOptions(Tk_SavedOptions *savePtr) @@ -828,15 +827,12 @@ declare 216 { declare 217 { void Tk_CreateSmoothMethod(Tcl_Interp *interp, const Tk_SmoothMethod *method) } - #declare 218 { # void Tk_CreateCanvasVisitor(Tcl_Interp *interp, void *typePtr) #} - #declare 219 { # void *Tk_GetCanvasVisitor(Tcl_Interp *interp, const char *name) #} - declare 220 { int Tk_GetDash(Tcl_Interp *interp, const char *value, Tk_Dash *dash) } @@ -1167,3 +1163,7 @@ export { const char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, const char *version, int exact) } + +# Local Variables: +# mode: tcl +# End: diff --git a/generic/tkBind.c b/generic/tkBind.c index 53a2046..6841f1e 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -2147,7 +2147,7 @@ ExpandPercents( } goto doNumber; case 'A': - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) { Tcl_DStringFree(&buf); string = TkpGetString(winPtr, eventPtr, &buf); } diff --git a/generic/tkColor.c b/generic/tkColor.c index c538365..f1258f5 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.c @@ -868,8 +868,8 @@ TkParseColor( const char *name, /* String to be parsed */ XColor *color) { + char buf[14]; if (*name == '#') { - char buf[14]; buf[0] = '#'; buf[13] = '\0'; if (!*(++name) || !*(++name) || !*(++name)) { /* Not at least 3 hex digits, so invalid */ diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 113d5d6..2f58dde 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -305,7 +305,6 @@ declare 83 { # void TkSetClassProcs(Tk_Window tkwin, # TkClassProcs *procs, ClientData instanceData) #} - declare 85 { void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin, const char *oldMenuName, const char *menuName) @@ -1037,7 +1036,6 @@ declare 9 win { declare 10 win { XHostAddress *XListHosts(Display *d, int *i, Bool *b) } - # second parameter was of type KeyCode declare 11 win { KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i) diff --git a/generic/tkMain.c b/generic/tkMain.c index fee669e..a48ddd4 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -187,7 +187,7 @@ Tk_MainEx( is.gotPartial = 0; Tcl_Preserve(interp); -#if defined(__WIN32__) +#if defined(__WIN32__) && !defined(__CYGWIN__) Tk_InitConsoleChannels(interp); #endif |