Commit be55566c authored by Michael Foord's avatar Michael Foord

Merge

parents 83a16856 db66eba2
...@@ -26,7 +26,9 @@ static int tk_load_failed; ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment