Skip to content

Commit

Permalink
Unicode, Windows: Remove stringapiset.h include (breaks vs2010 and se…
Browse files Browse the repository at this point in the history
…ems unnecessary?). (#2541, #2815)
  • Loading branch information
ocornut committed Mar 11, 2020
1 parent e137db2 commit 4a10af2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions docs/TODO.txt
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ It's mostly a bunch of personal notes, probably incomplete. Feel free to query i
- log: let user copy any window content to clipboard easily (CTRL+C on windows? while moving it? context menu?). code is commented because it fails with multiple Begin/End pairs.
- log: obsolete LogButtons() all together.
- log: LogButtons() options for specifying depth and/or hiding depth slider
- log: enabling log ends up pushing and growing vertices buffersbecause we don't distinguish layout vs render clipping

- filters: set a current filter that tree node can automatically query to hide themselves
- filters: handle wild-cards (with implicit leading/trailing *), reg-exprs
Expand Down
1 change: 0 additions & 1 deletion imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,6 @@ CODE
#else
#include <windows.h>
#endif
#include <stringapiset.h> // MultiByteToWideChar, WideCharToMultiByte
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) // UWP doesn't have all Win32 functions
#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS
#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS
Expand Down

0 comments on commit 4a10af2

Please sign in to comment.