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

Avoid invisible caret on wxOSX because of hiding the caret multiple times

Browse Source
This commit is contained in:
JulianSmart
2015-11-13 15:44:03 +00:00
parent 6602eb3384
commit 308727daed
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/richtext/richtextctrl.cpp
View File

@@ -540,7 +540,8 @@ void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
#if !wxRICHTEXT_USE_OWN_CARET
PositionCaret();
#endif
GetCaret()->Show();
if (!GetCaret()->IsVisible())
GetCaret()->Show();
}
#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
@@ -554,7 +555,7 @@ void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
{
if (GetCaret())
if (GetCaret() && GetCaret()->IsVisible())
GetCaret()->Hide();
#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
@@ -2856,7 +2857,8 @@ void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
{
((wxRichTextCaret*) GetCaret())->SetNeedsUpdate(false);
PositionCaret();
GetCaret()->Show();
if (!GetCaret()->IsVisible())
GetCaret()->Show();
}
#endif
@@ -2898,7 +2900,8 @@ void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
#if wxRICHTEXT_USE_OWN_CARET
if (!((wxRichTextCaret*) GetCaret())->GetNeedsUpdate())
{
GetCaret()->Hide();
if (GetCaret()->IsVisible())
GetCaret()->Hide();
((wxRichTextCaret*) GetCaret())->SetNeedsUpdate();
}
#endif
@@ -5419,7 +5422,8 @@ void wxRichTextCaret::Notify()
// Workaround for lack of kill focus event in wxOSX
if (m_richTextCtrl && !m_richTextCtrl->HasFocus())
{
Hide();
if (IsVisible())
Hide();
return;
}
#endif