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

diff --git a/src/stc/scintilla/include/ScintillaWidget.h b/src/stc/scintilla/include/ScintillaWidget.h
index 6e22f58f8b..c60c4a21b9 100644
--- a/src/stc/scintilla/include/ScintillaWidget.h
+++ b/src/stc/scintilla/include/ScintillaWidget.h
@@ -1,10 +1,10 @@
-// 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
@@ -28,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
 }