Commit Graph

52 Commits

Author SHA1 Message Date
Robin Dunn
7acd36259b Added NormalizeFontSizes which will set the html font sizes based on
the size of a system font.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-05 23:59:44 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Stefan Csomor
c83e123712 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-22 20:09:31 +00:00
Stefan Csomor
90548138ac preliminary fix, for using the correct output encoding on mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 22:01:43 +00:00
Mattia Barbon
4f44ea367d Add wxRTTI information.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:16:56 +00:00
Julian Smart
44d0c580e6 Attempt to fix Borland compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-27 12:13:20 +00:00
Robin Dunn
3403ccd5ae Uses wxSystemSettings for colour when there is no window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-22 22:15:35 +00:00
Robin Dunn
6be0b53f3d When used from wxHtmlListBox it's possible for GetWindow to return NULL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-20 23:12:50 +00:00
Václav Slavík
eb6a4098a0 Always set background colour prior to any HTML rendering (this fixes assert in GTK2 build because BgColor of wxHtmlRenderingState was unset=invalid)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-11 13:19:57 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Václav Slavík
ace0fab4f1 remove extra space at top and bottom of the page if present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:11:10 +00:00
Václav Slavík
b6d93b260e don't break lines in the middle of word
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:39:09 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +00:00
Václav Slavík
4eecf1150d applied patch adding SetFonts to wxHTML printing classes and allowing NULL sizes list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 20:30:26 +00:00
Václav Slavík
fa2f5d3bc9 fixed encoding handling in ANSI mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 18:55:33 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Václav Slavík
0d5b4bc274 fix for bug reported by Robert and Julian, probably causes other problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-26 19:11:32 +00:00
Václav Slavík
1aedb1dd8b gcc pragmas fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-05 18:26:51 +00:00
Václav Slavík
142b3bc26a added wxFontMapper::Get/Set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-06 15:04:27 +00:00
Václav Slavík
d6a6d666b4 a note just in case I misread wxHTML code again...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-11 23:46:46 +00:00
Vadim Zeitlin
2c892c0b0c fixed VC++ compilation warnings in optimized build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-05 00:01:17 +00:00
Vadim Zeitlin
0423bdc761 fixed code in OpenURL() to actually use the result of OnOpeningURL()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-28 01:39:55 +00:00
Václav Slavík
6cc4e6b81a new wxHtmlWindow::OnOpeningURL API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-27 19:03:10 +00:00
Václav Slavík
04db5c3f8f implemented URLs blocking in wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 23:23:15 +00:00
Václav Slavík
88dcf47c56 oops, HTML entities were parsed twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-08 22:39:06 +00:00
Václav Slavík
af035b26c4 fixed HTML parsing in regard to spaces between tags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-26 14:49:09 +00:00
Václav Slavík
f23e92e72a fix for nbsp problem and minor parsing flow change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:19:02 +00:00
Vadim Zeitlin
e3c7fd79d0 fixed three new warnings after the last warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 08:56:27 +00:00
Vadim Zeitlin
3c8c8da2aa fixed a warning and detabified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 08:55:08 +00:00
Václav Slavík
211dfeddfc new wxHtmlParser core and changes implied by it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 22:31:00 +00:00
Vadim Zeitlin
04dbb6467b removed/replaced include 'wx/wx.h'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 18:48:48 +00:00
Václav Slavík
daa616fca0 new HTML tags parser and entities substitution code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:09:35 +00:00
Julian Smart
7a5e62674f Fixed some warnings (don't know why dialoged Makefile is being committed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 14:23:44 +00:00
Václav Slavík
4f9297b0ee wxHTML src code indentation now conforms (more) to wxWin coding style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-11-05 14:59:59 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Vadim Zeitlin
0e8c82331d don't translate wxASSERT_MSG messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 16:33:49 +00:00
Václav Slavík
f3c8285953 added wxLogError/Warning into wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-23 21:47:41 +00:00
Václav Slavík
cc638fc6ad added WXMAC default font sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-23 01:03:23 +00:00
Václav Slavík
b250d38459 added encoding conversion to wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-16 22:54:49 +00:00
Václav Slavík
67cfebc2b6 code fragment that adds one more line to each html page for better look was moved to wxHtmlWindow so that it does not affect m_Cell->GetHeight()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-14 21:41:45 +00:00
Václav Slavík
f1ad10f373 added <font face> support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-24 23:27:20 +00:00
Václav Slavík
f2c2fa4d62 wxHtmlWindow::OnLinkClicked and wxHtmlCell::Get/SetLink and wxHtmlWinParser::GetSetLink now work with wxHtmlLinkInfo instead of wxString (making it ready for frames) ************** also fixed font size interpretation to conform to HTML (1..6 instead of wrong -2..4)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-23 21:11:46 +00:00
Václav Slavík
8eb2940f7f removed wxITALIC/wxSLANT stuff from wxHTML (no longer neccessary, we have intelligent font matching) - affects SetFonts method of wxHtmlWindow, wxHtmlWinParser and private stuff in wxHtmlHelpFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-23 18:14:26 +00:00
Václav Slavík
edbd0635f2 new wxHTML printing code ; parser now supports scaling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-11 21:50:44 +00:00
Václav Slavík
c9f56e70f4 wxHtmlWinParser::SetFonts now refreshes fonts cache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-28 18:26:45 +00:00
Vadim Zeitlin
3096bd2fa7 include <wx/...> => include "wx/..."
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-02 15:50:22 +00:00
Václav Slavík
efba2b89f1 HTML_xxxx constants changed to wxHTML_xxxx (with backward compatibility through WXWIN_COMPATIBILITY_2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-17 20:52:29 +00:00
Václav Slavík
89966d5c0d SetFonts methods have const param now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-16 12:27:35 +00:00
Vadim Zeitlin
1bb27b0cc6 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-15 23:04:24 +00:00