No longer a need for changing the names to protect against multiple definitions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/src/stc/PlatWX.cpp

@@ -6,9 +6,6 @@
 
 #include <ctype.h>
 
-#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/encconv.h>
 #include <wx/listctrl.h>
@@ -16,9 +13,6 @@
 #include <wx/image.h>
 #include <wx/imaglist.h>
 
-#undef Point
-#undef Style
-
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"

contrib/src/stc/ScintillaWX.cpp

@@ -14,18 +14,12 @@
 // 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"

contrib/src/stc/stc.cpp

@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
-#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/tokenzr.h>
 #include <wx/mstream.h>
 #include <wx/image.h>
 #include <wx/file.h>
 
-#undef Point
-#undef Style
-
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 

contrib/src/stc/stc.cpp.in

@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
-#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/tokenzr.h>
 #include <wx/mstream.h>
 #include <wx/image.h>
 #include <wx/file.h>
 
-#undef Point
-#undef Style
-
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 

src/stc/PlatWX.cpp

@@ -6,9 +6,6 @@
 
 #include <ctype.h>
 
-#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/encconv.h>
 #include <wx/listctrl.h>
@@ -16,9 +13,6 @@
 #include <wx/image.h>
 #include <wx/imaglist.h>
 
-#undef Point
-#undef Style
-
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"

src/stc/ScintillaWX.cpp

@@ -14,18 +14,12 @@
 // 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"

src/stc/stc.cpp

@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
-#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/tokenzr.h>
 #include <wx/mstream.h>
 #include <wx/image.h>
 #include <wx/file.h>
 
-#undef Point
-#undef Style
-
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 

src/stc/stc.cpp.in

@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
-#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/tokenzr.h>
 #include <wx/mstream.h>
 #include <wx/image.h>
 #include <wx/file.h>
 
-#undef Point
-#undef Style
-
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"