Added compatibility with arc and non-arc project

brunow · Feb 12, 2012 · f484028 · f484028
1 parent a0e777c
commit f484028
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/ITWLoadingPanel/ITWLoadingPanel.h b/ITWLoadingPanel/ITWLoadingPanel.h
@@ -17,16 +17,30 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef ILP_USE_ARC
+    #define ILP_USE_ARC __has_feature(objc_arc)
+#endif
+
+#if ILP_USE_ARC
+    #define ILP_RETAIN(xx)           xx
+    #define ILP_RELEASE(xx)
+    #define ILP_AUTORELEASE(xx)      xx
+#else
+    #define ILP_RETAIN(xx)           [xx retain];
+    #define ILP_RELEASE(xx)          [xx release];
+    #define ILP_AUTORELEASE(xx)      [xx autorelease];
+#endif
+
 typedef void(^ITWLoadingPanelBasicBlock)(void);
 
 @interface ITWLoadingPanel : UIView
 
-@property (nonatomic, retain) IBOutlet UIButton *cancelBtn;
-@property (nonatomic, retain) IBOutlet UIProgressView *progressView;
-@property (nonatomic, retain) IBOutlet UIActivityIndicatorView *activityView;
-@property (nonatomic, retain) IBOutlet UIImageView *successImageView;
-@property (nonatomic, retain) IBOutlet UILabel *cancelLabel;
-@property (nonatomic, retain) IBOutlet UILabel *titleLabel;
+@property (nonatomic, strong) IBOutlet UIButton *cancelBtn;
+@property (nonatomic, strong) IBOutlet UIProgressView *progressView;
+@property (nonatomic, strong) IBOutlet UIActivityIndicatorView *activityView;
+@property (nonatomic, strong) IBOutlet UIImageView *successImageView;
+@property (nonatomic, strong) IBOutlet UILabel *cancelLabel;
+@property (nonatomic, strong) IBOutlet UILabel *titleLabel;
 @property (nonatomic, readonly) CFTimeInterval animationDuration;
 @property (nonatomic, copy) ITWLoadingPanelBasicBlock onDisappearBlock;
 @property (nonatomic, copy) ITWLoadingPanelBasicBlock onCancelBlock;

diff --git a/ITWLoadingPanel/ITWLoadingPanel.m b/ITWLoadingPanel/ITWLoadingPanel.m
@@ -67,14 +67,18 @@ - (void)dealloc {
     self.onCancelBlock = nil;
     self.onDisappearBlock = nil;
 
+#ifdef ILP_USE_ARC
+    // Do nothing
+#else
     [super dealloc];
+#endif
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 + (id)sharedInstance {
     if (_sharedObject == nil) {
-        _sharedObject = [[self panel] retain];
+        _sharedObject = ILP_RETAIN([self panel]);
     }
 
     return _sharedObject;
@@ -238,7 +242,7 @@ - (void)hidePanel {
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)removePanelFromView {
     [self removeFromSuperview];
-    [_sharedObject release];
+    ILP_RELEASE(_sharedObject);
     _sharedObject = nil;
 }