Commit Graph

85 Commits

Author SHA1 Message Date
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Vadim Zeitlin
f68e16c5fc Add <span> tag and limited support for CSS styles to wxHTML.
Parse "style" attributes of the HTML tags and honour those of them that can be
mapped to the HTML 3 attributes.

Also add a handler for <span> tag.

Closes #10631.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-30 23:12:25 +00:00
Václav Slavík
c44a49b852 Use fixed screen DPI of 96 when printing HTML.
Unlike font sizes, which depend on screen resolution because of weird
wxFont API, pixel sizes used elsewhere (and in particular, for images)
shouldn't depend on screen DPI.

This finally makes the output independent of screen size.

Fixes #10942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-29 14:19:06 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Vadim Zeitlin
e54266add7 fix some unused variables warnings reported by Borland
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-08 14:48:59 +00:00
Václav Slavík
5096757411 fixed &nbsp; handling in wxHtmlWinParser, broken by TAB-handling changes (bug #1957041)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-05 10:52:30 +00:00
Václav Slavík
6a603a10e7 preserve TAB characters when copying HTML <pre> content to clipboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-21 10:46:30 +00:00
Václav Slavík
37ed592f71 remove needless casting (no real change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-21 20:11:55 +00:00
Václav Slavík
8aef90e872 fixed unreadable formatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-13 14:21:25 +00:00
Václav Slavík
c782096417 don't recompute nonbreakable space character every time a text fragment is added in ANSI build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-20 20:24:22 +00:00
Václav Slavík
f5595af61e fixed dereferencing of invalid pointers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-07 12:30:27 +00:00
Václav Slavík
5bce3e6feb use wxString argument and not wxChar* in wxHtmlParser::AddText(), for compatibility with STL build without implicit wxString conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-11 12:11:15 +00:00
Robert Roebling
5620726fd7 Compilo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 10:27:42 +00:00
Václav Slavík
b4f4d3dd61 WX_PRECOMP, not WXPRECOMP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-27 21:35:43 +00:00
Michael Wetherell
5c4035d686 Use wxFS_SEEKABLE when opening images since some image handlers need seeking.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-27 10:14:03 +00:00
Vadim Zeitlin
1d203ed837 ensure that -2 font size is readable, it could be too small after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-10 18:18:13 +00:00
Vadim Zeitlin
ba804ab2d4 don't hardcode HTML font sizes, this makes wxHtmlWindow look really ugly when default font size is not 12, base the default font sizes on wxNORMAL_FONT instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-25 16:52:58 +00:00
Stefan Neis
6a17b868de Fixed typos in comments (patch #1515724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-02 21:40:38 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 07:16:32 +00:00
Václav Slavík
69328c1a88 commented OpenContainer usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-17 08:52:01 +00:00
Włodzimierz Skiba
e4db172a3b Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 08:21:31 +00:00
Włodzimierz Skiba
93763ad5ba wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 08:11:26 +00:00
Václav Slavík
bc55e31bdc 1. added abstract interface to wxHtmlWindow for use by wxHtmlWinParser and implemented it for wxHtmlListBox
2. used the above to implement clickable links support in wxHtmlListBox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 22:08:28 +00:00
Václav Slavík
3c115835b3 added support for <sub> and <sup> to wxHTML (based on patch #1263152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-27 00:00:39 +00:00
Václav Slavík
97eac136f3 reduced code duplication in wxHtmlWinParser::AddText (no real change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-17 23:35:36 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:43:15 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
9548f38086 Minor decorations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-08 13:02:34 +00:00
Václav Slavík
3ec372c84f compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-22 09:21:42 +00:00
Włodzimierz Skiba
7e49601492 wxURI is enough for the basic url operations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-21 17:20:47 +00:00
Włodzimierz Skiba
4bfa318965 Send full url to wxHtmlWindow::OnOpeningURL validation (and therefore use wxURL to not duplicate code). Present it in statusbar of samples/html/test application.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-16 20:32:43 +00:00
Włodzimierz Skiba
d1da887276 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 19:15:07 +00:00
Václav Slavík
10e5c7eaa0 replaced NormalizeFontSizes with SetStandardFonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 09:55:10 +00:00
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