summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
diff options
context:
space:
mode:
authorericm <ericm>2000-09-07 00:28:38 (GMT)
committerericm <ericm>2000-09-07 00:28:38 (GMT)
commitafa5142dc2d0c3a33bd4b391b000c152c2576337 (patch)
tree91c6cac39950aa1f64d9c29ffd03feecbc42da20 /generic/tk.h
parent35bef08e556a55ceea7225fb321da5395f1e3afa (diff)
downloadtk-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.
Diffstat (limited to 'generic/tk.h')
-rw-r--r--generic/tk.h8
1 files changed, 1 insertions, 7 deletions
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:
*/