/////////////////////////////////////////////////////////////////////////////
-// Name: htmlwin.cpp
+// Name: src/html/htmlwin.cpp
// Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "htmlwin.h"
-#pragma implementation "htmlproc.h"
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
+ #include "wx/list.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/dcclient.h"
#include "wx/frame.h"
+ #include "wx/dcmemory.h"
+ #include "wx/timer.h"
+ #include "wx/settings.h"
+ #include "wx/dataobj.h"
+ #include "wx/statusbr.h"
#endif
#include "wx/html/htmlwin.h"
#include "wx/html/htmlproc.h"
-#include "wx/list.h"
#include "wx/clipbrd.h"
-#include "wx/dataobj.h"
-#include "wx/timer.h"
-#include "wx/dcmemory.h"
#include "wx/arrimpl.cpp"
#include "wx/listimpl.cpp"
+// HTML events:
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_CELL_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_CELL_HOVER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_LINK_CLICKED)
#if wxUSE_CLIPBOARD
}
}
}
-#endif
+
+#endif // wxUSE_CLIPBOARD
//-----------------------------------------------------------------------------
// item of history list
-class WXDLLEXPORT wxHtmlHistoryItem
+class WXDLLIMPEXP_HTML wxHtmlHistoryItem
{
public:
wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}
//-----------------------------------------------------------------------------
WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
-WX_DEFINE_OBJARRAY(wxHtmlHistoryArray);
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray)
WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
-WX_DEFINE_LIST(wxHtmlProcessorList);
+WX_DEFINE_LIST(wxHtmlProcessorList)
+
+//-----------------------------------------------------------------------------
+// wxHtmlWindowMouseHelper
+//-----------------------------------------------------------------------------
+
+wxHtmlWindowMouseHelper::wxHtmlWindowMouseHelper(wxHtmlWindowInterface *iface)
+ : m_tmpMouseMoved(false),
+ m_tmpLastLink(NULL),
+ m_tmpLastCell(NULL),
+ m_interface(iface)
+{
+}
+
+void wxHtmlWindowMouseHelper::HandleMouseMoved()
+{
+ m_tmpMouseMoved = true;
+}
+
+bool wxHtmlWindowMouseHelper::HandleMouseClick(wxHtmlCell *rootCell,
+ const wxPoint& pos,
+ const wxMouseEvent& event)
+{
+ if (!rootCell)
+ return false;
+
+ wxHtmlCell *cell = rootCell->FindCellByPos(pos.x, pos.y);
+ // this check is needed because FindCellByPos returns terminal cell and
+ // containers may have empty borders -- in this case NULL will be
+ // returned
+ if (!cell)
+ return false;
+
+ // adjust the coordinates to be relative to this cell:
+ wxPoint relpos = pos - cell->GetAbsPos(rootCell);
+
+ return OnCellClicked(cell, relpos.x, relpos.y, event);
+}
+
+void wxHtmlWindowMouseHelper::HandleIdle(wxHtmlCell *rootCell,
+ const wxPoint& pos)
+{
+ wxHtmlCell *cell = rootCell ? rootCell->FindCellByPos(pos.x, pos.y) : NULL;
+
+ if (cell != m_tmpLastCell)
+ {
+ wxHtmlLinkInfo *lnk = NULL;
+ if (cell)
+ {
+ // adjust the coordinates to be relative to this cell:
+ wxPoint relpos = pos - cell->GetAbsPos(rootCell);
+ lnk = cell->GetLink(relpos.x, relpos.y);
+ }
+
+ wxCursor cur;
+ if (cell)
+ cur = cell->GetMouseCursor(m_interface);
+ else
+ cur = m_interface->GetHTMLCursor(
+ wxHtmlWindowInterface::HTMLCursor_Default);
+
+ m_interface->GetHTMLWindow()->SetCursor(cur);
+
+ if (lnk != m_tmpLastLink)
+ {
+ if (lnk)
+ m_interface->SetHTMLStatusText(lnk->GetHref());
+ else
+ m_interface->SetHTMLStatusText(wxEmptyString);
+
+ m_tmpLastLink = lnk;
+ }
+
+ m_tmpLastCell = cell;
+ }
+ else // mouse moved but stayed in the same cell
+ {
+ if ( cell )
+ {
+ OnCellMouseHover(cell, pos.x, pos.y);
+ }
+ }
+
+ m_tmpMouseMoved = false;
+}
+
+bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell,
+ wxCoord x, wxCoord y,
+ const wxMouseEvent& event)
+{
+ wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_CLICKED,
+ m_interface->GetHTMLWindow()->GetId(),
+ cell, wxPoint(x,y), event);
+
+ if (!m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev))
+ {
+ // if the event wasn't handled, do the default processing here:
+
+ wxASSERT_MSG( cell, _T("can't be called with NULL cell") );
+
+ cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent());
+ }
+
+ // true if a link was clicked, false otherwise
+ return ev.GetLinkClicked();
+}
+
+void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * cell,
+ wxCoord x,
+ wxCoord y)
+{
+ wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_HOVER,
+ m_interface->GetHTMLWindow()->GetId(),
+ cell, wxPoint(x,y), wxMouseEvent());
+ m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev);
+}
+
+
+
//-----------------------------------------------------------------------------
// 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()
{
- m_tmpMouseMoved = FALSE;
- m_tmpLastLink = NULL;
- m_tmpLastCell = NULL;
m_tmpCanDrawLocks = 0;
m_FS = new wxFileSystem();
- m_RelatedStatusBar = -1;
+#if wxUSE_STATUSBAR
+ m_RelatedStatusBar = NULL;
+ m_RelatedStatusBarIndex = -1;
+#endif // wxUSE_STATUSBAR
m_RelatedFrame = NULL;
m_TitleFormat = wxT("%s");
m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
m_Parser = new wxHtmlWinParser(this);
m_Parser->SetFS(m_FS);
m_HistoryPos = -1;
- m_HistoryOn = TRUE;
+ m_HistoryOn = true;
m_History = new wxHtmlHistoryArray;
m_Processors = NULL;
- m_Style = 0;
SetBorders(10);
m_selection = NULL;
m_makingSelection = false;
#if wxUSE_CLIPBOARD
m_timerAutoScroll = NULL;
m_lastDoubleClick = 0;
-#endif
+#endif // wxUSE_CLIPBOARD
m_backBuffer = NULL;
+ m_eraseBgInOnPaint = false;
+ m_tmpSelFromCell = NULL;
}
bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
long style, const wxString& name)
{
if (!wxScrolledWindow::Create(parent, id, pos, size,
- style | wxVSCROLL | wxHSCROLL, name))
- return FALSE;
+ style | wxVSCROLL | wxHSCROLL,
+ name))
+ return false;
- m_Style = style;
SetPage(wxT("<html><body></body></html>"));
- return TRUE;
+ return true;
}
{
#if wxUSE_CLIPBOARD
StopAutoScrolling();
-#endif
+#endif // wxUSE_CLIPBOARD
HistoryClear();
- if (m_Cell) delete m_Cell;
+ delete m_selection;
+
+ delete m_Cell;
+
+ if ( m_Processors )
+ {
+ WX_CLEAR_LIST(wxHtmlProcessorList, *m_Processors);
+ }
delete m_Parser;
delete m_FS;
-void wxHtmlWindow::SetRelatedStatusBar(int bar)
+#if wxUSE_STATUSBAR
+void wxHtmlWindow::SetRelatedStatusBar(int index)
{
- m_RelatedStatusBar = bar;
+ m_RelatedStatusBarIndex = index;
}
+void wxHtmlWindow::SetRelatedStatusBar(wxStatusBar* statusbar, int index)
+{
+ m_RelatedStatusBar = statusbar;
+ m_RelatedStatusBarIndex = index;
+}
+#endif // wxUSE_STATUSBAR
-void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
-{
- wxString op = m_OpenedPage;
+
+void wxHtmlWindow::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes)
+{
m_Parser->SetFonts(normal_face, fixed_face, sizes);
- // fonts changed => contents invalid, so reload the page:
- SetPage(wxT("<html><body></body></html>"));
- if (!op.IsEmpty()) LoadPage(op);
+
+ // re-layout the page after changing fonts:
+ DoSetPage(*(m_Parser->GetSource()));
}
+void wxHtmlWindow::SetStandardFonts(int size,
+ const wxString& normal_face,
+ const wxString& fixed_face)
+{
+ m_Parser->SetStandardFonts(size, normal_face, fixed_face);
+ // re-layout the page after changing fonts:
+ DoSetPage(*(m_Parser->GetSource()));
+}
bool wxHtmlWindow::SetPage(const wxString& source)
+{
+ m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+ return DoSetPage(source);
+}
+
+bool wxHtmlWindow::DoSetPage(const wxString& source)
{
wxString newsrc(source);
wxDELETE(m_selection);
+ // we will soon delete all the cells, so clear pointers to them:
+ m_tmpSelFromCell = NULL;
+
// pass HTML through registered processors:
if (m_Processors || m_GlobalProcessors)
{
- wxHtmlProcessorList::Node *nodeL, *nodeG;
+ wxHtmlProcessorList::compatibility_iterator nodeL, nodeG;
int prL, prG;
- nodeL = (m_Processors) ? m_Processors->GetFirst() : NULL;
- nodeG = (m_GlobalProcessors) ? m_GlobalProcessors->GetFirst() : NULL;
+ if ( m_Processors )
+ nodeL = m_Processors->GetFirst();
+ if ( m_GlobalProcessors )
+ nodeG = m_GlobalProcessors->GetFirst();
// VS: there are two lists, global and local, both of them sorted by
// priority. Since we have to go through _both_ lists with
wxClientDC *dc = new wxClientDC(this);
dc->SetMapMode(wxMM_TEXT);
SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
- m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+ SetBackgroundImage(wxNullBitmap);
+
m_Parser->SetDC(dc);
if (m_Cell)
{
CreateLayout();
if (m_tmpCanDrawLocks == 0)
Refresh();
- return TRUE;
+ return true;
}
bool wxHtmlWindow::AppendToPage(const wxString& source)
{
- return SetPage(*(GetParser()->GetSource()) + source);
+ return DoSetPage(*(GetParser()->GetSource()) + source);
}
bool wxHtmlWindow::LoadPage(const wxString& location)
{
+ wxCHECK_MSG( !location.empty(), false, "location must be non-empty" );
+
wxBusyCursor busyCursor;
- wxFSFile *f;
bool rt_val;
- bool needs_refresh = FALSE;
+ bool needs_refresh = false;
m_tmpCanDrawLocks++;
if (m_HistoryOn && (m_HistoryPos != -1))
(*m_History)[m_HistoryPos].SetPos(y);
}
- if (location[0] == wxT('#'))
- {
- // local anchor:
- wxString anch = location.Mid(1) /*1 to end*/;
- m_tmpCanDrawLocks--;
- rt_val = ScrollToAnchor(anch);
- m_tmpCanDrawLocks++;
- }
- else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage)
+ // first check if we're moving to an anchor in the same page
+ size_t posLocalAnchor = location.Find('#');
+ if ( posLocalAnchor != wxString::npos && posLocalAnchor != 0 )
{
- wxString anch = location.AfterFirst(wxT('#'));
- m_tmpCanDrawLocks--;
- rt_val = ScrollToAnchor(anch);
- m_tmpCanDrawLocks++;
+ // check if the part before the anchor is the same as the (either
+ // relative or absolute) URI of the current page
+ const wxString beforeAnchor = location.substr(0, posLocalAnchor);
+ if ( beforeAnchor != m_OpenedPage &&
+ m_FS->GetPath() + beforeAnchor != m_OpenedPage )
+ {
+ // indicate that we're not moving to a local anchor
+ posLocalAnchor = wxString::npos;
+ }
}
- else if (location.Find(wxT('#')) != wxNOT_FOUND &&
- (m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage)
+
+ if ( posLocalAnchor != wxString::npos )
{
- wxString anch = location.AfterFirst(wxT('#'));
m_tmpCanDrawLocks--;
- rt_val = ScrollToAnchor(anch);
+ rt_val = ScrollToAnchor(location.substr(posLocalAnchor + 1));
m_tmpCanDrawLocks++;
}
-
- else
+ else // moving to another page
{
- needs_refresh = TRUE;
+ needs_refresh = true;
+#if wxUSE_STATUSBAR
// load&display it:
- if (m_RelatedStatusBar != -1)
+ if (m_RelatedStatusBarIndex != -1)
{
- m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
- Refresh(FALSE);
+ SetHTMLStatusText(_("Connecting..."));
+ Refresh(false);
}
+#endif // wxUSE_STATUSBAR
- f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
+ wxFSFile *f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
// try to interpret 'location' as filename instead of URL:
if (f == NULL)
{
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
m_tmpCanDrawLocks--;
- return FALSE;
+ SetHTMLStatusText(wxEmptyString);
+ return false;
}
else
{
- wxNode *node;
+ wxList::compatibility_iterator node;
wxString src = wxEmptyString;
- if (m_RelatedStatusBar != -1)
+#if wxUSE_STATUSBAR
+ if (m_RelatedStatusBarIndex != -1)
{
wxString msg = _("Loading : ") + location;
- m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
- Refresh(FALSE);
+ SetHTMLStatusText(msg);
+ Refresh(false);
}
+#endif // wxUSE_STATUSBAR
node = m_Filters.GetFirst();
while (node)
delete f;
- if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+#if wxUSE_STATUSBAR
+ if (m_RelatedStatusBarIndex != -1)
+ {
+ SetHTMLStatusText(_("Done"));
+ }
+#endif // wxUSE_STATUSBAR
}
}
if (!c)
{
wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
- return FALSE;
+ return false;
}
else
{
for (y = 0; c != NULL; c = c->GetParent()) y += c->GetPosY();
Scroll(-1, y / wxHTML_SCROLL_STEP);
m_OpenedAnchor = anchor;
- return TRUE;
+ return true;
}
}
if (!m_Cell) return;
- if (m_Style & wxHW_SCROLLBAR_NEVER)
+ if ( HasFlag(wxHW_SCROLLBAR_NEVER) )
{
- SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
+ SetScrollbars(1, 1, 0, 0); // always off
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell->Layout(ClientWidth);
}
-
- else {
+ else // !wxHW_SCROLLBAR_NEVER
+ {
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell->Layout(ClientWidth);
if (ClientHeight < m_Cell->GetHeight() + GetCharHeight())
{
wxString a, l;
- if (m_HistoryPos < 1) return FALSE;
+ if (m_HistoryPos < 1) return false;
// store scroll position into history item:
int x, y;
l = (*m_History)[m_HistoryPos].GetPage();
a = (*m_History)[m_HistoryPos].GetAnchor();
- m_HistoryOn = FALSE;
+ m_HistoryOn = false;
m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
else LoadPage(l + wxT("#") + a);
- m_HistoryOn = TRUE;
+ m_HistoryOn = true;
m_tmpCanDrawLocks--;
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
Refresh();
- return TRUE;
+ return true;
}
bool wxHtmlWindow::HistoryCanBack()
{
- if (m_HistoryPos < 1) return FALSE;
- return TRUE ;
+ if (m_HistoryPos < 1) return false;
+ return true ;
}
{
wxString a, l;
- if (m_HistoryPos == -1) return FALSE;
- if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
+ if (m_HistoryPos == -1) return false;
+ if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage()
m_HistoryPos++;
l = (*m_History)[m_HistoryPos].GetPage();
a = (*m_History)[m_HistoryPos].GetAnchor();
- m_HistoryOn = FALSE;
+ m_HistoryOn = false;
m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
else LoadPage(l + wxT("#") + a);
- m_HistoryOn = TRUE;
+ m_HistoryOn = true;
m_tmpCanDrawLocks--;
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
Refresh();
- return TRUE;
+ return true;
}
bool wxHtmlWindow::HistoryCanForward()
{
- if (m_HistoryPos == -1) return FALSE;
- if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
- return TRUE ;
+ if (m_HistoryPos == -1) return false;
+ if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
+ return true ;
}
if (!m_Processors)
{
m_Processors = new wxHtmlProcessorList;
- m_Processors->DeleteContents(TRUE);
}
- wxHtmlProcessorList::Node *node;
+ wxHtmlProcessorList::compatibility_iterator node;
for (node = m_Processors->GetFirst(); node; node = node->GetNext())
{
if (!m_GlobalProcessors)
{
m_GlobalProcessors = new wxHtmlProcessorList;
- m_GlobalProcessors->DeleteContents(TRUE);
}
- wxHtmlProcessorList::Node *node;
+ wxHtmlProcessorList::compatibility_iterator node;
for (node = m_GlobalProcessors->GetFirst(); node; node = node->GetNext())
{
-wxList wxHtmlWindow::m_Filters;
-wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
-wxHtmlProcessorList *wxHtmlWindow::m_GlobalProcessors = NULL;
-
-void wxHtmlWindow::CleanUpStatics()
-{
- wxDELETE(m_DefaultFilter);
- m_Filters.DeleteContents(TRUE);
- m_Filters.Clear();
- wxDELETE(m_GlobalProcessors);
-}
-
-
-
void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
{
m_Filters.Append(filter);
bool wxHtmlWindow::IsSelectionEnabled() const
{
#if wxUSE_CLIPBOARD
- return !(m_Style & wxHW_NO_SELECTION);
+ return !HasFlag(wxHW_NO_SELECTION);
#else
return false;
#endif
}
-
+
#if wxUSE_CLIPBOARD
-wxString wxHtmlWindow::SelectionToText()
+wxString wxHtmlWindow::DoSelectionToText(wxHtmlSelection *sel)
{
- if ( !m_selection )
+ if ( !sel )
return wxEmptyString;
wxClientDC dc(this);
-
- const wxHtmlCell *end = m_selection->GetToCell();
wxString text;
- wxHtmlTerminalCellsInterator i(m_selection->GetFromCell(), end);
- if ( i )
- {
- text << i->ConvertToText(m_selection);
- ++i;
- }
- const wxHtmlCell *prev = *i;
+
+ wxHtmlTerminalCellsInterator i(sel->GetFromCell(), sel->GetToCell());
+ const wxHtmlCell *prev = NULL;
+
while ( i )
{
- if ( prev->GetParent() != i->GetParent() )
- text << _T('\n');
- text << i->ConvertToText(*i == end ? m_selection : NULL);
+ // When converting HTML content to plain text, the entire paragraph
+ // (container in wxHTML) goes on single line. A new paragraph (that
+ // should go on its own line) has its own container. Therefore, the
+ // simplest way of detecting where to insert newlines in plain text
+ // is to check if the parent container changed -- if it did, we moved
+ // to a new paragraph.
+ if ( prev && prev->GetParent() != i->GetParent() )
+ text << '\n';
+
+ // NB: we don't need to pass the selection to ConvertToText() in the
+ // middle of the selected text; it's only useful when only part of
+ // a cell is selected
+ text << i->ConvertToText(sel);
+
prev = *i;
++i;
}
return text;
}
-void wxHtmlWindow::CopySelection(ClipboardType t)
+wxString wxHtmlWindow::ToText()
{
+ if (m_Cell)
+ {
+ wxHtmlSelection sel;
+ sel.Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
+ return DoSelectionToText(&sel);
+ }
+ else
+ return wxEmptyString;
+}
+
+#endif // wxUSE_CLIPBOARD
+
+bool wxHtmlWindow::CopySelection(ClipboardType t)
+{
+#if wxUSE_CLIPBOARD
if ( m_selection )
{
+#if defined(__UNIX__) && !defined(__WXMAC__)
wxTheClipboard->UsePrimarySelection(t == Primary);
- wxString txt(SelectionToText());
+#else // !__UNIX__
+ // Primary selection exists only under X11, so don't do anything under
+ // the other platforms when we try to access it
+ //
+ // TODO: this should be abstracted at wxClipboard level!
+ if ( t == Primary )
+ return false;
+#endif // __UNIX__/!__UNIX__
+
if ( wxTheClipboard->Open() )
{
+ const wxString txt(SelectionToText());
wxTheClipboard->SetData(new wxTextDataObject(txt));
wxTheClipboard->Close();
wxLogTrace(_T("wxhtmlselection"),
_("Copied to clipboard:\"%s\""), txt.c_str());
+
+ return true;
}
}
+#else
+ wxUnusedVar(t);
+#endif // wxUSE_CLIPBOARD
+
+ return false;
}
-#endif
void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
- const wxMouseEvent *e = link.GetEvent();
- if (e == NULL || e->LeftUp())
- LoadPage(link.GetHref());
+ wxHtmlLinkEvent event(GetId(), link);
+ event.SetEventObject(this);
+ if (!GetEventHandler()->ProcessEvent(event))
+ {
+ // the default behaviour is to load the URL in this window
+ const wxMouseEvent *e = event.GetLinkInfo().GetEvent();
+ if (e == NULL || e->LeftUp())
+ LoadPage(event.GetLinkInfo().GetHref());
+ }
}
-void wxHtmlWindow::OnCellClicked(wxHtmlCell *cell,
- wxCoord x, wxCoord y,
- const wxMouseEvent& event)
+void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
{
- wxCHECK_RET( cell, _T("can't be called with NULL cell") );
+ if ( !m_bmpBg.Ok() )
+ {
+ // don't even skip the event, if we don't have a bg bitmap we're going
+ // to overwrite background in OnPaint() below anyhow, so letting the
+ // default handling take place would only result in flicker, just set a
+ // flag to erase the background below
+ m_eraseBgInOnPaint = true;
+ return;
+ }
- cell->OnMouseClick(this, x, y, event);
-}
+ wxDC& dc = *event.GetDC();
-void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
- wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
-{
- // do nothing here
-}
+ // if the image is not fully opaque, we have to erase the background before
+ // drawing it, however avoid doing it for opaque images as this would just
+ // result in extra flicker without any other effect as background is
+ // completely covered anyhow
+ if ( m_bmpBg.GetMask() )
+ {
+ dc.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
+ dc.Clear();
+ }
-void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
-{
+ const wxSize sizeWin(GetClientSize());
+ const wxSize sizeBmp(m_bmpBg.GetWidth(), m_bmpBg.GetHeight());
+ for ( wxCoord x = 0; x < sizeWin.x; x += sizeBmp.x )
+ {
+ for ( wxCoord y = 0; y < sizeWin.y; y += sizeBmp.y )
+ {
+ dc.DrawBitmap(m_bmpBg, x, y, true /* use mask */);
+ }
+ }
}
void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
- if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return;
+ if (m_tmpCanDrawLocks > 0 || m_Cell == NULL)
+ return;
int x, y;
GetViewStart(&x, &y);
wxMemoryDC dcm;
if ( !m_backBuffer )
m_backBuffer = new wxBitmap(sz.x, sz.y);
- dcm.SelectObject(*m_backBuffer);
- dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
- dcm.Clear();
+ dcm.SelectObject(*m_backBuffer);
+
+ if ( m_eraseBgInOnPaint )
+ {
+ dcm.SetBackground(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
+ dcm.Clear();
+
+ m_eraseBgInOnPaint = false;
+ }
+ else // someone has already erased the background, keep it
+ {
+ // preserve the existing background, otherwise we'd erase anything the
+ // user code had drawn in its EVT_ERASE_BACKGROUND handler when we do
+ // the Blit back below
+ dcm.Blit(0, rect.GetTop(),
+ sz.x, rect.GetBottom() - rect.GetTop() + 1,
+ &dc,
+ 0, rect.GetTop());
+ }
+
PrepareDC(dcm);
dcm.SetMapMode(wxMM_TEXT);
- dcm.SetBackgroundMode(wxTRANSPARENT);
-
+ dcm.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+
wxHtmlRenderingInfo rinfo;
wxDefaultHtmlRenderingStyle rstyle;
rinfo.SetSelection(m_selection);
y * wxHTML_SCROLL_STEP + rect.GetBottom(),
rinfo);
+//#define DEBUG_HTML_SELECTION
+#ifdef DEBUG_HTML_SELECTION
+ {
+ int xc, yc, x, y;
+ wxGetMousePosition(&xc, &yc);
+ ScreenToClient(&xc, &yc);
+ CalcUnscrolledPosition(xc, yc, &x, &y);
+ wxHtmlCell *at = m_Cell->FindCellByPos(x, y);
+ wxHtmlCell *before =
+ m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE);
+ wxHtmlCell *after =
+ m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
+
+ dcm.SetBrush(*wxTRANSPARENT_BRUSH);
+ dcm.SetPen(*wxBLACK_PEN);
+ if (at)
+ dcm.DrawRectangle(at->GetAbsPos(),
+ wxSize(at->GetWidth(),at->GetHeight()));
+ dcm.SetPen(*wxGREEN_PEN);
+ if (before)
+ dcm.DrawRectangle(before->GetAbsPos().x+1, before->GetAbsPos().y+1,
+ before->GetWidth()-2,before->GetHeight()-2);
+ dcm.SetPen(*wxRED_PEN);
+ if (after)
+ dcm.DrawRectangle(after->GetAbsPos().x+2, after->GetAbsPos().y+2,
+ after->GetWidth()-4,after->GetHeight()-4);
+ }
+#endif
+
dcm.SetDeviceOrigin(0,0);
dc.Blit(0, rect.GetTop(),
sz.x, rect.GetBottom() - rect.GetTop() + 1,
m_selection->GetToCell());
m_selection->ClearPrivPos();
}
-
+
Refresh();
}
-void wxHtmlWindow::OnMouseMove(wxMouseEvent& event)
+void wxHtmlWindow::OnMouseMove(wxMouseEvent& WXUNUSED(event))
{
- m_tmpMouseMoved = true;
+ wxHtmlWindowMouseHelper::HandleMouseMoved();
}
void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
if ( wxGetLocalTimeMillis() - m_lastDoubleClick <= TRIPLECLICK_LEN )
{
SelectLine(CalcUnscrolledPosition(event.GetPosition()));
+
+ (void) CopySelection();
}
else
- {
+ {
m_makingSelection = true;
-
+
if ( m_selection )
{
wxDELETE(m_selection);
CaptureMouse();
}
}
-#endif
+#endif // wxUSE_CLIPBOARD
+
+ // in any case, let the default handler set focus to this window
+ event.Skip();
}
void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
ReleaseMouse();
m_makingSelection = false;
- // did the user move the mouse far enough from starting point?
+ // if m_selection=NULL, the user didn't move the mouse far enough from
+ // starting point and the mouse up event is part of a click, the user
+ // is not selecting text:
if ( m_selection )
{
-#ifdef __UNIX__
CopySelection(Primary);
-#endif
+
// we don't want mouse up event that ended selecting to be
// handled as mouse click and e.g. follow hyperlink:
return;
}
}
-#endif
-
- SetFocus();
- if ( m_Cell )
- {
- wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
- wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+#endif // wxUSE_CLIPBOARD
- // VZ: is it possible that we don't find anything at all?
- // VS: yes. FindCellByPos returns terminal cell and
- // containers may have empty borders
- if ( cell )
- OnCellClicked(cell, pos.x, pos.y, event);
- }
+ wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
+ wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event);
}
+#if wxUSE_CLIPBOARD
+void wxHtmlWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+{
+ if ( !m_makingSelection )
+ return;
+
+ // discard the selecting operation
+ m_makingSelection = false;
+ wxDELETE(m_selection);
+ m_tmpSelFromCell = NULL;
+ Refresh();
+}
+#endif // wxUSE_CLIPBOARD
-void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxHtmlWindow::OnInternalIdle()
{
- if (m_tmpMouseMoved && (m_Cell != NULL))
+ wxWindow::OnInternalIdle();
+
+ if (m_Cell != NULL && DidMouseMove())
{
+#ifdef DEBUG_HTML_SELECTION
+ Refresh();
+#endif
int xc, yc, x, y;
wxGetMousePosition(&xc, &yc);
ScreenToClient(&xc, &yc);
// handle selection update:
if ( m_makingSelection )
{
- bool goingDown = m_tmpSelFromPos.y < y ||
- m_tmpSelFromPos.y == y && m_tmpSelFromPos.x < x;
-
if ( !m_tmpSelFromCell )
+ m_tmpSelFromCell = m_Cell->FindCellByPos(
+ m_tmpSelFromPos.x,m_tmpSelFromPos.y);
+
+ // NB: a trick - we adjust selFromPos to be upper left or bottom
+ // right corner of the first cell of the selection depending
+ // on whether the mouse is moving to the right or to the left.
+ // This gives us more "natural" behaviour when selecting
+ // a line (specifically, first cell of the next line is not
+ // included if you drag selection from left to right over
+ // entire line):
+ wxPoint dirFromPos;
+ if ( !m_tmpSelFromCell )
+ {
+ dirFromPos = m_tmpSelFromPos;
+ }
+ else
+ {
+ dirFromPos = m_tmpSelFromCell->GetAbsPos();
+ if ( x < m_tmpSelFromPos.x )
+ {
+ dirFromPos.x += m_tmpSelFromCell->GetWidth();
+ dirFromPos.y += m_tmpSelFromCell->GetHeight();
+ }
+ }
+ bool goingDown = dirFromPos.y < y ||
+ (dirFromPos.y == y && dirFromPos.x < x);
+
+ // determine selection span:
+ if ( /*still*/ !m_tmpSelFromCell )
{
if (goingDown)
{
if (goingDown)
{
selcell = m_Cell->FindCellByPos(x, y,
- wxHTML_FIND_NEAREST_AFTER);
+ wxHTML_FIND_NEAREST_BEFORE);
if (!selcell)
selcell = m_Cell->GetLastTerminal();
}
else
{
selcell = m_Cell->FindCellByPos(x, y,
- wxHTML_FIND_NEAREST_BEFORE);
+ wxHTML_FIND_NEAREST_AFTER);
if (!selcell)
selcell = m_Cell->GetFirstTerminal();
}
// NB: it may *rarely* happen that the code above didn't find one
// of the cells, e.g. if wxHtmlWindow doesn't contain any
- // visible cells.
+ // visible cells.
if ( selcell && m_tmpSelFromCell )
- {
+ {
if ( !m_selection )
{
// start selecting only if mouse movement was big enough
if ( m_tmpSelFromCell->IsBefore(selcell) )
{
m_selection->Set(m_tmpSelFromPos, m_tmpSelFromCell,
- wxPoint(x,y), selcell); }
+ wxPoint(x,y), selcell);
+ }
else
{
m_selection->Set(wxPoint(x,y), selcell,
}
}
}
-
- // handle cursor and status bar text changes:
- if ( cell != m_tmpLastCell )
- {
- wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL;
- wxCursor cur;
- if (cell)
- cur = cell->GetCursor();
- else
- cur = *wxSTANDARD_CURSOR;
- SetCursor(cur);
- if (lnk != m_tmpLastLink)
- {
- if (lnk == NULL)
- {
- if (m_RelatedStatusBar != -1)
- m_RelatedFrame->SetStatusText(wxEmptyString,
- m_RelatedStatusBar);
- }
- else
- {
- if (m_RelatedStatusBar != -1)
- m_RelatedFrame->SetStatusText(lnk->GetHref(),
- m_RelatedStatusBar);
- }
- m_tmpLastLink = lnk;
- }
-
- m_tmpLastCell = cell;
- }
- else // mouse moved but stayed in the same cell
- {
- if ( cell )
- OnCellMouseHover(cell, x, y);
- }
+ // handle cursor and status bar text changes:
- m_tmpMouseMoved = FALSE;
+ // NB: because we're passing in 'cell' and not 'm_Cell' (so that the
+ // leaf cell lookup isn't done twice), we need to adjust the
+ // position for the new root:
+ wxPoint posInCell(x, y);
+ if (cell)
+ posInCell -= cell->GetAbsPos();
+ wxHtmlWindowMouseHelper::HandleIdle(cell, posInCell);
}
}
void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
{
if ( IsSelectionEnabled() &&
- event.GetKeyCode() == 'C' && event.ControlDown() )
+ (event.GetKeyCode() == 'C' && event.CmdDown()) )
{
- if ( m_selection )
- CopySelection();
+ wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());
+
+ evt.SetEventObject(this);
+
+ GetEventHandler()->ProcessEvent(evt);
}
}
-void wxHtmlWindow::OnCopy(wxCommandEvent& event)
+void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
{
- if ( m_selection )
- CopySelection();
+ (void) CopySelection();
}
-
+
+void wxHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))
+{
+ (void) CopySelection();
+}
+
void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
{
// select word under cursor:
if ( IsSelectionEnabled() )
{
SelectWord(CalcUnscrolledPosition(event.GetPosition()));
+
+ (void) CopySelection(Primary);
+
m_lastDoubleClick = wxGetLocalTimeMillis();
}
else
void wxHtmlWindow::SelectWord(const wxPoint& pos)
{
- wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
- if ( cell )
+ if ( m_Cell )
{
- delete m_selection;
- m_selection = new wxHtmlSelection();
- m_selection->Set(cell, cell);
- RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
- wxSize(cell->GetWidth(), cell->GetHeight())));
+ wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+ if ( cell )
+ {
+ delete m_selection;
+ m_selection = new wxHtmlSelection();
+ m_selection->Set(cell, cell);
+ RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
+ wxSize(cell->GetWidth(), cell->GetHeight())));
+ }
}
}
void wxHtmlWindow::SelectLine(const wxPoint& pos)
{
- wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
- if ( cell )
+ if ( m_Cell )
{
- // We use following heuristic to find a "line": let the line be all
- // cells in same container as the cell under mouse cursor that are
- // neither completely above nor completely bellow the clicked cell
- // (i.e. are likely to be words positioned on same line of text).
-
- int y1 = cell->GetAbsPos().y;
- int y2 = y1 + cell->GetHeight();
- int y;
- const wxHtmlCell *c;
- const wxHtmlCell *before = NULL;
- const wxHtmlCell *after = NULL;
-
- // find last cell of line:
- for ( c = cell->GetNext(); c; c = c->GetNext())
+ wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+ if ( cell )
{
- y = c->GetAbsPos().y;
- if ( y + c->GetHeight() > y1 && y < y2 )
- after = c;
- else
- break;
- }
- if ( !after )
- after = cell;
+ // We use following heuristic to find a "line": let the line be all
+ // cells in same container as the cell under mouse cursor that are
+ // neither completely above nor completely bellow the clicked cell
+ // (i.e. are likely to be words positioned on same line of text).
+
+ int y1 = cell->GetAbsPos().y;
+ int y2 = y1 + cell->GetHeight();
+ int y;
+ const wxHtmlCell *c;
+ const wxHtmlCell *before = NULL;
+ const wxHtmlCell *after = NULL;
+
+ // find last cell of line:
+ for ( c = cell->GetNext(); c; c = c->GetNext())
+ {
+ y = c->GetAbsPos().y;
+ if ( y + c->GetHeight() > y1 && y < y2 )
+ after = c;
+ else
+ break;
+ }
+ if ( !after )
+ after = cell;
- // find first cell of line:
- for ( c = cell->GetParent()->GetFirstChild();
- c && c != cell; c = c->GetNext())
- {
- y = c->GetAbsPos().y;
- if ( y + c->GetHeight() > y1 && y < y2 )
+ // find first cell of line:
+ for ( c = cell->GetParent()->GetFirstChild();
+ c && c != cell; c = c->GetNext())
{
- if ( ! before )
- before = c;
+ y = c->GetAbsPos().y;
+ if ( y + c->GetHeight() > y1 && y < y2 )
+ {
+ if ( ! before )
+ before = c;
+ }
+ else
+ before = NULL;
}
- else
- before = NULL;
+ if ( !before )
+ before = cell;
+
+ delete m_selection;
+ m_selection = new wxHtmlSelection();
+ m_selection->Set(before, after);
+
+ Refresh();
}
- if ( !before )
- before = cell;
-
+ }
+}
+
+void wxHtmlWindow::SelectAll()
+{
+ if ( m_Cell )
+ {
delete m_selection;
m_selection = new wxHtmlSelection();
- m_selection->Set(before, after);
-
+ m_selection->Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
Refresh();
}
}
-#endif
+
+#endif // wxUSE_CLIPBOARD
IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
+/*
+ TODO PROPERTIES
+ style , wxHW_SCROLLBAR_AUTO
+ borders , (dimension)
+ url , string
+ htmlcode , string
+*/
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
+#endif
BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
EVT_SIZE(wxHtmlWindow::OnSize)
EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
EVT_RIGHT_UP(wxHtmlWindow::OnMouseUp)
EVT_MOTION(wxHtmlWindow::OnMouseMove)
- EVT_IDLE(wxHtmlWindow::OnIdle)
EVT_ERASE_BACKGROUND(wxHtmlWindow::OnEraseBackground)
EVT_PAINT(wxHtmlWindow::OnPaint)
#if wxUSE_CLIPBOARD
EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick)
EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter)
EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave)
+ EVT_MOUSE_CAPTURE_LOST(wxHtmlWindow::OnMouseCaptureLost)
EVT_KEY_UP(wxHtmlWindow::OnKeyUp)
EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)
-#endif
+ EVT_TEXT_COPY(wxID_ANY, wxHtmlWindow::OnClipboardEvent)
+#endif // wxUSE_CLIPBOARD
END_EVENT_TABLE()
+//-----------------------------------------------------------------------------
+// wxHtmlWindowInterface implementation in wxHtmlWindow
+//-----------------------------------------------------------------------------
+void wxHtmlWindow::SetHTMLWindowTitle(const wxString& title)
+{
+ OnSetTitle(title);
+}
+void wxHtmlWindow::OnHTMLLinkClicked(const wxHtmlLinkInfo& link)
+{
+ OnLinkClicked(link);
+}
+wxHtmlOpeningStatus wxHtmlWindow::OnHTMLOpeningURL(wxHtmlURLType type,
+ const wxString& url,
+ wxString *redirect) const
+{
+ return OnOpeningURL(type, url, redirect);
+}
+
+wxPoint wxHtmlWindow::HTMLCoordsToWindow(wxHtmlCell *WXUNUSED(cell),
+ const wxPoint& pos) const
+{
+ return CalcScrolledPosition(pos);
+}
+
+wxWindow* wxHtmlWindow::GetHTMLWindow()
+{
+ return this;
+}
+
+wxColour wxHtmlWindow::GetHTMLBackgroundColour() const
+{
+ return GetBackgroundColour();
+}
+
+void wxHtmlWindow::SetHTMLBackgroundColour(const wxColour& clr)
+{
+ SetBackgroundColour(clr);
+}
+
+void wxHtmlWindow::SetHTMLBackgroundImage(const wxBitmap& bmpBg)
+{
+ SetBackgroundImage(bmpBg);
+}
+
+void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
+{
+#if wxUSE_STATUSBAR
+ if (m_RelatedStatusBarIndex != -1)
+ {
+ if (m_RelatedStatusBar)
+ {
+ m_RelatedStatusBar->SetStatusText(text, m_RelatedStatusBarIndex);
+ }
+ else if (m_RelatedFrame)
+ {
+ m_RelatedFrame->SetStatusText(text, m_RelatedStatusBarIndex);
+ }
+ }
+#else
+ wxUnusedVar(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
+//-----------------------------------------------------------------------------
// A module to allow initialization/cleanup
// without calling these functions from app.cpp or from
DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
public:
wxHtmlWinModule() : wxModule() {}
- bool OnInit() { return TRUE; }
+ bool OnInit() { return true; }
void OnExit() { wxHtmlWindow::CleanUpStatics(); }
};
#include "wx/html/forcelnk.h"
FORCE_WXHTML_MODULES()
-#endif
+#endif // wxUSE_HTML
projects / wxWidgets.git / blobdiff