cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,258 Commits 1 Branch 0 Tags 333 MiB
cbc8576a9b
Commit Graph

53 Commits

Author SHA1 Message Date
Václav Slavík
17473a770a Fix lots of warnings reported by Clang. 
Mostly potentially lossy implicit conversions in headers (long->int). Also dangling else warnings. Struct/class mismatches.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-10 16:41:34 +00:00
Vadim Zeitlin
3f7564f229 Small fixes after wxHtmlTagHandler::GetParser() addition. 
Amend the changes of r73839:

- Don't use covariant return type for wxHtmlWinTagHandler::GetParser() as
  VC6, which we still support, doesn't like it. Besides, this seems
  unnecessary.

- Don't make GetParser() virtual at all as this doesn't appear to be necessary
  neither.

- Add "@since 2.9.5" to the documentation of the new method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-25 09:35:38 +00:00
Robin Dunn
047ea2e26a Add GetParser methods for the tag handlers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-04-24 02:40:02 +00:00
Vadim Zeitlin
754afd1061 Fix warnings about using type attribute on forward declaration. 
This results in many, many warnings in OS X build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-26 13:13:47 +00:00
Vadim Zeitlin
0d7acfb995 Support some CSS styles for the links in wxHTML too. 
Refactor limited CSS styles support for <span> tag to reuse it for <a> tag as
well.

Closes #14599.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-10-07 22:38:56 +00:00
Vadim Zeitlin
f5413b878c Add support for background-color style to span element in wxHTML. 
Add code for setting/restoring background mode and use it to implement support
for changing the text background colour.

Closes #14443.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-09-30 22:20:58 +00:00
Vadim Zeitlin
a0393f9725 Fix handling of spaces after <img> tag in wxHTML. 
Don't collapse the spaces following this tag with the ones preceding it.

See #14557.

Closes #2980.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-09-30 22:20:34 +00:00
Vadim Zeitlin
0199dae316 Fix off by 1 error in wxHTML font size from points calculation. 
m_FontSize is in 1..7 range, not 0..6, so add 1 to it when setting it from the
index into m_FontsSizes array.

Also update the comment explaining the valid range of m_FontsSize.

Closes #14442.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-28 11:58:55 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files. 
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-20 00:14:35 +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
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
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
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
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +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
Václav Slavík
47b378bd88 removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-14 09:58:37 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-05 20:47:48 +00:00
Václav Slavík
968d6f46c8 added comment explaining how to replace calls to deprecated method 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-21 20:47:48 +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
6fb99eb3b7 Semicolon fixes according to Vadim's note about being danger (OW,BCC,MinGW,DMC tested). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-13 14:04:19 +00:00
Włodzimierz Skiba
6953da0088 Source cleaning: whitespaces, tabs, -1/wxID_ANY, TRUE/true, FALSE/false. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-27 19:06:39 +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
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
Václav Slavík
1202890513 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:38:21 +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
8ba2f3ec94 don't break lines in the middle of word 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-15 18:28:21 +00:00
Václav Slavík
6acba9a719 fixes for moving wxHTML files into their own DLL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-04 13:04:05 +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
Vadim Zeitlin
22f3361e1c use DECLARE_NO_COPY_CLASS() where applicable (patch 633384) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-02 23:38:11 +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
Gilles Depeyrot
af49c4b8a2 disable use of #pragma interface under Mac OS X 
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-31 11:29:13 +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
Kendall Bennett
19193a2c85 Mutiple updates from SciTech for wxWindows including the following: 
1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-10-17 22:25:56 +00:00
Václav Slavík
6c62a62bf7 new wxHtmlParser core 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-07-19 22:30:22 +00:00
Václav Slavík
9749497156 cleanup and reformatting to match indentation style of the rest of wx 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-29 17:57:59 +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
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
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
846914d18d wxHtmlWindow::OnLinkClicked and wxHtmlCell::Get/SetLink and wxHtmlWinParser::GetSetLink now work with wxHtmlLinkInfo instead of wxString (making it ready for frames) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-23 21:12:23 +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