diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 20:41:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-12 20:41:40 (GMT) |
| commit | 0a059e0ac765f91e397cbf13a617b6ffe6b1c02a (patch) | |
| tree | 5fd570527bd745435c774b5b7745a11bf516d6a0 /generic | |
| parent | c748766c59dabb2bec19ab6e3a9f3b3b66975a9b (diff) | |
| parent | f2067061a65c27001d806ced018ed3d2a34a35de (diff) | |
| download | tk-0a059e0ac765f91e397cbf13a617b6ffe6b1c02a.zip tk-0a059e0ac765f91e397cbf13a617b6ffe6b1c02a.tar.gz tk-0a059e0ac765f91e397cbf13a617b6ffe6b1c02a.tar.bz2 | |
minor clean-up of tkInt.decls
disallow colors like xellow
configure changes for cygwin
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.decls | 2 | ||||
| -rw-r--r-- | generic/tkMain.c | 2 |
2 files changed, 1 insertions, 3 deletions
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 |