X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5526e819eca4465ed5520d49bccfebc6a28045e0..bbdb0e1313e5fe26df04bc14bae1a1c723332102:/src/html/htmlcell.cpp?ds=sidebyside diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index c70e0a281c..1019e1367f 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -6,14 +6,12 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// - #ifdef __GNUG__ -#pragma implementation +#pragma implementation "htmlcell.h" #endif -#include +#include "wx/wxprec.h" -#include "wx/defs.h" #if wxUSE_HTML #ifdef __BORDLANDC__ @@ -21,16 +19,14 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif -#include -#include +#include "wx/html/htmlcell.h" +#include "wx/html/htmlwin.h" #include - - //----------------------------------------------------------------------------- // wxHtmlCell //----------------------------------------------------------------------------- @@ -38,8 +34,9 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right) { - if (GetLink() != wxEmptyString) - ((wxHtmlWindow*)parent) -> OnLinkClicked(GetLink()); + wxString lnk = GetLink(x, y); + if (lnk != wxEmptyString) + ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk); // note : this overcasting is legal because parent is *always* wxHtmlWindow } @@ -70,10 +67,6 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) - - - - //----------------------------------------------------------------------------- // wxHtmlContainerCell //-----------------------------------------------------------------------------