colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-06 17:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for alternate button title in nib2cib

Browse Source
This commit is contained in:
Aparajita Fishman committed 2012-07-02 09:55:52 -04:00
1 parent 8651a59f43
commit fc23863d85
1 file changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files
Tools/nib2cib/NSButton.j
+4 -1
View File
@@ -118,6 +118,7 @@ var NSButtonIsBorderedMask = 0x00800000,
NIB_CONNECTION_EQUIVALENCY_TABLE[[cell UID]] = self;
_title = [cell title];
_alternateTitle = [cell alternateTitle];
_controlSize = CPRegularControlSize;
[self setBordered:[cell isBordered]];
@@ -254,6 +255,7 @@ var NSButtonIsBorderedMask = 0x00800000,
int _bezelStyle @accessors(readonly, getter=bezelStyle);
CPString _title @accessors(readonly, getter=title);
CPString _alternateTitle @accessors(readonly, getter=alternateTitle);
CPImage _normalImage @accessors(readonly, getter=normalImage);
CPImage _alternateImage @accessors(readonly, getter=alternateImage);
@@ -281,8 +283,9 @@ var NSButtonIsBorderedMask = 0x00800000,
_isBordered = (buttonFlags & NSButtonIsBorderedMask) ? YES : NO;
_bezelStyle = (buttonFlags2 & 0x7) | ((buttonFlags2 & 0x20) >> 2);
// NSContents for NSButton is actually the title
// NSContents/NSAlternateContents for NSButton is actually the title/alternate title
_title = [aCoder decodeObjectForKey:@"NSContents"];
_alternateTitle = [aCoder decodeObjectForKey:@"NSAlternateContents"];
// ... and _objectValue is _state
_objectValue = [self state];