Skip to content

Commit 315d84d

Browse files
committed
misc: Address macOS deprecation warnings
1 parent 192039b commit 315d84d

13 files changed

+37
-23
lines changed

hiro/cocoa/action/menu-check-item.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
-(void) activate {
1515
menuCheckItem->state.checked = !menuCheckItem->state.checked;
16-
auto state = menuCheckItem->state.checked ? NSOnState : NSOffState;
16+
auto state = menuCheckItem->state.checked ? NSControlStateValueOn : NSControlStateValueOff;
1717
[self setState:state];
1818
menuCheckItem->doToggle();
1919
}
@@ -34,7 +34,7 @@ auto pMenuCheckItem::destruct() -> void {
3434
}
3535

3636
auto pMenuCheckItem::setChecked(bool checked) -> void {
37-
auto state = checked ? NSOnState : NSOffState;
37+
auto state = checked ? NSControlStateValueOn : NSControlStateValueOff;
3838
[cocoaAction setState:state];
3939
}
4040

hiro/cocoa/action/menu-radio-item.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ auto pMenuRadioItem::setChecked() -> void {
4040
if(auto object = weak.acquire()) {
4141
if(auto self = object->self()) {
4242
if(auto p = dynamic_cast<pMenuRadioItem*>(self)) {
43-
auto state = this == p ? NSOnState : NSOffState;
43+
auto state = this == p ? NSControlStateValueOn : NSControlStateValueOff;
4444
[p->cocoaAction setState:state];
4545
}
4646
}

hiro/cocoa/utility.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ auto NSMakeImage(image icon, u32 scaleWidth = 0, u32 scaleHeight = 0) -> NSImage
4141
pixelsWide:icon.width() pixelsHigh:icon.height()
4242
bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES
4343
isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace
44-
bitmapFormat:NSAlphaNonpremultipliedBitmapFormat
44+
bitmapFormat:NSBitmapFormatAlphaNonpremultiplied
4545
bytesPerRow:(4 * icon.width()) bitsPerPixel:32
4646
];
4747
memory::copy<u32>([bitmap bitmapData], icon.data(), icon.width() * icon.height());

hiro/cocoa/widget/button.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[self setTarget:self];
99
[self setAction:@selector(activate:)];
1010
//NSRoundedBezelStyle has a fixed height; which breaks both icons and larger/smaller text
11-
[self setBezelStyle:NSRegularSquareBezelStyle];
11+
[self setBezelStyle:NSBezelStyleFlexiblePush];
1212
}
1313
return self;
1414
}

hiro/cocoa/widget/check-button.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
[self setTarget:self];
1010
[self setAction:@selector(activate:)];
11-
[self setBezelStyle:NSRegularSquareBezelStyle];
12-
[self setButtonType:NSOnOffButton];
11+
[self setBezelStyle:NSBezelStyleFlexiblePush];
12+
[self setButtonType:NSButtonTypeOnOff];
1313
}
1414
return self;
1515
}
1616

1717
-(IBAction) activate:(id)sender {
18-
checkButton->state.checked = [self state] != NSOffState;
18+
checkButton->state.checked = [self state] != NSControlStateValueOff;
1919
checkButton->doToggle();
2020
}
2121

@@ -58,7 +58,7 @@ auto pCheckButton::setBordered(bool bordered) -> void {
5858
}
5959

6060
auto pCheckButton::setChecked(bool checked) -> void {
61-
[(CocoaCheckButton*)cocoaView setState:checked ? NSOnState : NSOffState];
61+
[(CocoaCheckButton*)cocoaView setState:checked ? NSControlStateValueOn : NSControlStateValueOff];
6262
}
6363

6464
auto pCheckButton::setGeometry(Geometry geometry) -> void {

hiro/cocoa/widget/check-label.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
[self setTarget:self];
1010
[self setAction:@selector(activate:)];
11-
[self setButtonType:NSSwitchButton];
11+
[self setButtonType:NSButtonTypeSwitch];
1212
}
1313
return self;
1414
}
1515

1616
-(IBAction) activate:(id)sender {
17-
checkLabel->state.checked = [self state] != NSOffState;
17+
checkLabel->state.checked = [self state] != NSControlStateValueOff;
1818
checkLabel->doToggle();
1919
}
2020

@@ -40,7 +40,7 @@ auto pCheckLabel::minimumSize() const -> Size {
4040
}
4141

4242
auto pCheckLabel::setChecked(bool checked) -> void {
43-
[(CocoaCheckLabel*)cocoaView setState:checked ? NSOnState : NSOffState];
43+
[(CocoaCheckLabel*)cocoaView setState:checked ? NSControlStateValueOn : NSControlStateValueOff];
4444
}
4545

4646
auto pCheckLabel::setGeometry(Geometry geometry) -> void {

hiro/cocoa/widget/horizontal-scroll-bar.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
auto& state = horizontalScrollBar->state;
3131

3232
switch([self hitPart]) {
33-
case NSScrollerIncrementLine:
3433
case NSScrollerIncrementPage:
3534
if(state.position < state.length - 1) state.position++;
3635
[self update];
3736
break;
3837

39-
case NSScrollerDecrementLine:
4038
case NSScrollerDecrementPage:
4139
if(state.position) state.position--;
4240
[self update];

hiro/cocoa/widget/radio-button.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
[self setTarget:self];
1010
[self setAction:@selector(activate:)];
11-
[self setBezelStyle:NSRegularSquareBezelStyle];
12-
[self setButtonType:NSOnOffButton];
11+
[self setBezelStyle:NSBezelStyleFlexiblePush];
12+
[self setButtonType:NSButtonTypeOnOff];
1313
}
1414
return self;
1515
}
@@ -64,7 +64,7 @@ auto pRadioButton::setChecked() -> void {
6464
if(auto object = weak.acquire()) {
6565
if(auto self = object->self()) {
6666
if(auto p = dynamic_cast<pRadioButton*>(self)) {
67-
auto state = this == p ? NSOnState : NSOffState;
67+
auto state = this == p ? NSControlStateValueOn : NSControlStateValueOff;
6868
[(CocoaRadioButton*)p->cocoaView setState:state];
6969
}
7070
}

hiro/cocoa/widget/radio-label.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[self setTarget:self];
1010
[self setAction:@selector(activate:)];
11-
[self setButtonType:NSRadioButton];
11+
[self setButtonType:NSButtonTypeRadio];
1212
}
1313
return self;
1414
}
@@ -60,7 +60,7 @@ auto pRadioLabel::setGroup(sGroup group) -> void {
6060
if(auto object = weak.acquire()) {
6161
if(auto self = object->self()) {
6262
if(auto p = dynamic_cast<pRadioLabel*>(self)) {
63-
auto state = p->state().checked ? NSOnState : NSOffState;
63+
auto state = p->state().checked ? NSControlStateValueOn : NSControlStateValueOff;
6464
[(CocoaRadioLabel*)p->cocoaView setState:state];
6565
}
6666
}

hiro/cocoa/widget/table-view.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
if(self = [super initTextCell:@""]) {
203203
tableView = &tableViewReference;
204204
buttonCell = [[NSButtonCell alloc] initTextCell:@""];
205-
[buttonCell setButtonType:NSSwitchButton];
205+
[buttonCell setButtonType:NSButtonTypeSwitch];
206206
[buttonCell setControlSize:NSControlSizeSmall];
207207
[buttonCell setRefusesFirstResponder:YES];
208208
[buttonCell setTarget:self];
@@ -222,7 +222,7 @@
222222
if(auto tableViewCell = tableViewItem->cell([view columnAtPoint:frame.origin])) {
223223
if(tableViewCell->state.checkable) {
224224
[buttonCell setHighlighted:YES];
225-
[buttonCell setState:(tableViewCell->state.checked ? NSOnState : NSOffState)];
225+
[buttonCell setState:(tableViewCell->state.checked ? NSControlStateValueOn : NSControlStateValueOff)];
226226
[buttonCell drawWithFrame:frame inView:view];
227227
frame.origin.x += frame.size.height + 2;
228228
frame.size.width -= frame.size.height + 2;

hiro/cocoa/widget/vertical-scroll-bar.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
auto& state = verticalScrollBar->state;
3131

3232
switch([self hitPart]) {
33-
case NSScrollerIncrementLine:
3433
case NSScrollerIncrementPage:
3534
if(state.position < state.length - 1) state.position++;
3635
[self update];
3736
break;
3837

39-
case NSScrollerDecrementLine:
4038
case NSScrollerDecrementPage:
4139
if(state.position) state.position--;
4240
[self update];

ruby/audio/audio.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
#endif
1616

1717
#if defined(AUDIO_OPENAL)
18+
#if defined(__APPLE__)
19+
#pragma clang diagnostic push
20+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
21+
#endif
22+
1823
#include <ruby/audio/openal.cpp>
24+
25+
#if defined(__APPLE__)
26+
#pragma clang diagnostic pop
27+
#endif
1928
#endif
2029

2130
#if defined(AUDIO_OSS)

ruby/video/video.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
#if defined(VIDEO_CGL)
2+
#if defined(__APPLE__)
3+
#pragma clang diagnostic push
4+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
5+
#endif
6+
27
#include <ruby/video/cgl.cpp>
8+
9+
#if defined(__APPLE__)
10+
#pragma clang diagnostic pop
11+
#endif
312
#endif
413

514
#if defined(VIDEO_DIRECT3D9)

0 commit comments

Comments
 (0)