Merge pull request #4369 from lioncash/config

DolphinWX: Minor include changes to config panes/dialogs

5 files changed, 24 insertions, 20 deletions

diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
index 4b19e35c55..09ae33aea2 100644
--- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
+++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
@@ -4,8 +4,11 @@
 
 #pragma once
 
+#include <ctime>
 #include <wx/panel.h>
 
+#include "Common/CommonTypes.h"
+
 class DolphinSlider;
 class wxCheckBox;
 class wxDatePickerCtrl;
diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
index 975502718a..66ab071a4c 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
@@ -2,13 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinWX/Config/GCAdapterConfigDiag.h"
+
 #include <wx/checkbox.h>
+#include <wx/sizer.h>
 #include <wx/stattext.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "DolphinWX/Config/GCAdapterConfigDiag.h"
 #include "InputCommon/GCAdapter.h"
 
 wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
@@ -57,6 +59,11 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString&
   Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::UpdateAdapter, this);
 }
 
+GCAdapterConfigDiag::~GCAdapterConfigDiag()
+{
+  GCAdapter::SetAdapterCallback(nullptr);
+}
+
 void GCAdapterConfigDiag::ScheduleAdapterUpdate()
 {
   wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
@@ -72,7 +79,12 @@ void GCAdapterConfigDiag::UpdateAdapter(wxCommandEvent& ev)
   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();
 }
diff --git a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
index 233d4085ef..a8ce4f0d2a 100644
--- a/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
+++ b/Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
@@ -4,16 +4,9 @@
 
 #pragma once
 
-#include <cstddef>
-#include <string>
-#include <vector>
-#include <wx/button.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
 {
@@ -28,13 +21,6 @@ private:
   wxStaticText* m_adapter_status;
   int m_pad_id;
 
-  void OnAdapterRumble(wxCommandEvent& event)
-  {
-    SConfig::GetInstance().m_AdapterRumble[m_pad_id] = event.IsChecked();
-  }
-
-  void OnAdapterKonga(wxCommandEvent& event)
-  {
-    SConfig::GetInstance().m_AdapterKonga[m_pad_id] = event.IsChecked();
-  }
+  void OnAdapterRumble(wxCommandEvent& event);
+  void OnAdapterKonga(wxCommandEvent& event);
 };
diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
index 73e4d5c75e..cf8c8a2f7b 100644
--- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
+++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
@@ -7,6 +7,8 @@
 #include <wx/arrstr.h>
 #include <wx/panel.h>
 
+enum TEXIDevices : int;
+
 class wxButton;
 class wxCheckBox;
 class wxChoice;
diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.h b/Source/Core/DolphinWX/Config/GeneralConfigPane.h
index 5425cc8ee3..bfe7007ce4 100644
--- a/Source/Core/DolphinWX/Config/GeneralConfigPane.h
+++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <vector>
 #include <wx/arrstr.h>
 #include <wx/panel.h>