diff options
| author | das <das@noemail.net> | 2008-12-07 21:56:37 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2008-12-07 21:56:37 (GMT) |
| commit | 6fec1deb6275f0cad3473c92e65ce93b1c46cb6f (patch) | |
| tree | 4fa3201c9ac36f981caf55136c5404ea8e99734c /macosx | |
| parent | f06fde9316a24bc2a44f3fae22a520d0edb1c437 (diff) | |
| download | tk-6fec1deb6275f0cad3473c92e65ce93b1c46cb6f.zip tk-6fec1deb6275f0cad3473c92e65ce93b1c46cb6f.tar.gz tk-6fec1deb6275f0cad3473c92e65ce93b1c46cb6f.tar.bz2 | |
fix brekage (bad merge?)
FossilOrigin-Name: 6a125524fe5583f2da7f570f8075591e4a44a47b
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 598abd9..c78d463 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -27,7 +27,7 @@ * top-level window, not to the Tk_Window. BoxToRect() * accounts for this. * - * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.24 2008/12/07 18:42:55 jenglish Exp $ + * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.25 2008/12/07 21:56:37 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -473,13 +473,6 @@ static Ttk_ElementSpec ComboboxElementSpec = { }; /*---------------------------------------------------------------------- - * +++ DrawThemeTrack-based elements -- - * Progress bars and scales. (See also: <<NOTE-TRACKS>>) - */ - -static Ttk_StateTable ThemeTrackEnableTable[] = { - { kThemeTrackDisabled, TTK_STATE_DISABLED, 0 }, - { kThemeTrackInactive, TTK_STATE_BACKGROUND, 0 }, * +++ Spinbuttons. * * From Apple HIG, part III, section "Controls", "The Stepper Control": @@ -530,6 +523,13 @@ static Ttk_ElementSpec SpinButtonElementSpec = { /*---------------------------------------------------------------------- + * +++ DrawThemeTrack-based elements -- + * Progress bars and scales. (See also: <<NOTE-TRACKS>>) + */ + +static Ttk_StateTable ThemeTrackEnableTable[] = { + { kThemeTrackDisabled, TTK_STATE_DISABLED, 0 }, + { kThemeTrackInactive, TTK_STATE_BACKGROUND, 0 }, { kThemeTrackActive, 0, 0 } /* { kThemeTrackNothingToScroll, ?, ? }, */ }; |