summaryrefslogtreecommitdiffstats
path: root/macosx/ttkMacOSXTheme.c
diff options
context:
space:
mode:
authordas <das>2008-12-07 21:56:37 (GMT)
committerdas <das>2008-12-07 21:56:37 (GMT)
commit597daf2f923e59de1a284ad76b26b59e66ac0df9 (patch)
tree4fa3201c9ac36f981caf55136c5404ea8e99734c /macosx/ttkMacOSXTheme.c
parent2fda008258648b130dc7884a0be2da3b9ad0f38b (diff)
downloadtk-597daf2f923e59de1a284ad76b26b59e66ac0df9.zip
tk-597daf2f923e59de1a284ad76b26b59e66ac0df9.tar.gz
tk-597daf2f923e59de1a284ad76b26b59e66ac0df9.tar.bz2
fix brekage (bad merge?)
Diffstat (limited to 'macosx/ttkMacOSXTheme.c')
-rw-r--r--macosx/ttkMacOSXTheme.c16
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, ?, ? }, */
};