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

Merge pull request #743 from parkerlamb/startup_race

Browse Source 
Prevent race condition during emulator startup (issue #702)
This commit is contained in:
Justin Moore
2017-08-03 21:36:22 -05:00
committed by GitHub
parent b3b7acb7ca aae82430f2
commit d081cf5f5c
7 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/ui/window_win.h
View File

@@ -30,6 +30,9 @@ class Win32Window : public Window {
NativeWindowHandle native_handle() const override { return hwnd_; }
HWND hwnd() const { return hwnd_; }
void EnableMainMenu() override;
void DisableMainMenu() override;
bool set_title(const std::wstring& title) override;
bool SetIcon(const void* buffer, size_t size) override;
@@ -92,6 +95,9 @@ class Win32MenuItem : public MenuItem {
HMENU handle() { return handle_; }
void EnableMenuItem(Window& window) override;
void DisableMenuItem(Window& window) override;
using MenuItem::OnSelected;
protected: