From 876968f47018a5fcdee2b7f323f2da1cab7c0746 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sat, 17 Feb 2001 10:00:42 +0000
Subject: If ScintillaWidget.h included without Scintilla.h already included
 display a warning message and #include "Scintilla.h".

---
 gtk/ScintillaGTK.cxx      |  2 +-
 include/ScintillaWidget.h | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3