From 230d23765a3a76f068e222c8be45bd44b095ba27 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 10 Feb 2017 22:22:47 -0500 Subject: [PATCH] Removed Uniscribe from the Windows build process and header file list. Also more TODOs. Next major goal: reinstating the font button. --- examples/drawtext/hittest.c | 1 + windows/CMakeLists.txt | 3 +-- windows/winapi.hpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/drawtext/hittest.c b/examples/drawtext/hittest.c index cbd0bd90..2393e65b 100644 --- a/examples/drawtext/hittest.c +++ b/examples/drawtext/hittest.c @@ -3,6 +3,7 @@ // TODO have a ligature // TODO the hiding and showing does not work properly on GTK+ +// TODO using the arrow keys allows us to walk back to the end of the line; IIRC arrow keys shouldn't do that static const char *text = "Each of the glyphs an end user interacts with are called graphemes. " diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 5b1232ed..a9551776 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -76,10 +76,9 @@ macro(_handle_static) COMMENT "Copying libui.res") endmacro() -# notice that usp10 comes before gdi32 # TODO prune this list set(_LIBUI_LIBS - user32 kernel32 usp10 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid + user32 kernel32 gdi32 comctl32 uxtheme msimg32 comdlg32 d2d1 dwrite ole32 oleaut32 oleacc uuid PARENT_SCOPE) if(NOT MSVC) diff --git a/windows/winapi.hpp b/windows/winapi.hpp index 86aba5d7..a540809c 100644 --- a/windows/winapi.hpp +++ b/windows/winapi.hpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include