merge 8.6core-8-6-10

2 files changed, 6 insertions, 6 deletions

diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index 03b3e57..a537846 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.c
@@ -113,15 +113,16 @@ static const Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_CUSTOM, "-disabledwidth", NULL, NULL,
 	"0.0", Tk_Offset(PolygonItem, outline.disabledWidth),
 	TK_CONFIG_DONT_SET_DEFAULT, &pixelOption},
+    /* Remark: Default for -fill should be NULL, see [2860519]. Will be fixed in Tk 8.7 */
     {TK_CONFIG_COLOR, "-fill", NULL, NULL,
-	NULL, Tk_Offset(PolygonItem, fillColor), TK_CONFIG_NULL_OK, NULL},
+ 	DEF_CANVITEM_OUTLINE, Tk_Offset(PolygonItem, fillColor), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_JOIN_STYLE, "-joinstyle", NULL, NULL,
 	"round", Tk_Offset(PolygonItem, joinStyle), TK_CONFIG_DONT_SET_DEFAULT, NULL},
     {TK_CONFIG_CUSTOM, "-offset", NULL, NULL,
 	"0,0", Tk_Offset(PolygonItem, tsoffset),
 	TK_CONFIG_NULL_OK, &offsetOption},
     {TK_CONFIG_COLOR, "-outline", NULL, NULL,
-	DEF_CANVITEM_OUTLINE, Tk_Offset(PolygonItem, outline.color), TK_CONFIG_NULL_OK, NULL},
+	NULL, Tk_Offset(PolygonItem, outline.color), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_CUSTOM, "-outlineoffset", NULL, NULL,
 	"0,0", Tk_Offset(PolygonItem, outline.tsoffset),
 	TK_CONFIG_NULL_OK, &offsetOption},
diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index 5249aaf..870c1f3 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -220,13 +220,12 @@ Tk_SetInternalBorderEx(
     /*
      * All the slaves for which this is the master window must now be
      * repositioned to take account of the new internal border width. To
-     * signal all the geometry managers to do this, just resize the window to
-     * its current size. The ConfigureNotify event will cause geometry
-     * managers to recompute everything.
+     * signal all the geometry managers to do this, trigger a ConfigureNotify
+     * event. This will cause geometry managers to recompute everything.
      */
 
     if (changed) {
-	Tk_ResizeWindow(tkwin, Tk_Width(tkwin), Tk_Height(tkwin));
+	TkDoConfigureNotify(winPtr);
     }
 }