From 1328bc732fb7c87a4b0ebfa14c41b72beb613d73 Mon Sep 17 00:00:00 2001
From: Ross Boucher <ross@280north.com>
Date: Wed, 17 Feb 2010 16:29:57 -0800
Subject: [PATCH] Move around some imports and constant declarations.

---
 AppKit/CPControl.j           | 5 ++++-
 AppKit/CPTextField.j         | 1 +
 AppKit/_CPImageAndTextView.j | 7 +------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index 83356f195..25ca13544 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -23,7 +23,6 @@
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
-@import "_CPImageAndTextView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
@@ -45,6 +44,10 @@ CPLineBreakByTruncatingHead     = 3;
 CPLineBreakByTruncatingTail     = 4;
 CPLineBreakByTruncatingMiddle   = 5;
 
+CPTopVerticalTextAlignment      = 1,
+CPCenterVerticalTextAlignment   = 2,
+CPBottomVerticalTextAlignment   = 3;
+
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
 CPControlHighlightedBackgroundColor = "CPControlHighlightedBackgroundColor";
diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index f5f43e5bf..762e4c9b3 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -24,6 +24,7 @@
 @import "CPControl.j"
 @import "CPStringDrawing.j"
 @import "CPCompatibility.j"
+@import "_CPImageAndTextView.j"
 
 #include "CoreGraphics/CGGeometry.h"
 #include "Platform/Platform.h"
diff --git a/AppKit/_CPImageAndTextView.j b/AppKit/_CPImageAndTextView.j
index d5755c60d..c611c4c0a 100644
--- a/AppKit/_CPImageAndTextView.j
+++ b/AppKit/_CPImageAndTextView.j
@@ -25,19 +25,14 @@
 @import "CPColor.j"
 @import "CPFont.j"
 @import "CPImage.j"
-@import "CPTextField.j"
 @import "CPView.j"
+@import "CPControl.j"
 
 #include "CoreGraphics/CGGeometry.h"
 
 #include "Platform/Platform.h"
 #include "Platform/DOM/CPDOMDisplayServer.h"
 
-
-CPTopVerticalTextAlignment      = 1,
-CPCenterVerticalTextAlignment   = 2,
-CPBottomVerticalTextAlignment   = 3;
-
 var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
     _CPImageAndTextViewImageChangedFlag             = 1 << 1,
     _CPImageAndTextViewTextChangedFlag              = 1 << 2,