aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx23
1 files changed, 12 insertions, 11 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 07f801a78..a83c92ef6 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -8,8 +8,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
#include <limits.h>
#include <new>
@@ -26,6 +26,8 @@
#include <commctrl.h>
#include <richedit.h>
#include <windowsx.h>
+#include <zmouse.h>
+#include <ole2.h>
#if defined(NTDDI_WIN7) && !defined(DISABLE_D2D)
#define USE_D2D 1
@@ -43,9 +45,11 @@
#ifdef SCI_LEXER
#include "SciLexer.h"
-#include "LexerModule.h"
#endif
#include "StringCopy.h"
+#ifdef SCI_LEXER
+#include "LexerModule.h"
+#endif
#include "SplitVector.h"
#include "Partitioning.h"
#include "RunStyles.h"
@@ -57,25 +61,26 @@
#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
-#include "AutoComplete.h"
#include "ViewStyle.h"
#include "CharClassify.h"
#include "Decoration.h"
#include "CaseFolder.h"
#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
#include "Selection.h"
#include "PositionCache.h"
#include "Editor.h"
-#include "ScintillaBase.h"
-#include "UniConversion.h"
-#include "CaseConvert.h"
-#include "PlatWin.h"
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
#ifdef SCI_LEXER
#include "ExternalLexer.h"
#endif
+#include "PlatWin.h"
+
#ifndef SPI_GETWHEELSCROLLLINES
#define SPI_GETWHEELSCROLLLINES 104
#endif
@@ -88,10 +93,6 @@
#define UNICODE_NOCHAR 0xFFFF
#endif
-#include <commctrl.h>
-#include <zmouse.h>
-#include <ole2.h>
-
#ifndef MK_ALT
#define MK_ALT 32
#endif