Bug 21900 – wx port doesn't draw text caret

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit wx

[Kevin Watters]

Active and focus states get out of sync in the wx port, resulting in the text control caret not being drawn.

[Kevin Watters]

Created attachment 24688 [details]
fix caret drawing in the wx port

[Kevin Ollivier]

Comment on attachment 24688 [details]
fix caret drawing in the wx port

> diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
> index 3d105b4..1a6e911 100644
> --- a/WebKit/wx/ChangeLog
> +++ b/WebKit/wx/ChangeLog
> @@ -1,3 +1,14 @@
> [phone]  Kevin Watters  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +        
> +        Update the active state as well as the focused state as both need to be true
> +        for the caret to be drawn.
> +
> +        * WebView.cpp:
> +        (wxWebView::OnSetFocus):
> +        (wxWebView::OnKillFocus):
> +
>  2008-10-25  Kevin Ollivier  <[e-mail]>
>  
>          wx build fix.
> diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
> index 0c4cb66..546518f 100644
> --- a/WebKit/wx/WebView.cpp
> +++ b/WebKit/wx/WebView.cpp
> @@ -564,8 +564,10 @@ void wxWebView::OnSetFocus(wxFocusEvent& event)
>      if (m_mainFrame)
>          frame = m_mainFrame->GetFrame();
>          
> -    if (frame)
> +    if (frame) {
> +        m_impl->page->focusController()->setActive(true);
>          frame->selection()->setFocused(true);
> +    }
>  
>      event.Skip();
>  }
> @@ -576,9 +578,10 @@ void wxWebView::OnKillFocus(wxFocusEvent& event)
>      if (m_mainFrame)
>          frame = m_mainFrame->GetFrame();
>          
> -    if (frame)
> +    if (frame) {
> +        m_impl->page->focusController()->setActive(false);
>          frame->selection()->setFocused(false);
> -
> +    }
>      event.Skip();
>  }
>

[Kevin Ollivier]

Landed in r37906, thanks!