Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppressed double hiding/deletion of caret which can cause the caret to go missing from a different window that's currently focused

Browse Source
This commit is contained in:
JulianSmart
2015-09-28 14:18:34 +01:00
parent 40430585d6
commit 965786a0fa
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/stc/ScintillaWX.cpp
View File

@@ -705,13 +705,18 @@ bool ScintillaWX::CreateSystemCaret() {
bool ScintillaWX::DestroySystemCaret() { bool ScintillaWX::DestroySystemCaret() {
#ifdef __WXMSW__ #ifdef __WXMSW__
::HideCaret(GetHwndOf(stc)); if (sysCaretBitmap)
BOOL retval = ::DestroyCaret(); {
if (sysCaretBitmap) { ::HideCaret(GetHwndOf(stc));
::DeleteObject(sysCaretBitmap); BOOL retval = ::DestroyCaret();
sysCaretBitmap = 0; if (sysCaretBitmap) {
::DeleteObject(sysCaretBitmap);
sysCaretBitmap = 0;
}
return retval != 0;
} }
return retval != 0; else
return false;
#else #else
return false; return false;
#endif #endif