From 8de71663c22c48987dc7ad7d1eed2c0efb1142ec Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Wed, 13 Jan 2010 21:30:10 -0500
Subject: [PATCH 1/3] Fixes for the CPTableView drag operation (selection and
 drag and drop) after the nasty fix for the outlineview fix for Safari.

---
 AppKit/CPTableView.j | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 110efabbb..93806cd8b 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -241,9 +241,12 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
         _selectedColumnIndexes = [CPIndexSet indexSet];
         _selectedRowIndexes = [CPIndexSet indexSet];
-window.setTimeout(function(){
-        self._draggedRowIndexes = [CPIndexSet indexSet];
-        self._verticalMotionCanDrag = YES;}, 0);
+        _draggedRowIndexes = [CPIndexSet indexSet];
+        _verticalMotionCanDrag = YES;
+        _isSelectingSession = NO;
+        _retargetedDropRow = nil;
+        _retargetedDropOperation = nil;
+        _dragOperationDefaultMask = nil;
         _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular;
         _dropOperationFeedbackView = [[_dropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
         [self addSubview:_dropOperationFeedbackView];

From 57a63440f9e158bfad073a2b68cf6e1d1dba8996 Mon Sep 17 00:00:00 2001
From: Ross Boucher <ross@280north.com>
Date: Wed, 13 Jan 2010 20:04:23 -0800
Subject: [PATCH 2/3] Remove unnecessary comments.

---
 AppKit/CPTableColumn.j | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j
index 647122576..05d2c6d88 100644
--- a/AppKit/CPTableColumn.j
+++ b/AppKit/CPTableColumn.j
@@ -27,21 +27,8 @@
 
 @import "CPTableHeaderView.j"
 
-
-/*
-    @global
-    @class CPTableColumn
-*/
 CPTableColumnNoResizing         = 0;
-/*
-    @global
-    @class CPTableColumn
-*/
 CPTableColumnAutoresizingMask   = 1;
-/*
-    @global
-    @class CPTableColumn
-*/
 CPTableColumnUserResizingMask   = 2;
 
 @implementation CPTableColumn : CPObject

From a5e34d91532937966109ca32df1e99e3a743639c Mon Sep 17 00:00:00 2001
From: Scott Kyle <scott@appden.com>
Date: Thu, 7 Jan 2010 18:44:19 -0800
Subject: [PATCH 3/3] Added CGGeometry to CPTableColumn since it's called from
 sizeToFit

---
 AppKit/CPTableColumn.j | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j
index 05d2c6d88..f098b4eaa 100644
--- a/AppKit/CPTableColumn.j
+++ b/AppKit/CPTableColumn.j
@@ -27,6 +27,8 @@
 
 @import "CPTableHeaderView.j"
 
+#include "CoreGraphics/CGGeometry.h"
+
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1;
 CPTableColumnUserResizingMask   = 2;
@@ -41,6 +43,7 @@ CPTableColumnUserResizingMask   = 2;
     float               _width;
     float               _minWidth;
     float               _maxWidth;
+    unsigned            _resizingMask;
 
     id                  _identifier;
     BOOL                _isEditable;