Revision: 5727
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5727&view=rev
Author:   hofman
Date:     2009-09-09 16:27:50 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
Define macros to simulate @optional category methods using the 10.5 SDK and 
conformance of the delegate.

Modified Paths:
--------------
    trunk/BDSKDragImageView.h
    trunk/BDSKDragImageView.m
    trunk/SKApplication.h
    trunk/SKApplication.m
    trunk/SKBookmarkOutlineView.h
    trunk/SKCompatibility.h
    trunk/SKDownload.h
    trunk/SKDownload.m
    trunk/SKDownloadController.h
    trunk/SKMainWindowController.h
    trunk/SKNoteOutlineView.h
    trunk/SKOutlineView.h
    trunk/SKPDFSynchronizer.h
    trunk/SKPDFSynchronizer.m
    trunk/SKSnapshotWindowController.h
    trunk/SKSnapshotWindowController.m
    trunk/SKSplitView.h
    trunk/SKTableView.h
    trunk/SKThumbnail.h
    trunk/SKThumbnail.m
    trunk/SKThumbnailTableView.h
    trunk/SKTocOutlineView.h

Modified: trunk/BDSKDragImageView.h
===================================================================
--- trunk/BDSKDragImageView.h   2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/BDSKDragImageView.h   2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 @class BDSKDragImageView;
 
 @protocol BDSKDragImageViewDelegate <NSObject>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (BDSKDragImageViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(BDSKDragImageViewDelegate)
 
 - (BOOL)dragImageView:(BDSKDragImageView *)view 
writeDataToPasteboard:(NSPasteboard *)pasteboard;
 - (NSArray *)dragImageView:(BDSKDragImageView *)view 
namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
@@ -56,11 +51,11 @@
 
 
 @interface BDSKDragImageView : NSImageView {
-       id delegate;
+       id SKCONFORM(BDSKDragImageViewDelegate) delegate;
 } 
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+- (id SKCONFORM(BDSKDragImageViewDelegate))delegate;
+- (void)setDelegate:(id SKCONFORM(BDSKDragImageViewDelegate))newDelegate;
 
 - (IBAction)show:(id)sender;
 

Modified: trunk/BDSKDragImageView.m
===================================================================
--- trunk/BDSKDragImageView.m   2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/BDSKDragImageView.m   2009-09-09 16:27:50 UTC (rev 5727)
@@ -40,11 +40,11 @@
 
 @implementation BDSKDragImageView
 
-- (id)delegate {
+- (id SKCONFORM(BDSKDragImageViewDelegate))delegate {
     return delegate;
 }
 
-- (void)setDelegate:(id)newDelegate {
+- (void)setDelegate:(id SKCONFORM(BDSKDragImageViewDelegate))newDelegate {
        delegate = newDelegate;
 }
 

Modified: trunk/SKApplication.h
===================================================================
--- trunk/SKApplication.h       2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKApplication.h       2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 extern NSString *SKApplicationStartsTerminatingNotification;
 
 @protocol SKApplicationDelegate <NSApplicationDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKApplicationDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKApplicationDelegate)
 - (void)applicationStartsTerminating:(NSNotification *)aNotification;
 @end
 
@@ -60,8 +55,10 @@
 
 - (NSArray *)allOrderedDocuments;
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+#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       2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKApplication.m       2009-09-09 16:27:50 UTC (rev 5727)
@@ -245,12 +245,14 @@
     return orderedDocuments;
 }
 
-- (id)delegate {
-    return (id)[super delegate];
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+- (id <SKApplicationDelegate>)delegate {
+    return (id <SKApplicationDelegate>)[super delegate];
 }
 
-- (void)setDelegate:(id)newDelegate {
+- (void)setDelegate:(id <SKApplicationDelegate>)newDelegate {
     [super setDelegate:newDelegate];
 }
+#endif
 
 @end

Modified: trunk/SKBookmarkOutlineView.h
===================================================================
--- trunk/SKBookmarkOutlineView.h       2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKBookmarkOutlineView.h       2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 
 
 @protocol SKBookmarkOutlineViewDelegate <SKOutlineViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKBookmarkOutlineViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKBookmarkOutlineViewDelegate)
 
 - (BOOL)outlineView:(NSOutlineView *)anOutlineView 
drawSeparatorRowForItem:(id)item;
 

Modified: trunk/SKCompatibility.h
===================================================================
--- trunk/SKCompatibility.h     2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKCompatibility.h     2009-09-09 16:27:50 UTC (rev 5727)
@@ -58,6 +58,14 @@
 @protocol NSTabViewDelegate <NSObject> @end
 @protocol NSSplitViewDelegate <NSObject> @end
 
+#define SKOPTIONAL(name) @end @interface NSObject (name)
+#define SKCONFORM(protocol) 
+
+#else
+
+#define SKOPTIONAL(name) @optional
+#define SKCONFORM(protocol) <protocol>
+
 #endif
 
 #ifndef NSAppKitVersionNumber10_5

Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h  2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKDownload.h  2009-09-09 16:27:50 UTC (rev 5727)
@@ -53,6 +53,20 @@
 };
 typedef NSInteger SKDownloadStatus;
 
+
+...@class SKDownload;
+
+...@protocol SKDownloadDelegate <NSObject>
+SKOPTIONAL(SKDownloadDelegate)
+
+- (void)downloadDidStart:(SKDownload *)download;
+- (void)downloadDidBeginDownloading:(SKDownload *)download;
+- (void)downloadDidUpdate:(SKDownload *)download;
+- (void)downloadDidEnd:(SKDownload *)download;
+
+...@end
+
+
 @interface SKDownload : NSObject {
     NSURL *URL;
     NSURLDownload *URLDownload;
@@ -62,13 +76,13 @@
     NSImage *fileIcon;
     NSProgressIndicator *progressIndicator;
     NSInteger status;
-    id delegate;
+    id SKCONFORM(SKDownloadDelegate) delegate;
 }
 
-- (id)initWithURL:(NSURL *)aURL delegate:(id)aDelegate;
+- (id)initWithURL:(NSURL *)aURL delegate:(id 
SKCONFORM(SKDownloadDelegate))aDelegate;
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+- (id SKCONFORM(SKDownloadDelegate))delegate;
+- (void)setDelegate:(id SKCONFORM(SKDownloadDelegate))newDelegate;
 
 - (SKDownloadStatus)status;
 
@@ -98,11 +112,3 @@
 - (void)removeProgressIndicatorFromSuperview;
 
 @end
-
-
-...@interface NSObject (SKDownloadDelegate)
-- (void)downloadDidStart:(SKDownload *)download;
-- (void)downloadDidBeginDownloading:(SKDownload *)download;
-- (void)downloadDidUpdate:(SKDownload *)download;
-- (void)downloadDidEnd:(SKDownload *)download;
-...@end

Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m  2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKDownload.m  2009-09-09 16:27:50 UTC (rev 5727)
@@ -83,7 +83,7 @@
     return [self infoKeys];
 }
 
-- (id)initWithURL:(NSURL *)aURL delegate:(id)aDelegate {
+- (id)initWithURL:(NSURL *)aURL delegate:(id 
SKCONFORM(SKDownloadDelegate))aDelegate {
     if (self = [super init]) {
         URL = [aURL retain];
         URLDownload = nil;
@@ -132,11 +132,11 @@
 
 #pragma mark Accessors
 
-- (id)delegate {
+- (id SKCONFORM(SKDownloadDelegate))delegate {
     return delegate;
 }
 
-- (void)setDelegate:(id)newDelegate {
+- (void)setDelegate:(id SKCONFORM(SKDownloadDelegate))newDelegate {
     delegate = newDelegate;
 }
 

Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h        2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKDownloadController.h        2009-09-09 16:27:50 UTC (rev 5727)
@@ -38,11 +38,12 @@
 
 #import <Cocoa/Cocoa.h>
 #import "SKTableView.h"
+#import "SKDownload.h"
 
 
-...@class SKTableView, SKDownload;
+...@class SKTableView;
 
-...@interface SKDownloadController : NSWindowController <SKTableViewDelegate, 
NSTableViewDataSource> {
+...@interface SKDownloadController : NSWindowController <SKTableViewDelegate, 
NSTableViewDataSource, SKDownloadDelegate> {
     IBOutlet NSArrayController *arrayController;
     IBOutlet SKTableView *tableView;
     IBOutlet NSButton *clearButton;

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKMainWindowController.h      2009-09-09 16:27:50 UTC (rev 5727)
@@ -43,6 +43,7 @@
 #import "SKTocOutlineView.h"
 #import "SKNoteOutlineView.h"
 #import "SKSnapshotWindowController.h"
+#import "SKThumbnail.h"
 
 enum {
     SKThumbnailSidePaneState,
@@ -70,11 +71,11 @@
 
 extern NSString *SKUnarchiveFromDataArrayTransformerName;
 
-...@class PDFAnnotation, PDFSelection, SKThumbnail, SKGroupedSearchResult;
+...@class PDFAnnotation, PDFSelection, SKGroupedSearchResult;
 @class SKPDFView, SKSecondaryPDFView, BDSKCollapsibleView, BDSKEdgeView, 
BDSKGradientView, SKColorSwatch, SKStatusBar;
 @class SKMainDocument, SKFullScreenWindow, SKNavigationWindow, SKSideWindow, 
SKProgressController, SKPageSheetController, SKScaleSheetController, 
SKPasswordSheetController, SKBookmarkSheetController, 
SKPresentationOptionsSheetController;
 
-...@interface SKMainWindowController : NSWindowController <NSWindowDelegate, 
NSToolbarDelegate, NSDrawerDelegate, SKThumbnailTableViewDelegate, 
NSTableViewDataSource, SKTocOutlineViewDelegate, SKNoteOutlineViewDelegate, 
SKOutlineViewDataSource, SKSplitViewDelegate, 
SKSnapshotWindowControllerDelegate> {
+...@interface SKMainWindowController : NSWindowController <NSWindowDelegate, 
NSToolbarDelegate, NSDrawerDelegate, SKThumbnailTableViewDelegate, 
NSTableViewDataSource, SKTocOutlineViewDelegate, SKNoteOutlineViewDelegate, 
SKOutlineViewDataSource, SKSplitViewDelegate, 
SKSnapshotWindowControllerDelegate, SKThumbnailDelegate> {
     IBOutlet SKSplitView            *splitView;
     
     IBOutlet NSView                 *pdfContentView;

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h   2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKNoteOutlineView.h   2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 
 
 @protocol SKNoteOutlineViewDelegate <SKOutlineViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKNoteOutlineViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKNoteOutlineViewDelegate)
 
 - (BOOL)outlineView:(NSOutlineView *)anOutlineView canResizeRowByItem:(id)item;
 - (void)outlineView:(NSOutlineView *)anOutlineView 
setHeightOfRow:(CGFloat)newHeight byItem:(id)item;

Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h       2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKOutlineView.h       2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 @class SKTypeSelectHelper;
 
 @protocol SKOutlineViewDelegate <NSOutlineViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKOutlineViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKOutlineViewDelegate)
 
 - (void)outlineView:(NSOutlineView *)anOutlineView deleteItems:(NSArray 
*)items;
 - (BOOL)outlineView:(NSOutlineView *)anOutlineView canDeleteItems:(NSArray 
*)items;
@@ -63,12 +58,7 @@
 @end
 
 @protocol SKOutlineViewDataSource <NSOutlineViewDataSource>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKOutlineViewDataSource)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKOutlineViewDataSource)
 
 - (void)outlineView:(NSOutlineView *)anOutlineView 
dragEndedWithOperation:(NSDragOperation)operation;
 

Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h   2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKPDFSynchronizer.h   2009-09-09 16:27:50 UTC (rev 5727)
@@ -47,12 +47,7 @@
 @class SKPDFSynchronizer;
 
 @protocol SKPDFSynchronizerDelegate <NSObject>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKPDFSynchronizerDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKPDFSynchronizerDelegate)
 
 - (void)synchronizer:(SKPDFSynchronizer *)synchronizer 
foundLine:(NSInteger)line inFile:(NSString *)file;
 - (void)synchronizer:(SKPDFSynchronizer *)synchronizer 
foundLocation:(NSPoint)point atPageIndex:(NSUInteger)pageIndex 
options:(NSInteger)options;
@@ -61,15 +56,15 @@
 
 
 @interface SKPDFSynchronizer : NSObject {
-    id delegate;
+    id SKCONFORM(SKPDFSynchronizerDelegate) delegate;
     
     id server;
     id serverProxy;
     NSConnection *connection;
 }
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+- (id SKCONFORM(SKPDFSynchronizerDelegate))delegate;
+- (void)setDelegate:(id SKCONFORM(SKPDFSynchronizerDelegate))newDelegate;
 
 - (NSString *)fileName;
 - (void)setFileName:(NSString *)newFileName;

Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m   2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKPDFSynchronizer.m   2009-09-09 16:27:50 UTC (rev 5727)
@@ -97,11 +97,11 @@
 
 #pragma mark | Accessors
 
-- (id)delegate {
+- (id SKCONFORM(SKPDFSynchronizerDelegate))delegate {
     return delegate;
 }
 
-- (void)setDelegate:(id)newDelegate {
+- (void)setDelegate:(id SKCONFORM(SKPDFSynchronizerDelegate))newDelegate {
     delegate = newDelegate;
 }
 

Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h  2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKSnapshotWindowController.h  2009-09-09 16:27:50 UTC (rev 5727)
@@ -43,12 +43,7 @@
 @class SKSnapshotWindowController;
 
 @protocol SKSnapshotWindowControllerDelegate <NSObject>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKSnapshotWindowControllerDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKSnapshotWindowControllerDelegate)
 
 - (void)snapshotControllerDidFinishSetup:(SKSnapshotWindowController 
*)controller;
 - (void)snapshotControllerWindowWillClose:(SKSnapshotWindowController 
*)controller;
@@ -63,7 +58,7 @@
 @interface SKSnapshotWindowController : NSWindowController <NSWindowDelegate> {
     IBOutlet SKSnapshotPDFView* pdfView;
     NSImage *thumbnail;
-    id delegate;
+    id SKCONFORM(SKSnapshotWindowControllerDelegate) delegate;
     NSString *pageLabel;
     BOOL hasWindow;
     BOOL miniaturizing;
@@ -77,8 +72,8 @@
 
 - (void)redisplay;
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+- (id SKCONFORM(SKSnapshotWindowControllerDelegate))delegate;
+- (void)setDelegate:(id 
SKCONFORM(SKSnapshotWindowControllerDelegate))newDelegate;
 
 - (PDFView *)pdfView;
 - (NSImage *)thumbnail;

Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m  2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKSnapshotWindowController.m  2009-09-09 16:27:50 UTC (rev 5727)
@@ -269,11 +269,11 @@
 
 #pragma mark Acessors
 
-- (id)delegate {
+- (id SKCONFORM(SKSnapshotWindowControllerDelegate))delegate {
     return delegate;
 }
 
-- (void)setDelegate:(id)newDelegate {
+- (void)setDelegate:(id 
SKCONFORM(SKSnapshotWindowControllerDelegate))newDelegate {
     delegate = newDelegate;
 }
 

Modified: trunk/SKSplitView.h
===================================================================
--- trunk/SKSplitView.h 2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKSplitView.h 2009-09-09 16:27:50 UTC (rev 5727)
@@ -42,12 +42,7 @@
 
 
 @protocol SKSplitViewDelegate <NSSplitViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKSplitViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKSplitViewDelegate)
 - (void)splitView:(SKSplitView *)sender 
doubleClickedDividerAt:(NSInteger)offset;
 @end
 
@@ -55,12 +50,16 @@
 @interface SKSplitView : NSSplitView {
     BOOL blendEnds;
 }
+
 + (NSColor *)startColor;
 + (NSColor *)endColor;
+
 - (BOOL)blendEnds;
 - (void)setBlendEnds:(BOOL)flag;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 - (id <SKSplitViewDelegate>)delegate;
 - (void)setDelegate:(id <SKSplitViewDelegate>)newDelegate;
 #endif
+
 @end

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKTableView.h 2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 @class SKTypeSelectHelper;
 
 @protocol SKTableViewDelegate <NSTableViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKTableViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKTableViewDelegate)
 
 - (void)tableView:(NSTableView *)aTableView deleteRowsWithIndexes:(NSIndexSet 
*)rowIndexes;
 - (BOOL)tableView:(NSTableView *)aTableView 
canDeleteRowsWithIndexes:(NSIndexSet *)rowIndexes;

Modified: trunk/SKThumbnail.h
===================================================================
--- trunk/SKThumbnail.h 2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKThumbnail.h 2009-09-09 16:27:50 UTC (rev 5727)
@@ -39,18 +39,26 @@
 #import <Cocoa/Cocoa.h>
 
 
+...@class SKThumbnail;
+
+...@protocol SKThumbnailDelegate <NSObject>
+SKOPTIONAL(SKThumbnailDelegate)
+- (BOOL)generateImageForThumbnail:(SKThumbnail *)thumbnail;
+...@end
+
+
 @interface SKThumbnail : NSObject {
     NSImage *image;
     NSString *label;
     NSUInteger pageIndex;
     BOOL dirty;
-    id delegate;
+    id SKCONFORM(SKThumbnailDelegate) delegate;
 }
 
 - (id)initWithImage:(NSImage *)anImage label:(NSString *)aLabel 
pageIndex:(NSUInteger)anIndex;
 
-- (id)delegate;
-- (void)setDelegate:(id)newDelegate;
+- (id SKCONFORM(SKThumbnailDelegate))delegate;
+- (void)setDelegate:(id SKCONFORM(SKThumbnailDelegate))newDelegate;
 
 - (BOOL)isDirty;
 - (void)setDirty:(BOOL)flag;
@@ -65,7 +73,3 @@
 - (NSSize)size;
 
 @end
-
-...@interface NSObject (SKThumbnailDelegate)
-- (BOOL)generateImageForThumbnail:(SKThumbnail *)thumbnail;
-...@end

Modified: trunk/SKThumbnail.m
===================================================================
--- trunk/SKThumbnail.m 2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKThumbnail.m 2009-09-09 16:27:50 UTC (rev 5727)
@@ -57,9 +57,9 @@
     [super dealloc];
 }
 
-- (id)delegate { return delegate; }
+- (id SKCONFORM(SKThumbnailDelegate))delegate { return delegate; }
 
-- (void)setDelegate:(id)newDelegate { delegate = newDelegate; }
+- (void)setDelegate:(id SKCONFORM(SKThumbnailDelegate))newDelegate { delegate 
= newDelegate; }
 
 - (BOOL)isDirty { return dirty; }
 

Modified: trunk/SKThumbnailTableView.h
===================================================================
--- trunk/SKThumbnailTableView.h        2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKThumbnailTableView.h        2009-09-09 16:27:50 UTC (rev 5727)
@@ -41,12 +41,7 @@
 
 
 @protocol SKThumbnailTableViewDelegate <SKTableViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKThumbnailTableViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKThumbnailTableViewDelegate)
 
 - (NSArray *)tableViewHighlightedRows:(NSTableView *)tableView;
 - (BOOL)tableView:(NSTableView *)tableView 
commandSelectRow:(NSInteger)rowIndex;

Modified: trunk/SKTocOutlineView.h
===================================================================
--- trunk/SKTocOutlineView.h    2009-09-09 12:44:19 UTC (rev 5726)
+++ trunk/SKTocOutlineView.h    2009-09-09 16:27:50 UTC (rev 5727)
@@ -43,12 +43,7 @@
 
 
 @protocol SKTocOutlineViewDelegate <SKOutlineViewDelegate>
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
-...@end
-...@interface NSObject (SKTocOutlineViewDelegate)
-#else
-...@optional
-#endif
+SKOPTIONAL(SKTocOutlineViewDelegate)
 
 - (NSArray *)outlineViewHighlightedRows:(NSOutlineView *)anOutlineView;
 - (BOOL)outlineView:(NSOutlineView *)anOutlineView 
shouldTrackTableColumn:(NSTableColumn *)aTableColumn item:(id)item;


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

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to