diff options
| author | Tilka <tilkax@gmail.com> | 2017-04-23 23:40:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-23 23:40:32 +0100 |
| commit | c6bc474c29d5dfd58aba818a5621507efcde6f14 (patch) | |
| tree | 92954fcaf9795fc34695cac1cc98dba584fc0bd4 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | a8dfb325766b09ad5dddc5636f06e2a9ca2e759e (diff) | |
| parent | a41c0d3caa79849abf405ad16abaaa3a73c378e9 (diff) | |
Merge pull request #5291 from Starsam80/fix-10221
WX: Don't specify a parent frame for the render frame
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 39480f4bcb..321a0c94e4 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -665,7 +665,8 @@ void CFrame::StartGame(const std::string& filename) // Set window size in framebuffer pixels since the 3D rendering will be operating at // that level. wxSize default_size{wxSize(640, 480) * (1.0 / GetContentScaleFactor())}; - m_RenderFrame = new CRenderFrame(this, wxID_ANY, _("Dolphin"), wxDefaultPosition, default_size); + m_RenderFrame = + new CRenderFrame(nullptr, wxID_ANY, _("Dolphin"), wxDefaultPosition, default_size); // Convert ClientSize coordinates to frame sizes. wxSize decoration_fudge = m_RenderFrame->GetSize() - m_RenderFrame->GetClientSize(); |