Apply patch 1520776, partial completion on wxOwnerDrawnComboBox

[wxWidgets.git] / src / stc / scintilla / include / ScintillaWidget.h

diff --git a/src/stc/scintilla/include/ScintillaWidget.h b/src/stc/scintilla/include/ScintillaWidget.h
index 980557a2e7450a594efc0001e5e21c89be1ebcd4..7f47de7e13c33fd31b7aec0bb10a8ad12a703d50 100644 (file)
--- a/src/stc/scintilla/include/ScintillaWidget.h
+++ b/src/stc/scintilla/include/ScintillaWidget.h
@@ -1,7 +1,9 @@
 // Scintilla source code edit control
 // 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>
+/** @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.
 
 #ifndef SCINTILLAWIDGET_H
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef SCINTILLAWIDGET_H


@@ -21,21 +23,28 @@ typedef struct _ScintillaObject ScintillaObject;
 typedef struct _ScintillaClass  ScintillaClass;
 
 struct _ScintillaObject {
 typedef struct _ScintillaClass  ScintillaClass;
 
 struct _ScintillaObject {

-       GtkFixed vbox;
+       GtkContainer cont;

        void *pscin;
 };
 
 struct _ScintillaClass {
        void *pscin;
 };
 
 struct _ScintillaClass {

-       GtkFixedClass parent_class;
+       GtkContainerClass parent_class;

 
        void (* command) (ScintillaObject *ttt);
        void (* notify) (ScintillaObject *ttt);
 };
 
 
        void (* command) (ScintillaObject *ttt);
        void (* notify) (ScintillaObject *ttt);
 };
 

-guint          scintilla_get_type      (void);
+GtkType                scintilla_get_type      (void);

 GtkWidget*     scintilla_new           (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);
+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
 }
 
 #ifdef __cplusplus
 }