diff options
author | Michael Foord <michael@voidspace.org.uk> | 2012-03-14 12:59:08 -0700 |
---|---|---|
committer | Michael Foord <michael@voidspace.org.uk> | 2012-03-14 12:59:08 -0700 |
commit | be55566c25be5af76247acb92ae43567426154ce (patch) | |
tree | 32263f3b5ab2f72927c60ad8e4af844850a4ea45 | |
parent | 83a16856ee1db8eb49a08c4492ece8239ffb5819 (diff) | |
parent | db66eba288137fdbdeeac57c8775e53fc2d7b822 (diff) | |
download | cpython-git-be55566c25be5af76247acb92ae43567426154ce.tar.gz |
Merge
-rw-r--r-- | Modules/tkappinit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/tkappinit.c b/Modules/tkappinit.c index c1f97b0a40..2ed85949cb 100644 --- a/Modules/tkappinit.c +++ b/Modules/tkappinit.c @@ -26,7 +26,9 @@ static int tk_load_failed; int Tcl_AppInit(Tcl_Interp *interp) { +#ifdef WITH_MOREBUTTONS Tk_Window main_window; +#endif const char *_tkinter_skip_tk_init; #ifdef TKINTER_PROTECT_LOADTK const char *_tkinter_tk_failed; @@ -111,7 +113,11 @@ Tcl_AppInit(Tcl_Interp *interp) return TCL_ERROR; } +#ifdef WITH_MOREBUTTONS main_window = Tk_MainWindow(interp); +#else + Tk_MainWindow(interp); +#endif #ifdef TK_AQUA TkMacOSXInitAppleEvents(interp); |