aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPWindowController.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2011-03-19 15:05:23 +0000
committerstuconnolly <stuart02@gmail.com>2011-03-19 15:05:23 +0000
commit6d3f21336846d7745e795202c99390832c4220c8 (patch)
tree6195dafeeb1871afc5e41f6f17a917dc8047d44a /Source/SPWindowController.m
parentb2a0af91eae18b6490ddeafd2708d256b0d53cb3 (diff)
downloadsequelpro-6d3f21336846d7745e795202c99390832c4220c8.tar.gz
sequelpro-6d3f21336846d7745e795202c99390832c4220c8.tar.bz2
sequelpro-6d3f21336846d7745e795202c99390832c4220c8.zip
Bring outline view branch up to date with trunk (r3235:r3245), which should resolve all warnings.
Diffstat (limited to 'Source/SPWindowController.m')
-rw-r--r--Source/SPWindowController.m11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m
index 7fdb76e6..e9b73491 100644
--- a/Source/SPWindowController.m
+++ b/Source/SPWindowController.m
@@ -255,7 +255,8 @@
[[control tabView] addTabViewItem:selectedTabViewItem];
- [control update:NO]; //make sure the new tab is set in the correct position
+ // Make sure the new tab is set in the correct position by forcing an update
+ [tabBar update:NO];
// Update tabBar of the new window
[newWindowController tabView:[tabBar tabView] didDropTabViewItem:[selectedCell representedObject] inTabBar:control];
@@ -318,7 +319,7 @@
*/
- (void)selectTabAtIndex:(NSInteger)index
{
- if([[tabBar cells] count] > 0 && [[tabBar cells] count] > index) {
+ if([[tabBar cells] count] > 0 && [[tabBar cells] count] > (NSUInteger)index) {
[tabView selectTabViewItemAtIndex:index];
} else if([[tabBar cells] count]) {
[tabView selectTabViewItemAtIndex:0];
@@ -438,7 +439,7 @@
NSInteger tabIndex = [tabView indexOfTabViewItem:tabViewItem];
- if([[tabBar cells] count] < tabIndex) return @"";
+ if([[tabBar cells] count] < (NSUInteger)tabIndex) return @"";
PSMTabBarCell *theCell = [[tabBar cells] objectAtIndex:tabIndex];
@@ -539,7 +540,7 @@
NSImage *viewImage = [[NSImage alloc] init];
// Capture an image of the entire window
- CGImageRef windowImage = CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, [[self window] windowNumber], kCGWindowImageBoundsIgnoreFraming);
+ CGImageRef windowImage = CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, (unsigned int)[[self window] windowNumber], kCGWindowImageBoundsIgnoreFraming);
NSBitmapImageRep *viewRep = [[NSBitmapImageRep alloc] initWithCGImage:windowImage];
[viewImage addRepresentation:viewRep];
@@ -750,7 +751,7 @@
[bindingOptions setObject:NSNegateBooleanTransformerName forKey:@"NSValueTransformerName"];
[[theCell indicator] bind:@"animate" toObject:theDocument withKeyPath:@"isProcessing" options:nil];
[[theCell indicator] bind:@"hidden" toObject:theDocument withKeyPath:@"isProcessing" options:bindingOptions];
- [theDocument addObserver:self forKeyPath:@"isProcessing" options:nil context:nil];
+ [theDocument addObserver:self forKeyPath:@"isProcessing" options:0 context:nil];
}
/**