diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ebc85fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+Carthage/Build
+.DS_Store
+*.xcuserdatad
diff --git a/Resources/Info.plist b/Resources/Info.plist
index 8ad60c9..3d55dbd 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -9,7 +9,7 @@
CFBundleIconFile
CFBundleIdentifier
- com.iccir.XUIKit
+ $(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleInfoDictionaryVersion
6.0
CFBundleName
diff --git a/Source/XUIBezierPathAdditions.h b/Source/XUIBezierPathAdditions.h
index 0d37d04..f80aa56 100644
--- a/Source/XUIBezierPathAdditions.h
+++ b/Source/XUIBezierPathAdditions.h
@@ -18,6 +18,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
+
#import
diff --git a/Source/XUIColorAdditions.h b/Source/XUIColorAdditions.h
index 6a71f2b..f542bb9 100644
--- a/Source/XUIColorAdditions.h
+++ b/Source/XUIColorAdditions.h
@@ -18,6 +18,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
@interface NSColor (XUIKitAdditions)
diff --git a/Source/XUIFontAdditions.h b/Source/XUIFontAdditions.h
index f65d37c..eb73a29 100644
--- a/Source/XUIFontAdditions.h
+++ b/Source/XUIFontAdditions.h
@@ -18,6 +18,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
+
@interface NSFont (XUIKitAdditions)
+ (NSArray *) familyNames;
diff --git a/Source/XUIFontAdditions.m b/Source/XUIFontAdditions.m
index 422a95b..1705d78 100644
--- a/Source/XUIFontAdditions.m
+++ b/Source/XUIFontAdditions.m
@@ -93,7 +93,7 @@ - (CGFloat) xui_lineHeight
int unitsPerEm = CTFontGetUnitsPerEm(ctFont);
long ascent = lroundf( ( CTFontGetAscent( ctFont) / unitsPerEm) * pointSize);
- long descent = lroundf(-(-abs(CTFontGetDescent(ctFont)) / unitsPerEm) * pointSize);
+ long descent = lroundf(-(-fabs(CTFontGetDescent(ctFont)) / unitsPerEm) * pointSize);
long lineGap = lroundf( ( CTFontGetLeading(ctFont) / unitsPerEm) * pointSize);
return ascent + descent + lineGap;
diff --git a/Source/XUIGeometry.h b/Source/XUIGeometry.h
index a673e01..35cd80b 100644
--- a/Source/XUIGeometry.h
+++ b/Source/XUIGeometry.h
@@ -18,7 +18,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import
+#import
#import
diff --git a/Source/XUIGraphics.h b/Source/XUIGraphics.h
index 7199a20..0e79bf9 100644
--- a/Source/XUIGraphics.h
+++ b/Source/XUIGraphics.h
@@ -18,6 +18,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
#import
@class NSImage;
diff --git a/Source/XUIImageAdditions.h b/Source/XUIImageAdditions.h
index 2514e43..feaf94f 100644
--- a/Source/XUIImageAdditions.h
+++ b/Source/XUIImageAdditions.h
@@ -19,8 +19,7 @@
*/
#import
-#import
-
+#import
@class CIImage;
diff --git a/Source/XUIIndexPathAdditions.h b/Source/XUIIndexPathAdditions.h
index 4895386..11cf26a 100644
--- a/Source/XUIIndexPathAdditions.h
+++ b/Source/XUIIndexPathAdditions.h
@@ -17,8 +17,10 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import
+#import
+
+#import
@interface NSIndexPath (XUIKitAdditions)
diff --git a/Source/XUIValueAdditions.h b/Source/XUIValueAdditions.h
index 1100afb..222e0ca 100644
--- a/Source/XUIValueAdditions.h
+++ b/Source/XUIValueAdditions.h
@@ -18,6 +18,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
#import
#import
diff --git a/Source/XUIView.h b/Source/XUIView.h
index 2c3d6a1..e05b08d 100644
--- a/Source/XUIView.h
+++ b/Source/XUIView.h
@@ -18,6 +18,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
#import
#import
#import
diff --git a/Source/XUIViewAdditions.h b/Source/XUIViewAdditions.h
index 20cb436..ee0b5a7 100644
--- a/Source/XUIViewAdditions.h
+++ b/Source/XUIViewAdditions.h
@@ -18,6 +18,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import
#import
diff --git a/XUIKit.xcodeproj/project.pbxproj b/XUIKit.xcodeproj/project.pbxproj
index 2d122f1..21b58cc 100644
--- a/XUIKit.xcodeproj/project.pbxproj
+++ b/XUIKit.xcodeproj/project.pbxproj
@@ -272,7 +272,7 @@
555459F514EC607B0074B45E /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0600;
+ LastUpgradeCheck = 0730;
};
buildConfigurationList = 555459F814EC607B0074B45E /* Build configuration list for PBXProject "XUIKit" */;
compatibilityVersion = "Xcode 3.2";
@@ -332,6 +332,9 @@
DYLIB_CURRENT_VERSION = 1;
GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.10;
+ PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
+ VALID_ARCHS = x86_64;
};
name = Debug;
};
@@ -345,6 +348,9 @@
DYLIB_CURRENT_VERSION = 1;
GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.10;
+ PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
+ VALID_ARCHS = x86_64;
};
name = Profile;
};
@@ -358,12 +364,17 @@
DYLIB_CURRENT_VERSION = 1;
GCC_PREFIX_HEADER = Source/XUIKitPrefix.pch;
MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.10;
+ PRODUCT_BUNDLE_IDENTIFIER = com.iccir.XUIKit;
+ VALID_ARCHS = x86_64;
};
name = Release;
};
55545A1214EC607B0074B45E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEFINES_MODULE = YES;
+ ENABLE_TESTABILITY = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
};
@@ -372,6 +383,7 @@
55545A1314EC607B0074B45E /* Profile */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEFINES_MODULE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Profile;
@@ -379,6 +391,7 @@
5579298314FEE20900FCDE7C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ DEFINES_MODULE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Release;
diff --git a/XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/XUIKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.xcscheme b/XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.xcscheme
new file mode 100644
index 0000000..289980b
--- /dev/null
+++ b/XUIKit.xcodeproj/xcshareddata/xcschemes/XUIKit.xcscheme
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+