gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSMenuItemCell.m

Browse source 
* Headers/AppKit/NSMenuItemCell.h
          float -> CGFloat transitions



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36238 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sebastian Reitenbach 2013-03-02 18:06:25 +00:00
parent c3c8dd05da
commit 1bda279897
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,8 +1,13 @@
2012-03-01 Richard Frith-Macdonald <rfm@gnu.org>
2013-03-02 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* Source/NSMenuItemCell.m
* Headers/AppKit/NSMenuItemCell.h
float -> CGFloat transitions
2013-03-01 Richard Frith-Macdonald <rfm@gnu.org>
* Version ... bump subminor number in preparation for next release.
2012-03-01 Richard Frith-Macdonald <rfm@gnu.org>
2013-03-01 Richard Frith-Macdonald <rfm@gnu.org>
Make release
* Version 0.23.0

18
Headers/AppKit/NSMenuItemCell.h
View file

@ -50,11 +50,11 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
BOOL _needs_display;
char _pad[1];
float _imageWidth;
float _titleWidth;
float _keyEquivalentWidth;
float _stateImageWidth;
float _menuItemHeight;
CGFloat _imageWidth;
CGFloat _titleWidth;
CGFloat _keyEquivalentWidth;
CGFloat _stateImageWidth;
CGFloat _menuItemHeight;
NSImage *_imageToDisplay;
NSString *_titleToDisplay;
@ -76,10 +76,10 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
- (void)setNeedsDisplay:(BOOL)flag;
- (BOOL)needsDisplay;
- (float)imageWidth;
- (float)titleWidth;
- (float)keyEquivalentWidth;
- (float)stateImageWidth;
- (CGFloat)imageWidth;
- (CGFloat)titleWidth;
- (CGFloat)keyEquivalentWidth;
- (CGFloat)stateImageWidth;
- (NSRect)imageRectForBounds:(NSRect)cellFrame;
- (NSRect)keyEquivalentRectForBounds:(NSRect)cellFrame;

12
Source/NSMenuItemCell.m
View file

@ -268,7 +268,7 @@ static NSString *commandKeyString = @"#";
{
NSSize componentSize;
NSImage *anImage = nil;
float neededMenuItemHeight = 20;
CGFloat neededMenuItemHeight = 20;
// Check if _mcell_belongs_to_popupbutton = NO while cell owned by
// popup button. FIXME
@ -385,7 +385,7 @@ static NSString *commandKeyString = @"#";
return _needs_display;
}
- (float) imageWidth
- (CGFloat) imageWidth
{
if (_needs_sizing)
[self calcSize];
@ -393,7 +393,7 @@ static NSString *commandKeyString = @"#";
return _imageWidth;
}
- (float) titleWidth
- (CGFloat) titleWidth
{
if (_needs_sizing)
[self calcSize];
@ -401,7 +401,7 @@ static NSString *commandKeyString = @"#";
return _titleWidth;
}
- (float) keyEquivalentWidth
- (CGFloat) keyEquivalentWidth
{
if (_needs_sizing)
[self calcSize];
@ -409,7 +409,7 @@ static NSString *commandKeyString = @"#";
return _keyEquivalentWidth;
}
- (float) stateImageWidth
- (CGFloat) stateImageWidth
{
if (_needs_sizing)
[self calcSize];
@ -625,7 +625,7 @@ static NSString *commandKeyString = @"#";
{
if (_cell.is_bordered)
{
float yDelta = [_control_view isFlipped] ? 1. : 2.;
CGFloat yDelta = [_control_view isFlipped] ? 1. : 2.;
unsigned mask;
NSRect interiorFrame;