Fix editing error made while resolving merge conflicts and add TCL_UNUSED where needed.

5 files changed, 10 insertions, 43 deletions

diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index ecf6e94..efc9b38 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -1316,7 +1316,7 @@ TkNSImageCreate(
     int objc,			 /* Number of arguments. */
     Tcl_Obj *const objv[],	 /* Argument strings for options (not
 				  * including image name or type). */
-    const Tk_ImageType *typePtr, /* Pointer to our type record (not used). */
+    TCL_UNUSED(const Tk_ImageType *), /* typePtr */
     Tk_ImageMaster master,	 /* Token for image, to be used in callbacks. */
     ClientData *clientDataPtr)	 /* Store manager's token for image here; it
 				  * will be returned in later callbacks. */
@@ -1371,8 +1371,7 @@ TkNSImageCreate(
 
 static ClientData
 TkNSImageGet(
-    Tk_Window tkwin,		/* Token for window in which image will be
-				 * used. */
+    TCL_UNUSED(Tk_Window),      /* tkwin */
     ClientData clientData)	/* Pointer to TkNSImageMaster for image. */
 {
     TkNSImageMaster *masterPtr = (TkNSImageMaster *) clientData;
@@ -1402,7 +1401,7 @@ TkNSImageGet(
 static void
 TkNSImageDisplay(
     ClientData clientData,	/* Pointer to TkNSImageInstance for image. */
-    Display *display,		/* Display to use for drawing. */
+    TCL_UNUSED(Display *),      /* display */
     Drawable drawable,		/* Where to draw or redraw image. */
     int imageX, int imageY,	/* Origin of area to redraw, relative to
 				 * origin of image. */
@@ -1457,7 +1456,7 @@ TkNSImageDisplay(
 static void
 TkNSImageFree(
     ClientData clientData,	/* Pointer to TkNSImageInstance for instance. */
-    Display *display)		/* Display where image was to be drawn. */
+    TCL_UNUSED(Display *))	/* display */
 {
     TkNSImageInstance *instPtr = (TkNSImageInstance *) clientData;
     ckfree(instPtr);
@@ -1516,7 +1515,7 @@ TkNSImageDelete(
 
 int
 TkMacOSXNSImage_Init(
-    Tcl_Interp *interp)		/* Interpreter for application. */
+    TCL_UNUSED(Tcl_Interp *))	 /* interp */
 {
     Tk_CreateImageType(&TkNSImageType);
     return 1;
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 253cb88..e74e46c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -262,38 +262,6 @@ static int		TkMacOSVersionObjCmd(ClientData cd, Tcl_Interp *ip,
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXVersion --
- *
- *	Tcl command which returns the minor version number of the currently
- *	running operating system.
- *
- * Results:
- *	Returns the minor version number.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-static int
-TkMacOSVersionObjCmd(
-    ClientData cd,
-    Tcl_Interp *ip,
-    int objc,
-    Tcl_Obj *const objv[])
-{
-    static char version[16] = "";
-    if (version[0] == '\0') {
-	snprintf(version, 16, "%d", [NSApp macOSVersion]);
-    }
-    Tcl_SetResult(ip, version, NULL);
-    return TCL_OK;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
  * TkpInit --
  *
  *	Performs Mac-specific interpreter initialization related to the
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index a5d164f..09e8769 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -175,7 +175,7 @@ static void drawMacScrollbar(
     CGContextRef context)
 {
     MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
-    NSView *view = TkMacOSXDrawableView(macWin);
+    NSView *view = TkMacOSXDrawableView((Drawable) macWin);
     CGPathRef path;
     CGPoint inner[2], outer[2], thumbOrigin;
     CGSize thumbSize;
@@ -259,7 +259,7 @@ TkpDisplayScrollbar(
     }
 
     MacDrawable *macWin = (MacDrawable *) winPtr->window;
-    NSView *view = TkMacOSXDrawableView(macWin);
+    NSView *view = TkMacOSXDrawableView((Drawable) macWin);
 
     if ((view == NULL)
 	    || (macWin->flags & TK_DO_NOT_DRAW)
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index cdbb786..0a37734 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -341,7 +341,7 @@ XUnmapWindow(
 
 	if (parentPtr && parentPtr->privatePtr->visRgn) {
 	    TkMacOSXInvalidateViewRegion(
-		    TkMacOSXDrawableView(parentPtr->privatePtr),
+		TkMacOSXDrawableView((Drawable) (parentPtr->privatePtr)),
 		    parentPtr->privatePtr->visRgn);
 	}
 	TkMacOSXInvalClipRgns((Tk_Window) parentPtr);
@@ -1053,7 +1053,7 @@ TkMacOSXInvalidateWindow(
     if (macWin->flags & TK_CLIP_INVALID) {
 	TkMacOSXUpdateClipRgn(macWin->winPtr);
     }
-    TkMacOSXInvalidateViewRegion(TkMacOSXDrawableView(macWin),
+    TkMacOSXInvalidateViewRegion(TkMacOSXDrawableView((Drawable) macWin),
 	    (flag == TK_WINDOW_ONLY) ? macWin->visRgn : macWin->aboveVisRgn);
 }
 
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index b7d60b9..86501d4 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -3132,7 +3132,7 @@ static void TreeAreaElementSize (
     TCL_UNUSED(Tk_Window), /* tkwin */
     TCL_UNUSED(int *),     /* minWidth */
     TCL_UNUSED(int *),     /* minHeight */
-    TCL_UNUSED(Ttk_Padding *)) /* paddingPtr */
+    Ttk_Padding *paddingPtr)
 {
 
     /*