Mercurial > dwindows
comparison mac/dw.m @ 763:2cace4e6e69a
Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 18 Mar 2011 00:25:46 +0000 |
parents | 2aaa3f67cfb1 |
children | 82cde14ec084 |
comparison
equal
deleted
inserted
replaced
762:2aaa3f67cfb1 | 763:2cace4e6e69a |
---|---|
2651 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath]; | 2651 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath]; |
2652 DWButton *button = _button_new("", resid); | 2652 DWButton *button = _button_new("", resid); |
2653 if(image) | 2653 if(image) |
2654 { | 2654 { |
2655 [button setImage:image]; | 2655 [button setImage:image]; |
2656 [button setButtonType:NSMomentaryLight]; | |
2657 [button setBordered:NO]; | |
2658 } | 2656 } |
2659 [button setToolTip:[NSString stringWithUTF8String:text]]; | 2657 [button setToolTip:[NSString stringWithUTF8String:text]]; |
2660 [image release]; | 2658 [image release]; |
2661 return button; | 2659 return button; |
2662 } | 2660 } |
2681 } | 2679 } |
2682 DWButton *button = _button_new("", cid); | 2680 DWButton *button = _button_new("", cid); |
2683 if(image) | 2681 if(image) |
2684 { | 2682 { |
2685 [button setImage:image]; | 2683 [button setImage:image]; |
2686 [button setButtonType:NSMomentaryLight]; | |
2687 [button setBordered:NO]; | |
2688 } | 2684 } |
2689 [button setToolTip:[NSString stringWithUTF8String:text]]; | 2685 [button setToolTip:[NSString stringWithUTF8String:text]]; |
2690 [image release]; | 2686 [image release]; |
2691 return button; | 2687 return button; |
2692 } | 2688 } |
2706 NSImage *image = [[NSImage alloc] initWithData:thisdata]; | 2702 NSImage *image = [[NSImage alloc] initWithData:thisdata]; |
2707 DWButton *button = _button_new("", cid); | 2703 DWButton *button = _button_new("", cid); |
2708 if(image) | 2704 if(image) |
2709 { | 2705 { |
2710 [button setImage:image]; | 2706 [button setImage:image]; |
2711 [button setButtonType:NSMomentaryLight]; | |
2712 [button setBordered:NO]; | |
2713 } | 2707 } |
2714 [button setToolTip:[NSString stringWithUTF8String:text]]; | 2708 [button setToolTip:[NSString stringWithUTF8String:text]]; |
2715 [image release]; | 2709 [image release]; |
2716 return button; | 2710 return button; |
2717 } | 2711 } |
5927 } | 5921 } |
5928 else if([object isMemberOfClass:[NSTextView class]]) | 5922 else if([object isMemberOfClass:[NSTextView class]]) |
5929 { | 5923 { |
5930 NSTextView *tv = handle; | 5924 NSTextView *tv = handle; |
5931 [tv setAlignment:(style & mask)]; | 5925 [tv setAlignment:(style & mask)]; |
5926 } | |
5927 else if([object isMemberOfClass:[DWButton class]]) | |
5928 { | |
5929 DWButton *button = handle; | |
5930 | |
5931 if(mask & DW_BS_NOBORDER) | |
5932 { | |
5933 if(style & DW_BS_NOBORDER) | |
5934 { | |
5935 [button setButtonType:NSMomentaryLight]; | |
5936 [button setBordered:NO]; | |
5937 } | |
5938 else | |
5939 { | |
5940 [button setButtonType:NSMomentaryPushInButton]; | |
5941 [button setBordered:YES]; | |
5942 } | |
5943 } | |
5932 } | 5944 } |
5933 } | 5945 } |
5934 | 5946 |
5935 /* | 5947 /* |
5936 * Sets the default focus item for a window/dialog. | 5948 * Sets the default focus item for a window/dialog. |