[Python-checkins] r71210 - in python/trunk/Modules: _tkinter.c tkinter.h

guilherme.polo python-checkins at python.org
Sun Apr 5 04:11:19 CEST 2009


Author: guilherme.polo
Date: Sun Apr  5 04:11:19 2009
New Revision: 71210

Log:
Include tkinter.h only after including tk.h (or the equivalent for another platform).

Modified:
   python/trunk/Modules/_tkinter.c
   python/trunk/Modules/tkinter.h

Modified: python/trunk/Modules/_tkinter.c
==============================================================================
--- python/trunk/Modules/_tkinter.c	(original)
+++ python/trunk/Modules/_tkinter.c	Sun Apr  5 04:11:19 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/trunk/Modules/tkinter.h
==============================================================================
--- python/trunk/Modules/tkinter.h	(original)
+++ python/trunk/Modules/tkinter.h	Sun Apr  5 04:11:19 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


More information about the Python-checkins mailing list