X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e508567a95c7858f7bbf21d37c189fdd6f3eac2e..ed4eede6c2c16cdb422a39c1b3655956b8f51a1c:/src/stc/PlatWX.cpp diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 8408f88a72..af915be587 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -6,6 +6,9 @@ #include +#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 #include #include @@ -13,11 +16,15 @@ #include #include +#undef Point +#undef Style + #include "Platform.h" #include "PlatWX.h" #include "wx/stc/stc.h" + Point Point::FromLong(long lpoint) { return Point(lpoint & 0xFFFF, lpoint >> 16); }