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

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

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);