non-PCH build fix (according to Tinderbox).

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

diff --git a/contrib/src/stc/scintilla/include/ScintillaWidget.h b/contrib/src/stc/scintilla/include/ScintillaWidget.h
index 765fd8594d159e6420d32fdcc3cc420711400b00..9d23ce2a9180759f56d7889397d1ab5d972e5e0e 100644 (file)
--- a/contrib/src/stc/scintilla/include/ScintillaWidget.h
+++ b/contrib/src/stc/scintilla/include/ScintillaWidget.h
@@ -34,9 +34,13 @@ struct _ScintillaClass {
        void (* notify) (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);
 GtkWidget*     scintilla_new           (void);

-void           scintilla_set_id        (ScintillaObject *sci,int id);
+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);
 
 sptr_t         scintilla_send_message  (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 void           scintilla_release_resources(void);