ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix OS X build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5669 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-12 23:27:39 +00:00
parent ca39437b78
commit 615d4e1df8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputUICommon/Src/ConfigDiag.cpp
View File

@ -102,8 +102,8 @@ void PadSettingChoice::UpdateValue()
ControlDialog::ControlDialog( wxWindow* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref, const std::vector<ControllerInterface::Device*>& devs ) ControlDialog::ControlDialog( wxWindow* const parent, InputPlugin& plugin, ControllerInterface::ControlReference* const ref, const std::vector<ControllerInterface::Device*>& devs )
:wxDialog( parent, -1, wxT("Configure Control"), wxDefaultPosition ) :wxDialog( parent, -1, wxT("Configure Control"), wxDefaultPosition )
,m_plugin(plugin)
,control_reference(ref) ,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 ); 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 ) GamepadPage::GamepadPage( wxWindow* parent, InputPlugin& plugin, const unsigned int pad_num, InputConfigDialog* const config_dialog )
: wxNotebookPage( parent, -1 , wxDefaultPosition, wxDefaultSize ) : wxNotebookPage( parent, -1 , wxDefaultPosition, wxDefaultSize )
,m_plugin(plugin)
,controller(plugin.controllers[pad_num]) ,controller(plugin.controllers[pad_num])
,m_config_dialog(config_dialog) ,m_config_dialog(config_dialog)
,m_plugin(plugin)
{ {
wxBoxSizer* control_group_sizer = new ControlGroupsSizer( m_plugin.controllers[pad_num], this, this, &control_groups ); 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() InputConfigDialog::~InputConfigDialog()
{ {
m_update_timer->Stop(); m_update_timer->Stop();
} }

2
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -30,7 +30,7 @@ if wmenv['HAVE_WX']:
"FillReport.cpp", "FillReport.cpp",
] ]
libs = [ 'common', 'inputcommon' ] libs = [ 'common', 'inputcommon', 'inputuicommon' ]
cxxflags = [ ] cxxflags = [ ]