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

gh-103538: Remove unused TK_AQUA code (GH-103539)

This commit is contained in:
Christopher Chavez 2023-05-10 13:53:13 -05:00 committed by GitHub
parent a33ce66dca
commit e464ec9f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS.d/next/Library/2023-04-14-21-12-32.gh-issue-103538.M4FK_v.rst Normal file
View File

@ -0,0 +1,3 @@
Remove ``_tkinter`` module code guarded by definition of the ``TK_AQUA`` macro
which was only needed for Tk 8.4.7 or earlier and was never actually defined by
any build system or documented for manual use.

14
Modules/_tkinter.c
View File

@ -3283,20 +3283,6 @@ PyInit__tkinter(void)
} }
PyTclObject_Type = o; PyTclObject_Type = o;
#ifdef TK_AQUA
/* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems
* start waking up. Note that Tcl_FindExecutable will do this, this
* code must be above it! The original warning from
* tkMacOSXAppInit.c is copied below.
*
* NB - You have to swap in the Tk Notifier BEFORE you start up the
* Tcl interpreter for now. It probably should work to do this
* in the other order, but for now it doesn't seem to.
*
*/
Tk_MacOSXSetupTkNotifier();
#endif
/* This helps the dynamic loader; in Unicode aware Tcl versions /* This helps the dynamic loader; in Unicode aware Tcl versions
it also helps Tcl find its encodings. */ it also helps Tcl find its encodings. */

50
Modules/tkappinit.c
View File

@ -23,54 +23,9 @@ Tcl_AppInit(Tcl_Interp *interp)
{ {
const char *_tkinter_skip_tk_init; const char *_tkinter_skip_tk_init;
#ifdef TK_AQUA
#ifndef MAX_PATH_LEN
#define MAX_PATH_LEN 1024
#endif
char tclLibPath[MAX_PATH_LEN], tkLibPath[MAX_PATH_LEN];
Tcl_Obj* pathPtr;
/* pre- Tcl_Init code copied from tkMacOSXAppInit.c */
Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tcllibrary",
tclLibPath, MAX_PATH_LEN, 0);
if (tclLibPath[0] != '\0') {
Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
}
if (tclLibPath[0] != '\0') {
Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
}
#endif
if (Tcl_Init (interp) == TCL_ERROR) if (Tcl_Init (interp) == TCL_ERROR)
return TCL_ERROR; return TCL_ERROR;
#ifdef TK_AQUA
/* pre- Tk_Init code copied from tkMacOSXAppInit.c */
Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tklibrary",
tkLibPath, MAX_PATH_LEN, 1);
if (tclLibPath[0] != '\0') {
pathPtr = Tcl_NewStringObj(tclLibPath, -1);
} else {
Tcl_Obj *pathPtr = TclGetLibraryPath();
}
if (tkLibPath[0] != '\0') {
Tcl_Obj *objPtr;
Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY);
objPtr = Tcl_NewStringObj(tkLibPath, -1);
Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
}
TclSetLibraryPath(pathPtr);
#endif
#ifdef WITH_XXX #ifdef WITH_XXX
/* Initialize modules that don't require Tk */ /* Initialize modules that don't require Tk */
#endif #endif
@ -88,11 +43,6 @@ Tcl_AppInit(Tcl_Interp *interp)
Tk_MainWindow(interp); Tk_MainWindow(interp);
#ifdef TK_AQUA
TkMacOSXInitAppleEvents(interp);
TkMacOSXInitMenus(interp);
#endif
#ifdef WITH_PIL /* 0.2b5 and later -- not yet released as of May 14 */ #ifdef WITH_PIL /* 0.2b5 and later -- not yet released as of May 14 */
{ {
extern void TkImaging_Init(Tcl_Interp *); extern void TkImaging_Init(Tcl_Interp *);