aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2001-02-17 10:00:42 +0000
committernyamatongwe <devnull@localhost>2001-02-17 10:00:42 +0000
commit7b07c00e76ef0ec5e5e3eb1d5237357eecbaa007 (patch)
tree319b8b138be2a338246decd85e9243ff663f187d
parent417663279f7254f8e56e36048635b168d151605d (diff)
downloadscintilla-mirror-7b07c00e76ef0ec5e5e3eb1d5237357eecbaa007.tar.gz
If ScintillaWidget.h included without Scintilla.h already included display
a warning message and #include "Scintilla.h".
-rw-r--r--gtk/ScintillaGTK.cxx2
-rw-r--r--include/ScintillaWidget.h11
2 files changed, 12 insertions, 1 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 57323f5bf..d6b1c3c0d 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -11,8 +11,8 @@
#include "Platform.h"
-#include "Scintilla.h"
#include "ScintillaWidget.h"
+#include "Scintilla.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
diff --git a/include/ScintillaWidget.h b/include/ScintillaWidget.h
index 9ac743573..2a7a02745 100644
--- a/include/ScintillaWidget.h
+++ b/include/ScintillaWidget.h
@@ -9,6 +9,17 @@
#if PLAT_GTK
+#ifndef SCINTILLA_H
+#ifdef _MSC_VER
+#pragma message(__FILE__ "(1) : warning : Scintilla.h should be included before ScintillaWidget.h")
+#pragma message("This will be required in the next version of Scintilla")
+#else
+#warning __FILE__:1: warning: Scintilla.h should be included before ScintillaWidget.h
+#warning This will be required in the next version of Scintilla
+#endif
+#include "Scintilla.h"
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif