Include wx/object.h to get the global memory operators if defined.

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

diff --git a/contrib/src/stc/scintilla/include/Platform.h b/contrib/src/stc/scintilla/include/Platform.h
index dc8c9dc9356bfcbbd4600c572bd86493ac97553a..0984ea66c7cf4ec59b29ee63254d5a5ae84aa131 100644 (file)
--- a/contrib/src/stc/scintilla/include/Platform.h
+++ b/contrib/src/stc/scintilla/include/Platform.h
@@ -44,6 +44,11 @@
 #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
 

diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index dc8c9dc9356bfcbbd4600c572bd86493ac97553a..0984ea66c7cf4ec59b29ee63254d5a5ae84aa131 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -44,6 +44,11 @@
 #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