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 ab932d1

Browse filesBrowse files
authored
Merge pull request #15671 from anntzer/tkcomments
Don't mention tcl in tkagg commments anymore.
2 parents f13b53c + e570856 commit ab932d1
Copy full SHA for ab932d1

File tree

Expand file treeCollapse file tree

1 file changed

+12
-13
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+12
-13
lines changed

‎src/_tkagg.cpp

Copy file name to clipboardExpand all lines: src/_tkagg.cpp
+12-13Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "_tkmini.h"
2424
#include "py_converters.h"
2525

26-
// Global vars for Tcl / Tk functions. We load these symbols from the tkinter
27-
// extension module or loaded Tcl / Tk libraries at run-time.
26+
// Global vars for Tk functions. We load these symbols from the tkinter
27+
// extension module or loaded Tk libraries at run-time.
2828
static Tk_FindPhoto_t TK_FIND_PHOTO;
2929
static Tk_PhotoPutBlock_NoComposite_t TK_PHOTO_PUT_BLOCK_NO_COMPOSITE;
3030

@@ -108,7 +108,7 @@ static PyMethodDef functions[] = {
108108
{ NULL, NULL } /* sentinel */
109109
};
110110

111-
// Functions to fill global TCL / Tk function pointers by dynamic loading
111+
// Functions to fill global Tk function pointers by dynamic loading
112112

113113
template <class T>
114114
int load_tk(T lib)
@@ -125,23 +125,22 @@ int load_tk(T lib)
125125
#ifdef _WIN32
126126

127127
/*
128-
* On Windows, we can't load the tkinter module to get the TCL or Tk symbols,
129-
* because Windows does not load symbols into the library name-space of
130-
* importing modules. So, knowing that tkinter has already been imported by
131-
* Python, we scan all modules in the running process for the TCL and Tk
132-
* function names.
128+
* On Windows, we can't load the tkinter module to get the Tk symbols, because
129+
* Windows does not load symbols into the library name-space of importing
130+
* modules. So, knowing that tkinter has already been imported by Python, we
131+
* scan all modules in the running process for the Tk function names.
133132
*/
134133

135134
void load_tkinter_funcs(void)
136135
{
137-
// Load TCL and Tk functions by searching all modules in current process.
136+
// Load Tk functions by searching all modules in current process.
138137
HMODULE hMods[1024];
139138
HANDLE hProcess;
140139
DWORD cbNeeded;
141140
unsigned int i;
142141
// Returns pseudo-handle that does not need to be closed
143142
hProcess = GetCurrentProcess();
144-
// Iterate through modules in this process looking for TCL / Tk names
143+
// Iterate through modules in this process looking for Tk names.
145144
if (EnumProcessModules(hProcess, hMods, sizeof(hMods), &cbNeeded)) {
146145
for (i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
147146
if (load_tk(hMods[i])) {
@@ -154,9 +153,9 @@ void load_tkinter_funcs(void)
154153
#else // not Windows
155154

156155
/*
157-
* On Unix, we can get the TCL and Tk symbols from the tkinter module, because
158-
* tkinter uses these symbols, and the symbols are therefore visible in the
159-
* tkinter dynamic library (module).
156+
* On Unix, we can get the Tk symbols from the tkinter module, because tkinter
157+
* uses these symbols, and the symbols are therefore visible in the tkinter
158+
* dynamic library (module).
160159
*/
161160

162161
void load_tkinter_funcs(void)

0 commit comments

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