Attempt to fix unused parameter warningcore-bug-a80e5ff97e

4 files changed, 29 insertions, 32 deletions

diff --git a/generic/ttk/ttkCache.c b/generic/ttk/ttkCache.c
index 4890ba7..c066817 100644
--- a/generic/ttk/ttkCache.c
+++ b/generic/ttk/ttkCache.c
@@ -253,7 +253,7 @@ static void CacheWinEventHandler(void *clientData, XEvent *eventPtr)
  * InitCacheWindow --
  *	Specify the cache window if not already set.
  */
-static void InitCacheWindow(Ttk_ResourceCache cache, Tk_Window tkwin)
+static void InitCacheWindow(Ttk_ResourceCache cache)
 {
     if (cache->tkwin == NULL) {
 	cache->tkwin = Tk_MainWindow(cache->interp);
@@ -384,23 +384,23 @@ static Tcl_Obj *Ttk_Use(
  * Ttk_UseFont --
  *	Acquire a font from the cache.
  */
-Tcl_Obj *Ttk_UseFont(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
+Tcl_Obj *Ttk_UseFont(Ttk_ResourceCache cache, Tcl_Obj *objPtr)
 {
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
     return Ttk_Use(cache->interp,
-	&cache->fontTable, AllocFont, tkwin, objPtr);
+	&cache->fontTable, AllocFont, cache->tkwin, objPtr);
 }
 
 /*
  * Ttk_UseColor --
  *	Acquire a color from the cache.
  */
-Tcl_Obj *Ttk_UseColor(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
+Tcl_Obj *Ttk_UseColor(Ttk_ResourceCache cache, Tcl_Obj *objPtr)
 {
     objPtr = CheckNamedColor(cache, objPtr);
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
     return Ttk_Use(cache->interp,
-	&cache->colorTable, AllocColor, tkwin, objPtr);
+	&cache->colorTable, AllocColor, cache->tkwin, objPtr);
 }
 
 /*
@@ -408,12 +408,12 @@ Tcl_Obj *Ttk_UseColor(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
  *	Acquire a Tk_3DBorder from the cache.
  */
 Tcl_Obj *Ttk_UseBorder(
-    Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
+    Ttk_ResourceCache cache, Tcl_Obj *objPtr)
 {
     objPtr = CheckNamedColor(cache, objPtr);
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
     return Ttk_Use(cache->interp,
-	&cache->borderTable, AllocBorder, tkwin, objPtr);
+	&cache->borderTable, AllocBorder, cache->tkwin, objPtr);
 }
 
 /* NullImageChanged --
@@ -435,14 +435,14 @@ static void NullImageChanged(
  * Ttk_UseImage --
  *	Acquire a Tk_Image from the cache.
  */
-Tk_Image Ttk_UseImage(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
+Tk_Image Ttk_UseImage(Ttk_ResourceCache cache, Tcl_Obj *objPtr)
 {
     const char *imageName = Tcl_GetString(objPtr);
     int newEntry;
     Tcl_HashEntry *entryPtr;
     Tk_Image image;
 
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
 #if !NEED_EXTRA_INFO
     entryPtr = Tcl_CreateHashEntry(&cache->imageTable, imageName, &newEntry);
 #else
@@ -452,7 +452,7 @@ Tk_Image Ttk_UseImage(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
     Tcl_DStringInit(&ds);
     Tcl_DStringAppend(&ds, imageName, -1);
     snprintf(buffer, 64, ",%d,%lu,%lu", ConnectionNumber(Tk_Display(tkwin)),
-	Tk_Visual(tkwin)->visualid, (unsigned long)Tk_Colormap(tkwin));
+	Tk_Visual(tkwin)->visualid, (unsigned long)Tk_Colormap(cache->tkwin));
     Tcl_DStringAppend(&ds, buffer, -1);
     entryPtr = Tcl_CreateHashEntry(&cache->imageTable,
 	Tcl_DStringValue(&ds), &newEntry);
@@ -463,7 +463,7 @@ Tk_Image Ttk_UseImage(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
 	return (Tk_Image)Tcl_GetHashValue(entryPtr);
     }
 
-    image = Tk_GetImage(cache->interp, tkwin, imageName, NullImageChanged,0);
+    image = Tk_GetImage(cache->interp, cache->tkwin, imageName, NullImageChanged,0);
     Tcl_SetHashValue(entryPtr, image);
 
     if (!image) {
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 578e9df..7b8a4d1 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -256,7 +256,6 @@ static void EntryInitStyleData(Entry *entryPtr, EntryStyleData *es)
 {
     Ttk_State state = entryPtr->core.state;
     Ttk_ResourceCache cache = Ttk_GetResourceCache(entryPtr->core.interp);
-    Tk_Window tkwin = entryPtr->core.tkwin;
     Tcl_Obj *tmp;
 
     /* Initialize to fallback values:
@@ -277,11 +276,11 @@ static void EntryInitStyleData(Entry *entryPtr, EntryStyleData *es)
 
     /* Reacquire color & border resources from resource cache.
      */
-    es->placeholderForegroundObj = Ttk_UseColor(cache, tkwin, es->placeholderForegroundObj);
-    es->foregroundObj = Ttk_UseColor(cache, tkwin, es->foregroundObj);
-    es->selForegroundObj = Ttk_UseColor(cache, tkwin, es->selForegroundObj);
-    es->insertColorObj = Ttk_UseColor(cache, tkwin, es->insertColorObj);
-    es->selBorderObj = Ttk_UseBorder(cache, tkwin, es->selBorderObj);
+    es->placeholderForegroundObj = Ttk_UseColor(cache, es->placeholderForegroundObj);
+    es->foregroundObj = Ttk_UseColor(cache, es->foregroundObj);
+    es->selForegroundObj = Ttk_UseColor(cache, es->selForegroundObj);
+    es->insertColorObj = Ttk_UseColor(cache, es->insertColorObj);
+    es->selBorderObj = Ttk_UseBorder(cache, es->selBorderObj);
 }
 
 /*------------------------------------------------------------------------
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index a5cf554..1948d3b 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -953,7 +953,6 @@ int Ttk_RegisterElementSpec(Ttk_Theme theme,
 
 static int AllocateResource(
     Ttk_ResourceCache cache,
-    Tk_Window tkwin,
     Tcl_Obj **destPtr,
     int optionType)
 {
@@ -962,11 +961,11 @@ static int AllocateResource(
     switch (optionType)
     {
 	case TK_OPTION_FONT:
-	    return (*destPtr = Ttk_UseFont(cache, tkwin, resource)) != NULL;
+	    return (*destPtr = Ttk_UseFont(cache, resource)) != NULL;
 	case TK_OPTION_COLOR:
-	    return (*destPtr = Ttk_UseColor(cache, tkwin, resource)) != NULL;
+	    return (*destPtr = Ttk_UseColor(cache, resource)) != NULL;
 	case TK_OPTION_BORDER:
-	    return (*destPtr = Ttk_UseBorder(cache, tkwin, resource)) != NULL;
+	    return (*destPtr = Ttk_UseBorder(cache, resource)) != NULL;
 	default:
 	    /* no-op; always succeeds */
 	    return 1;
@@ -996,7 +995,6 @@ int InitializeElementRecord(
     Ttk_Style style,		/* Style table */
     void *widgetRecord,		/* Source of widget option values */
     Tk_OptionTable optionTable,	/* Option table describing widget record */
-    Tk_Window tkwin,		/* Corresponding window */
     Ttk_State state)	/* Widget or element state */
 {
     void *elementRecord = eclass->elementRecord;
@@ -1028,7 +1026,7 @@ int InitializeElementRecord(
 	    *dest = styleDefault ? styleDefault : elementDefault;
 	}
 
-	if (!AllocateResource(cache, tkwin, dest, elementOption->type)) {
+	if (!AllocateResource(cache, dest, elementOption->type)) {
 	    return 0;
 	}
     }
@@ -1100,7 +1098,7 @@ Ttk_ElementSize(
 	= *widthPtr = *heightPtr = 0;
 
     if (!InitializeElementRecord(
-	    eclass, style, recordPtr, optionTable, tkwin,  state))
+	    eclass, style, recordPtr, optionTable,  state))
     {
 	return;
     }
@@ -1129,7 +1127,7 @@ Ttk_DrawElement(
 	return;
     }
     if (!InitializeElementRecord(
-	    eclass, style, recordPtr, optionTable, tkwin,  state))
+	    eclass, style, recordPtr, optionTable,  state))
     {
 	return;
     }
diff --git a/generic/ttk/ttkTheme.h b/generic/ttk/ttkTheme.h
index d5f4ac8..5011541 100644
--- a/generic/ttk/ttkTheme.h
+++ b/generic/ttk/ttkTheme.h
@@ -317,10 +317,10 @@ MODULE_SCOPE Ttk_ResourceCache Ttk_CreateResourceCache(Tcl_Interp *);
 MODULE_SCOPE void Ttk_FreeResourceCache(Ttk_ResourceCache);
 
 MODULE_SCOPE Ttk_ResourceCache Ttk_GetResourceCache(Tcl_Interp*);
-MODULE_SCOPE Tcl_Obj *Ttk_UseFont(Ttk_ResourceCache, Tk_Window, Tcl_Obj *);
-MODULE_SCOPE Tcl_Obj *Ttk_UseColor(Ttk_ResourceCache, Tk_Window, Tcl_Obj *);
-MODULE_SCOPE Tcl_Obj *Ttk_UseBorder(Ttk_ResourceCache, Tk_Window, Tcl_Obj *);
-MODULE_SCOPE Tk_Image Ttk_UseImage(Ttk_ResourceCache, Tk_Window, Tcl_Obj *);
+MODULE_SCOPE Tcl_Obj *Ttk_UseFont(Ttk_ResourceCache, Tcl_Obj *);
+MODULE_SCOPE Tcl_Obj *Ttk_UseColor(Ttk_ResourceCache, Tcl_Obj *);
+MODULE_SCOPE Tcl_Obj *Ttk_UseBorder(Ttk_ResourceCache, Tcl_Obj *);
+MODULE_SCOPE Tk_Image Ttk_UseImage(Ttk_ResourceCache, Tcl_Obj *);
 
 MODULE_SCOPE void Ttk_RegisterNamedColor(Ttk_ResourceCache, const char *, XColor *);