Update to v096r01 release.

byuu says:

Changelog:

- restructured the project and removed a whole bunch of old/dead
  directives from higan/GNUmakefile
- huge amounts of work on hiro/cocoa (compiles but ~70% of the
  functionality is commented out)
- fixed a masking error in my ARM CPU disassembler [Lioncash]
- SFC: decided to change board cic=(411,413) back to board
  region=(ntsc,pal) ... the former was too obtuse

If you rename Boolean (it's a problem with an include from ruby, not
from hiro) and disable all the ruby drivers, you can compile an
OS X binary, but obviously it's not going to do anything.

It's a boring WIP, I just wanted to push out the project structure
change now at the start of this WIP cycle.
This commit is contained in:
Tim Allen
2015-12-30 17:41:46 +11:00
parent 27660505c8
commit 47d4bd4d81
707 changed files with 3789 additions and 3373 deletions

View File

@@ -1,6 +1,8 @@
#if defined(Hiro_CheckLabel)
@implementation CocoaCheckLabel : NSButton
-(id) initWith:(phoenix::CheckLabel&)checkLabelReference {
-(id) initWith:(hiro::mCheckLabel&)checkLabelReference {
if(self = [super initWithFrame:NSMakeRect(0, 0, 0, 0)]) {
checkLabel = &checkLabelReference;
@@ -13,49 +15,53 @@
-(IBAction) activate:(id)sender {
checkLabel->state.checked = [self state] != NSOffState;
if(checkLabel->onToggle) checkLabel->onToggle();
checkLabel->doToggle();
}
@end
namespace phoenix {
namespace hiro {
Size pCheckLabel::minimumSize() {
Size size = Font::size(checkLabel.font(), checkLabel.state.text);
return {size.width + 20, size.height};
}
void pCheckLabel::setChecked(bool checked) {
auto pCheckLabel::construct() -> void {
@autoreleasepool {
[cocoaView setState:checked ? NSOnState : NSOffState];
cocoaView = cocoaCheckLabel = [[CocoaCheckLabel alloc] initWith:self()];
pWidget::construct();
setChecked(state().checked);
setText(state().text);
}
}
void pCheckLabel::setGeometry(Geometry geometry) {
pWidget::setGeometry({
geometry.x - 2, geometry.y,
geometry.width + 4, geometry.height
});
}
void pCheckLabel::setText(string text) {
@autoreleasepool {
[cocoaView setTitle:[NSString stringWithUTF8String:text]];
}
}
void pCheckLabel::constructor() {
@autoreleasepool {
cocoaView = cocoaCheckLabel = [[CocoaCheckLabel alloc] initWith:checkLabel];
setChecked(checkLabel.state.checked);
setText(checkLabel.state.text);
}
}
void pCheckLabel::destructor() {
auto pCheckLabel::destruct() -> void {
@autoreleasepool {
[cocoaView release];
}
}
auto pCheckLabel::minimumSize() const -> Size {
Size size = pFont::size(self().font(true), state().text);
return {size.width() + 20, size.height()};
}
auto pCheckLabel::setChecked(bool checked) -> void {
@autoreleasepool {
[cocoaView setState:checked ? NSOnState : NSOffState];
}
}
auto pCheckLabel::setGeometry(Geometry geometry) -> void {
pWidget::setGeometry({
geometry.x() - 2, geometry.y(),
geometry.width() + 4, geometry.height()
});
}
auto pCheckLabel::setText(const string& text) -> void {
@autoreleasepool {
[cocoaView setTitle:[NSString stringWithUTF8String:text]];
}
}
}
#endif