piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linux build fix. Also take care of a few compiler warnings that have developed.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7578 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-06-02 23:28:47 +00:00
parent 837375a13d
commit bad9fd1f1d
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
View File

@ -120,7 +120,7 @@ void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED (event))
}
// If the above-mentioned conditions weren't met, then something went wrong.
if (!PanicYesNoT("Unable to parse line %u of the entered AR code as a valid "
if (!PanicYesNoT("Unable to parse line %lu of the entered AR code as a valid "
"encrypted or decrypted code. Make sure you typed it correctly.\n"
"Would you like to ignore this line and continue parsing?", i + 1))
{

13
Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
View File

@ -3,11 +3,14 @@
#include "FileUtil.h"
#include "TextureCacheBase.h"
#include "Core.h"
#include "Frame.h"
#include <wx/intl.h>
#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
extern CFrame* main_frame;
// template instantiation
template class BoolSetting<wxCheckBox>;
template class BoolSetting<wxRadioButton>;
@ -600,6 +603,16 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
UpdateWindowUI();
}
void VideoConfigDiag::Event_DisplayResolution(wxCommandEvent &ev)
{
SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
choice_display_resolution->GetStringSelection().mb_str();
#if defined(HAVE_XRANDR) && HAVE_XRANDR
main_frame->m_XRRConfig->Update();
#endif
ev.Skip();
}
SettingCheckBox* VideoConfigDiag::CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
{
SettingCheckBox* const cb = new SettingCheckBox(parent, label, wxString(), setting, reverse, style);

13
Source/Core/DolphinWX/Src/VideoConfigDiag.h
View File

@ -20,9 +20,6 @@
#include <wx/spinctrl.h>
#include "MsgHandler.h"
#include "Frame.h"
extern CFrame* main_frame;
template <typename W>
class BoolSetting : public W
@ -109,15 +106,7 @@ protected:
}
void Event_Adapter(wxCommandEvent &ev) { ev.Skip(); } // TODO
void Event_DisplayResolution(wxCommandEvent &ev)
{
SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
choice_display_resolution->GetStringSelection().mb_str();
#if defined(HAVE_XRANDR) && HAVE_XRANDR
main_frame->m_XRRConfig->Update();
#endif
ev.Skip();
}
void Event_DisplayResolution(wxCommandEvent &ev);
void Event_ProgressiveScan(wxCommandEvent &ev)
{