Commit Graph

85 Commits

Author SHA1 Message Date
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
Václav Slavík
d5bb85a0a4 cleaned Harm's new wxHTML help code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-27 23:26:24 +00:00
Julian Smart
af111fc338 Removed lots of wxMotif compile warnings. Copied new install.txt into old
install.txt (wxMotif).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-26 13:33:13 +00:00
David Webster
16a12a3d27 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-25 20:03:39 +00:00
Václav Slavík
efba2b89f1 HTML_xxxx constants changed to wxHTML_xxxx (with backward compatibility through WXWIN_COMPATIBILITY_2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-17 20:52:29 +00:00
Vadim Zeitlin
9b64e79868 some fixes after global _T() => T() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-07 14:07:48 +00:00
Vadim Zeitlin
e90c1d2a19 many changes; major ones:
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-04 20:15:38 +00:00
Robert Roebling
9b7e522ae9 Applied a few old patches,
Changed dclick handling in wxFileDialog,
  Added cursor code to wxToolBar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-04 09:03:48 +00:00
Václav Slavík
69941f0586 making wxHTML 8.3 compliant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-02 18:19:46 +00:00
Vadim Zeitlin
0c5d3e1ccd 1. added a brief overview of Unicode support
2. added and documented wxBITMAP() macros (as wxICON)
3. restructured wxFont class, added support of encoding parameter
4. regenerated makefiles to compile the new fontcmn.cpp file
5. corrected bug with non existing files in document-view history


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-29 19:02:07 +00:00
Robin Dunn
f42b1601d6 Fixed some compile errors (MSVC++ 6) and some very strange link errors when
building a DLL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-13 05:27:36 +00:00
Harco de Hilster
8ec2b48446 New HTML help system. The old controller class has been split in
three parts; basic data, a frame and a controller. Docs will appear
shortly...

All Makefiles should be correctly updated. To be sure, I put an
#error pragma in the old files, which will be removed in a few days.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-12 17:45:34 +00:00