diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2015-02-14 11:11:50 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2015-02-14 11:11:50 +1100 |
| commit | 9b01cf93e9d08be90bdce08a12be77ef4f6332fc (patch) | |
| tree | 1cbe430090714c0691245ddc72a94f158c72f902 /cocoa/InfoBar.mm | |
| parent | a2f8fd71a1c55e7b8e66f9f299dcdfdafe5d7d6e (diff) | |
| download | scintilla-mirror-9b01cf93e9d08be90bdce08a12be77ef4f6332fc.tar.gz | |
Fix warnings for suspicious type conversions and not fully bracketed initializers,
Diffstat (limited to 'cocoa/InfoBar.mm')
| -rw-r--r-- | cocoa/InfoBar.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm index 3ea0fce5d..01e2ce49c 100644 --- a/cocoa/InfoBar.mm +++ b/cocoa/InfoBar.mm @@ -32,7 +32,7 @@ NSSize textSize = [self cellSizeForBounds: theRect]; // Center that in the proposed rect - float heightDelta = newRect.size.height - textSize.height; + CGFloat heightDelta = newRect.size.height - textSize.height; if (heightDelta > 0) { newRect.size.height -= heightDelta; @@ -143,7 +143,7 @@ static NSString *DefaultScaleMenuLabels[] = { @"20%", @"30%", @"50%", @"75%", @"100%", @"130%", @"160%", @"200%", @"250%", @"300%" }; static float DefaultScaleMenuFactors[] = { - 0.2, 0.3, 0.5, 0.75, 1.0, 1.3, 1.6, 2.0, 2.5, 3.0 + 0.2f, 0.3f, 0.5f, 0.75f, 1.0f, 1.3f, 1.6f, 2.0f, 2.5f, 3.0f }; static unsigned DefaultScaleMenuSelectedItemIndex = 4; static float BarFontSize = 10.0; @@ -251,7 +251,7 @@ static float BarFontSize = 10.0; // Draw separator lines between items. NSRect verticalLineRect; - float component = 190.0 / 255.0; + CGFloat component = 190.0 / 255.0; NSColor* lineColor = [NSColor colorWithDeviceRed: component green: component blue: component alpha: 1]; if (mDisplayMask & IBShowZoom) @@ -301,7 +301,7 @@ static float BarFontSize = 10.0; - (void) positionSubViews { - NSRect currentBounds = {0, 0, 0, [self frame].size.height}; + NSRect currentBounds = {{0, 0}, {0, [self frame].size.height}}; if (mDisplayMask & IBShowZoom) { [mZoomPopup setHidden: NO]; |