diff options
| author | B. Stack <bgstack15@gmail.com> | 2024-06-23 16:51:52 -0400 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2024-06-23 16:51:52 -0400 |
| commit | 994ec9e1cba547bed6eef02f996ca2a7beaf777a (patch) | |
| tree | c6bdfb8c2096a1c579d3603e050d5f697d2306e0 /wx+ | |
| parent | add upstream 13.6 (diff) | |
| download | FreeFileSync-994ec9e1cba547bed6eef02f996ca2a7beaf777a.tar.gz FreeFileSync-994ec9e1cba547bed6eef02f996ca2a7beaf777a.tar.bz2 FreeFileSync-994ec9e1cba547bed6eef02f996ca2a7beaf777a.zip | |
add upstream 13.713.7
Diffstat (limited to 'wx+')
| -rw-r--r-- | wx+/grid.cpp | 2 | ||||
| -rw-r--r-- | wx+/window_tools.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/wx+/grid.cpp b/wx+/grid.cpp index 1c8897a1..3665c6cf 100644 --- a/wx+/grid.cpp +++ b/wx+/grid.cpp @@ -163,7 +163,7 @@ void GridData::drawCellText(wxDC& dc, const wxRect& rect, const std::wstring_vie if (extentTrunc.GetWidth() > rect.width) { - //unlike Windows Explorer, we truncate UTF-16 correctly: e.g. CJK-Ideograph encodes to TWO wchar_t: utfTo<std::wstring>("\xf0\xa4\xbd\x9c"); + //unlike File Explorer, we truncate UTF-16 correctly: e.g. CJK-Ideograph encodes to TWO wchar_t: utfTo<std::wstring>("\xf0\xa4\xbd\x9c"); size_t low = 0; //number of Unicode chars! size_t high = unicodeLength(text); // if (high > 1) diff --git a/wx+/window_tools.h b/wx+/window_tools.h index 94cb2c32..45f43556 100644 --- a/wx+/window_tools.h +++ b/wx+/window_tools.h @@ -79,7 +79,10 @@ struct FocusPreserver if (oldFocusId_ != wxID_ANY) if (wxWindow* oldFocusWin = wxWindow::FindWindowById(oldFocusId_)) + { + assert(oldFocusWin->IsEnabled()); //only enabled windows can have focus, so why wouldn't it be anymore? setFocusIfActive(*oldFocusWin); + } } wxWindowID getFocusId() const { return oldFocusId_; } |