From 615d4e1df85921615b7b5958c8028fc9996cd33d Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 12 Jun 2010 23:27:39 +0000 Subject: [PATCH] Fix OS X build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5669 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputUICommon/Src/ConfigDiag.cpp | 6 +++--- Source/Plugins/Plugin_Wiimote/Src/SConscript | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp index 9007f92f9c..c0b1e3fcc2 100644 --- a/Source/Core/InputUICommon/Src/ConfigDiag.cpp +++ b/Source/Core/InputUICommon/Src/ConfigDiag.cpp @@ -102,8 +102,8 @@ void PadSettingChoice::UpdateValue() ControlDialog::ControlDialog( wxWindow* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref, const std::vector& devs ) :wxDialog( parent, -1, wxT("Configure Control"), wxDefaultPosition ) - ,m_plugin(plugin) ,control_reference(ref) + ,m_plugin(plugin) { device_cbox = new wxComboBox( this, -1, wxString::FromAscii( ref->device_qualifier.ToString().c_str() ), wxDefaultPosition, wxSize(256,-1), wxArrayString(), wxTE_PROCESS_ENTER ); @@ -845,9 +845,9 @@ ControlGroupsSizer::ControlGroupsSizer( ControllerEmu* const controller, wxWindo GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned int pad_num, InputConfigDialog* const config_dialog ) : wxNotebookPage( parent, -1 , wxDefaultPosition, wxDefaultSize ) - ,m_plugin(plugin) ,controller(plugin.controllers[pad_num]) ,m_config_dialog(config_dialog) + ,m_plugin(plugin) { wxBoxSizer* control_group_sizer = new ControlGroupsSizer( m_plugin.controllers[pad_num], this, this, &control_groups ); @@ -954,4 +954,4 @@ InputConfigDialog::InputConfigDialog( wxWindow* const parent, InputPlugin& plugi InputConfigDialog::~InputConfigDialog() { m_update_timer->Stop(); -} \ No newline at end of file +} diff --git a/Source/Plugins/Plugin_Wiimote/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript index f021dc82af..7f4cc11aa8 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript @@ -30,7 +30,7 @@ if wmenv['HAVE_WX']: "FillReport.cpp", ] -libs = [ 'common', 'inputcommon' ] +libs = [ 'common', 'inputcommon', 'inputuicommon' ] cxxflags = [ ]