diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 17:32:32 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 17:32:32 -0700 |
| commit | 1fcf07f9cccf838894bf7a869ec0749cf2abbb2d (patch) | |
| tree | 73f77b4597289f4dc663f332bc368db78e231c35 /Source/Core/VideoBackends/D3D/main.cpp | |
| parent | 35654513c1ba0eb9ccd39b1e49254b8d2786e184 (diff) | |
| parent | a66a7e1344bac0522dab868104be39923c1608bc (diff) | |
Merge pull request #5 from lioncash/vertex-loader
Isolate D3D and Software Renderer from wxWidgets code
Diffstat (limited to 'Source/Core/VideoBackends/D3D/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 1e78abfcb7..42c492b793 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include <string> -#include <wx/wx.h> #include "Common/FileUtil.h" #include "Common/IniFile.h" @@ -14,9 +13,6 @@ #include "Core/Core.h" #include "Core/Host.h" -#include "DolphinWX/VideoConfigDiag.h" -#include "DolphinWX/Debugger/DebuggerPanel.h" - #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DUtil.h" #include "VideoBackends/D3D/Globals.h" @@ -139,13 +135,10 @@ void InitBackendInfo() DX11::D3D::UnloadD3D(); } -void VideoBackend::ShowConfig(void *_hParent) +void VideoBackend::ShowConfig(void *hParent) { -#if defined(HAVE_WX) && HAVE_WX InitBackendInfo(); - VideoConfigDiag diag((wxWindow*)_hParent, _trans("Direct3D"), "gfx_dx11"); - diag.ShowModal(); -#endif + Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11"); } bool VideoBackend::Initialize(void *&window_handle) |