diff options
| -rw-r--r-- | TableDocument.h | 1 | ||||
| -rw-r--r-- | TableDocument.m | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/TableDocument.h b/TableDocument.h index 29224ae2..5ce1ada2 100644 --- a/TableDocument.h +++ b/TableDocument.h @@ -27,7 +27,6 @@ #import <MCPKit_bundled/MCPKit_bundled.h> #import "CMMCPConnection.h" #import "CMMCPResult.h" -#import "DatabaseSelectToolbarItem.h" /** * The TableDocument class controls the primary database view window. diff --git a/TableDocument.m b/TableDocument.m index ea562e3b..ad7644df 100644 --- a/TableDocument.m +++ b/TableDocument.m @@ -977,7 +977,7 @@ returns the currently selected database returns the currently selected table (passing the request to TablesList) */ { - return [tablesListInstance table]; + return (NSString *)[tablesListInstance table]; } - (NSString *)mySQLVersion @@ -1164,7 +1164,7 @@ passes the request to the tableDump object { NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease]; - if ([itemIdentifier isEqualToString:DatabaseSelectToolbarItemIdentifier]) { + if ([itemIdentifier isEqualToString:@"DatabaseSelectToolbarItemIdentifier"]) { [toolbarItem setLabel:NSLocalizedString(@"Select Database", @"toolbar item for selecting a db")]; [toolbarItem setPaletteLabel:[toolbarItem label]]; [toolbarItem setView:chooseDatabaseButton]; @@ -1252,7 +1252,7 @@ passes the request to the tableDump object - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar { return [NSArray arrayWithObjects: - DatabaseSelectToolbarItemIdentifier, + @"DatabaseSelectToolbarItemIdentifier", @"ToggleConsoleIdentifier", @"ClearConsoleIdentifier", @"FlushPrivilegesIdentifier", @@ -1273,7 +1273,7 @@ passes the request to the tableDump object - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar { return [NSArray arrayWithObjects: - DatabaseSelectToolbarItemIdentifier, + @"DatabaseSelectToolbarItemIdentifier", NSToolbarSpaceItemIdentifier, @"SwitchToTableStructureToolbarItemIdentifier", @"SwitchToTableContentToolbarItemIdentifier", |