Fix Seeking to end of wxStreamInputStream (patch [ 1178834 ] string stream bad m_len...

[wxWidgets.git] / src / stc / stc.cpp

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);

 }
 
 
 }