diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-05-31 09:27:48 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-05-31 09:27:48 +1000 |
| commit | 9bc61b338dfe63d2e6fcc66bc0933a0de6bcd31b (patch) | |
| tree | 64c541e9dcb42c9999759ab7dd40d67c72749b9a /win32 | |
| parent | 8326c658b392ba13e92918dd89deebd60bcd195f (diff) | |
| parent | 8b447b76bbc110e055a0637657f5f00c65cc98dd (diff) | |
| download | scintilla-mirror-9bc61b338dfe63d2e6fcc66bc0933a0de6bcd31b.tar.gz | |
Merge 343-Win32-Fix which fixes hangs and crashes at shutdown on Windows.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 507075a77..fda07875a 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -8,10 +8,10 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <ctype.h> #include <stdarg.h> #include <time.h> #include <math.h> +#include <ctype.h> #include <limits.h> #include <vector> diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index d4f0415e8..c3a6beefb 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 @@ -1338,6 +1339,7 @@ void ScintillaWin::SetTrackMouseLeaveEvent(bool on) { tme.cbSize = sizeof(tme); tme.dwFlags = TME_LEAVE; tme.hwndTrack = MainHWND(); + tme.dwHoverTime = HOVER_DEFAULT; // Unused but triggers Dr. Memory if not initialized TrackMouseEventFn(&tme); } trackedMouseLeave = on; |