Skip to content

Commit

Permalink
Fixing compiler warnings and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
kgn committed Jul 22, 2011
1 parent d8ec128 commit c181784
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions Source/DBPrefsWindowController.h
Expand Up @@ -67,6 +67,7 @@
- (BOOL)shiftSlowsAnimation;
- (void)setShiftSlowsAnimation:(BOOL)slows;

- (void)toggleActivePreferenceView:(NSToolbarItem *)toolbarItem;
- (void)displayViewForIdentifier:(NSString *)identifier animate:(BOOL)animate;
- (void)crossFadeView:(NSView *)oldView withView:(NSView *)newView;
- (NSRect)frameForView:(NSView *)view;
Expand Down
18 changes: 9 additions & 9 deletions Source/DBPrefsWindowController.m
Expand Up @@ -56,7 +56,7 @@ - (id)initWithWindow:(NSWindow *)window
viewAnimation = [[NSViewAnimation alloc] init];
[viewAnimation setAnimationBlockingMode:NSAnimationNonblocking];
[viewAnimation setAnimationCurve:NSAnimationEaseInOut];
[viewAnimation setDelegate:self];
[viewAnimation setDelegate:(id<NSAnimationDelegate>)self];

[self setCrossFade:YES];
[self setShiftSlowsAnimation:YES];
Expand Down Expand Up @@ -206,7 +206,7 @@ - (IBAction)showWindow:(id)sender
[toolbar setAutosavesConfiguration:NO];
[toolbar setSizeMode:NSToolbarSizeModeDefault];
[toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
[toolbar setDelegate:self];
[toolbar setDelegate:(id<NSToolbarDelegate>)self];
[[self window] setToolbar:toolbar];
[toolbar release];
}
Expand Down Expand Up @@ -365,16 +365,16 @@ - (void)animationDidEnd:(NSAnimation *)animation
{
NSView *subview;

// Get a list of all of the views in the window. Hopefully
// at this point there are two. One is visible and one is hidden.
// Get a list of all of the views in the window. Hopefully
// at this point there are two. One is visible and one is hidden.
NSEnumerator *subviewsEnum = [[contentSubview subviews] reverseObjectEnumerator];

// This is our visible view. Just get past it.
subview = [subviewsEnum nextObject];
// This is our visible view. Just get past it.
[subviewsEnum nextObject];

// Remove everything else. There should be just one, but
// if the user does a lot of fast clicking, we might have
// more than one to remove.
// Remove everything else. There should be just one, but
// if the user does a lot of fast clicking, we might have
// more than one to remove.
while ((subview = [subviewsEnum nextObject]) != nil) {
[subview removeFromSuperviewWithoutNeedingDisplay];
}
Expand Down

0 comments on commit c181784

Please sign in to comment.