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

Merge pull request #4889 from ligfx/netwindow

Browse Source 
NetWindow: explicitly tell wxWidgets to clean up Windows macros
This commit is contained in:
Anthony
2017-02-23 13:16:59 -08:00
committed by GitHub
parent e9850382e3 2b65e41d97
commit ecb7d01347
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,15 @@
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "Core/NetPlayServer.h" #include "Core/NetPlayServer.h"
// HACK: wxWidgets headers don't play well with some of the macros defined in Windows
// headers and perform their own magic to fix things, as long as they're included entirely
// either before or after any Windows headers.
//
// This file can cause a conflict in other DolphinWX files because NetPlay headers directly
// include ENet headers, which leak Windows header macros. To fix this, explicitly tell
// wxWidgets here that it needs to re-clean macros.
#include <wx/msw/winundef.h>
class CGameListCtrl; class CGameListCtrl;
class MD5Dialog; class MD5Dialog;
class wxButton; class wxButton;