Fixed most of the warnings in a sensible way

This commit is contained in:
AlessandroSangiuliano 2013-12-29 15:30:33 +01:00
parent 1d5faee70f
commit 3139a909a6
5 changed files with 19 additions and 7 deletions

View File

@ -12,13 +12,13 @@
+ (NSButton *) standardWindowButton: (NSWindowButton)button
forStyleMask: (NSUInteger) mask
{
NSButton *newButton;
RikWindowButton *newButton;
switch (button)
{
case NSWindowCloseButton:
newButton = [[RikWindowButton alloc] init];
[(RikWindowButton*)newButton setBaseColor: [NSColor colorWithCalibratedRed: 0.698 green: 0.427 blue: 1.00 alpha: 1]];
[newButton setBaseColor: [NSColor colorWithCalibratedRed: 0.698 green: 0.427 blue: 1.00 alpha: 1]];
[newButton setImage: [NSImage imageNamed: @"common_Close"]];
[newButton setAlternateImage: [NSImage imageNamed: @"common_CloseH"]];
[newButton setAction: @selector(performClose:)];
@ -41,12 +41,12 @@
case NSWindowToolbarButton:
// FIXME
newButton = [[NSButton alloc] init];
newButton = [[RikWindowButton alloc] init];
[newButton setAction: @selector(toggleToolbarShown:)];
break;
case NSWindowDocumentIconButton:
default:
newButton = [[NSButton alloc] init];
newButton = [[RikWindowButton alloc] init];
// FIXME
break;
}

8
Rik+Button.h Normal file
View File

@ -0,0 +1,8 @@
#import "Rik.h"
@interface Rik (RikButton)
{
}
- (NSGradient *) _bezelGradientWithColor:(NSColor*) baseColor;
@end

View File

@ -1,4 +1,5 @@
#import "Rik.h"
#import "Rik+Button.h"
@implementation Rik(RikButton)

View File

@ -1,4 +1,5 @@
#import "Rik.h"
#import "Rik+Button.h"
@implementation Rik(RikSegmented)

View File

@ -1,10 +1,12 @@
#include "Rik.h"
#import "Rik.h"
@interface Rik(RikSlider)
@interface GSTheme()
- (void) drawCircularBezel: (NSRect)cellFrame
withColor: (NSColor*)backgroundColor;
@end
@implementation Rik(RikSlider)
@implementation Rik (RikSlider)
- (void) drawSliderBorderAndBackground: (NSBorderType)aType
frame: (NSRect)cellFrame
inCell: (NSCell *)cell