diff options
| author | Neil <nyamatongwe@gmail.com> | 2022-03-01 12:03:38 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2022-03-01 12:03:38 +1100 |
| commit | f433d8c6ed6875a983c9ff229ee7777728798a9b (patch) | |
| tree | 65e01d80c50e3e6cc0ce9e691cbccb34fbcead95 | |
| parent | 86192b2636eeac718135ef71b1e53c5ed96f0839 (diff) | |
| download | scintilla-mirror-f433d8c6ed6875a983c9ff229ee7777728798a9b.tar.gz | |
Update Windows API version to Windows 10 (0x0A00) as released in 2015 and SDKs
should now be compatible.
| -rw-r--r-- | win32/PlatWin.cxx | 16 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 41 |
2 files changed, 4 insertions, 53 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 6a77aab3f..3d8595b1d 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -28,9 +28,9 @@ #define NOMINMAX #endif #undef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0A00 #undef WINVER -#define WINVER 0x0500 +#define WINVER 0x0A00 #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #include <commctrl.h> @@ -58,14 +58,6 @@ #include "WinTypes.h" #include "PlatWin.h" -#ifndef SPI_GETFONTSMOOTHINGCONTRAST -#define SPI_GETFONTSMOOTHINGCONTRAST 0x200C -#endif - -#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32 -#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 -#endif - // __uuidof is a Microsoft extension but makes COM code neater, so disable warning #if defined(__clang__) #pragma clang diagnostic ignored "-Wlanguage-extension-token" @@ -159,10 +151,6 @@ bool LoadD2D() { #endif -#ifndef CLEARTYPE_QUALITY -#define CLEARTYPE_QUALITY 5 -#endif - void *PointerFromWindow(HWND hWnd) noexcept { return reinterpret_cast<void *>(::GetWindowLongPtr(hWnd, 0)); } diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 471adea7c..c0b31866f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -32,9 +32,9 @@ #define NOMINMAX #endif #undef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0A00 #undef WINVER -#define WINVER 0x0500 +#define WINVER 0x0A00 #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #include <commctrl.h> @@ -98,37 +98,6 @@ #include "HanjaDic.h" #include "ScintillaWin.h" -#ifndef SPI_GETWHEELSCROLLLINES -#define SPI_GETWHEELSCROLLLINES 104 -#endif - -#ifndef WM_UNICHAR -#define WM_UNICHAR 0x0109 -#endif - -#ifndef WM_DPICHANGED -#define WM_DPICHANGED 0x02E0 -#endif -#ifndef WM_DPICHANGED_AFTERPARENT -#define WM_DPICHANGED_AFTERPARENT 0x02E3 -#endif - -#ifndef UNICODE_NOCHAR -#define UNICODE_NOCHAR 0xFFFF -#endif - -#ifndef IS_HIGH_SURROGATE -#define IS_HIGH_SURROGATE(x) ((x) >= SURROGATE_LEAD_FIRST && (x) <= SURROGATE_LEAD_LAST) -#endif - -#ifndef IS_LOW_SURROGATE -#define IS_LOW_SURROGATE(x) ((x) >= SURROGATE_TRAIL_FIRST && (x) <= SURROGATE_TRAIL_LAST) -#endif - -#ifndef MK_ALT -#define MK_ALT 32 -#endif - namespace { // Two idle messages SC_WIN_IDLE and SC_WORK_IDLE. @@ -146,12 +115,6 @@ constexpr int IndicatorTarget = IndicatorInput + 1; constexpr int IndicatorConverted = IndicatorInput + 2; constexpr int IndicatorUnknown = IndicatorInput + 3; -#ifndef SCS_CAP_SETRECONVERTSTRING -#define SCS_CAP_SETRECONVERTSTRING 0x00000004 -#define SCS_QUERYRECONVERTSTRING 0x00020000 -#define SCS_SETRECONVERTSTRING 0x00010000 -#endif - typedef UINT_PTR (WINAPI *SetCoalescableTimerSig)(HWND hwnd, UINT_PTR nIDEvent, UINT uElapse, TIMERPROC lpTimerFunc, ULONG uToleranceDelay); |