[Python-checkins] cpython (merge default -> default): Merge

[michael.foord]

http://hg.python.org/cpython/rev/4925efb9f9f6
changeset:   75637:4925efb9f9f6
parent:      75636:6493f091b401
parent:      75635:a7a9e0f46b8a
user:        Michael Foord <michael at voidspace.org.uk>
date:        Wed Mar 14 12:59:08 2012 -0700
summary:
  Merge

files:
  Modules/tkappinit.c |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Modules/tkappinit.c b/Modules/tkappinit.c
--- a/Modules/tkappinit.c
+++ b/Modules/tkappinit.c
@@ -26,7 +26,9 @@
 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 @@
         return TCL_ERROR;
     }
 
+#ifdef WITH_MOREBUTTONS
     main_window = Tk_MainWindow(interp);
+#else
+    Tk_MainWindow(interp);
+#endif
 
 #ifdef TK_AQUA
     TkMacOSXInitAppleEvents(interp);

-- 
Repository URL: http://hg.python.org/cpython