diff options
| author | jenglish <jenglish@flightlab.com> | 2011-09-22 18:10:30 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2011-09-22 18:10:30 (GMT) |
| commit | 3d7771a4c563657f852eddc6b6e5a1e5223cd568 (patch) | |
| tree | 1f3d74c51d27e678018aae35bf2e4f667359e082 /generic/ttk/ttkSeparator.c | |
| parent | aef5d3cf9a433ab18b10d9d5770943f1cd703bd7 (diff) | |
| download | tk-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/ttkSeparator.c')
| -rw-r--r-- | generic/ttk/ttkSeparator.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c index 6c8ee6b..b52e6f4 100644 --- a/generic/ttk/ttkSeparator.c +++ b/generic/ttk/ttkSeparator.c @@ -23,13 +23,13 @@ typedef struct SeparatorPart separator; } Separator; -static Tk_OptionSpec SeparatorOptionSpecs[] = -{ +static Tk_OptionSpec SeparatorOptionSpecs[] = { {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal", Tk_Offset(Separator,separator.orientObj), Tk_Offset(Separator,separator.orient), 0,(ClientData)ttkOrientStrings,STYLE_CHANGED }, + WIDGET_TAKEFOCUS_FALSE, WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs) }; @@ -84,6 +84,11 @@ TTK_END_LAYOUT * Has no options or methods other than the standard ones. */ +static Tk_OptionSpec SizegripOptionSpecs[] = { + WIDGET_TAKEFOCUS_FALSE, + WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs) +}; + static const Ttk_Ensemble SizegripCommands[] = { { "configure", TtkWidgetConfigureCommand,0 }, { "cget", TtkWidgetCgetCommand,0 }, @@ -97,7 +102,7 @@ static WidgetSpec SizegripWidgetSpec = { "TSizegrip", /* className */ sizeof(WidgetCore), /* recordSize */ - ttkCoreOptionSpecs, /* optionSpecs */ + SizegripOptionSpecs, /* optionSpecs */ SizegripCommands, /* subcommands */ TtkNullInitialize, /* initializeProc */ TtkNullCleanup, /* cleanupProc */ |