summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkSquare.c
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2011-09-22 18:10:30 (GMT)
committerjenglish <jenglish@flightlab.com>2011-09-22 18:10:30 (GMT)
commit3d7771a4c563657f852eddc6b6e5a1e5223cd568 (patch)
tree1f3d74c51d27e678018aae35bf2e4f667359e082 /generic/ttk/ttkSquare.c
parentaef5d3cf9a433ab18b10d9d5770943f1cd703bd7 (diff)
downloadtk-3d7771a4c563657f852eddc6b6e5a1e5223cd568.zip
tk-3d7771a4c563657f852eddc6b6e5a1e5223cd568.tar.gz
tk-3d7771a4c563657f852eddc6b6e5a1e5223cd568.tar.bz2
Move -takefocus option out of ttkCoreOptionSpecs,
explicitly specify it on individual widgets. [Bug 3404541], [Bug 1204186].
Diffstat (limited to 'generic/ttk/ttkSquare.c')
-rw-r--r--generic/ttk/ttkSquare.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c
index 23caeb4..d002f2f 100644
--- a/generic/ttk/ttkSquare.c
+++ b/generic/ttk/ttkSquare.c
@@ -50,8 +50,6 @@ typedef struct
static Tk_OptionSpec SquareOptionSpecs[] =
{
- WIDGET_TAKES_FOCUS,
-
{TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth",
DEFAULT_BORDERWIDTH, Tk_Offset(Square,square.borderWidthObj), -1,
0,0,GEOMETRY_CHANGED },
@@ -76,6 +74,7 @@ static Tk_OptionSpec SquareOptionSpecs[] =
{TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
NULL, Tk_Offset(Square,square.anchorObj), -1, TK_OPTION_NULL_OK, 0, 0},
+ WIDGET_TAKEFOCUS_TRUE,
WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
};