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

Fix more header sorting issues in DolphinWX/ (now check-includes clean).

This commit is contained in:
Pierre Bourdon 2014-02-19 02:56:29 +01:00
parent ffe588cc24
commit 592ebc5262
48 changed files with 213 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/ARCodeAddEdit.h
View File

@ -4,8 +4,9 @@
#pragma once
#include <wx/wx.h>
#include <wx/spinctrl.h>
#include <wx/wx.h>
#include "DolphinWX/ISOProperties.h"
class CARCodeAddEdit : public wxDialog

8
Source/Core/DolphinWX/AboutDolphin.h
View File

@ -4,13 +4,13 @@
#pragma once
#include <wx/wx.h>
#include <wx/dialog.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/statbox.h>
#include <wx/dialog.h>
#include <wx/mstream.h>
#include <wx/statbmp.h>
#include <wx/statbox.h>
#include <wx/stattext.h>
#include <wx/wx.h>
class AboutDolphin : public wxDialog
{

4
Source/Core/DolphinWX/CheatsWindow.cpp
View File

@ -3,13 +3,11 @@
// Refer to the license.txt file included.
#include "Common/CommonPaths.h"
#include "Core/ActionReplay.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/VolumeHandler.h"
#include "Core/HW/Memmap.h"
#include "DolphinWX/CheatsWindow.h"
#include "DolphinWX/Frame.h"
#include "DolphinWX/Globals.h"

27
Source/Core/DolphinWX/CheatsWindow.h
View File

@ -4,24 +4,23 @@
#pragma once
#include <wx/wx.h>
#include <wx/sizer.h>
#include <wx/filepicker.h>
#include <wx/statbmp.h>
#include <wx/imaglist.h>
#include <wx/treectrl.h>
#include <wx/gbsizer.h>
#include <wx/textctrl.h>
#include <wx/notebook.h>
#include <wx/mimetype.h>
#include <wx/colour.h>
#include <wx/listbox.h>
#include <string>
#include <vector>
#include <wx/colour.h>
#include <wx/filepicker.h>
#include <wx/gbsizer.h>
#include <wx/imaglist.h>
#include <wx/listbox.h>
#include <wx/mimetype.h>
#include <wx/notebook.h>
#include <wx/sizer.h>
#include <wx/statbmp.h>
#include <wx/textctrl.h>
#include <wx/treectrl.h>
#include <wx/wx.h>
#include "Core/ActionReplay.h"
#include "Common/IniFile.h"
#include "Core/ActionReplay.h"
#include "DiscIO/Filesystem.h"
#include "DolphinWX/GeckoCodeDiag.h"

6
Source/Core/DolphinWX/ConfigMain.h
View File

@ -4,12 +4,12 @@
#pragma once
#include <wx/wx.h>
#include <wx/filepicker.h>
#include <wx/gbsizer.h>
#include <wx/notebook.h>
#include <wx/spinbutt.h>
#include <wx/spinctrl.h>
#include <wx/notebook.h>
#include <wx/filepicker.h>
#include <wx/wx.h>
#include "Core/ConfigManager.h"
#if defined(HAVE_XRANDR) && HAVE_XRANDR

2
Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp
View File

@ -4,9 +4,9 @@
#include "Common/StringUtil.h"
#include "Core/PowerPC/PowerPC.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/BreakpointDlg.h"
#include "DolphinWX/Debugger/BreakpointWindow.h"
#include "DolphinWX/WxUtils.h"
BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog)
EVT_BUTTON(wxID_OK, BreakPointDlg::OnOK)

4
Source/Core/DolphinWX/Debugger/BreakpointView.cpp
View File

@ -6,11 +6,11 @@
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/BreakpointView.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h"
#include "DolphinWX/WxUtils.h"
CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id)
: wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize,

2
Source/Core/DolphinWX/Debugger/BreakpointWindow.h
View File

@ -4,8 +4,8 @@
#pragma once
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <wx/wx.h>
#include <wx/aui/aui.h>
class CBreakPointView;

10
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -7,12 +7,12 @@
#include "Common/Common.h"
#include "Common/FileUtil.h"
#include "Common/LogManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/Boot/Boot.h"
#include "Core/ConfigManager.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/CPU.h"
#include "Core/HW/Memmap.h"
@ -22,19 +22,19 @@
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PPCTables.h"
#include "Core/PowerPC/SignatureDB.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/BreakpointWindow.h"
#include "DolphinWX/Debugger/CodeView.h"
#include "DolphinWX/Debugger/CodeWindow.h"
#include "DolphinWX/Debugger/JitWindow.h"
#include "DolphinWX/Debugger/MemoryWindow.h"
#include "DolphinWX/Debugger/RegisterWindow.h"
#include "DolphinWX/WxUtils.h"
extern "C" // Bitmaps
{
#include "DolphinWX/resources/toolbar_add_memorycheck.c"
#include "DolphinWX/resources/toolbar_add_breakpoint.c"
#include "DolphinWX/resources/toolbar_add_memorycheck.c" // NOLINT
#include "DolphinWX/resources/toolbar_add_breakpoint.c" // NOLINT
}
// -------

4
Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
View File

@ -13,10 +13,10 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/HLE/HLE.h"
#include "Core/Boot/Boot.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/HLE/HLE.h"
#include "Core/HW/CPU.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"

3
Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
View File

@ -2,10 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <iostream>
#include <fstream>
#include <iostream>
#include <sstream>
#include <wx/artprov.h>
#include "Common/Common.h"

7
Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
View File

@ -10,15 +10,14 @@
#include <list>
#include <map>
#include <vector>
#include <wx/wx.h>
#include <wx/button.h>
#include <wx/frame.h>
#include <wx/listctrl.h>
#include <wx/statbox.h>
#include <wx/stattext.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/statline.h>
#include <wx/stattext.h>
#include <wx/wx.h>
#include <wx/aui/aui.h>
#include "Core/DSP/disassemble.h"

2
Source/Core/DolphinWX/Debugger/DebuggerPanel.h
View File

@ -4,8 +4,8 @@
#pragma once
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/wx.h>
#include "VideoCommon/Debugger.h"

9
Source/Core/DolphinWX/Debugger/JitWindow.cpp
View File

@ -2,26 +2,23 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <disasm.h> // Bochs
#include <PowerPCDisasm.h> // Bochs
#include <wx/button.h>
#include <wx/listctrl.h>
#include <wx/textctrl.h>
#include <wx/thread.h>
#include "PowerPCDisasm.h" // Bochs
#include "disasm.h" // Bochs
#include "Common/LogManager.h"
#include "Common/StringUtil.h"
#include "Core/Core.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/Debugger/Debugger_SymbolMap.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/HW/CPU.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCAnalyst.h"
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/JitCommon/JitCache.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/JitWindow.h"

2
Source/Core/DolphinWX/Debugger/MemoryView.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <wx/event.h>
#include <wx/clipbrd.h>
#include <wx/event.h>
#include "Common/Common.h"
#include "Core/Host.h"

6
Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
View File

@ -3,22 +3,20 @@
// Refer to the license.txt file included.
#include <wx/button.h>
#include <wx/listctrl.h>
#include <wx/textctrl.h>
#include <wx/listctrl.h>
#include <wx/thread.h>
#include <wx/listctrl.h>
#include "Common/FileUtil.h"
#include "Common/LogManager.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Debugger/PPCDebugInterface.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/PowerPC/PPCSymbolDB.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/MemoryWindow.h"

2
Source/Core/DolphinWX/Debugger/MemoryWindow.h
View File

@ -5,8 +5,8 @@
#pragma once
#include <wx/dialog.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>
#include <wx/textctrl.h>
#include "Common/StringUtil.h"
#include "Common/Thread.h"

5
Source/Core/DolphinWX/FifoPlayerDlg.cpp
View File

@ -4,6 +4,8 @@
#include <algorithm>
#include <vector>
#include <wx/clipbrd.h>
#include <wx/spinctrl.h>
#include "Common/Common.h"
#include "Common/FileUtil.h"
@ -14,9 +16,6 @@
#include "DolphinWX/WxUtils.h"
#include "VideoCommon/OpcodeDecoding.h"
#include <wx/spinctrl.h>
#include <wx/clipbrd.h>
DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1)
DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT)

2
Source/Core/DolphinWX/FifoPlayerDlg.h
View File

@ -5,8 +5,8 @@
#pragma once
#include <vector>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/wx.h>
class wxSpinCtrl;
class wxSpinEvent;

15
Source/Core/DolphinWX/Frame.cpp
View File

@ -13,19 +13,12 @@
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
#include <wx/datetime.h>
#include "Common/Common.h"
#include "Common/FileUtil.h"
#include "Common/Timer.h"
#include "DolphinWX/CheatsWindow.h"
#include "DolphinWX/ConfigMain.h"
#include "DolphinWX/Frame.h"
#include "DolphinWX/GameListCtrl.h"
#include "DolphinWX/Globals.h"
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
@ -36,6 +29,12 @@
#include "Core/HW/GCPad.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "DolphinWX/CheatsWindow.h"
#include "DolphinWX/ConfigMain.h"
#include "DolphinWX/Frame.h"
#include "DolphinWX/GameListCtrl.h"
#include "DolphinWX/Globals.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoBackendBase.h"
@ -44,7 +43,7 @@
// Resources
extern "C" {
#include "DolphinWX/resources/Dolphin.c" // Dolphin icon
#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon
};
#ifdef _WIN32

13
Source/Core/DolphinWX/Frame.h
View File

@ -6,20 +6,19 @@
#include <string>
#include <vector>
#include <wx/wx.h>
#include <wx/busyinfo.h>
#include <wx/mstream.h>
#include <wx/listctrl.h>
#include <wx/artprov.h>
#include <wx/aui/aui.h>
#include <wx/busyinfo.h>
#include <wx/listctrl.h>
#include <wx/mstream.h>
#include <wx/tooltip.h>
#include <wx/wx.h>
#include <wx/aui/aui.h>
#include "Common/CDUtils.h"
#include "Core/Movie.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/LogWindow.h"
#include "DolphinWX/LogConfigWindow.h"
#include "DolphinWX/LogWindow.h"
#include "DolphinWX/TASInputDlg.h"
#include "DolphinWX/Debugger/CodeWindow.h"

46
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -16,15 +16,32 @@ Core::GetWindowHandle().
#include <wx/datetime.h>
#ifdef __APPLE__
#include <AppKit/AppKit.h>
#endif
#include "Common/Common.h"
#include "Common/FileSearch.h"
#include "Common/FileUtil.h"
#include "Common/Timer.h"
#include "VideoCommon/VideoBackendBase.h"
#ifdef __APPLE__
#include <AppKit/AppKit.h>
#endif
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/Movie.h"
#include "Core/State.h"
#include "Core/VolumeHandler.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/Wiimote.h"
//#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/PowerPC/PowerPC.h"
#include "DiscIO/NANDContentLoader.h"
#include "DolphinWX/AboutDolphin.h"
#include "DolphinWX/CheatsWindow.h"
@ -35,8 +52,8 @@ Core::GetWindowHandle().
#include "DolphinWX/Globals.h"
#include "DolphinWX/HotkeyDlg.h"
#include "DolphinWX/InputConfigDiag.h"
#include "DolphinWX/LogWindow.h"
#include "DolphinWX/LogConfigWindow.h"
#include "DolphinWX/LogWindow.h"
#include "DolphinWX/MemcardManager.h"
#include "DolphinWX/NetWindow.h"
#include "DolphinWX/TASInputDlg.h"
@ -44,22 +61,7 @@ Core::GetWindowHandle().
#include "DolphinWX/WXInputBase.h"
#include "DolphinWX/WxUtils.h"
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/Movie.h"
#include "Core/State.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DVDInterface.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/ProcessorInterface.h"
#include "Core/HW/Wiimote.h"
//#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/VolumeHandler.h"
#include "DiscIO/NANDContentLoader.h"
#include "VideoCommon/VideoBackendBase.h"
#ifdef _WIN32
#ifndef SM_XVIRTUALSCREEN
@ -78,7 +80,7 @@ Core::GetWindowHandle().
// Resources
extern "C" {
#include "DolphinWX/resources/Dolphin.c" // Dolphin icon
#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon
};
bool confirmStop = false;

2
Source/Core/DolphinWX/GLInterface/AGL.cpp
View File

@ -7,8 +7,8 @@
#include "Core/ConfigManager.h"
#include "Core/Host.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "DolphinWX/GLInterface/AGL.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"

2
Source/Core/DolphinWX/GLInterface/EGL.cpp
View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included.
#include "Core/Host.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "DolphinWX/GLInterface/EGL.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "VideoCommon/RenderBase.h"
// Show the current FPS

2
Source/Core/DolphinWX/GLInterface/GLX.h
View File

@ -4,8 +4,8 @@
#pragma once
#include "DolphinWX/GLInterface/X11_Util.h"
#include "DolphinWX/GLInterface/InterfaceBase.h"
#include "DolphinWX/GLInterface/X11_Util.h"
class cInterfaceGLX : public cInterfaceBase
{

2
Source/Core/DolphinWX/GLInterface/Wayland_Util.h
View File

@ -5,8 +5,8 @@
#pragma once
#include <wayland-client.h>
#include <wayland-egl.h>
#include <wayland-cursor.h>
#include <wayland-egl.h>
#include <xkbcommon/xkbcommon.h>
#define MOD_SHIFT_MASK 0x01

2
Source/Core/DolphinWX/GLInterface/X11_Util.h
View File

@ -4,8 +4,8 @@
#pragma once
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#if USE_EGL

19
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -2,13 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <wx/imaglist.h>
#include <wx/fontmap.h>
#include <wx/filename.h>
#include <algorithm>
#include <cinttypes>
#include <memory>
#include <wx/filename.h>
#include <wx/fontmap.h>
#include <wx/imaglist.h>
#include "Common/CDUtils.h"
#include "Common/FileSearch.h"
@ -19,26 +18,24 @@
#include "Core/Core.h"
#include "Core/HW/DVDInterface.h"
#include "DiscIO/Blob.h"
#include "DolphinWX/GameListCtrl.h"
#include "DolphinWX/Globals.h"
#include "DolphinWX/ISOProperties.h"
#include "DolphinWX/Main.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/resources/Flag_Europe.xpm"
#include "DolphinWX/resources/Flag_Germany.xpm"
#include "DolphinWX/resources/Flag_France.xpm"
#include "DolphinWX/resources/Flag_Germany.xpm"
#include "DolphinWX/resources/Flag_Italy.xpm"
#include "DolphinWX/resources/Flag_Japan.xpm"
#include "DolphinWX/resources/Flag_USA.xpm"
#include "DolphinWX/resources/Flag_Taiwan.xpm"
#include "DolphinWX/resources/Flag_Korea.xpm"
#include "DolphinWX/resources/Flag_Unknown.xpm"
#include "DolphinWX/resources/Flag_SDK.xpm"
#include "DolphinWX/resources/Flag_Taiwan.xpm"
#include "DolphinWX/resources/Flag_Unknown.xpm"
#include "DolphinWX/resources/Flag_USA.xpm"
#include "DolphinWX/resources/Platform_Gamecube.xpm"
#include "DolphinWX/resources/Platform_Wad.xpm"
#include "DolphinWX/resources/Platform_Wii.xpm"
#include "DolphinWX/resources/Platform_Gamecube.xpm"
#include "DolphinWX/resources/rating_gamelist.h"
size_t CGameListCtrl::m_currentItem = 0;

34
Source/Core/DolphinWX/Globals.h
View File

@ -7,6 +7,23 @@
#pragma once
#include <wx/aboutdlg.h>
#include <wx/busyinfo.h>
#include <wx/button.h>
#include <wx/choice.h>
#include <wx/cmdline.h>
#include <wx/filedlg.h>
#include <wx/image.h>
#include <wx/imagpng.h>
#include <wx/listctrl.h>
#include <wx/log.h>
#include <wx/progdlg.h>
#include <wx/spinctrl.h>
#include <wx/srchctrl.h>
#include <wx/stattext.h>
#include <wx/toolbar.h>
#include <wx/wx.h>
#include "Common/Common.h"
enum
@ -251,23 +268,6 @@ enum
LIST_CTRL = 1000
};
#include <wx/wx.h>
#include <wx/toolbar.h>
#include <wx/log.h>
#include <wx/image.h>
#include <wx/aboutdlg.h>
#include <wx/filedlg.h>
#include <wx/spinctrl.h>
#include <wx/srchctrl.h>
#include <wx/listctrl.h>
#include <wx/progdlg.h>
#include <wx/imagpng.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/choice.h>
#include <wx/cmdline.h>
#include <wx/busyinfo.h>
// custom message macro
#define EVT_HOST_COMMAND(id, fn) \
DECLARE_EVENT_TABLE_ENTRY(\

8
Source/Core/DolphinWX/HotkeyDlg.h
View File

@ -4,13 +4,13 @@
#pragma once
#include <wx/wx.h>
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/gbsizer.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/wx.h>
#include "Common/Common.h"
#include "Core/CoreParameter.h"

5
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -12,12 +12,9 @@
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/VolumeCreator.h"
#include "DolphinWX/ARCodeAddEdit.h"
#include "DolphinWX/GeckoCodeDiag.h"
#include "DolphinWX/Globals.h"
@ -25,9 +22,9 @@
#include "DolphinWX/PatchAddEdit.h"
#include "DolphinWX/PHackSettings.h"
#include "DolphinWX/WxUtils.h"
#include "DolphinWX/resources/isoprop_disc.xpm"
#include "DolphinWX/resources/isoprop_file.xpm"
#include "DolphinWX/resources/isoprop_folder.xpm"
#include "DolphinWX/resources/isoprop_disc.xpm"
struct WiiPartition
{

13
Source/Core/DolphinWX/ISOProperties.h
View File

@ -5,17 +5,16 @@
#pragma once
#include <string>
#include <wx/wx.h>
#include <wx/sizer.h>
#include <wx/filepicker.h>
#include <wx/statbmp.h>
#include <wx/imaglist.h>
#include <wx/fontmap.h>
#include <wx/treectrl.h>
#include <wx/gbsizer.h>
#include <wx/notebook.h>
#include <wx/imaglist.h>
#include <wx/mimetype.h>
#include <wx/notebook.h>
#include <wx/sizer.h>
#include <wx/statbmp.h>
#include <wx/treectrl.h>
#include <wx/wx.h>
#include "Common/IniFile.h"
#include "Core/ActionReplay.h"

11
Source/Core/DolphinWX/InputConfigDiag.h
View File

@ -13,17 +13,16 @@
#include <sstream>
#include <vector>
#include <wx/wx.h>
#include <wx/listbox.h>
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/listbox.h>
#include <wx/notebook.h>
#include <wx/panel.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/wx.h>
#include "Common/FileSearch.h"
#include "InputCommon/ControllerEmu.h"

5
Source/Core/DolphinWX/Main.cpp
View File

@ -4,6 +4,8 @@
#include <string>
#include <vector>
#include <wx/intl.h>
#include <wx/stdpaths.h>
#include "Common/Common.h"
#include "Common/CommonPaths.h"
@ -26,8 +28,6 @@
#include "VideoCommon/VideoBackendBase.h"
#include <wx/intl.h>
#if defined HAVE_X11 && HAVE_X11
#include <X11/Xlib.h>
#endif
@ -74,7 +74,6 @@ BEGIN_EVENT_TABLE(DolphinApp, wxApp)
EVT_END_SESSION(DolphinApp::OnEndSession)
END_EVENT_TABLE()
#include <wx/stdpaths.h>
bool wxMsgAlert(const char*, const char*, bool, int);
std::string wxStringTranslator(const char *);

54
Source/Core/DolphinWX/MainAndroid.cpp
View File

@ -14,38 +14,36 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include "Common.h"
#include "FileUtil.h"
#include "Core.h"
#include "Host.h"
#include "CPUDetect.h"
#include "Thread.h"
#include "State.h"
#include "PowerPC/PowerPC.h"
#include "HW/Wiimote.h"
#include "VideoBackendBase.h"
#include "ConfigManager.h"
#include "LogManager.h"
#include "BootManager.h"
#include "OnScreenDisplay.h"
// Banner loading
#include "Filesystem.h"
#include "BannerLoader.h"
#include "VolumeCreator.h"
#include "Android/ButtonManager.h"
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
#include <jni.h>
#include <android/log.h>
#include <android/native_window_jni.h>
#include "Android/ButtonManager.h"
#include "Common/Common.h"
#include "Common/CPUDetect.h"
#include "Common/FileUtil.h"
#include "Common/LogManager.h"
#include "Common/Thread.h"
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/State.h"
#include "Core/HW/Wiimote.h"
#include "Core/PowerPC/PowerPC.h"
// Banner loading
#include "DiscIO/BannerLoader.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/VolumeCreator.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"
ANativeWindow* surf;
int g_width, g_height;
std::string g_filename;

20
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
#include <cstdarg>
#include <getopt.h>
#include "Common/Common.h"
@ -13,6 +13,15 @@
#include "Common/LogManager.h"
#include "Common/Thread.h"
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/HW/Wiimote.h"
#include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/VideoBackendBase.h"
#if HAVE_X11
#include <X11/keysym.h>
#include "Core/State.h"
@ -28,15 +37,6 @@
#import <Cocoa/Cocoa.h>
#endif
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/HW/Wiimote.h"
#include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/VideoBackendBase.h"
bool rendererHasFocus = true;
bool running = true;

12
Source/Core/DolphinWX/MemcardManager.h
View File

@ -4,18 +4,18 @@
#pragma once
#include <wx/wx.h>
#include <wx/sizer.h>
#include <wx/filepicker.h>
#include <wx/fontmap.h>
#include <wx/imaglist.h>
#include <wx/listctrl.h>
#include <wx/sizer.h>
#include <wx/statbmp.h>
#include <wx/stattext.h>
#include <wx/listctrl.h>
#include <wx/imaglist.h>
#include <wx/fontmap.h>
#include <wx/wx.h>
#include "Core/HW/GCMemcard.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Core/HW/GCMemcard.h"
#undef MEMCARD_MANAGER_STYLE
#define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX

9
Source/Core/DolphinWX/NetWindow.h
View File

@ -6,15 +6,14 @@
#include <queue>
#include <string>
#include <wx/wx.h>
#include <wx/event.h>
#include <wx/sizer.h>
#include <wx/dialog.h>
#include <wx/notebook.h>
#include <wx/event.h>
#include <wx/gbsizer.h>
#include <wx/listbox.h>
#include <wx/notebook.h>
#include <wx/sizer.h>
#include <wx/spinctrl.h>
#include <wx/wx.h>
#include "Common/CommonTypes.h"
#include "Common/FifoQueue.h"

2
Source/Core/DolphinWX/PHackSettings.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Core/ConfigManager.h"
#include "Common/CommonPaths.h"
#include "Core/ConfigManager.h"
#include "DolphinWX/PHackSettings.h"
#include "DolphinWX/WxUtils.h"

2
Source/Core/DolphinWX/PHackSettings.h
View File

@ -4,8 +4,8 @@
#pragma once
#include <wx/wx.h>
#include <wx/spinctrl.h>
#include <wx/wx.h>
#include "DolphinWX/ISOProperties.h"

2
Source/Core/DolphinWX/PatchAddEdit.h
View File

@ -4,8 +4,8 @@
#pragma once
#include <wx/wx.h>
#include <wx/spinctrl.h>
#include <wx/wx.h>
#include "DolphinWX/ISOProperties.h"

10
Source/Core/DolphinWX/UDPConfigDiag.h
View File

@ -1,15 +1,15 @@
#pragma once
#include <wx/wx.h>
#include <wx/listbox.h>
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/listbox.h>
#include <wx/notebook.h>
#include <wx/panel.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/wx.h>
#include "InputCommon/UDPWrapper.h"

11
Source/Core/DolphinWX/VideoConfigDiag.h
View File

@ -3,20 +3,19 @@
#include <map>
#include <string>
#include <vector>
#include <wx/wx.h>
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/notebook.h>
#include <wx/panel.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/wx.h>
#include "Common/MsgHandler.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "DolphinWX/WxUtils.h"
#include "VideoCommon/VideoConfig.h"

4
Source/Core/DolphinWX/WiimoteConfigDiag.cpp
View File

@ -1,8 +1,8 @@
#include "DolphinWX/Frame.h"
#include "DolphinWX/WiimoteConfigDiag.h"
#include "Core/NetPlayProto.h"
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "DolphinWX/Frame.h"
#include "DolphinWX/WiimoteConfigDiag.h"
WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin)
: wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize)

11
Source/Core/DolphinWX/WiimoteConfigDiag.h
View File

@ -1,17 +1,16 @@
#pragma once
#include <map>
#include <wx/wx.h>
#include <wx/listbox.h>
#include <wx/textctrl.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/combobox.h>
#include <wx/listbox.h>
#include <wx/notebook.h>
#include <wx/panel.h>
#include <wx/spinctrl.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/wx.h>
#include "Core/ConfigManager.h"
#include "Core/HW/Wiimote.h"

2
Source/Core/DolphinWX/WxUtils.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <wx/wx.h>
#include <wx/string.h>
#include <wx/wx.h>
#include "Common/Common.h"
#include "DolphinWX/WxUtils.h"

9
Source/Core/DolphinWX/X11Utils.cpp
View File

@ -2,17 +2,18 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "DolphinWX/X11Utils.h"
#include <spawn.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/wait.h>
#include "DolphinWX/X11Utils.h"
extern char **environ;
#if defined(HAVE_WX) && HAVE_WX
#include <string>
#include <algorithm>
#include <string>
#include "DolphinWX/WxUtils.h"
#endif

15
Source/Core/DolphinWX/X11Utils.h
View File

@ -4,29 +4,28 @@
#pragma once
#include "Common/Common.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
// HACK: Xlib.h (included from gtk/gdk headers and directly) uses #defines on
// common names such as "Status", "BadRequest" or "Response", causing SFML
// headers to be completely broken.
//
// We work around that issue by including SFML first before X11 headers. This
// is terrible, but such is the life with Xlib.
#include <SFML/Network.hpp>
#include <SFML/Network.hpp> // NOLINT
#if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <wx/wx.h>
#endif
#include <X11/Xlib.h>
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#include <X11/extensions/Xrandr.h>
#endif
#include <X11/Xlib.h>
#include "Common/Common.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
// EWMH state actions, see