From 1b828b1c13d2bb1104619f5cd3730d21e3ef7060 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sat, 17 Feb 2001 08:41:43 +0000
Subject: Changed header order to work on GTK+. Scintilla.h must be before
 ScintillaWidget.h now.

---
 gtk/PlatGTK.cxx      | 2 +-
 gtk/ScintillaGTK.cxx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'gtk')

diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index a9b24ad23..977aee7fa 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -11,8 +11,8 @@
 
 #include "Platform.h"
 
-#include "ScintillaWidget.h"
 #include "Scintilla.h"
+#include "ScintillaWidget.h"
 
 /* Use fast way of getting char data on win32 to work around problems 
    with gdk_string_extents. */
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index bd7262601..57323f5bf 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -11,8 +11,8 @@
 
 #include "Platform.h"
 
-#include "ScintillaWidget.h"
 #include "Scintilla.h"
+#include "ScintillaWidget.h"
 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"
@@ -1296,7 +1296,7 @@ gint ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip
 }
 
 sptr_t ScintillaGTK::DirectFunction(
-    ScintillaGTK *sciThis, unsigned int iMessage, sptr_t wParam, sptr_t lParam) {
+    ScintillaGTK *sciThis, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	return sciThis->WndProc(iMessage, wParam, lParam);
 }
 
-- 
cgit v1.2.3