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

src/stc/stc.cpp

@@ -17,8 +17,8 @@
 
 #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>
@@ -26,6 +26,11 @@
 #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
 
+    SetBestFittingSize(size);
+
     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-    SetBestFittingSize(size);
 }