comparison mac/dw.m @ 718:002f33d4439d

More 10.5 fixes... some selectors cause exceptions.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 13 Mar 2011 05:47:02 +0000
parents 17923b931393
children d5e49ef8f541
comparison
equal deleted inserted replaced
717:17923b931393 718:002f33d4439d
2137 */ 2137 */
2138 void dw_clipboard_set_text( char *str, int len) 2138 void dw_clipboard_set_text( char *str, int len)
2139 { 2139 {
2140 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard]; 2140 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
2141 2141
2142 #if MAC_OS_X_VERSION_10_6 > MAC_OS_X_VERSION_MAX_ALLOWED
2142 [pasteboard clearContents]; 2143 [pasteboard clearContents];
2144 #endif
2143 2145
2144 [pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSStringPboardType]; 2146 [pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSStringPboardType];
2145 } 2147 }
2146 2148
2147 2149
5460 DWView *view = [[DWView alloc] init]; 5462 DWView *view = [[DWView alloc] init];
5461 5463
5462 [window setContentView:view]; 5464 [window setContentView:view];
5463 [window setDelegate:view]; 5465 [window setDelegate:view];
5464 [window makeKeyAndOrderFront:nil]; 5466 [window makeKeyAndOrderFront:nil];
5467 #if MAC_OS_X_VERSION_10_6 > MAC_OS_X_VERSION_MAX_ALLOWED
5465 [window setAllowsConcurrentViewDrawing:NO]; 5468 [window setAllowsConcurrentViewDrawing:NO];
5469 #endif
5466 [view release]; 5470 [view release];
5467 5471
5468 /* If it isn't a toplevel window... */ 5472 /* If it isn't a toplevel window... */
5469 if(hwndOwner) 5473 if(hwndOwner)
5470 { 5474 {
5615 { 5619 {
5616 id object = handle; 5620 id object = handle;
5617 5621
5618 if([object isMemberOfClass:[NSWindow class]]) 5622 if([object isMemberOfClass:[NSWindow class]])
5619 { 5623 {
5624 #if MAC_OS_X_VERSION_10_6 > MAC_OS_X_VERSION_MAX_ALLOWED
5620 NSWindow *window = object; 5625 NSWindow *window = object;
5621 int currentstyle = (int)[window styleMask]; 5626 int currentstyle = (int)[window styleMask];
5622 int tmp; 5627 int tmp;
5623 5628
5624 tmp = currentstyle | (int)mask; 5629 tmp = currentstyle | (int)mask;
5625 tmp ^= mask; 5630 tmp ^= mask;
5626 tmp |= style; 5631 tmp |= style;
5627 5632
5628 [window setStyleMask:tmp]; 5633 [window setStyleMask:tmp];
5634 #endif
5629 } 5635 }
5630 else if([object isMemberOfClass:[NSTextView class]]) 5636 else if([object isMemberOfClass:[NSTextView class]])
5631 { 5637 {
5632 NSTextView *tv = handle; 5638 NSTextView *tv = handle;
5633 [tv setAlignment:(style & mask)]; 5639 [tv setAlignment:(style & mask)];