From 08a79ec7df5e1d6f822053e14882e635d24ef4f8 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 12 Sep 2008 20:08:38 +0000 Subject: [PATCH] win64 build fix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@502 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.cpp | 24 +++++++++++++----------- Source/Dolphin.sln | 20 +++++++++++++------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index c7a06598f5..ec2b2dbbb2 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -293,6 +293,7 @@ void CFrame::RecreateToolbar() PopulateToolbar(theToolBar); SetToolBar(theToolBar); + UpdateGUI(); } @@ -405,26 +406,26 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event)) } else if (!SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.empty()) { - if (wxFileExists(wxString(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.c_str(), wxConvUTF8))) + if (wxFileExists(wxString(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.c_str(), wxConvUTF8))) { BootManager::BootCore(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM); } else { - wxMessageBox(_("The default ISO you have set is invalid.\n" - "Please pick on new one by right clicking on a game\n" - "and selecting \"Set as default ISO\"."), - _("Invalid Default ISO"), - wxOK, this); + wxMessageBox(_("The default ISO you have set is invalid.\n" + "Please pick on new one by right clicking on a game\n" + "and selecting \"Set as default ISO\"."), + _("Invalid Default ISO"), + wxOK, this); } } else { - wxMessageBox(_("You can set an ISO to load by default.\n" - "Choose one by right clicking on a game and selecting\n" - "\"Set as default ISO\"."), - _("Set Default ISO"), - wxOK, this); + wxMessageBox(_("You can set an ISO to load by default.\n" + "Choose one by right clicking on a game and selecting\n" + "\"Set as default ISO\"."), + _("Set Default ISO"), + wxOK, this); } } @@ -615,6 +616,7 @@ void CFrame::UpdateGUI() GetToolBar()->EnableTool(IDM_STOP, false); + m_pToolPlay->SetNormalBitmap(m_Bitmaps[Toolbar_Play]); m_pToolPlay->SetShortHelp(_T("Play")); m_pToolPlay->SetLabel(_T("Play")); diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 54239d4022..4a89586e0a 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}" @@ -100,13 +100,16 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {F0B874CB-4476-4199-9315-8343D05AE684}.Debug|Win32.ActiveCfg = Debug|Win32 {F0B874CB-4476-4199-9315-8343D05AE684}.Debug|Win32.Build.0 = Debug|Win32 - {F0B874CB-4476-4199-9315-8343D05AE684}.Debug|x64.ActiveCfg = Debug|Win32 + {F0B874CB-4476-4199-9315-8343D05AE684}.Debug|x64.ActiveCfg = Debug|x64 + {F0B874CB-4476-4199-9315-8343D05AE684}.Debug|x64.Build.0 = Debug|x64 {F0B874CB-4476-4199-9315-8343D05AE684}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {F0B874CB-4476-4199-9315-8343D05AE684}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {F0B874CB-4476-4199-9315-8343D05AE684}.DebugFast|x64.ActiveCfg = DebugFast|Win32 + {F0B874CB-4476-4199-9315-8343D05AE684}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {F0B874CB-4476-4199-9315-8343D05AE684}.DebugFast|x64.Build.0 = DebugFast|x64 {F0B874CB-4476-4199-9315-8343D05AE684}.Release|Win32.ActiveCfg = Release|Win32 {F0B874CB-4476-4199-9315-8343D05AE684}.Release|Win32.Build.0 = Release|Win32 - {F0B874CB-4476-4199-9315-8343D05AE684}.Release|x64.ActiveCfg = Release|Win32 + {F0B874CB-4476-4199-9315-8343D05AE684}.Release|x64.ActiveCfg = Release|x64 + {F0B874CB-4476-4199-9315-8343D05AE684}.Release|x64.Build.0 = Release|x64 {636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}.Debug|Win32.ActiveCfg = Debug|Win32 {636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}.Debug|Win32.Build.0 = Debug|Win32 {636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}.Debug|x64.ActiveCfg = Debug|x64 @@ -205,13 +208,16 @@ Global {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.Release|x64.Build.0 = Release|x64 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Debug|Win32.ActiveCfg = Debug|Win32 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Debug|Win32.Build.0 = Debug|Win32 - {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Debug|x64.ActiveCfg = Debug|Win32 + {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Debug|x64.ActiveCfg = Debug|x64 + {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Debug|x64.Build.0 = Debug|x64 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.DebugFast|x64.ActiveCfg = DebugFast|Win32 + {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.DebugFast|x64.Build.0 = DebugFast|x64 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|Win32.ActiveCfg = Release|Win32 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|Win32.Build.0 = Release|Win32 - {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.ActiveCfg = Release|Win32 + {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.ActiveCfg = Release|x64 + {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.Build.0 = Release|x64 {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|Win32.ActiveCfg = Debug|Win32 {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|Win32.Build.0 = Debug|Win32 {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|x64.ActiveCfg = Debug|x64