From 91681d7846b594c2d64055d3bf2b4b03e9da1ec3 Mon Sep 17 00:00:00 2001
From: Ross Boucher <ross@280north.com>
Date: Wed, 17 Feb 2010 17:06:09 -0800
Subject: [PATCH] Move more constants to CPControl.j

---
 AppKit/CPButton.j  | 22 ----------------------
 AppKit/CPControl.j | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j
index 40fb82ee3..a4852ce2a 100644
--- a/AppKit/CPButton.j
+++ b/AppKit/CPButton.j
@@ -28,28 +28,6 @@
 #include "CoreGraphics/CGGeometry.h"
 
 
-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
-
-
-/* @group CPCellImagePosition */
-
-CPNoImage       = 0;
-CPImageOnly     = 1;
-CPImageLeft     = 2;
-CPImageRight    = 3;
-CPImageBelow    = 4;
-CPImageAbove    = 5;
-CPImageOverlaps = 6;
-
-
-/*  @group CPButtonState */
-
-CPOnState                       = 1;
-CPOffState                      = 0;
-CPMixedState                    = -1;
-
 /* @group CPBezelStyle */
 
 CPRoundedBezelStyle             = 1;
diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index 25ca13544..d8fc926f1 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -48,6 +48,22 @@ CPTopVerticalTextAlignment      = 1,
 CPCenterVerticalTextAlignment   = 2,
 CPBottomVerticalTextAlignment   = 3;
 
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
+
+CPNoImage       = 0;
+CPImageOnly     = 1;
+CPImageLeft     = 2;
+CPImageRight    = 3;
+CPImageBelow    = 4;
+CPImageAbove    = 5;
+CPImageOverlaps = 6;
+
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
+
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
 CPControlHighlightedBackgroundColor = "CPControlHighlightedBackgroundColor";