diff options
| -rw-r--r-- | gtk/PlatGTK.cxx | 2 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 4 | ||||
| -rw-r--r-- | include/Scintilla.h | 3 |
3 files changed, 3 insertions, 6 deletions
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); } diff --git a/include/Scintilla.h b/include/Scintilla.h index 429b7a9d7..f78fa7c31 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -21,11 +21,8 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance); // Here should be placed typedefs for uptr_t, an unsigned integer type large enough to // hold a pointer and sptr_t, a signed integer large enough to hold a pointer. // May need to be changed for 64 bit platforms. -#ifndef POINTER_TYPES -#define POINTER_TYPES typedef unsigned long uptr_t; typedef long sptr_t; -#endif typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); |