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

Merge pull request #4369 from lioncash/config 

DolphinWX: Minor include changes to config panes/dialogs
This commit is contained in:
JosJuice 2016-10-21 22:04:09 +02:00 committed by GitHub
parent 500175ae61 855061682e
commit 2fc2baf376
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Config/AdvancedConfigPane.h
View File

@ -4,8 +4,11 @@
#pragma once #pragma once
#include <ctime>
#include <wx/panel.h> #include <wx/panel.h>
#include "Common/CommonTypes.h"
class DolphinSlider; class DolphinSlider;
class wxCheckBox; class wxCheckBox;
class wxDatePickerCtrl; class wxDatePickerCtrl;

18
Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
View File

@ -2,13 +2,15 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "DolphinWX/Config/GCAdapterConfigDiag.h"
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/sizer.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "DolphinWX/Config/GCAdapterConfigDiag.h"
#include "InputCommon/GCAdapter.h" #include "InputCommon/GCAdapter.h"
wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent); wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
@ -57,6 +59,11 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString&
Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::UpdateAdapter, this); Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::UpdateAdapter, this);
} }
GCAdapterConfigDiag::~GCAdapterConfigDiag()
{
GCAdapter::SetAdapterCallback(nullptr);
}
void GCAdapterConfigDiag::ScheduleAdapterUpdate() void GCAdapterConfigDiag::ScheduleAdapterUpdate()
{ {
wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE)); wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
@ -72,7 +79,12 @@ void GCAdapterConfigDiag::UpdateAdapter(wxCommandEvent& ev)
Core::PauseAndLock(false, unpause); Core::PauseAndLock(false, unpause);
} }
GCAdapterConfigDiag::~GCAdapterConfigDiag() void GCAdapterConfigDiag::OnAdapterRumble(wxCommandEvent& event)
{ {
GCAdapter::SetAdapterCallback(nullptr); SConfig::GetInstance().m_AdapterRumble[m_pad_id] = event.IsChecked();
}
void GCAdapterConfigDiag::OnAdapterKonga(wxCommandEvent& event)
{
SConfig::GetInstance().m_AdapterKonga[m_pad_id] = event.IsChecked();
} }

20
Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
View File

@ -4,16 +4,9 @@
#pragma once #pragma once
#include <cstddef>
#include <string>
#include <vector>
#include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/eventfilter.h>
#include <wx/panel.h>
#include <wx/sizer.h>
#include "Core/ConfigManager.h" class wxStaticText;
class GCAdapterConfigDiag : public wxDialog class GCAdapterConfigDiag : public wxDialog
{ {
@ -28,13 +21,6 @@ private:
wxStaticText* m_adapter_status; wxStaticText* m_adapter_status;
int m_pad_id; int m_pad_id;
void OnAdapterRumble(wxCommandEvent& event) void OnAdapterRumble(wxCommandEvent& event);
{ void OnAdapterKonga(wxCommandEvent& event);
SConfig::GetInstance().m_AdapterRumble[m_pad_id] = event.IsChecked();
}
void OnAdapterKonga(wxCommandEvent& event)
{
SConfig::GetInstance().m_AdapterKonga[m_pad_id] = event.IsChecked();
}
}; };

2
Source/Core/DolphinWX/Config/GameCubeConfigPane.h
View File

@ -7,6 +7,8 @@
#include <wx/arrstr.h> #include <wx/arrstr.h>
#include <wx/panel.h> #include <wx/panel.h>
enum TEXIDevices : int;
class wxButton; class wxButton;
class wxCheckBox; class wxCheckBox;
class wxChoice; class wxChoice;

1
Source/Core/DolphinWX/Config/GeneralConfigPane.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <vector>
#include <wx/arrstr.h> #include <wx/arrstr.h>
#include <wx/panel.h> #include <wx/panel.h>