Skip to content

loading TCL / Tk symbols dynamically #6442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 24, 2016
Merged

loading TCL / Tk symbols dynamically #6442

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
edc80a3
WIP: loading TCL / Tk symbols dynamically
matthew-brett May 17, 2016
64f01dd
RF: refactor C code to Michael D's commments
matthew-brett May 17, 2016
89535be
NF: add Windows support for TCL dynamic loading
matthew-brett May 18, 2016
fc5d060
RF: make dynamic loading of TCL the one true way
matthew-brett May 18, 2016
1c85968
RF: disable build-time link against TCL/Tk
matthew-brett May 18, 2016
830d7a3
RF: find TCL / Tk symbols correctly on Windows
matthew-brett May 19, 2016
4c5a3ab
RF: short-circuit the Tk function tests
matthew-brett May 20, 2016
94bb457
WIP: Add excerpts from TCL / Tk header
matthew-brett May 20, 2016
3f5407a
RF: check, edit, refactor Tcl / tk mini header
matthew-brett May 21, 2016
573aeb5
RF: remove Tcl / Tk header / lib discovery
matthew-brett May 21, 2016
626a1d2
RF: remove build-time check of Tkinter
matthew-brett May 22, 2016
0c2c5a0
RF: force TkAgg / Agg extensions with messages
matthew-brett May 23, 2016
de99a76
BF: fix goofy double "installing" message
matthew-brett May 23, 2016
aa275c6
TST: add test of tkagg backend import
matthew-brett May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
RF: make dynamic loading of TCL the one true way 
Remove ifdefs that allowed not-dynamic library resolution of TCL / Tk
symbols.
  • Loading branch information
@matthew-brett
matthew-brett committed May 18, 2016
commit fc5d0604e5313e772e77ee217de87120147f0b31
21 changes: 1 addition & 20 deletions src/_tkagg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ typedef struct
Tcl_Interp *interp;
} TkappObject;

#define DYNAMIC_TKINTER

#ifdef DYNAMIC_TKINTER
// Load TCL / Tk symbols from tkinter extension module at run-time.
// Typedefs, global vars for TCL / Tk library functions.
typedef Tcl_Command (*tcl_cc)(Tcl_Interp *interp,
Expand All @@ -66,15 +63,6 @@ typedef void (*tk_ppb_nc) (Tk_PhotoHandle handle,
static tk_ppb_nc TK_PHOTO_PUTBLOCK;
typedef void (*tk_pb) (Tk_PhotoHandle handle);
static tk_pb TK_PHOTO_BLANK;
#else
// Build-time linking against system TCL / Tk functions.
#define TCL_CREATE_COMMAND Tcl_CreateCommand
#define TCL_APPEND_RESULT Tcl_AppendResult
#define TK_MAIN_WINDOW Tk_MainWindow
#define TK_FIND_PHOTO Tk_FindPhoto
#define TK_PHOTO_PUTBLOCK Tk_PhotoPutBlock
#define TK_PHOTO_BLANK Tk_PhotoBlank
#endif

static int PyAggImagePhoto(ClientData clientdata, Tcl_Interp *interp, int argc, char **argv)
{
Expand Down Expand Up @@ -264,7 +252,6 @@ static PyMethodDef functions[] = {
{ NULL, NULL } /* sentinel */
};

#ifdef DYNAMIC_TKINTER
// Functions to fill global TCL / Tk function pointers from tkinter module.

#if PY3K
Expand Down Expand Up @@ -387,7 +374,6 @@ int load_tkinter_funcs(void)
Py_XDECREF(pString);
return ret;
}
#endif

#if PY3K
static PyModuleDef _tkagg_module = { PyModuleDef_HEAD_INIT, "_tkagg", "", -1, functions,
Expand All @@ -401,20 +387,15 @@ PyMODINIT_FUNC PyInit__tkagg(void)

import_array();

#ifdef DYNAMIC_TKINTER
return (load_tkinter_funcs() == 0) ? m : NULL;
#else
return m
#endif
}
#else
PyMODINIT_FUNC init_tkagg(void)
{
import_array();

Py_InitModule("_tkagg", functions);
#ifdef DYNAMIC_TKINTER

load_tkinter_funcs();
#endif
}
#endif