diff options
| author | Mat M <mathew1800@gmail.com> | 2016-11-06 08:21:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-06 08:21:02 -0500 |
| commit | 136a10482f099aec67cebd8673388f54b78458b6 (patch) | |
| tree | 11fec99892342dc65ded42979b6b5274cfdee204 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 3924a9994297661a4a5d0609f304a14bde8f8464 (diff) | |
| parent | c2d00d25fe8b2f46eb35f039bc664b73669c3755 (diff) | |
Merge pull request #4427 from lioncash/config-update
DolphinWX: Enable/disable config UI options based on core state
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index c966bf84f6..147e2a47b6 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinWX/Frame.h" + #include <atomic> #include <cstddef> #include <fstream> @@ -49,8 +51,8 @@ #include "Core/Movie.h" #include "Core/State.h" +#include "DolphinWX/Config/ConfigMain.h" #include "DolphinWX/Debugger/CodeWindow.h" -#include "DolphinWX/Frame.h" #include "DolphinWX/GameListCtrl.h" #include "DolphinWX/Globals.h" #include "DolphinWX/LogWindow.h" @@ -310,6 +312,8 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo { BindEvents(); + m_main_config_dialog = new CConfigMain(this); + for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++) bFloatWindow[i] = false; @@ -488,6 +492,7 @@ void CFrame::BindEvents() BindMenuBarEvents(); Bind(DOLPHIN_EVT_RELOAD_THEME_BITMAPS, &CFrame::OnReloadThemeBitmaps, this); + Bind(DOLPHIN_EVT_RELOAD_GAMELIST, &CFrame::OnReloadGameList, this); } bool CFrame::RendererIsFullscreen() |