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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index af915be587990f8d1af5510e1591c659a8631a77..f9fac1a8440bc3f60e4d8061bb8fb7080bbda0cc 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -6,9 +6,6 @@
 
 #include <ctype.h>
 
 
 #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>
 #include <wx/wx.h>
 #include <wx/encconv.h>
 #include <wx/listctrl.h>


@@ -16,9 +13,6 @@
 #include <wx/image.h>
 #include <wx/imaglist.h>
 
 #include <wx/image.h>
 #include <wx/imaglist.h>
 

-#undef Point
-#undef Style
-

 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index f139054299741fd4121e13df1fc20ccba54cbb10..8e89374ab4cd9821bc86e1f54142ee78a6f63381 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -14,18 +14,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // 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>
 
 #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 "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 892f639501744b3be3c2ebd386f31dc9644c79a2..ed561d51cd8db5cb928885c2a71a0fbd3f041a66 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
 
 #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>
 
 #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"
 
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index e07f6d5194c21915b2129ced8a8c2d5c4bf5b32c..17143cf67853f9ba32f8f7b2865396bb0fdeeab2 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
 
 #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>
 
 #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"
 
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index af915be587990f8d1af5510e1591c659a8631a77..f9fac1a8440bc3f60e4d8061bb8fb7080bbda0cc 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -6,9 +6,6 @@
 
 #include <ctype.h>
 
 
 #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>
 #include <wx/wx.h>
 #include <wx/encconv.h>
 #include <wx/listctrl.h>


@@ -16,9 +13,6 @@
 #include <wx/image.h>
 #include <wx/imaglist.h>
 
 #include <wx/image.h>
 #include <wx/imaglist.h>
 

-#undef Point
-#undef Style
-

 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index f139054299741fd4121e13df1fc20ccba54cbb10..8e89374ab4cd9821bc86e1f54142ee78a6f63381 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -14,18 +14,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // 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>
 
 #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 "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 892f639501744b3be3c2ebd386f31dc9644c79a2..ed561d51cd8db5cb928885c2a71a0fbd3f041a66 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
 
 #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>
 
 #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"
 
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"
 

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index e07f6d5194c21915b2129ced8a8c2d5c4bf5b32c..17143cf67853f9ba32f8f7b2865396bb0fdeeab2 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -17,18 +17,12 @@
 
 #include <ctype.h>
 
 
 #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>
 
 #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"
 
 #include "wx/stc/stc.h"
 #include "ScintillaWX.h"