From 597daf2f923e59de1a284ad76b26b59e66ac0df9 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Sun, 7 Dec 2008 21:56:37 +0000
Subject: fix brekage (bad merge?)

---
 macosx/ttkMacOSXTheme.c | 16 ++++++++--------
 1 file 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, ?, ? }, */
 };
-- 
cgit v0.12