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

don't show the I-beam cursor over text in wxHtmlListBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-04-14 11:38:36 +00:00
parent b887dc7b5a
commit 88a1b6485f
8 changed files with 127 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/html/htmlwin.cpp
View File

@@ -194,9 +194,11 @@ void wxHtmlWindowMouseHelper::HandleIdle(wxHtmlCell *rootCell,
wxCursor cur;
if (cell)
cur = cell->GetCursor();
cur = cell->GetMouseCursor(m_interface);
else
cur = *wxSTANDARD_CURSOR;
cur = m_interface->GetHTMLCursor(
wxHtmlWindowInterface::HTMLCursor_Default);
m_interface->GetHTMLWindow()->SetCursor(cur);
if (lnk != m_tmpLastLink)
@@ -242,6 +244,22 @@ void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
// wxHtmlWindow
//-----------------------------------------------------------------------------
wxList wxHtmlWindow::m_Filters;
wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;
wxCursor *wxHtmlWindow::ms_cursorLink = NULL;
wxCursor *wxHtmlWindow::ms_cursorText = NULL;
void wxHtmlWindow::CleanUpStatics()
{
wxDELETE(m_DefaultFilter);
WX_CLEAR_LIST(wxList, m_Filters);
if (m_GlobalProcessors)
WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors);
wxDELETE(m_GlobalProcessors);
wxDELETE(ms_cursorLink);
wxDELETE(ms_cursorText);
}
void wxHtmlWindow::Init()
{
@@ -816,21 +834,6 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
wxList wxHtmlWindow::m_Filters;
wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;
void wxHtmlWindow::CleanUpStatics()
{
wxDELETE(m_DefaultFilter);
WX_CLEAR_LIST(wxList, m_Filters);
if (m_GlobalProcessors)
WX_CLEAR_LIST(wxHtmlProcessorList, *m_GlobalProcessors);
wxDELETE(m_GlobalProcessors);
}
void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
{
m_Filters.Append(filter);
@@ -1557,6 +1560,32 @@ void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
#endif // wxUSE_STATUSBAR
}
/*static*/
wxCursor wxHtmlWindow::GetDefaultHTMLCursor(HTMLCursor type)
{
switch (type)
{
case HTMLCursor_Link:
if ( !ms_cursorLink )
ms_cursorLink = new wxCursor(wxCURSOR_HAND);
return *ms_cursorLink;
case HTMLCursor_Text:
if ( !ms_cursorText )
ms_cursorText = new wxCursor(wxCURSOR_IBEAM);
return *ms_cursorText;
case HTMLCursor_Default:
default:
return *wxSTANDARD_CURSOR;
}
}
wxCursor wxHtmlWindow::GetHTMLCursor(HTMLCursor type) const
{
return GetDefaultHTMLCursor(type);
}
//-----------------------------------------------------------------------------
// wxHtmlWinModule