Revision: 6602
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6602&view=rev
Author:   hofman
Date:     2010-07-01 11:13:32 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
revert using macros for subclass delegates and datasource declarations and 
implementations, as IB can't handle that

Modified Paths:
--------------
    trunk/SKApplication.h
    trunk/SKApplication.m
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/SKOutlineView.h
    trunk/SKOutlineView.m
    trunk/SKTableView.h
    trunk/SKThumbnailTableView.h
    trunk/SKThumbnailTableView.m
    trunk/SKTocOutlineView.h
    trunk/SKTransitionController.m
    trunk/Skim_Prefix.pch

Modified: trunk/SKApplication.h
===================================================================
--- trunk/SKApplication.h       2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKApplication.h       2010-07-01 11:13:32 UTC (rev 6602)
@@ -48,7 +48,10 @@
 
 @property (nonatomic, getter=isUserAttentionDisabled) BOOL 
userAttentionDisabled;
 
-SUBCLASS_DELEGATE_DECLARATION(SKApplicationDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKApplicationDelegate>)delegate;
+- (void)setDelegate:(id <SKApplicationDelegate>)newDelegate;
+#endif
 
 @end
 

Modified: trunk/SKApplication.m
===================================================================
--- trunk/SKApplication.m       2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKApplication.m       2010-07-01 11:13:32 UTC (rev 6602)
@@ -196,6 +196,9 @@
     [self reorganizeWindowsItem:aWindow];
 }
 
-SUBCLASS_DELEGATE_DEFINITION(SKApplicationDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKApplicationDelegate>)delegate { return 
(<SKApplicationDelegate>)[super delegate]; }
+- (void)setDelegate:(id <SKApplicationDelegate>)newDelegate { [super 
setDelegate:newDelegate]; }
+#endif
 
 @end

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h   2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKNoteOutlineView.h   2010-07-01 11:13:32 UTC (rev 6602)
@@ -43,7 +43,10 @@
 
 @interface SKNoteOutlineView : SKOutlineView
 
-SUBCLASS_DELEGATE_DECLARATION(SKNoteOutlineViewDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKNoteOutlineViewDelegate>)delegate;
+- (void)setDelegate:(id <SKNoteOutlineViewDelegate>)newDelegate;
+#endif
 
 @end
 

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m   2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKNoteOutlineView.m   2010-07-01 11:13:32 UTC (rev 6602)
@@ -181,6 +181,9 @@
 
 #pragma mark Delegate
 
-SUBCLASS_DELEGATE_DEFINITION(SKNoteOutlineViewDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKNoteOutlineViewDelegate>)delegate { return 
(<SKNoteOutlineViewDelegate>)[super delegate]; }
+- (void)setDelegate:(id <SKNoteOutlineViewDelegate>)newDelegate { [super 
setDelegate:newDelegate]; }
+#endif
 
 @end

Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h       2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKOutlineView.h       2010-07-01 11:13:32 UTC (rev 6602)
@@ -57,8 +57,12 @@
 - (void)scrollToBeginningOfDocument:(id)sender;
 - (void)scrollToEndOfDocument:(id)sender;
 
-SUBCLASS_DELEGATE_DECLARATION(SKOutlineViewDelegate)
-SUBCLASS_DATASOURCE_DECLARATION(SKOutlineViewDataSource)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKOutlineViewDelegate>)delegate;
+- (void)setDelegate:(id <SKOutlineViewDelegate>)newDelegate;
+- (id <SKOutlineViewDataSource>)dataSource;
+- (void)setDataSource:(id <SKOutlineViewDataSource>)newDataSource;
+#endif
 
 @end
 

Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m       2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKOutlineView.m       2010-07-01 11:13:32 UTC (rev 6602)
@@ -263,7 +263,11 @@
         [[self delegate] outlineView:self typeSelectHelper:aTypeSelectHelper 
updateSearchString:searchString];
 }
 
-SUBCLASS_DELEGATE_DEFINITION(SKOutlineViewDelegate)
-SUBCLASS_DATASOURCE_DEFINITION(SKOutlineViewDataSource)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKOutlineViewDelegate>)delegate { return 
(<SKOutlineViewDelegate>)[super delegate]; }
+- (void)setDelegate:(id <SKOutlineViewDelegate>)newDelegate { [super 
setDelegate:newDelegate]; }
+- (id <SKOutlineViewDataSource>)dataSource { return 
(<SKOutlineViewDataSource>)[super dataSource]; }
+- (void)setDataSource:(id <SKOutlineViewDataSource>)newDataSource { [super 
setDelegate:newDataSource]; }
+#endif
 
 @end

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKTableView.h 2010-07-01 11:13:32 UTC (rev 6602)
@@ -59,7 +59,10 @@
 - (void)scrollToBeginningOfDocument:(id)sender;
 - (void)scrollToEndOfDocument:(id)sender;
 
-SUBCLASS_DELEGATE_DECLARATION(SKTableViewDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKTableViewDelegate>)delegate;
+- (void)setDelegate:(id <SKTableViewDelegate>)newDelegate;
+#endif
 
 @end
 

Modified: trunk/SKThumbnailTableView.h
===================================================================
--- trunk/SKThumbnailTableView.h        2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKThumbnailTableView.h        2010-07-01 11:13:32 UTC (rev 6602)
@@ -48,7 +48,10 @@
 
 @property (nonatomic, readonly) BOOL isScrolling;
 
-SUBCLASS_DELEGATE_DECLARATION(SKThumbnailTableViewDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKThumbnailTableViewDelegate>)delegate;
+- (void)setDelegate:(id <SKThumbnailTableViewDelegate>)newDelegate;
+#endif
 
 @end
 

Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m        2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKThumbnailTableView.m        2010-07-01 11:13:32 UTC (rev 6602)
@@ -192,6 +192,9 @@
        return [super dragImageForRowsWithIndexes:dragRows tableColumns:[[self 
tableColumns] subarrayWithRange:NSMakeRange(0, 1)] event:dragEvent 
offset:dragImageOffset];
 }
 
-SUBCLASS_DELEGATE_DEFINITION(SKThumbnailTableViewDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKThumbnailTableViewDelegate>)delegate { return 
(<SKThumbnailTableViewDelegate>)[super delegate]; }
+- (void)setDelegate:(id <SKThumbnailTableViewDelegate>)newDelegate { [super 
setDelegate:newDelegate]; }
+#endif
 
 @end

Modified: trunk/SKTocOutlineView.h
===================================================================
--- trunk/SKTocOutlineView.h    2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKTocOutlineView.h    2010-07-01 11:13:32 UTC (rev 6602)
@@ -46,7 +46,10 @@
 @interface SKTocOutlineView : SKOutlineView {
     NSMutableSet *trackingAreas;
 }
-SUBCLASS_DELEGATE_DECLARATION(SKTocOutlineViewDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKTocOutlineViewDelegate>)delegate;
+- (void)setDelegate:(id <SKTocOutlineViewDelegate>)newDelegate;
+#endif
 @end
 
 

Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m      2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/SKTransitionController.m      2010-07-01 11:13:32 UTC (rev 6602)
@@ -127,7 +127,10 @@
 }
 @property (nonatomic, readonly) CIImage *currentImage;
 - (id)initWithFilter:(CIFilter *)aFilter duration:(NSTimeInterval)duration;
-SUBCLASS_DELEGATE_DECLARATION(SKTransitionAnimationDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKTransitionAnimationDelegate>)delegate;
+- (void)setDelegate:(id <SKTransitionAnimationDelegate>)newDelegate;
+#endif
 @end
 
 @protocol SKTransitionAnimationDelegate <NSAnimationDelegate>
@@ -541,7 +544,10 @@
     return [filter valueForKey:kCIOutputImageKey];
 }
 
-SUBCLASS_DELEGATE_DEFINITION(SKTransitionAnimationDelegate)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKTransitionAnimationDelegate>)delegate { return 
(<SKTransitionAnimationDelegate>)[super delegate]; }
+- (void)setDelegate:(id <SKTransitionAnimationDelegate>)newDelegate { [super 
setDelegate:newDelegate]; }
+#endif
 
 @end
 

Modified: trunk/Skim_Prefix.pch
===================================================================
--- trunk/Skim_Prefix.pch       2010-06-30 20:47:58 UTC (rev 6601)
+++ trunk/Skim_Prefix.pch       2010-07-01 11:13:32 UTC (rev 6602)
@@ -40,27 +40,6 @@
     #define SKDESTROY(variable) do { [variable release]; variable = nil; } 
while (0)
     #define SKCFDESTROY(variable) do { if (variable) CFRelease(variable); 
variable = NULL; } while (0)
     #define SKZONEDESTROY(variable) do { if (variable) 
NSZoneFree(NSZoneFromPointer((void*)variable), (void *)variable); variable = 
NULL; } while (0)
-    
-    #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
-    
-    #define SUBCLASS_ACCESSOR_DECLARATION(protocol, key, Key) \
-    - (id <protocol>)key; \
-    - (void)set##Key:(id <protocol>)new##Key;
-    #define SUBCLASS_ACCESSOR_DEFINITION(protocol, key, Key) \
-    - (id <protocol>)key { return (id <protocol>)[super key]; } \
-    - (void)set##Key:(id <protocol>)new##Key { [super set##Key:new##Key]; }
-    
-    #else
-    
-    #define SUBCLASS_ACCESSOR_DECLARATION(protocol, key, Key)
-    #define SUBCLASS_ACCESSOR_DEFINITION(protocol, key, Key)
-    
-    #endif
-    
-    #define SUBCLASS_DELEGATE_DECLARATION(protocol) 
SUBCLASS_ACCESSOR_DECLARATION(protocol, delegate, Delegate)
-    #define SUBCLASS_DELEGATE_DEFINITION(protocol) 
SUBCLASS_ACCESSOR_DEFINITION(protocol, delegate, Delegate)
-    #define SUBCLASS_DATASOURCE_DECLARATION(protocol) 
SUBCLASS_ACCESSOR_DECLARATION(protocol, dataSource, DataSource)
-    #define SUBCLASS_DATASOURCE_DEFINITION(protocol) 
SUBCLASS_ACCESSOR_DEFINITION(protocol, dataSource, DataSource)
 
 #else
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to