Commit Graph

67 Commits

Author SHA1 Message Date
Vadim Zeitlin
566e401a3f Add support for style="page-break-inside:avoid" to wxHTML
Allow using this style to prevent page breaks inside the given <div>.
2018-07-22 00:43:25 +02:00
Vadim Zeitlin
b9b6ccb804 Remove "known_pagebreaks" from wxHtmlCell::AdjustPagebreak()
This parameter is not actually needed for any reasonable page breaking
algorithm, as it shouldn't care about any previous page breaks except
for the last one, which is already known as "*pagebreak - pageHeight" in
this function.

Removing it will allow to stop using wxArrayInt in the code using this
method and switch to an std::vector<int> instead.

This is not a backwards compatible change, but it seems that there is
very little code actually overriding this function (none could be found
in any open source repositories) and updating it should be as simple as
removing the now unneeded argument.
2018-05-24 18:12:40 +02:00
Vadim Zeitlin
c58d81d32d Simplify wxHtmlPageBreakCell::AdjustPagebreak()
There is no need to look in the known page breaks array for a page break
at the position of this cell, all we care about is whether this cell is
on the current page or not: we must insert a page break if, and only if,
it is.

No real changes in behaviour, but the code is now much simpler to
understand and this change paves way for removing "known_pagebreaks"
entirely, as it was only added for the use in this function (see
f2034f1b6e from 15 years ago), which
doesn't even actually need it.

It should also make pagination code somewhat faster.
2018-05-24 18:12:41 +02:00
Tobias Taschner
8282c1be0f Remove Windows CE support
Windows CE doesn't seem to be supported by Microsoft any longer. Last CE
release was in early 2013 and the PocketPC and Smartphone targets supported by
wxWidgets are long gone.

The build files where already removed in an earlier cleanup this commit
removes all files, every #ifdef and all documentation regarding the Windows CE
support.

Closes https://github.com/wxWidgets/wxWidgets/pull/81
2015-09-23 00:52:30 +02:00
Paul Cornett
845444f35f Fix null pointer check from 198d7c6c (r40919)
operator '?:' has lower precedence than '+'
2015-09-06 20:56:59 -07:00
Vadim Zeitlin
33ad33d447 Add wxOVERRIDE and use it in common and wxOSX code.
Make overriding virtual methods more explicit and enable additional checks
provided by C++11 compilers when "override" is used.

Closes #16100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-20 13:26:28 +00:00
Vadim Zeitlin
534f87c6c4 Avoid using wxHtmlTag::HasParam() unnecessarily.
Use GetParamAsXXX() accessors instead as they combine the calls to HasParam()
and GetParam() and make the code shorter and avoid the duplication of the tag
name.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-30 23:48:46 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
be9cae51e6 Improve appearance of text with background colour in wxHTML.
Use wxHTML_CLR_TRANSPARENT_BACKGROUND instead of wxHTML_CLR_BACKGROUND for the
bgcolor attribute of the body tag to prevent clipping of the text cells by the
next cell with opaque background.

Closes #14986.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-20 12:53:22 +00:00
Vadim Zeitlin
846f4568e5 Fix infinite loop in wxHtmlEasyPrinting page break code.
The code didn't handle cells higher than the page height correctly and entered
an infinite loop when trying to adjust page breaks in their presence, e.g.
when trying to print a very tall image.

Closes #13935.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 13:02:32 +00:00
Vadim Zeitlin
d7235613f4 No real changes, just pass const wxArrayInt to wxHtmlCell::AdjustPagebreak().
AdjustPagebreak() never modifies the array passed to it, so pass it as const
reference.

See #13935.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 13:02:27 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Václav Slavík
8d94819c43 Remove wxUSE_WCHAR_T checks.
wxWidgets requires wchar_t for some time now; wx/chartype.h has a check
to fail complation without it. Simplify code by removing now-dead code
for the !wxUSE_WCHAR_T case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-16 10:43:18 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +00:00
Vadim Zeitlin
e92b9e696c remove unused function and out of date comments (we don't use bsearch() any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 18:52:08 +00:00
Francesco Montorsi
7d7b3f69f2 do not export private symbols in wx shared libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-24 13:40:46 +00:00
Václav Slavík
c3485a4eef fixed pagebreaks computation in tables (#9935, patch by D.J.Stauffer)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-07 10:22:53 +00:00
Václav Slavík
b1a3a96499 fixed wxHTML parsing to run in O(n) even in UTF8 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-26 10:04:11 +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
Vadim Zeitlin
b4a980f4f5 don't use obsolete functions (mostly copystring() and Count()), remove their documentation (patch 1697956)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-11 00:23:19 +00:00
Vadim Zeitlin
a237d7ed48 fix memory leak when handling background attribute (patch 1687900)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-29 18:12:59 +00:00
Vadim Zeitlin
4d70ab089f don't convert title to current encoding if input encoding is wxFONTENCODING_DEFAULT (this shouldn't be necessary and provokes an assert from wxCSConv ctor)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-02 23:36:06 +00:00
Václav Slavík
198d7c6cb9 fixed crash in <sub/sup> handling (bug #1545152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-29 21:08:39 +00:00
Włodzimierz Skiba
155ecd4c42 Include wx/image.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 19:02:54 +00:00
Vadim Zeitlin
fd0bab4353 use dynamic array for the page breaks positions (patch 1483976)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 22:56:28 +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
Julian Smart
64c288fa47 Compile with wxUSE_DYNLIB_CLASS and wxUSE_WXDIB set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 16:47:30 +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
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
Michael Wetherell
61c213fe22 Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t
now, I will check, but compilation should work without anyway).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-22 15:12:46 +00:00
Vadim Zeitlin
97e490f8b0 added support for background bitmap specified in background attribute of the HTML body tag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 23:17:12 +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
c68d5f40d5 removed accidentally committed debugging code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 21:14:59 +00:00
Václav Slavík
140ba06778 use corrent charset for page title in ANSI builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-17 21:13:36 +00:00
Václav Slavík
4d5881b12d fixed HTML entities parsing inside <titl
e> tag


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-30 10:21:47 +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
Robert Roebling
7127d12912 Make wxHTML compile (and work) under CE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-17 12:10:43 +00:00
Václav Slavík
c5448f38d7 <div> handling fix (Xavier Nodet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 22:44:32 +00:00
Václav Slavík
e3ac6ee157 fixed wrong arguments to Draw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 15:48:45 +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
Vadim Zeitlin
fc7a2a602b undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 00:24:07 +00:00
Václav Slavík
4460b6c48b fixed compilation of multilib dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:18:11 +00:00
Václav Slavík
f9ba645e5d compilation fix for VisualAge C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-09 17:06:40 +00:00
Václav Slavík
e377412473 added copying selection to clipboard; fixes to selection making
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 21:21:23 +00:00
Václav Slavík
36c4ff4d65 preparing wxHtmlWindow for text selection (highlighting works, mouse input and clipboard does not)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 21:48:50 +00:00
Václav Slavík
92337e39b9 unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-15 22:38:32 +00:00
Václav Slavík
f2034f1b6e applied HTML pagebreaks patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 22:33:51 +00:00
Václav Slavík
8829fa8200 implemented empty handler for <script> tag, so that script code doesn't show in rendered page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 19:00:08 +00:00