Mercurial > dwindows
comparison mac/dw.m @ 1068:efaa9ceeb253
Removed test for class member for itemdata in dw_tree_item_get_data()
author | mhessling@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 24 Jun 2011 04:22:39 +0000 |
parents | 6ca1132a240e |
children | 991aa92a0642 |
comparison
equal
deleted
inserted
replaced
1067:6ca1132a240e | 1068:efaa9ceeb253 |
---|---|
332 { | 332 { |
333 int (* API containercontextfunc)(HWND, char *, int, int, void *, void *) = (int (* API)(HWND, char *, int, int, void *, void *))handler->signalfunction; | 333 int (* API containercontextfunc)(HWND, char *, int, int, void *, void *) = (int (* API)(HWND, char *, int, int, void *, void *))handler->signalfunction; |
334 char *text = (char *)event; | 334 char *text = (char *)event; |
335 void *user = NULL; | 335 void *user = NULL; |
336 LONG x,y; | 336 LONG x,y; |
337 | 337 |
338 /* Fill in both items for the tree */ | 338 /* Fill in both items for the tree */ |
339 if([object isKindOfClass:[NSOutlineView class]]) | 339 if([object isKindOfClass:[NSOutlineView class]]) |
340 { | 340 { |
341 id item = event; | 341 id item = event; |
342 NSString *nstr = [item objectAtIndex:1]; | 342 NSString *nstr = [item objectAtIndex:1]; |
380 } | 380 } |
381 else | 381 else |
382 { | 382 { |
383 text = NULL; | 383 text = NULL; |
384 } | 384 } |
385 | 385 |
386 NSValue *value = [item objectAtIndex:2]; | 386 NSValue *value = [item objectAtIndex:2]; |
387 if(value && [value isKindOfClass:[NSValue class]]) | 387 if(value && [value isKindOfClass:[NSValue class]]) |
388 { | 388 { |
389 user = [value pointerValue]; | 389 user = [value pointerValue]; |
390 } | 390 } |
1138 -(void)setFontManager:(NSFontManager *)input; | 1138 -(void)setFontManager:(NSFontManager *)input; |
1139 -(DWDialog *)dialog; | 1139 -(DWDialog *)dialog; |
1140 @end | 1140 @end |
1141 | 1141 |
1142 @implementation DWFontChoose | 1142 @implementation DWFontChoose |
1143 -(BOOL)windowShouldClose:(id)window | 1143 -(BOOL)windowShouldClose:(id)window |
1144 { | 1144 { |
1145 DWDialog *d = dialog; dialog = nil; | 1145 DWDialog *d = dialog; dialog = nil; |
1146 NSFont *pickedfont = [fontManager selectedFont]; | 1146 NSFont *pickedfont = [fontManager selectedFont]; |
1147 dw_dialog_dismiss(d, pickedfont); | 1147 dw_dialog_dismiss(d, pickedfont); |
1148 [window orderOut:nil]; | 1148 [window orderOut:nil]; |
1149 return NO; | 1149 return NO; |
1150 } | 1150 } |
1151 -(void)setDialog:(DWDialog *)input { dialog = input; } | 1151 -(void)setDialog:(DWDialog *)input { dialog = input; } |
1152 -(void)setFontManager:(NSFontManager *)input { fontManager = input; } | 1152 -(void)setFontManager:(NSFontManager *)input { fontManager = input; } |
1153 -(DWDialog *)dialog { return dialog; } | 1153 -(DWDialog *)dialog { return dialog; } |
1154 @end | 1154 @end |
1624 | 1624 |
1625 for(z=0;z<count;z++) | 1625 for(z=0;z<count;z++) |
1626 { | 1626 { |
1627 NSMutableArray *pnt = [node objectAtIndex:z]; | 1627 NSMutableArray *pnt = [node objectAtIndex:z]; |
1628 NSMutableArray *children = nil; | 1628 NSMutableArray *children = nil; |
1629 | 1629 |
1630 if(pnt && [pnt isMemberOfClass:[NSMutableArray class]]) | 1630 if(pnt && [pnt isMemberOfClass:[NSMutableArray class]]) |
1631 { | 1631 { |
1632 children = (NSMutableArray *)[pnt objectAtIndex:3]; | 1632 children = (NSMutableArray *)[pnt objectAtIndex:3]; |
1633 } | 1633 } |
1634 | 1634 |
5149 int _locked_by_me = FALSE; | 5149 int _locked_by_me = FALSE; |
5150 void *result = NULL; | 5150 void *result = NULL; |
5151 DW_MUTEX_LOCK; | 5151 DW_MUTEX_LOCK; |
5152 NSMutableArray *array = (NSMutableArray *)item; | 5152 NSMutableArray *array = (NSMutableArray *)item; |
5153 NSValue *value = [array objectAtIndex:2]; | 5153 NSValue *value = [array objectAtIndex:2]; |
5154 if(value && [value isMemberOfClass:[NSValue class]]) | 5154 if(value) |
5155 { | 5155 { |
5156 result = [value pointerValue]; | 5156 result = [value pointerValue]; |
5157 } | 5157 } |
5158 DW_MUTEX_UNLOCK; | 5158 DW_MUTEX_UNLOCK; |
5159 return result; | 5159 return result; |
7278 /* Create the Color Chooser Dialog class. */ | 7278 /* Create the Color Chooser Dialog class. */ |
7279 static DWFontChoose *fontDlg = nil; | 7279 static DWFontChoose *fontDlg = nil; |
7280 static NSFontManager *fontManager = nil; | 7280 static NSFontManager *fontManager = nil; |
7281 DWDialog *dialog; | 7281 DWDialog *dialog; |
7282 NSFont *font = nil; | 7282 NSFont *font = nil; |
7283 | 7283 |
7284 if(currfont) | 7284 if(currfont) |
7285 font = _dw_font_by_name(currfont); | 7285 font = _dw_font_by_name(currfont); |
7286 | 7286 |
7287 if(fontDlg) | 7287 if(fontDlg) |
7288 { | 7288 { |
7289 dialog = [fontDlg dialog]; | 7289 dialog = [fontDlg dialog]; |
7290 /* If someone is already waiting just return */ | 7290 /* If someone is already waiting just return */ |
7291 if(dialog) | 7291 if(dialog) |
7297 { | 7297 { |
7298 [NSFontManager setFontPanelFactory:[DWFontChoose class]]; | 7298 [NSFontManager setFontPanelFactory:[DWFontChoose class]]; |
7299 fontManager = [NSFontManager sharedFontManager]; | 7299 fontManager = [NSFontManager sharedFontManager]; |
7300 fontDlg = (DWFontChoose *)[fontManager fontPanel:YES]; | 7300 fontDlg = (DWFontChoose *)[fontManager fontPanel:YES]; |
7301 } | 7301 } |
7302 | 7302 |
7303 dialog = dw_dialog_new(fontDlg); | 7303 dialog = dw_dialog_new(fontDlg); |
7304 if(font) | 7304 if(font) |
7305 [fontManager setSelectedFont:font isMultiple:NO]; | 7305 [fontManager setSelectedFont:font isMultiple:NO]; |
7306 else | 7306 else |
7307 [fontManager setSelectedFont:[NSFont fontWithName:@"Helvetica" size:9.0] isMultiple:NO]; | 7307 [fontManager setSelectedFont:[NSFont fontWithName:@"Helvetica" size:9.0] isMultiple:NO]; |
7308 [fontDlg setDialog:dialog]; | 7308 [fontDlg setDialog:dialog]; |
7309 [fontDlg setFontManager:fontManager]; | 7309 [fontDlg setFontManager:fontManager]; |
7310 [fontManager orderFrontFontPanel:fontManager]; | 7310 [fontManager orderFrontFontPanel:fontManager]; |
7311 | 7311 |
7312 | 7312 |
7313 /* Wait for them to pick a color */ | 7313 /* Wait for them to pick a color */ |
7314 font = (NSFont *)dw_dialog_wait(dialog); | 7314 font = (NSFont *)dw_dialog_wait(dialog); |
7315 if(font) | 7315 if(font) |
7316 { | 7316 { |
7317 NSString *fontname = [font displayName]; | 7317 NSString *fontname = [font displayName]; |
7318 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]]; | 7318 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]]; |
7319 return strdup([output UTF8String]); | 7319 return strdup([output UTF8String]); |
7320 } | 7320 } |
7321 return NULL; | 7321 return NULL; |
7322 } | 7322 } |
7323 | 7323 |
7324 /* | 7324 /* |