Merge branch 'master' of github.com:Pixate/pixate-freestyle-ios

Pixate · Mar 17, 2014 · d5a6857 · d5a6857
2 parents 7779866 + 292539c
commit d5a6857
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Core/Styling/Utils/PXProxy.m b/src/Core/Styling/Utils/PXProxy.m
@@ -83,6 +83,12 @@ - (BOOL)respondsToSelector:(SEL)aSelector
     return NO;
 }
 
+- (BOOL)conformsToProtocol:(Protocol *)aProtocol {
+    if ([self.overridingObject conformsToProtocol:aProtocol]) return YES;
+    if ([self.baseObject conformsToProtocol:aProtocol]) return YES;
+    return NO;
+}
+
 #pragma mark - hash and equality
 
 /// make sure we look like the original object