mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge

Browse source
This commit is contained in:
Michael Foord 2012-03-14 12:59:08 -07:00
commit be55566c25
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/tkappinit.c
View file

@ -26,7 +26,9 @@ static int tk_load_failed;
int int
Tcl_AppInit(Tcl_Interp *interp) Tcl_AppInit(Tcl_Interp *interp)
{ {
#ifdef WITH_MOREBUTTONS
Tk_Window main_window; Tk_Window main_window;
#endif
const char *_tkinter_skip_tk_init; const char *_tkinter_skip_tk_init;
#ifdef TKINTER_PROTECT_LOADTK #ifdef TKINTER_PROTECT_LOADTK
const char *_tkinter_tk_failed; const char *_tkinter_tk_failed;
@ -111,7 +113,11 @@ Tcl_AppInit(Tcl_Interp *interp)
return TCL_ERROR; return TCL_ERROR;
} }
#ifdef WITH_MOREBUTTONS
main_window = Tk_MainWindow(interp); main_window = Tk_MainWindow(interp);
#else
Tk_MainWindow(interp);
#endif
#ifdef TK_AQUA #ifdef TK_AQUA
TkMacOSXInitAppleEvents(interp); TkMacOSXInitAppleEvents(interp);