Mercurial > dwindows
comparison mac/dw.m @ 927:e8c5bcf7846d
Removed some fixed that weren't really needed.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 23 Apr 2011 02:32:30 +0000 |
parents | 8a8d2699bd09 |
children | 43a5b3c78c41 |
comparison
equal
deleted
inserted
replaced
926:4519a1d2525e | 927:e8c5bcf7846d |
---|---|
956 { | 956 { |
957 DWBox *view = object; | 957 DWBox *view = object; |
958 Box *box = [view box]; | 958 Box *box = [view box]; |
959 NSSize size = [view frame].size; | 959 NSSize size = [view frame].size; |
960 _do_resize(box, size.width, size.height); | 960 _do_resize(box, size.width, size.height); |
961 _do_resize(box, size.width, size.height); | |
962 _handle_resize_events(box); | 961 _handle_resize_events(box); |
963 } | 962 } |
964 _event_handler(self, (void *)[page pageid], 15); | 963 _event_handler(self, (void *)[page pageid], 15); |
965 } | 964 } |
966 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; } | 965 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; } |
1019 if([object isMemberOfClass:[DWBox class]]) | 1018 if([object isMemberOfClass:[DWBox class]]) |
1020 { | 1019 { |
1021 DWBox *view = object; | 1020 DWBox *view = object; |
1022 Box *box = [view box]; | 1021 Box *box = [view box]; |
1023 NSSize size = [view frame].size; | 1022 NSSize size = [view frame].size; |
1024 _do_resize(box, size.width, size.height); | |
1025 _do_resize(box, size.width, size.height); | 1023 _do_resize(box, size.width, size.height); |
1026 _handle_resize_events(box); | 1024 _handle_resize_events(box); |
1027 } | 1025 } |
1028 } | 1026 } |
1029 } | 1027 } |
2344 if(view != nil) | 2342 if(view != nil) |
2345 { | 2343 { |
2346 Box *box = [view box]; | 2344 Box *box = [view box]; |
2347 NSSize size = [view frame].size; | 2345 NSSize size = [view frame].size; |
2348 _do_resize(box, size.width, size.height); | 2346 _do_resize(box, size.width, size.height); |
2349 _do_resize(box, size.width, size.height); | |
2350 _handle_resize_events(box); | 2347 _handle_resize_events(box); |
2351 } | 2348 } |
2352 } | 2349 } |
2353 /* Handle laying out scrollviews... if required space is less | 2350 /* Handle laying out scrollviews... if required space is less |
2354 * than available space, then expand. Otherwise use required space. | 2351 * than available space, then expand. Otherwise use required space. |
6709 { | 6706 { |
6710 /* Make a sane default size because MacOS won't automatically */ | 6707 /* Make a sane default size because MacOS won't automatically */ |
6711 [window setContentSize:NSMakeSize(200,150)]; | 6708 [window setContentSize:NSMakeSize(200,150)]; |
6712 } | 6709 } |
6713 [window makeKeyAndOrderFront:nil]; | 6710 [window makeKeyAndOrderFront:nil]; |
6714 [[window contentView] windowResized:nil]; | |
6715 [[window contentView] windowDidBecomeMain:nil]; | |
6716 } | 6711 } |
6717 return 0; | 6712 return 0; |
6718 } | 6713 } |
6719 | 6714 |
6720 /* | 6715 /* |