Change Tk_FreeXId() into a macro.

A few end-of-line spacing eliminations.

9 files changed, 24 insertions, 78 deletions

diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3
index 2f15ea6..61a47de 100644
--- a/doc/FindPhoto.3
+++ b/doc/FindPhoto.3
@@ -99,8 +99,8 @@ being written to the photo image.
 particular photo image to the other procedures.  The parameter is the
 name of the image, that is, the name specified to the \fBimage create
 photo\fR command, or assigned by that command if no name was specified.
-If \fIimageName\fR does not exist or is not a photo image, 
-\fBTk_FindPhoto\fR returns NULL. 
+If \fIimageName\fR does not exist or is not a photo image,
+\fBTk_FindPhoto\fR returns NULL.
 .PP
 \fBTk_PhotoPutBlock\fR is used to supply blocks of image data to be
 displayed.  The call affects an area of the image of size
@@ -184,16 +184,16 @@ that describe the address and layout of the image data that the
 photo image has stored internally.  The values are valid
 until the image is destroyed or its size is changed.
 .PP
-It is possible to modify an image by writing directly to the data 
+It is possible to modify an image by writing directly to the data
 the \fIpixelPtr\fR field points to. The size of the image cannot be
 changed this way, though.
-Also, changes made by writing directly to \fIpixelPtr\fR will not be 
-immediately visible, but only after a call to 
-\fBTk_ImageChanged\fR or after an event that causes the interested 
+Also, changes made by writing directly to \fIpixelPtr\fR will not be
+immediately visible, but only after a call to
+\fBTk_ImageChanged\fR or after an event that causes the interested
 widgets to redraw themselves.
-For these reasons usually it is preferable to make changes to 
-a copy of the image data and write it back with 
-\fBTk_PhotoPutBlock\fR or \fBTk_PhotoPutZoomedBlock\fR. 
+For these reasons usually it is preferable to make changes to
+a copy of the image data and write it back with
+\fBTk_PhotoPutBlock\fR or \fBTk_PhotoPutZoomedBlock\fR.
 .PP
 \fBTk_PhotoGetImage\fR returns 1 for compatibility with the
 corresponding procedure in the old photo widget.
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.
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 9851474..f92d260 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -365,7 +365,7 @@ XMoveResizeWindow(
 	    CGFloat Y = (CGFloat)y;
 	    CGFloat Width = (CGFloat)width;
 	    CGFloat Height = (CGFloat)height;
-	    CGFloat XOff = (CGFloat)macWin->winPtr->wmInfoPtr->xInParent; 
+	    CGFloat XOff = (CGFloat)macWin->winPtr->wmInfoPtr->xInParent;
 	    CGFloat YOff = (CGFloat)macWin->winPtr->wmInfoPtr->yInParent;
 	    NSRect r = NSMakeRect(X + XOff,
 	    			  tkMacOSXZeroScreenHeight - Y - YOff - Height,
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index a2d175b..1313c9f 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -681,14 +681,6 @@ XForceScreenSaver(
     display->request++;
 }
 
-void
-Tk_FreeXId(
-    Display *display,
-    XID xid)
-{
-    /* no-op function needed for stubs implementation. */
-}
-
 int
 XSync(
     Display *display,
@@ -897,7 +889,7 @@ XGetImage(
      * We do not support any other values here.
      */
     int scalefactor = 1;
-    if (win && [win respondsToSelector:@selector(backingScaleFactor)]) { 
+    if (win && [win respondsToSelector:@selector(backingScaleFactor)]) {
 	scalefactor = ([win backingScaleFactor] == 2.0) ? 2 : 1;
     }
     int scaled_height = height * scalefactor;
diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c
index ec2451c..c6873a1 100644
--- a/unix/tkUnixXId.c
+++ b/unix/tkUnixXId.c
@@ -14,39 +14,6 @@
 /*
  *----------------------------------------------------------------------
  *
- * Tk_FreeXId --
- *
- *	This function is called to indicate that an X resource identifier is
- *	now free.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The identifier is added to the stack of free identifiers for its
- *	display, so that it can be re-used.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tk_FreeXId(
-    Display *display,		/* Display for which xid was allocated. */
-    XID xid)			/* Identifier that is no longer in use. */
-{
-    /*
-     * This does nothing, because the XC-MISC extension takes care of
-     * freeing XIDs for us.  It has been a standard X11 extension for
-     * about 15 years as of 2008.  Keith Packard and another X.org
-     * developer suggested that we remove the previous code that used:
-     * #define XLIB_ILLEGAL_ACCESS.
-     */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
  * Tk_GetPixmap --
  *
  *	Same as the XCreatePixmap function except that it manages resource
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 6c44059..7e25826 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -1610,30 +1610,6 @@ HandleIMEComposition(
 /*
  *----------------------------------------------------------------------
  *
- * Tk_FreeXId --
- *
- *	This interface is not needed under Windows.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tk_FreeXId(
-    Display *display,
-    XID xid)
-{
-    /* Do nothing */
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkWinResendEvent --
  *
  *	This function converts an X event into a Windows event and invokes the