Changeset 4873

Show
Ignore:
Timestamp:
08/22/07 21:17:13 (1 year ago)
Author:
morris
Message:

Add waitUntilDone: equivalents

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredAdditions/trunk/NSNotificationCenter-WIAdditions.h

    r4438 r4873  
    3434 
    3535- (void)mainThreadPostNotificationName:(NSString *)name; 
     36- (void)mainThreadPostNotificationName:(NSString *)name waitUntilDone:(BOOL)waitUntilDone; 
    3637- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object; 
     38- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object waitUntilDone:(BOOL)waitUntilDone; 
    3739- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object userInfo:(NSDictionary *)userInfo; 
     40- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object userInfo:(NSDictionary *)userInfo waitUntilDone:(BOOL)waitUntilDone; 
    3841 
    3942@end 

  • WiredAdditions/trunk/NSNotificationCenter-WIAdditions.m

    r4438 r4873  
    4545 
    4646- (void)mainThreadPostNotificationName:(NSString *)name { 
     47        [self mainThreadPostNotificationName:name waitUntilDone:NO]; 
     48} 
     49 
     50 
     51 
     52- (void)mainThreadPostNotificationName:(NSString *)name waitUntilDone:(BOOL)waitUntilDone { 
    4753        [self performSelectorOnMainThread:@selector(postNotificationName:object:) 
    4854                                                   withObject:name 
    49                                                    withObject:NULL]; 
     55                                                   withObject:NULL 
     56                                                waitUntilDone:waitUntilDone]; 
    5057} 
    5158 
    …… 
    5360 
    5461- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object { 
     62        [self mainThreadPostNotificationName:name object:object waitUntilDone:NO]; 
     63} 
     64 
     65 
     66 
     67- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object waitUntilDone:(BOOL)waitUntilDone { 
    5568        [self performSelectorOnMainThread:@selector(postNotificationName:object:) 
    5669                                                   withObject:name 
    57                                                    withObject:object]; 
     70                                                   withObject:object 
     71                                                waitUntilDone:waitUntilDone]; 
    5872} 
    5973 
    …… 
    6175 
    6276- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object userInfo:(NSDictionary *)userInfo { 
     77        [self mainThreadPostNotificationName:name object:object userInfo:userInfo waitUntilDone:NO]; 
     78} 
     79 
     80 
     81 
     82- (void)mainThreadPostNotificationName:(NSString *)name object:(id)object userInfo:(NSDictionary *)userInfo waitUntilDone:(BOOL)waitUntilDone { 
    6383        [self performSelectorOnMainThread:@selector(postNotificationName:object:userInfo:) 
    6484                                                   withObject:name 
    6585                                                   withObject:object 
    66                                                    withObject:userInfo]; 
     86                                                   withObject:userInfo 
     87                                                waitUntilDone:waitUntilDone]; 
    6788} 
    6889 

  • WiredAdditions/trunk/NSObject-WIAdditions.h

    r4827 r4873  
    5757 
    5858- (void)performSelectorOnMainThread:(SEL)selector; 
     59- (void)performSelectorOnMainThread:(SEL)selector waitUntilDone:(BOOL)waitUntilDone; 
    5960- (void)performSelectorOnMainThread:(SEL)selector withObject:(id)object1; 
     61- (void)performSelectorOnMainThread:(SEL)selector withObject:(id)object1 waitUntilDone:(BOOL)waitUntilDone; 
    6062- (void)performSelectorOnMainThread:(SEL)selector withObject:(id)object1 withObject:(id)object2; 
     63- (void)performSelectorOnMainThread:(SEL)selector withObject:(id)object1 withObject:(id)object2 waitUntilDone:(BOOL)waitUntilDone; 
    6164- (void)performSelectorOnMainThread:(SEL)selector withObject:(id)object1 withObject:(id)object2 withObject:(id)object3; 
     65- (void)performSelectorOnMainThread:(SEL)selector withObject:(id)object1 withObject:(id)object2 withObject:(id)object3 waitUntilDone:(BOOL)waitUntilDone; 
    6266- (void)performInvocationOnMainThread:(NSInvocation *)invocation; 
     67- (void)performInvocationOnMainThread:(NSInvocation *)invocation waitUntilDone:(BOOL)waitUntilDone; 
    6368 
    6469@end 

  • WiredAdditions/trunk/NSObject-WIAdditions.m

    r4827 r4873  
    113113 
    114114 
     115- (void)performSelectorOnMainThread:(SEL)action waitUntilDone:(BOOL)waitUntilDone { 
     116        [self performSelectorOnMainThread:action withObject:NULL waitUntilDone:waitUntilDone]; 
     117} 
     118 
     119 
     120 
    115121- (void)performSelectorOnMainThread:(SEL)action withObject:(id)object1 { 
    116122        [self performSelectorOnMainThread:action withObject:object1 waitUntilDone:NO]; 
    …… 
    120126 
    121127- (void)performSelectorOnMainThread:(SEL)action withObject:(id)object1 withObject:(id)object2 { 
     128        [self performSelectorOnMainThread:action withObject:object1 withObject:object2 waitUntilDone:NO]; 
     129} 
     130 
     131 
     132 
     133- (void)performSelectorOnMainThread:(SEL)action withObject:(id)object1 withObject:(id)object2 waitUntilDone:(BOOL)waitUntilDone { 
    122134        NSInvocation    *invocation; 
    123135         
    …… 
    128140                [invocation setArgument:&object1 atIndex:2]; 
    129141                [invocation setArgument:&object2 atIndex:3]; 
    130                 [self performInvocationOnMainThread:invocation]; 
     142                [self performInvocationOnMainThread:invocation waitUntilDone:waitUntilDone]; 
    131143        } 
    132144} 
    …… 
    135147 
    136148- (void)performSelectorOnMainThread:(SEL)action withObject:(id)object1 withObject:(id)object2 withObject:(id)object3 { 
     149        [self performSelectorOnMainThread:action withObject:object1 withObject:object2 withObject:object3 waitUntilDone:NO]; 
     150} 
     151 
     152 
     153 
     154- (void)performSelectorOnMainThread:(SEL)action withObject:(id)object1 withObject:(id)object2 withObject:(id)object3 waitUntilDone:(BOOL)waitUntilDone { 
    137155        NSInvocation    *invocation; 
    138156         
    …… 
    145163                [invocation invoke]; 
    146164        else 
    147                 [self performInvocationOnMainThread:invocation]; 
     165                [self performInvocationOnMainThread:invocation waitUntilDone:waitUntilDone]; 
    148166} 
    149167 
    …… 
    151169 
    152170- (void)performInvocationOnMainThread:(NSInvocation *)invocation { 
     171        [self performInvocationOnMainThread:invocation waitUntilDone:NO]; 
     172} 
     173 
     174 
     175 
     176- (void)performInvocationOnMainThread:(NSInvocation *)invocation waitUntilDone:(BOOL)waitUntilDone { 
    153177        [invocation retainArguments]; 
    154         [invocation performSelectorOnMainThread:@selector(invoke) withObject:NULL waitUntilDone:NO]; 
     178        [invocation performSelectorOnMainThread:@selector(invoke) withObject:NULL waitUntilDone:waitUntilDone]; 
    155179} 
    156180