diff options
| author | Florent Castelli <florent.castelli@gmail.com> | 2017-01-24 02:20:40 +0100 |
|---|---|---|
| committer | Florent Castelli <florent.castelli@gmail.com> | 2017-01-24 03:22:03 +0100 |
| commit | cac53603c52af62372bccb660fb081fb6cdb2e40 (patch) | |
| tree | 8f41afc6df003b07be726a48e95720e4b3390760 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 7fe8395c33881f60dc3a00c1b42eaf900ddb5b28 (diff) | |
DolphinWX: Put wx related headers before including anything else
Including Windows.h before them creates compilation errors.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 9bb98c5f62..7bf2f7e1e1 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -10,12 +10,6 @@ #include <string> #include <utility> #include <vector> -#if defined(__unix__) || defined(__unix) || defined(__APPLE__) -#include <signal.h> -#endif -#ifdef _WIN32 -#include <windows.h> -#endif #include <wx/aui/auibook.h> #include <wx/aui/framemanager.h> #include <wx/filename.h> @@ -31,6 +25,24 @@ #include <wx/thread.h> #include <wx/toolbar.h> +#include "DolphinWX/Config/ConfigMain.h" +#include "DolphinWX/Debugger/BreakpointDlg.h" +#include "DolphinWX/Debugger/CodeWindow.h" +#include "DolphinWX/Debugger/MemoryCheckDlg.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" +#include "DolphinWX/LogWindow.h" +#include "DolphinWX/Main.h" +#include "DolphinWX/TASInputDlg.h" +#include "DolphinWX/WxUtils.h" + +#if defined(__unix__) || defined(__unix) || defined(__APPLE__) +#include <signal.h> +#endif +#ifdef _WIN32 +#include <windows.h> +#endif + #include "AudioCommon/AudioCommon.h" #include "Common/CommonTypes.h" @@ -51,17 +63,6 @@ #include "Core/Movie.h" #include "Core/State.h" -#include "DolphinWX/Config/ConfigMain.h" -#include "DolphinWX/Debugger/BreakpointDlg.h" -#include "DolphinWX/Debugger/CodeWindow.h" -#include "DolphinWX/Debugger/MemoryCheckDlg.h" -#include "DolphinWX/GameListCtrl.h" -#include "DolphinWX/Globals.h" -#include "DolphinWX/LogWindow.h" -#include "DolphinWX/Main.h" -#include "DolphinWX/TASInputDlg.h" -#include "DolphinWX/WxUtils.h" - #include "InputCommon/GCPadStatus.h" #include "VideoCommon/OnScreenDisplay.h" |
