mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 22:00:46 +00:00
Committing additional changes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14670 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
69441127b4
commit
6db538c88b
2 changed files with 16 additions and 3 deletions
|
@ -117,6 +117,7 @@
|
||||||
NSButtonType _buttonType;
|
NSButtonType _buttonType;
|
||||||
NSBezelStyle _bezelStyle;
|
NSBezelStyle _bezelStyle;
|
||||||
BOOL _bordered;
|
BOOL _bordered;
|
||||||
|
BOOL _allowsMixedState;
|
||||||
}
|
}
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
|
@ -1206,15 +1206,25 @@ Class gmodel_class(void)
|
||||||
{
|
{
|
||||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
|
||||||
[aCoder decodeValueOfObjCType: @encode(id) at: &_delegate];
|
[aCoder decodeValueOfObjCType: @encode(id) at: &_delegate];
|
||||||
[super initWithCoder: aCoder];
|
[aCoder decodeValueOfObjCType: @encode(id) at: &_dataSource];
|
||||||
|
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
|
||||||
return self;
|
[aCoder decodeValueOfObjCType: @encode(int) at: &_buttonType];
|
||||||
|
[aCoder decodeValueOfObjCType: @encode(int) at: &_bezelStyle];
|
||||||
|
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_bordered];
|
||||||
|
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_allowsMixedState];
|
||||||
|
return [super initWithCoder: aCoder];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) encodeWithCoder: (NSCoder *)aCoder
|
- (void) encodeWithCoder: (NSCoder *)aCoder
|
||||||
{
|
{
|
||||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
|
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
|
||||||
[aCoder encodeValueOfObjCType: @encode(id) at: &_delegate];
|
[aCoder encodeValueOfObjCType: @encode(id) at: &_delegate];
|
||||||
|
[aCoder encodeValueOfObjCType: @encode(id) at: &_dataSource];
|
||||||
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
|
||||||
|
[aCoder encodeValueOfObjCType: @encode(int) at: &_buttonType];
|
||||||
|
[aCoder encodeValueOfObjCType: @encode(int) at: &_bezelStyle];
|
||||||
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_bordered];
|
||||||
|
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_allowsMixedState];
|
||||||
[super encodeWithCoder: aCoder];
|
[super encodeWithCoder: aCoder];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1251,6 +1261,7 @@ Class gmodel_class(void)
|
||||||
[obj setFont: [self font]];
|
[obj setFont: [self font]];
|
||||||
[obj setAlignment: [self alignment]];
|
[obj setAlignment: [self alignment]];
|
||||||
[obj setEnabled: [self isEnabled]];
|
[obj setEnabled: [self isEnabled]];
|
||||||
|
[obj setContinuous: [self isContinuous]];
|
||||||
|
|
||||||
// since only some controls have delegates, we need to test...
|
// since only some controls have delegates, we need to test...
|
||||||
if([obj respondsToSelector: @selector(setDelegate:)])
|
if([obj respondsToSelector: @selector(setDelegate:)])
|
||||||
|
@ -1276,6 +1287,7 @@ Class gmodel_class(void)
|
||||||
[obj setButtonType: _buttonType];
|
[obj setButtonType: _buttonType];
|
||||||
[obj setBezelStyle: _bezelStyle];
|
[obj setBezelStyle: _bezelStyle];
|
||||||
[obj setBordered: _bordered];
|
[obj setBordered: _bordered];
|
||||||
|
[obj setAllowsMixedState: _allowsMixedState];
|
||||||
}
|
}
|
||||||
|
|
||||||
RELEASE(self);
|
RELEASE(self);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue