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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 8408f88a72b0cf311b2772b1696ac3cc06a963bc..af915be587990f8d1af5510e1591c659a8631a77 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -6,6 +6,9 @@
 
 #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>


@@ -13,11 +16,15 @@
 #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"
 
 

+

 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }
 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 565bfabb2c41b0830829a5a0b9bbcd14cdfc5783..9dd7697117f0922c9fd628357b2485df5e674d06 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -14,12 +14,22 @@
 // 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>
+
+#undef Point
+#undef Style

 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
 #include "PlatWX.h"
 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
 #include "PlatWX.h"

-#include <wx/textbuf.h>

 
 #ifdef __WXMSW__
     // GetHwndOf()
 
 #ifdef __WXMSW__
     // GetHwndOf()

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index 0746fd24b9baeacc65680dcbb32a2e201c721a6b..e703efe606873775137cca5f1119bf3cd3c31929 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -48,10 +48,6 @@
 #include "Editor.h"
 #include "ScintillaBase.h"
 
 #include "Editor.h"
 #include "ScintillaBase.h"
 

-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

diff --git a/contrib/src/stc/scintilla/include/Platform.h b/contrib/src/stc/scintilla/include/Platform.h
index f0c0b84d17103be352a5aeac065191dff1568870..1e3bd69d752e263134a739f8cda9eb722a11505c 100644 (file)
--- a/contrib/src/stc/scintilla/include/Platform.h
+++ b/contrib/src/stc/scintilla/include/Platform.h
@@ -44,11 +44,6 @@
 #endif
 
 
 #endif
 
 

-#if PLAT_WX
-#include <wx/object.h>  // For the global memory operators, if needed.
-#endif
-
-

 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 
 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 248ceb73e50c8fa4497fc5b7eaf555e91aa54a3f..892f639501744b3be3c2ebd386f31dc9644c79a2 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#include "wx/stc/stc.h"
-#include "ScintillaWX.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/wx.h>
 #include <wx/tokenzr.h>


@@ -26,6 +26,11 @@
 #include <wx/image.h>
 #include <wx/file.h>
 
 #include <wx/image.h>
 #include <wx/file.h>
 

+#undef Point
+#undef Style
+
+#include "wx/stc/stc.h"
+#include "ScintillaWX.h"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -178,9 +183,10 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 

+    SetBestFittingSize(size);
+

     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);

-    SetBestFittingSize(size);

 }
 
 
 }
 
 

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index a21f6812528d891858372fd2661b410ebb7a3a39..e07f6d5194c21915b2129ced8a8c2d5c4bf5b32c 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#include "wx/stc/stc.h"
-#include "ScintillaWX.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/wx.h>
 #include <wx/tokenzr.h>


@@ -26,6 +26,11 @@
 #include <wx/image.h>
 #include <wx/file.h>
 
 #include <wx/image.h>
 #include <wx/file.h>
 

+#undef Point
+#undef Style
+
+#include "wx/stc/stc.h"
+#include "ScintillaWX.h"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -179,6 +184,9 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
 #endif
 
     SetBestFittingSize(size);
 #endif
 
     SetBestFittingSize(size);

+
+    // Reduces flicker on GTK+/X11
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);

 }
 
 
 }
 
 

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 8408f88a72b0cf311b2772b1696ac3cc06a963bc..af915be587990f8d1af5510e1591c659a8631a77 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -6,6 +6,9 @@
 
 #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>


@@ -13,11 +16,15 @@
 #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"
 
 

+

 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }
 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 565bfabb2c41b0830829a5a0b9bbcd14cdfc5783..9dd7697117f0922c9fd628357b2485df5e674d06 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -14,12 +14,22 @@
 // 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>
+
+#undef Point
+#undef Style

 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
 #include "PlatWX.h"
 
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
 #include "PlatWX.h"

-#include <wx/textbuf.h>

 
 #ifdef __WXMSW__
     // GetHwndOf()
 
 #ifdef __WXMSW__
     // GetHwndOf()

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 0746fd24b9baeacc65680dcbb32a2e201c721a6b..e703efe606873775137cca5f1119bf3cd3c31929 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -48,10 +48,6 @@
 #include "Editor.h"
 #include "ScintillaBase.h"
 
 #include "Editor.h"
 #include "ScintillaBase.h"
 

-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index f0c0b84d17103be352a5aeac065191dff1568870..1e3bd69d752e263134a739f8cda9eb722a11505c 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -44,11 +44,6 @@
 #endif
 
 
 #endif
 
 

-#if PLAT_WX
-#include <wx/object.h>  // For the global memory operators, if needed.
-#endif
-
-

 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 
 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 248ceb73e50c8fa4497fc5b7eaf555e91aa54a3f..892f639501744b3be3c2ebd386f31dc9644c79a2 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#include "wx/stc/stc.h"
-#include "ScintillaWX.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/wx.h>
 #include <wx/tokenzr.h>


@@ -26,6 +26,11 @@
 #include <wx/image.h>
 #include <wx/file.h>
 
 #include <wx/image.h>
 #include <wx/file.h>
 

+#undef Point
+#undef Style
+
+#include "wx/stc/stc.h"
+#include "ScintillaWX.h"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -178,9 +183,10 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 

+    SetBestFittingSize(size);
+

     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);

-    SetBestFittingSize(size);

 }
 
 
 }
 
 

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index a21f6812528d891858372fd2661b410ebb7a3a39..e07f6d5194c21915b2129ced8a8c2d5c4bf5b32c 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#include "wx/stc/stc.h"
-#include "ScintillaWX.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/wx.h>
 #include <wx/tokenzr.h>


@@ -26,6 +26,11 @@
 #include <wx/image.h>
 #include <wx/file.h>
 
 #include <wx/image.h>
 #include <wx/file.h>
 

+#undef Point
+#undef Style
+
+#include "wx/stc/stc.h"
+#include "ScintillaWX.h"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -179,6 +184,9 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
 #endif
 
     SetBestFittingSize(size);
 #endif
 
     SetBestFittingSize(size);

+
+    // Reduces flicker on GTK+/X11
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);

 }
 
 
 }