diff options
| author | fvogel <fvogelnew1@free.fr> | 2019-09-18 17:34:30 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2019-09-18 17:34:30 (GMT) |
| commit | 62f6371418272b76ebdb6b38d67ae3f43b79f6fd (patch) | |
| tree | d9bc819aeca8b5b6b26e2b6f16afb593776afbad /generic | |
| parent | af123e3f03048a5013a6802a06321f1386efe71d (diff) | |
| parent | 250217d618d22baf0222a0f7fa837f0aab916608 (diff) | |
| download | tk-62f6371418272b76ebdb6b38d67ae3f43b79f6fd.zip tk-62f6371418272b76ebdb6b38d67ae3f43b79f6fd.tar.gz tk-62f6371418272b76ebdb6b38d67ae3f43b79f6fd.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkPanedWindow.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkFrame.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index c605bf3..a34a372 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -304,7 +304,7 @@ static const Tk_OptionSpec optionSpecs[] = { 0, orientStrings, GEOMETRY}, {TK_OPTION_BORDER, "-proxybackground", "proxyBackground", "ProxyBackground", 0, -1, offsetof(PanedWindow, proxyBackground), TK_OPTION_NULL_OK, - (ClientData) DEF_PANEDWINDOW_BG_MONO}, + (ClientData) DEF_PANEDWINDOW_BG_MONO, 0}, {TK_OPTION_PIXELS, "-proxyborderwidth", "proxyBorderWidth", "ProxyBorderWidth", DEF_PANEDWINDOW_PROXYBORDER, offsetof(PanedWindow, proxyBorderWidthPtr), offsetof(PanedWindow, proxyBorderWidth), 0, 0, GEOMETRY}, diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c index 794b184..bb3dd35 100644 --- a/generic/ttk/ttkFrame.c +++ b/generic/ttk/ttkFrame.c @@ -439,8 +439,10 @@ static void LabelframeDoLayout(void *recordPtr) */ switch (LabelAnchorSide(style.labelAnchor)) { case TTK_SIDE_LEFT: borderParcel.x -= lw / 2; + /* FALLTHRU */ case TTK_SIDE_RIGHT: borderParcel.width += lw/2; break; case TTK_SIDE_TOP: borderParcel.y -= lh / 2; + /* FALLTHRU */ case TTK_SIDE_BOTTOM: borderParcel.height += lh / 2; break; } } |