Switching to my turbo badger fork.

This commit is contained in:
Ben Vanik
2015-07-06 18:12:17 -07:00
parent f2ce11d268
commit 253a685dde
21 changed files with 882 additions and 1576 deletions

View File

@@ -13,6 +13,7 @@
#include <memory>
#include "xenia/debug/ui/application.h"
#include "xenia/ui/elemental_control.h"
#include "xenia/ui/platform.h"
#include "xenia/ui/window.h"
@@ -20,8 +21,6 @@ namespace xe {
namespace debug {
namespace ui {
class TurboBadgerControl;
class MainWindow : public xe::ui::PlatformWindow {
public:
MainWindow(Application* app);
@@ -37,7 +36,7 @@ class MainWindow : public xe::ui::PlatformWindow {
Application* app_ = nullptr;
xe::ui::PlatformMenu main_menu_;
std::unique_ptr<TurboBadgerControl> control_;
std::unique_ptr<xe::ui::ElementalControl> control_;
};
} // namespace ui