aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk/ScintillaGTK.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
-rw-r--r--gtk/ScintillaGTK.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 310ef032b..2bfdc8101 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -78,7 +78,7 @@ private:
virtual void SetVerticalScrollPos();
virtual void SetHorizontalScrollPos();
virtual bool ModifyScrollBars(int nMax, int nPage);
- void ScintillaGTK::ReconfigureScrollBars();
+ void ReconfigureScrollBars();
virtual void NotifyChange();
virtual void NotifyFocus(bool focus);
virtual void NotifyParent(SCNotification scn);
@@ -504,7 +504,7 @@ void ScintillaGTK::SetTicking(bool on) {
if (timer.ticking != on) {
timer.ticking = on;
if (timer.ticking) {
- timer.tickerID = gtk_timeout_add(timer.tickSize, TimeOut, this);
+ timer.tickerID = gtk_timeout_add(timer.tickSize, (GtkFunction)TimeOut, this);
} else {
gtk_timeout_remove(timer.tickerID);
}
@@ -1243,8 +1243,10 @@ guint scintilla_get_type() {
sizeof (ScintillaClass),
(GtkClassInitFunc) scintilla_class_init,
(GtkObjectInitFunc) scintilla_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
+ //(GtkArgSetFunc) NULL,
+ //(GtkArgGetFunc) NULL,
+ (gpointer) NULL,
+ (gpointer) NULL,
0
};