From 552a535f6da523399cddc519a44e8fbe31464bce Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 3 Aug 2010 18:57:59 +0000 Subject: [PATCH] Fix issue 2694. Fix another dramatic spelling "mistake" in DX9 which I forgot to commit last time. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6042 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/FrameTools.cpp | 3 ++- Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d5af6ddb20..4de5bf120d 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -780,7 +780,8 @@ void CFrame::StartGame(const std::string& filename) SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos); wxSize size(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth, SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); - m_RenderFrame = new CRenderFrame((wxFrame*)this, wxID_ANY, _("Dolphin"), position, size); + m_RenderFrame = new CRenderFrame((wxFrame*)this, wxID_ANY, _("Dolphin"), position); + m_RenderFrame->SetClientSize(size.GetWidth(), size.GetHeight()); m_RenderFrame->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler(CFrame::OnRenderParentClose), (wxObject*)0, this); diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp index ff40ff8cd3..2d1f4b2413 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp @@ -155,7 +155,7 @@ void Enumerate() bool isNvidia = a.ident.VendorId == VENDOR_NVIDIA; // Add SuperSamples modes - a.aa_levels.push_back(AALevel("NONE", D3DMULTISAMPLE_NONE, 0)); + a.aa_levels.push_back(AALevel("None", D3DMULTISAMPLE_NONE, 0)); a.aa_levels.push_back(AALevel("4x SSAA", D3DMULTISAMPLE_NONE, 0)); a.aa_levels.push_back(AALevel("9x SSAA", D3DMULTISAMPLE_NONE, 0)); //Add multisample modes