Commit Graph

61 Commits

Author SHA1 Message Date
Robert Roebling
5f79bebb29 More wxT() macros.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-11-03 16:19:32 +00:00
Václav Slavík
acc4028ecd fix binary incompatiblities in wxHtmlHelpController's cached data bytestream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-10-15 22:46:25 +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
Václav Slavík
93f30ee67a fixed bug #129464 (hopefully)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-20 19:50:05 +00:00
Václav Slavík
04b833fb81 applied pseudo-patch #103306
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 00:17:37 +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
Julian Smart
5da69e38e6 Help sample should work for .zip help files now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 23:41:57 +00:00
Julian Smart
dc1efb1d9f Some Motif fixes; makefile fixes; added wxTransferStreamToFile/FileToStream for wxWin
streams; fixed wxSP_... ids that clashed with wxTextCtrl; added generic GetPixel implementation for GTK/Motif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-24 15:04:24 +00:00
Václav Slavík
29e6059738 some fixes in names of cached helpbooks (does not contain # or : anymore)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-26 00:49:52 +00:00
Václav Slavík
b19d5e569e fixed false error report with helpfiles without index
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-24 15:38:42 +00:00
Václav Slavík
f3c8285953 added wxLogError/Warning into wxHTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-23 21:47:41 +00:00
Václav Slavík
f890e2d474 added encoding support to help contents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-19 23:05:31 +00:00
Václav Slavík
f35822af10 .cached format of help books is now endian-independent; also changed lookup logic for .cached files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-19 00:59:27 +00:00
Václav Slavík
b5a7b00057 help search is much faster now (7 times! that's what I call optimization ;-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-17 22:11:44 +00:00
Václav Slavík
c497114770 added case sensitive and whole words only search
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-16 15:53:25 +00:00
Václav Slavík
4157f43f4b fixed my previous commit that broke help context/index parser :-(
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-15 16:40:33 +00:00
Václav Slavík
50494a55ae removed a condition (l. 124) that always eval to true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-14 21:40:56 +00:00
Ove Kaaven
0413cec527 Unicode compilation fixes for BC++ 5
(BC++ 5 mostly doesn't cope with the wxString == char* operation)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-03 18:58:57 +00:00
Václav Slavík
6836465999 more wxHtmlHelpFrame fixes (didn't store customization correctly, still needs some fixing, will do asap)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-31 22:03:50 +00:00
Ove Kaaven
66a77a748e Well, wxHTML compiles in Unicode mode now. But if it works (without
further changes), it shall be considered proof that there is such a
thing as a divine intervention.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-29 03:10:22 +00:00