diff options
| author | ericm <ericm> | 2000-09-07 00:28:38 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-09-07 00:28:38 (GMT) |
| commit | afa5142dc2d0c3a33bd4b391b000c152c2576337 (patch) | |
| tree | 91c6cac39950aa1f64d9c29ffd03feecbc42da20 | |
| parent | 35bef08e556a55ceea7225fb321da5395f1e3afa (diff) | |
| download | tk-afa5142dc2d0c3a33bd4b391b000c152c2576337.zip tk-afa5142dc2d0c3a33bd4b391b000c152c2576337.tar.gz tk-afa5142dc2d0c3a33bd4b391b000c152c2576337.tar.bz2 | |
* doc/HWNDToWindow.3:
* doc/GetHWND.3: Changed synopsis to indicate the tkPlatDecls.h
should be included, not tk.h.
* generic/tkPlatDecls.h: Removed #include <windows.h> for Windows,
a better solution for now is to update the docs and have extension
authors #include <tkPlatDecls.h>.
* generic/tk.h: Removed '#include "tkPlatDecls.h"', as the
incorrect inclusion order between windows.h/tkPlatDecls.h causes
build conflicts on Windows.
* generic/tkPlatDecls.h: Added #include <windows.h> for Windows,
so that HWND, etc., are defined properly.
| -rw-r--r-- | doc/GetHWND.3 | 4 | ||||
| -rw-r--r-- | doc/HWNDToWindow.3 | 4 | ||||
| -rw-r--r-- | generic/tk.h | 8 | ||||
| -rw-r--r-- | generic/tkPlatDecls.h | 8 |
4 files changed, 6 insertions, 18 deletions
diff --git a/doc/GetHWND.3 b/doc/GetHWND.3 index 696f53f..b512578 100644 --- a/doc/GetHWND.3 +++ b/doc/GetHWND.3 @@ -2,7 +2,7 @@ '\" Copyright (c) 1998-2000 by Scriptics Corporation. '\" All rights reserved. '\" -'\" RCS: @(#) $Id: GetHWND.3,v 1.1 2000/04/24 19:47:26 ericm Exp $ +'\" RCS: @(#) $Id: GetHWND.3,v 1.2 2000/09/07 00:28:38 ericm Exp $ '\" '\" .so man.macros @@ -12,7 +12,7 @@ Tk_GetHWND \- retrieve the Windows handle for an X window .SH SYNOPSIS .nf -\fB#include <tk.h>\fR +\fB#include <tkPlatDecls.h>\fR .sp HWND \fBTk_GetHWND\fR(\fIwindow\fR) diff --git a/doc/HWNDToWindow.3 b/doc/HWNDToWindow.3 index 7e47c90..0aab1ed 100644 --- a/doc/HWNDToWindow.3 +++ b/doc/HWNDToWindow.3 @@ -2,7 +2,7 @@ '\" Copyright (c) 1998-2000 by Scriptics Corporation. '\" All rights reserved. '\" -'\" RCS: @(#) $Id: HWNDToWindow.3,v 1.1 2000/04/24 19:11:10 ericm Exp $ +'\" RCS: @(#) $Id: HWNDToWindow.3,v 1.2 2000/09/07 00:28:38 ericm Exp $ '\" .so man.macros .TH Tk_HWNDToWindow 3 "" Tk "Tk Library Procedures" @@ -11,7 +11,7 @@ Tk_HWNDToWindow \- Find Tk's window information for a Windows window .SH SYNOPSIS .nf -\fB#include <tk.h>\fR +\fB#include <tkPlatDecls.h>\fR .sp Tk_Window \fBTk_HWNDToWindow\fR(\fIhwnd\fR) diff --git a/generic/tk.h b/generic/tk.h index 35b21d3..cb93773 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.48 2000/09/06 19:05:16 hobbs Exp $ + * RCS: @(#) $Id: tk.h,v 1.49 2000/09/07 00:28:38 ericm Exp $ */ #ifndef _TK @@ -1361,12 +1361,6 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, #include "tkDecls.h" /* - * Platform dependant exported procedures and variables. - */ - -#include "tkPlatDecls.h" - -/* * Tcl commands exported by Tk: */ diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index fe7900f..61ac7b7 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPlatDecls.h,v 1.5 2000/09/06 23:39:47 ericm Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.6 2000/09/07 00:28:39 ericm Exp $ */ #ifndef _TKPLATDECLS @@ -25,12 +25,6 @@ * in the generic/tk.decls script. */ -#ifdef __WIN32__ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#undef WIN32_LEAN_AND_MEAN -#endif /* __WIN32__ */ - /* !BEGIN!: Do not edit below this line. */ /* |