From 895d8a817ac5ac7680947e2d63afb10c94467210 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Sun, 11 Jun 2000 08:05:12 +0000
Subject: Moved GTK+ Scintilla widget definition out into ScintillaWidget.h

---
 include/Scintilla.h       | 50 ++++-------------------------------------------
 include/ScintillaWidget.h | 46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 46 deletions(-)
 create mode 100644 include/ScintillaWidget.h

(limited to 'include')

diff --git a/include/Scintilla.h b/include/Scintilla.h
index a74ad08d7..9281ae2b5 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -9,54 +9,16 @@
 // Compile-time configuration options
 #define MACRO_SUPPORT 1  // Comment out to remove macro hooks
 
-#if PLAT_GTK
-#include <gdk/gdk.h>
-#include <gtk/gtkvbox.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAS	T (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
-
-	typedef struct _ScintillaObject ScintillaObject;
-	typedef struct _ScintillaClass  ScintillaClass;
-
-	struct _ScintillaObject
-	{
-		GtkFixed vbox;
-		void *pscin;
-	};
-
-	struct _ScintillaClass
-	{
-		GtkFixedClass parent_class;
-
-		void (* command) (ScintillaObject *ttt);
-		void (* notify) (ScintillaObject *ttt);
-	};
-
-	guint		scintilla_get_type	(void);
-	GtkWidget*	scintilla_new		(void);
-	void		scintilla_set_id	(ScintillaObject *sci,int id);
-	long 		scintilla_send_message	(ScintillaObject *sci,int iMessage,int wParam,int lParam);
-
+#if PLAT_WX || PLAT_GTK
 #include "WinDefs.h"
-
-#ifdef __cplusplus
-}
 #endif
 
+#if PLAT_WIN
+#ifdef STATIC_BUILD
+void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #endif
-
-#if PLAT_WX
-#include "WinDefs.h"
 #endif
 
-// Both GTK and Windows
-
 #define INVALID_POSITION -1 
 
 // Define start of Scintilla messages to be greater than all edit (EM_*) messages
@@ -445,10 +407,6 @@ struct SCNotification {
 #define SCN_MARGINCLICK 2010
 #define SCN_NEEDSHOWN 2011
 
-#ifdef STATIC_BUILD
-void Scintilla_RegisterClasses(HINSTANCE hInstance);
-#endif
-
 // Deprecation section listing all API features that are deprecated and will
 // will be removed completely in a future version.
 // To enable these features define INCLUDE_DEPRECATED_FEATURES
diff --git a/include/ScintillaWidget.h b/include/ScintillaWidget.h
new file mode 100644
index 000000000..980557a2e
--- /dev/null
+++ b/include/ScintillaWidget.h
@@ -0,0 +1,46 @@
+// Scintilla source code edit control
+// ScintillaWidget.h - definition of Scintilla widget for GTK+
+// Only needed by GTK+ code but is harmless on other platforms.
+// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCINTILLAWIDGET_H
+#define SCINTILLAWIDGET_H
+
+#if PLAT_GTK
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
+#define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
+#define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
+
+typedef struct _ScintillaObject ScintillaObject;
+typedef struct _ScintillaClass  ScintillaClass;
+
+struct _ScintillaObject {
+	GtkFixed vbox;
+	void *pscin;
+};
+
+struct _ScintillaClass {
+	GtkFixedClass parent_class;
+
+	void (* command) (ScintillaObject *ttt);
+	void (* notify) (ScintillaObject *ttt);
+};
+
+guint		scintilla_get_type	(void);
+GtkWidget*	scintilla_new		(void);
+void		scintilla_set_id	(ScintillaObject *sci,int id);
+long 		scintilla_send_message	(ScintillaObject *sci,int iMessage,int wParam,int lParam);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif
-- 
cgit v1.2.3