[Python-checkins] r71457 - in python/branches/py3k: Modules/_tkinter.c Modules/tkinter.h

[guilherme.polo]

Author: guilherme.polo
Date: Sat Apr 11 00:19:09 2009
New Revision: 71457

Log:
Merged revisions 71210 via svnmerge from 
svn+ssh://pythondev/python/trunk

........
  r71210 | guilherme.polo | 2009-04-04 23:11:19 -0300 (Sat, 04 Apr 2009) | 1 line
  
  Include tkinter.h only after including tk.h (or the equivalent for another platform).
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/_tkinter.c
   python/branches/py3k/Modules/tkinter.h

Modified: python/branches/py3k/Modules/_tkinter.c
==============================================================================
--- python/branches/py3k/Modules/_tkinter.c	(original)
+++ python/branches/py3k/Modules/_tkinter.c	Sat Apr 11 00:19:09 2009
@@ -33,8 +33,6 @@
 #include <windows.h>
 #endif
 
-#include "tkinter.h"
-
 /* Allow using this code in Python 2.[12] */
 #ifndef PyDoc_STRVAR
 #define PyDoc_STRVAR(name,str) static char name[] = str
@@ -69,6 +67,8 @@
 #include <tk.h>
 #endif
 
+#include "tkinter.h"
+
 /* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */
 #ifndef CONST84_RETURN
 #define CONST84_RETURN

Modified: python/branches/py3k/Modules/tkinter.h
==============================================================================
--- python/branches/py3k/Modules/tkinter.h	(original)
+++ python/branches/py3k/Modules/tkinter.h	Sat Apr 11 00:19:09 2009
@@ -2,7 +2,9 @@
 #define TKINTER_H
 
 /* This header is used to share some macros between _tkinter.c and
- * tkappinit.c */
+ * tkappinit.c.
+ * Be sure to include tk.h before including this header so
+ * TK_VERSION_HEX is properly defined. */
 
 /* TK_RELEASE_LEVEL is always one of the following:
  *	TCL_ALPHA_RELEASE   0