piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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