diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-04-22 17:44:57 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-04-22 17:44:57 +0000 |
| commit | 4611475c5b255eed9202474dd3bdee147e932946 (patch) | |
| tree | 39bdc50e046f802265950c6e2607ca9ebda453be /Source/SPTextView.h | |
| parent | 3ed8b33deeadcc98185911f41bc6bcb4e53b4719 (diff) | |
| download | sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.gz sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.bz2 sequelpro-4611475c5b255eed9202474dd3bdee147e932946.zip | |
Bring outline view branch up to date with trunk (r3234:3277).
Diffstat (limited to 'Source/SPTextView.h')
| -rw-r--r-- | Source/SPTextView.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Source/SPTextView.h b/Source/SPTextView.h index 3954c941..bc4a3eb8 100644 --- a/Source/SPTextView.h +++ b/Source/SPTextView.h @@ -32,7 +32,11 @@ @class SPNarrowDownCompletion, SPDatabaseDocument, SPTablesList, SPCustomQuery; -@interface SPTextView : NSTextView +#ifndef SP_REFACTOR +@interface SPTextView : NSTextView +#else +@interface SPTextView : NSTextView <NSTextStorageDelegate> +#endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; IBOutlet SPTablesList *tablesListInstance; @@ -43,18 +47,24 @@ BOOL autoindentIgnoresEnter; BOOL autouppercaseKeywordsEnabled; BOOL delBackwardsWasPressed; +#ifndef SP_REFACTOR BOOL autohelpEnabled; +#endif NoodleLineNumberView *lineNumberView; BOOL startListeningToBoundChanges; BOOL textBufferSizeIncreased; +#ifndef SP_REFACTOR NSString *showMySQLHelpFor; +#endif IBOutlet NSScrollView *scrollView; SPNarrowDownCompletion *completionPopup; +#ifndef SP_REFACTOR NSUserDefaults *prefs; +#endif MCPConnection *mySQLConnection; NSInteger mySQLmajorVersion; @@ -102,7 +112,9 @@ @property(assign) BOOL completionIsOpen; @property(assign) BOOL completionWasReinvokedAutomatically; +#ifndef SP_REFACTOR - (IBAction)showMySQLHelpForCurrentWord:(id)sender; +#endif - (BOOL) isNextCharMarkedBy:(id)attribute withValue:(id)aValue; - (BOOL) areAdjacentCharsLinked; @@ -119,12 +131,16 @@ - (BOOL) autopair; - (void) setAutouppercaseKeywords:(BOOL)enableAutouppercaseKeywords; - (BOOL) autouppercaseKeywords; +#ifndef SP_REFACTOR - (void) setAutohelp:(BOOL)enableAutohelp; - (BOOL) autohelp; +#endif - (void) setTabStops; - (void) selectLineNumber:(NSUInteger)lineNumber ignoreLeadingNewLines:(BOOL)ignLeadingNewLines; - (NSUInteger) getLineNumberForCharacterIndex:(NSUInteger)anIndex; +#ifndef SP_REFACTOR - (void) autoHelp; +#endif - (void) doSyntaxHighlighting; - (NSBezierPath*)roundedBezierPathAroundRange:(NSRange)aRange; - (void) setConnection:(MCPConnection *)theConnection withVersion:(NSInteger)majorVersion; |