diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-08-12 14:44:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-08-12 14:44:46 (GMT) |
| commit | f494a10c21ef287a1b1546a351f97c3f15f47f99 (patch) | |
| tree | 775fcd02f5a43223631bc87a40892ecbbeea3e2f /generic | |
| parent | 861ca920038c540cbbad1918183df4c1ecccb17a (diff) | |
| download | tk-f494a10c21ef287a1b1546a351f97c3f15f47f99.zip tk-f494a10c21ef287a1b1546a351f97c3f15f47f99.tar.gz tk-f494a10c21ef287a1b1546a351f97c3f15f47f99.tar.bz2 | |
Change Tk_FreeXId() into a macro.
A few end-of-line spacing eliminations.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkDecls.h | 3 | ||||
| -rw-r--r-- | generic/tkFrame.c | 1 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 9 | ||||
| -rw-r--r-- | generic/tkWindow.c | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h index 64c32cd..eaaaf6c 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -1721,6 +1721,9 @@ extern const TkStubs *tkStubsPtr; #undef Tk_SafeInit #undef Tk_CreateConsoleWindow +#undef Tk_FreeXId +#define Tk_FreeXId(display,xid) + #if defined(_WIN32) && defined(UNICODE) # define Tk_MainEx Tk_MainExW EXTERN void Tk_MainExW(int argc, wchar_t **argv, diff --git a/generic/tkFrame.c b/generic/tkFrame.c index f6edfb0..0f1a1b3 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -458,7 +458,6 @@ TkListCreateFrame( * window associated with the interpreter. * Gives the base name to use for the new * application. */ - { int objc; Tcl_Obj **objv; diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index f08d7f4..21e6a68 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -38,6 +38,15 @@ MODULE_SCOPE const TkStubs tkStubs; */ #undef Tk_MainEx +#undef Tk_FreeXId + +static void +doNothing(void) +{ + /* dummy implementation, no need to do anything */ +} + +#define Tk_FreeXId ((void (*)(Display *, XID)) doNothing) #ifdef _WIN32 diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 0c60321..5855b7c 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3101,7 +3101,7 @@ Initialize( Tcl_ListObjAppendElement(NULL, cmd, Tcl_NewStringObj("::safe::TkInit", -1)); Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master)); - + /* * Step 2 : Eval in the master. The argument is the *reversed* interp * path of the slave. |