rearrainge the #includes and etc. to avoid a name conflict with some
CoreFoundation headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,12 +14,22 @@
|
||||
// Licence: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define Point macPoint // These names are also defined by some mac headers so
|
||||
#define Style macStyle // change their names, and then undef before we need them
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/textbuf.h>
|
||||
#include <wx/dataobj.h>
|
||||
#include <wx/clipbrd.h>
|
||||
#include <wx/dnd.h>
|
||||
|
||||
#undef Point
|
||||
#undef Style
|
||||
|
||||
#include "ScintillaWX.h"
|
||||
#include "ExternalLexer.h"
|
||||
#include "wx/stc/stc.h"
|
||||
#include "PlatWX.h"
|
||||
#include <wx/textbuf.h>
|
||||
|
||||
#ifdef __WXMSW__
|
||||
// GetHwndOf()
|
||||
|
||||
Reference in New Issue
Block a user