From b143ab112da42b4f16bab11733b7353c0f555689 Mon Sep 17 00:00:00 2001 From: Riccardo Mottola Date: Tue, 14 Apr 2020 12:30:34 +0200 Subject: [PATCH] Cast to NSProgressIndiciator so corret isVertical method is choosen by compiler. Add check before casting. --- ChangeLog | 5 +++++ .../GormProgressIndicatorAttributesInspector.m | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53462377..f9c683df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-04-14 Riccardo Mottola + + * Palettes/2Controls/GormProgressIndicatorAttributesInspector.m + Cast to NSProgressIndiciator so corret isVertical method is choosen by compiler. Add check before casting. + 2020-03-29 Fred Kiefer * GormCore/GormDocument.m: Remove NSNibConnector duplicating code diff --git a/Palettes/2Controls/GormProgressIndicatorAttributesInspector.m b/Palettes/2Controls/GormProgressIndicatorAttributesInspector.m index 99488597..0de712fe 100644 --- a/Palettes/2Controls/GormProgressIndicatorAttributesInspector.m +++ b/Palettes/2Controls/GormProgressIndicatorAttributesInspector.m @@ -1,7 +1,7 @@ /* GormProgressIndicatorAttributesInspector.m - Copyright (C) 2001-2005 Free Software Foundation, Inc. + Copyright (C) 2001-2020 Free Software Foundation, Inc. Author: Adam Fedor Laurent Julliard @@ -94,10 +94,13 @@ { if ( object == nil ) return; - [indeterminate setState: [object isIndeterminate]?NSOnState:NSOffState]; - [vertical setState: [object isVertical] ? NSOnState:NSOffState]; - [minValue setIntValue: [object minValue]]; - [maxValue setIntValue: [object maxValue]]; + if ( ![object isKindOfClass:[NSProgressIndicator class]] ) + NSLog ( @"GormNSProgressIndicatorInspector: Unexpected class of object; %@", [object class]); + + [indeterminate setState: [(NSProgressIndicator *)object isIndeterminate]?NSOnState:NSOffState]; + [vertical setState: [(NSProgressIndicator *)object isVertical] ? NSOnState:NSOffState]; + [minValue setIntValue: [(NSProgressIndicator *)object minValue]]; + [maxValue setIntValue: [(NSProgressIndicator *)object maxValue]]; [super revert:sender]; }