Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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).
........
This commit is contained in:
Guilherme Polo 2009-04-10 22:19:09 +00:00
parent 7f587cd3c3
commit 2d87e42921
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_tkinter.c
View File

@ -33,8 +33,6 @@ Copyright (C) 1994 Steen Lumholt.
#include <windows.h> #include <windows.h>
#endif #endif
#include "tkinter.h"
/* Allow using this code in Python 2.[12] */ /* Allow using this code in Python 2.[12] */
#ifndef PyDoc_STRVAR #ifndef PyDoc_STRVAR
#define PyDoc_STRVAR(name,str) static char name[] = str #define PyDoc_STRVAR(name,str) static char name[] = str
@ -69,6 +67,8 @@ Copyright (C) 1994 Steen Lumholt.
#include <tk.h> #include <tk.h>
#endif #endif
#include "tkinter.h"
/* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */ /* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */
#ifndef CONST84_RETURN #ifndef CONST84_RETURN
#define CONST84_RETURN #define CONST84_RETURN

4
Modules/tkinter.h
View File

@ -2,7 +2,9 @@
#define TKINTER_H #define TKINTER_H
/* This header is used to share some macros between _tkinter.c and /* 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: /* TK_RELEASE_LEVEL is always one of the following:
* TCL_ALPHA_RELEASE 0 * TCL_ALPHA_RELEASE 0