From 4611475c5b255eed9202474dd3bdee147e932946 Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Fri, 22 Apr 2011 17:44:57 +0000
Subject: Bring outline view branch up to date with trunk (r3234:3277).

---
 Source/SPFieldEditorController.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Source/SPFieldEditorController.h')

diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h
index 1f3b6ea8..b629acbf 100644
--- a/Source/SPFieldEditorController.h
+++ b/Source/SPFieldEditorController.h
@@ -32,7 +32,11 @@
  * This class offers a sheet for editing different kind of data such as text, blobs (including images) as 
  * editSheet and bit fields as bitSheet. 
  */
+#ifndef SP_REFACTOR
 @interface SPFieldEditorController : NSWindowController
+#else
+@interface SPFieldEditorController : NSWindowController <NSComboBoxDataSource>
+#endif
 {
 	IBOutlet id editSheetProgressBar;
 	IBOutlet id editSheetSegmentControl;
-- 
cgit v1.2.3