Commit Graph

78 Commits

Author SHA1 Message Date
Stefan Csomor
f18d7097da adding wxFALLTHROUGH where until now we had comments, allows for code-analysis support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-26 17:36:32 +00:00
Vadim Zeitlin
486a0fa75f Add wxHtmlTag::GetParamAsString() convenience method.
This is more convenient to use than HasParam() + GetParam() and also slightly
more efficient as we search for the tag name only once.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-30 23:48:38 +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
e0e4b2b0e9 Add a wxHtmlTag helper parsing both absolute values and percents.
This allows to avoid some code duplication in different handlers.

Closes #14868.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-08 00:37:21 +00:00
Vadim Zeitlin
c7155388f5 Recognize background-color style in wxHtmlWindow.
Just treat it as a synonym for "background" i.e. the same as HTML3 BGCOLOR.

Closes #13173.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:29 +00:00
Vadim Zeitlin
3625820490 Fixes for parsing invalid HTML without tag ends.
The code in wxHtmlParser supposed in many places that a '<' character must be
always followed by a '>' one and could create (and sometimes dereference)
invalid iterators if this wasn't the case resulting in asserts from MSVC debug
CRT and possibly crashes.

Fix this by ensuring that only valid iterators are used and add a trivial unit
test for wxHtmlParser which checks that it can parse invalid HTML without
crashing.

Closes #12869.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:55 +00:00
Vadim Zeitlin
48d8ea6d93 No changes, just remove a level of indentation in wxHtmlTagsCache ctor.
Get rid of characters not starting a tag immediately in the beginning of the
loop instead of putting the entire loop body inside an if statement. This
doesn't change anything (this becomes more apparent if the patch is viewed
with "ignore white space changes" option) except making the code easier to
read and modify.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:44 +00:00
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
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
76de2296f1 fix warning about possible uninitialized variable with VC9 (part of #9803)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-01 14:19:22 +00:00
Vadim Zeitlin
3f6901ad7f don't return junk from wxHtmlTag::GetParamAsInt() if the parameter is not an integer (this resulted in practically infinite loop in table parsing code for bad HTML with incorrect colspan values)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-03 00:39:44 +00:00
Václav Slavík
ad20c567c2 be tolerant of XHTML self-closing tags when parsing the input in wxHTML (patch by kulick@hildensia.de)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-29 15:01:15 +00:00
Václav Slavík
6167969572 fixed wxHTML parser to not assert on invalid HTML input (unclosed tags)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-15 12:13:54 +00:00
Václav Slavík
d9359369af removed wxSTRING_TEXT() macro in favour of wxS()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-02 17:33:31 +00:00
Václav Slavík
614f971389 fixed badly named wxHtmlTag::GetParam() argument: with_quotes, not with_commas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-31 13:48:37 +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
7da48d4928 don't derive wxHtmlTag and wxHtmlTagsCache from wxObject, it's useless
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-22 08:46:01 +00:00
Václav Slavík
4fe7567d90 use wxVector<T> instead of homegrown growing array in wxHtmlTagsCache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-21 16:10:28 +00:00
Václav Slavík
d7640339e9 dont use wxChar* arguments in wxHTML API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-28 17:33:59 +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
Václav Slavík
193d0c9310 PCH-less compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-27 21:32:40 +00:00
Vadim Zeitlin
4609ee2ef8 fix the problem with parsing HTML comments (closes bug 1116708; based on patch 1168583)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-08 21:02:03 +00:00
Václav Slavík
86766dfdad fixed HTML colours parsing after patch #1473731 ('wxColourBase and wxString <-> wxColour implementation') broke it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-23 19:07:15 +00:00
Włodzimierz Skiba
7cf41a5d66 Include wx/colour.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 17:09:39 +00:00
Włodzimierz Skiba
40989e46b8 [ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifications and rebaked build files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-24 14:52:23 +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
Mattia Barbon
dee1a63ff5 Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 15:48:42 +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
7448de8d8d [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:08:42 +00:00
Vadim Zeitlin
10b9be3230 fixed a rare crash due to malformed HTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-16 22:38:46 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Václav Slavík
313ffa19c6 don't crash on unterminated CDATA elements (patch #1117629)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 19:40:03 +00:00
Włodzimierz Skiba
1729813a8d Old API clearly deprecated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-05 19:25:02 +00:00
Włodzimierz Skiba
42841dfcad Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 16:30: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
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
Václav Slavík
e77fbecf59 part of DS' change _was_ corrent, restored
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-11 12:35:24 +00:00
Dimitri Schoolwerth
335d757931 Really fixed Borland release build warning (without sabotaging code this time).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 17:32:04 +00:00
Václav Slavík
b5d464b982 previous DS' change was broken, reverted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 15:49:46 +00:00
Dimitri Schoolwerth
8703bc01c2 Added wxUnusedVar for Borland and fixed 2 release mode warnings for Borland (patch #835707); Slight code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-10 15:17:46 +00:00
Vadim Zeitlin
999836aaca warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:28:15 +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
5447d1b493 GTK2 Unicode build warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-15 20:03:34 +00:00
Václav Slavík
07cc7ddca5 compilation fix for optimizing compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-26 19:29:21 +00:00
Václav Slavík
7c6cd4a86b fixed parsing of CDATA elements (<script> and <style>) (Bill Nalen)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-23 18:59:13 +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
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
Vadim Zeitlin
4f22f506a8 corrected the previous warning fix so that it doesn't break the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-29 10:49:54 +00:00