fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring window stuff. Still needs some work.

Browse Source
This commit is contained in:
Ben Vanik
2014-01-14 22:40:02 -08:00
parent e7d61f4b1f
commit 991e7d8ad3
23 changed files with 926 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/emulator.h
View File

@@ -25,6 +25,7 @@ XEDECLARECLASS2(xe, kernel, KernelState);
XEDECLARECLASS2(xe, kernel, XamModule);
XEDECLARECLASS2(xe, kernel, XboxkrnlModule);
XEDECLARECLASS3(xe, kernel, fs, FileSystem);
XEDECLARECLASS2(xe, ui, Window);
namespace xe {
@@ -36,6 +37,10 @@ public:
~Emulator();
const xechar_t* command_line() const { return command_line_; }
ui::Window* main_window() const { return main_window_; }
void set_main_window(ui::Window* window) { main_window_ = window; }
Memory* memory() const { return memory_; }
debug::DebugServer* debug_server() const { return debug_server_; }
@@ -58,8 +63,11 @@ public:
X_STATUS LaunchDiscImage(const xechar_t* path);
private:
xechar_t command_line_[XE_MAX_PATH];
Memory* memory_;
xechar_t command_line_[XE_MAX_PATH];
ui::Window* main_window_;
Memory* memory_;
debug::DebugServer* debug_server_;