gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 20:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change return of -drawTitle:withFrame:inView to NSRect instead of void.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38049 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2014-08-21 02:52:06 +00:00
parent cb6f3d721e
commit e8c87f46a2
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2014-08-20 22:49-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Headers/AppKit/NSButtonCell.h
* Source/NSButtonCell.m: Change return type of -drawTitle:withFrame:
inView: to NSRect instead of void per Cocoa documentation.
2014-08-18 12:14-EDT Gregory John Casamento <greg.casamento@gmail.com> 2014-08-18 12:14-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSWindow.m: Change code in * Source/NSWindow.m: Change code in

6
Headers/AppKit/NSButtonCell.h
View file

@ -213,9 +213,9 @@ typedef enum _NSGradientType {
- (void) drawImage: (NSImage*)imageToDisplay - (void) drawImage: (NSImage*)imageToDisplay
withFrame: (NSRect)cellFrame withFrame: (NSRect)cellFrame
inView: (NSView *)controlView; inView: (NSView *)controlView;
- (void) drawTitle: (NSAttributedString*)titleToDisplay - (NSRect) drawTitle: (NSAttributedString*)titleToDisplay
withFrame: (NSRect)cellFrame withFrame: (NSRect)cellFrame
inView: (NSView *)controlView; inView: (NSView *)controlView;
#endif #endif
// //

10
Source/NSButtonCell.m
View file

@ -1068,12 +1068,16 @@ typedef struct _GSButtonCellFlags
} }
} }
- (void) drawTitle: (NSAttributedString*)titleToDisplay - (NSRect) drawTitle: (NSAttributedString*)titleToDisplay
withFrame: (NSRect)cellFrame withFrame: (NSRect)cellFrame
inView: (NSView*)controlView inView: (NSView*)controlView
{ {
[self _drawAttributedText: titleToDisplay [self _drawAttributedText: titleToDisplay
inFrame: cellFrame]; inFrame: cellFrame];
return [titleToDisplay
boundingRectWithSize: cellFrame.size
options: NSStringDrawingUsesLineFragmentOrigin];
} }
// Private helper method overridden in subclasses // Private helper method overridden in subclasses