Commit Graph

79 Commits

Author SHA1 Message Date
Robert Roebling
5a969262e1 #
Compile without fontmapper.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-06 11:52:05 +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
Václav Slavík
7fbe5489ad fixed crash on invalid data (patch 1039453)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-03 16:31:58 +00:00
Julian Smart
3444e4a8f9 Fixed case sensitivity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-29 17:53: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
91fa114d88 implemented nested index entries and index entries pointing to multiple documents in wxHtmlHelpController; modified wxHtmlHelpData API to make it possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-28 21:45:30 +00:00
Václav Slavík
67c276bdb6 more fixes to HTML entities parsing when loading .hhk and .hhc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-27 19:40:20 +00:00
Václav Slavík
3912b3f8f7 fixes to charset conversion when loading non-Latin1 helpbooks; use wxString instead of wxChar* in data structures
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-27 13:09:18 +00:00
Dimitri Schoolwerth
0b4f47a319 partially applied patch #895170: "Building with minimal setup.h - continuation"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-30 15:14:41 +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
Vadim Zeitlin
a509f83054 VC++ release mode warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-12 01:46:17 +00:00
Václav Slavík
3527f29c87 added .chm support for Unix (Markus Sinner)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-07 20:15:27 +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
Vadim Zeitlin
e2b87f38d9 allow compilation with wxUSE_DATETIME == 0 (patch 679822)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-06 00:53:46 +00:00
Václav Slavík
d1a9c82bd1 fixed ANSI/Unicode incompatibility of the cache (bug 663396)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-08 19:44:53 +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
Václav Slavík
fcf77487ed added wxHtmlHelpController::AddBook(wxFileName)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-08 20:30:42 +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
Robert Roebling
401eb3dec2 Lots of Unix/Unicode compile fixes, some of which
are just #ifdef 0 such as the wxExecute calls
    in gdcps.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-05 18:04:08 +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
Mattia Barbon
1a1dac18e3 Fixed Unicode breakage I caused
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-01 08:57:51 +00:00
Václav Slavík
ae7f6528ed gcc3 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-23 22:03:22 +00:00
Mattia Barbon
eb37e1d2f3 Removed the need for wxStream::GetSize in wxHTML.
Ascape '&' in text/plain.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-21 17:36:16 +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
5ecdcaa78f rewrote Chris' fix properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-07 21:45:03 +00:00
Julian Smart
fc7995487f Applied patch for Forty, print patch and wxHTML book patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-06 17:50:52 +00:00
Václav Slavík
4fd5055c0d fixed .cached files on big endian machines and cleaned the code up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-23 00:13:27 +00:00
Václav Slavík
3dde6c7293 case insensitive HHP files and fixed buffer overflow vulnerability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-15 16:20:25 +00:00
Vadim Zeitlin
903506828b fixes for the compilation warnings with Sun CC:
1. some fixes for "String literal to char * conversion" warnings (many
   more left in the *.xpm files)
2. fixes for "assignment of function to extern "C" function"
3. a few other miscellaneous ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-09 12:49:12 +00:00
Václav Slavík
25fd9bdfca case-insensitive sort of HTML help index
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-19 23:54:12 +00:00
Robert Roebling
b2d1bc21c5 Small patch for HTML help under Drawin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-15 15:49:12 +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
Robert Roebling
53e46b61bb Fix HTML help on Mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 14:26:27 +00:00
Robert Roebling
057b55b016 AddBook ignores wxMac paths (still won't work)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 11:29:26 +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
8bd72d9065 added convenience accessors to wxHtmlTag and modified wxHTML code to use them; improved colours parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 18:07:33 +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
Václav Slavík
c3d62ecf55 fixed bug #429351 (compilation broken in CJK environment (whatever it is) in 'agrave' definition)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-01 21:47:27 +00:00
Václav Slavík
8bc25b29f1 fixed à parsing (here too)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-18 22:13:30 +00:00
Julian Smart
66242f2079 Added a couple more numeric character references
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-10 14:51:22 +00:00
Václav Slavík
00a693ed2f removed now obsoleted commented-out piece of code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-08 22:25:33 +00:00
Julian Smart
e96360efd9 Misc small mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-07 09:57:45 +00:00
Václav Slavík
daa084c239 reverted the hack for accepting broken HHC files (new wxHF_xxxx flags provide same features)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-05 18:06:05 +00:00
Václav Slavík
468ae730db changed wxAddBasePath to wxHtmlCotentsItem's method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 22:14:02 +00:00
Julian Smart
71d04f7ffd Added showing the default URL in DisplayContents and DisplayIndex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 15:04:57 +00:00
Václav Slavík
891000d61b removed duplicities in HTML entities tables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 22:37:27 +00:00
Julian Smart
0bbfe845ed Added support for more special characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 14:55:37 +00:00
Julian Smart
7df9fbc3f1 Fix/hack 1.
========

At present, if you wish to load a .hhc file instead of add books manually, you can only have one book - UNLESS you omit the outer <ul> </ul>. Then the contents will appear to have more than book, although in fact it's just one book that's displayed on level zero and therefore get the Book icons.

However, you'll also get a dummy 'book' with the name of the project but no children. So my hack detects whether the .hhc file is trying to add books at level zero, and if so, throws away the first 'book', so that only the hhc-specified books get shown.

So the end result is that our hhc file can specify multiple sections that don't all hang off one dummy book node which itself hangs off the root node -- which is a UI pain!

Fix 2.
====

I changed  the test

        if (!m_Page.IsEmpty())

to

        if (tag.GetParam("TYPE") == "text/sitemap")

at around L.120 of helpdata.cpp as suggested in the comment, so we don't have to specify a URL for the node to be valid. Sometimes you don't want a URL in a contents item. I've added some tests to stop it complaining if you click on a URL-less item.

Feature enhancement/Hack 3.
======================

I've added wxHtmlHelpController::SetBookBasePath so that the .hhp/.hhc files don't have to be in the same hierarchy as the HTML files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 16:17:15 +00:00