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/SPCustomQuery.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/SPCustomQuery.h')
| -rw-r--r-- | Source/SPCustomQuery.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h index 68969a01..8a1ad793 100644 --- a/Source/SPCustomQuery.h +++ b/Source/SPCustomQuery.h @@ -46,9 +46,17 @@ #define SP_HISTORY_SAVE_MENUITEM_TAG 300001 #define SP_HISTORY_CLEAR_MENUITEM_TAG 300002 +#ifndef SP_REFACTOR @class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, BWSplitView, SPFieldEditorController; +#else +@class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, NSSplitView, SPFieldEditorController; +#endif +#ifndef SP_REFACTOR @interface SPCustomQuery : NSObject +#else +@interface SPCustomQuery : NSObject <NSTableViewDataSource, NSWindowDelegate, NSTableViewDelegate> +#endif { IBOutlet id tableDocumentInstance; IBOutlet id tablesListInstance; @@ -101,15 +109,21 @@ IBOutlet NSMenuItem *previousHistoryMenuItem; IBOutlet NSMenuItem *nextHistoryMenuItem; +#ifndef SP_REFACTOR IBOutlet NSWindow *helpWebViewWindow; IBOutlet WebView *helpWebView; IBOutlet NSSearchField *helpSearchField; IBOutlet NSSearchFieldCell *helpSearchFieldCell; IBOutlet NSSegmentedControl *helpNavigator; IBOutlet NSSegmentedControl *helpTargetSelector; +#endif IBOutlet NSButton *queryInfoButton; +#ifndef SP_REFACTOR IBOutlet BWSplitView *queryInfoPaneSplitView; +#else + IBOutlet NSSplitView *queryInfoPaneSplitView; +#endif SPFieldEditorController *fieldEditor; @@ -129,9 +143,11 @@ NSUInteger queryStartPosition; +#ifndef SP_REFACTOR NSUInteger helpTarget; WebHistory *helpHistory; NSString *helpHTMLTemplate; +#endif SPDataStorage *resultData; pthread_mutex_t resultDataLock; @@ -181,6 +197,7 @@ - (IBAction)chooseQueryHistory:(id)sender; - (IBAction)closeSheet:(id)sender; - (IBAction)gearMenuItemSelected:(id)sender; +#ifndef SP_REFACTOR - (IBAction)showHelpForCurrentWord:(id)sender; - (IBAction)showHelpForSearchString:(id)sender; - (IBAction)helpSegmentDispatcher:(id)sender; @@ -190,6 +207,7 @@ - (IBAction)helpSelectHelpTargetMySQL:(id)sender; - (IBAction)helpSelectHelpTargetPage:(id)sender; - (IBAction)helpSelectHelpTargetWeb:(id)sender; +#endif - (IBAction)filterQueryFavorites:(id)sender; - (IBAction)filterQueryHistory:(id)sender; - (IBAction)saveQueryHistory:(id)sender; @@ -226,6 +244,7 @@ - (void) clearResultViewDetailsToRestore; - (void) autosizeColumns; +#ifndef SP_REFACTOR // MySQL Help - (void)showAutoHelpForCurrentWord:(id)sender; - (NSString *)getHTMLformattedMySQLHelpFor:(NSString *)searchString calledByAutoHelp:(BOOL)autoHelp; @@ -233,6 +252,7 @@ - (void)helpTargetValidation; - (void)openMySQLonlineDocumentationWithString:(NSString *)searchString; - (NSWindow *)helpWebViewWindow; +#endif - (void)setMySQLversion:(NSString *)theVersion; // Task interaction |