From d587e3f195e1b1c5e89d8d2075788c7b30ae4157 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Fri, 26 Jul 2019 21:29:00 +0200 Subject: [PATCH] Add .gitignore. Fix a few compiler warnings. --- .gitignore | 7 +++++++ GormCore/GormViewWithContentViewEditor.m | 4 ++-- Palettes/2Controls/GormFormAttributesInspector.m | 1 + Palettes/2Controls/GormMatrixAttributesInspector.m | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..23dc3ac9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +*.app +*.debug +*.profile +*.palette +*.plugin +obj +InterfaceBuilder diff --git a/GormCore/GormViewWithContentViewEditor.m b/GormCore/GormViewWithContentViewEditor.m index b6b40f94..edb902dd 100644 --- a/GormCore/GormViewWithContentViewEditor.m +++ b/GormCore/GormViewWithContentViewEditor.m @@ -243,7 +243,7 @@ #define MAX(A,B) ((A)>(B)?(A):(B)) #define MIN(A,B) ((A)<(B)?(A):(B)) -int _sortViews(id view1, id view2, void *context) +NSComparisonResult _sortViews(id view1, id view2, void *context) { BOOL isVertical = *((BOOL *)context); NSInteger order = NSOrderedSame; @@ -279,7 +279,7 @@ int _sortViews(id view1, id view2, void *context) { NSMutableArray *array = [subviews mutableCopy]; NSArray *result = [array sortedArrayUsingFunction: _sortViews - context: &isVertical]; + context: &isVertical]; return result; } diff --git a/Palettes/2Controls/GormFormAttributesInspector.m b/Palettes/2Controls/GormFormAttributesInspector.m index 8fc268a4..20280f25 100644 --- a/Palettes/2Controls/GormFormAttributesInspector.m +++ b/Palettes/2Controls/GormFormAttributesInspector.m @@ -44,6 +44,7 @@ #include #include #include +#include /* IBObjectAdditions category diff --git a/Palettes/2Controls/GormMatrixAttributesInspector.m b/Palettes/2Controls/GormMatrixAttributesInspector.m index 22b86206..2c6f0b33 100644 --- a/Palettes/2Controls/GormMatrixAttributesInspector.m +++ b/Palettes/2Controls/GormMatrixAttributesInspector.m @@ -42,6 +42,7 @@ #include #include #include +#include @implementation NSMatrix (IBObjectAdditions)