Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3854440

Browse filesBrowse files
committed
gh-103538: Remove unused TK_AQUA code
1 parent 6b58d41 commit 3854440
Copy full SHA for 3854440

File tree

2 files changed

+0
-64
lines changed
Filter options

2 files changed

+0
-64
lines changed

‎Modules/_tkinter.c

Copy file name to clipboardExpand all lines: Modules/_tkinter.c
-14Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3283,20 +3283,6 @@ PyInit__tkinter(void)
32833283
}
32843284
PyTclObject_Type = o;
32853285

3286-
#ifdef TK_AQUA
3287-
/* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems
3288-
* start waking up. Note that Tcl_FindExecutable will do this, this
3289-
* code must be above it! The original warning from
3290-
* tkMacOSXAppInit.c is copied below.
3291-
*
3292-
* NB - You have to swap in the Tk Notifier BEFORE you start up the
3293-
* Tcl interpreter for now. It probably should work to do this
3294-
* in the other order, but for now it doesn't seem to.
3295-
*
3296-
*/
3297-
Tk_MacOSXSetupTkNotifier();
3298-
#endif
3299-
33003286

33013287
/* This helps the dynamic loader; in Unicode aware Tcl versions
33023288
it also helps Tcl find its encodings. */

‎Modules/tkappinit.c

Copy file name to clipboardExpand all lines: Modules/tkappinit.c
-50Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -23,54 +23,9 @@ Tcl_AppInit(Tcl_Interp *interp)
2323
{
2424
const char *_tkinter_skip_tk_init;
2525

26-
#ifdef TK_AQUA
27-
#ifndef MAX_PATH_LEN
28-
#define MAX_PATH_LEN 1024
29-
#endif
30-
char tclLibPath[MAX_PATH_LEN], tkLibPath[MAX_PATH_LEN];
31-
Tcl_Obj* pathPtr;
32-
33-
/* pre- Tcl_Init code copied from tkMacOSXAppInit.c */
34-
Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tcllibrary",
35-
tclLibPath, MAX_PATH_LEN, 0);
36-
37-
if (tclLibPath[0] != '\0') {
38-
Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
39-
Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
40-
Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
41-
}
42-
43-
if (tclLibPath[0] != '\0') {
44-
Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
45-
Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
46-
Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
47-
}
48-
#endif
4926
if (Tcl_Init (interp) == TCL_ERROR)
5027
return TCL_ERROR;
5128

52-
#ifdef TK_AQUA
53-
/* pre- Tk_Init code copied from tkMacOSXAppInit.c */
54-
Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tklibrary",
55-
tkLibPath, MAX_PATH_LEN, 1);
56-
57-
if (tclLibPath[0] != '\0') {
58-
pathPtr = Tcl_NewStringObj(tclLibPath, -1);
59-
} else {
60-
Tcl_Obj *pathPtr = TclGetLibraryPath();
61-
}
62-
63-
if (tkLibPath[0] != '\0') {
64-
Tcl_Obj *objPtr;
65-
66-
Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY);
67-
objPtr = Tcl_NewStringObj(tkLibPath, -1);
68-
Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
69-
}
70-
71-
TclSetLibraryPath(pathPtr);
72-
#endif
73-
7429
#ifdef WITH_XXX
7530
/* Initialize modules that don't require Tk */
7631
#endif
@@ -88,11 +43,6 @@ Tcl_AppInit(Tcl_Interp *interp)
8843

8944
Tk_MainWindow(interp);
9045

91-
#ifdef TK_AQUA
92-
TkMacOSXInitAppleEvents(interp);
93-
TkMacOSXInitMenus(interp);
94-
#endif
95-
9646
#ifdef WITH_PIL /* 0.2b5 and later -- not yet released as of May 14 */
9747
{
9848
extern void TkImaging_Init(Tcl_Interp *);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.