X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65ec6247df6af7b6489257b1ac04ca2242dc14ec..7aa18fc78675ced488adc9d42ad306a539334680:/src/stc/scintilla/include/ScintillaWidget.h

diff --git a/src/stc/scintilla/include/ScintillaWidget.h b/src/stc/scintilla/include/ScintillaWidget.h
index f6c2fc3542..c60c4a21b9 100644
--- a/src/stc/scintilla/include/ScintillaWidget.h
+++ b/src/stc/scintilla/include/ScintillaWidget.h
@@ -1,27 +1,16 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */
 /** @file ScintillaWidget.h
  ** Definition of Scintilla widget for GTK+.
  ** Only needed by GTK+ code but is harmless on other platforms.
  **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 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
 
-#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 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
@@ -39,16 +28,27 @@ struct _ScintillaObject {
 };
 
 struct _ScintillaClass {
-	GtkFixedClass parent_class;
+	GtkContainerClass parent_class;
 
 	void (* command) (ScintillaObject *ttt);
 	void (* notify) (ScintillaObject *ttt);
 };
 
-guint		scintilla_get_type	(void);
+#if GLIB_MAJOR_VERSION < 2
+GtkType		scintilla_get_type	(void);
+#else
+GType		scintilla_get_type	(void);
+#endif
 GtkWidget*	scintilla_new		(void);
-void		scintilla_set_id	(ScintillaObject *sci,int id);
-sptr_t	scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+void		scintilla_set_id	(ScintillaObject *sci, uptr_t id);
+sptr_t		scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+void		scintilla_release_resources(void);
+
+#if GTK_MAJOR_VERSION < 2
+#define SCINTILLA_NOTIFY "notify"
+#else
+#define SCINTILLA_NOTIFY "sci-notify"
+#endif
 
 #ifdef __cplusplus
 }