Commit Graph

14 Commits

Author SHA1 Message Date
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
Julian Smart
673dfcfac1 Added DisplayTextPopup to wxHtmlHelpController; fixed refresh bugs in
generic wxListCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-02 15:16:16 +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
b4414c1f37 wxHtmlHelpController made compatible with other controllers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-09 20:05:52 +00:00
Václav Slavík
721ab90538 inline functions with if moved to .cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-27 00:02:44 +00:00
Václav Slavík
b854b7b82e it is now possible to add custom buttons into wxHtmlHelpFrame's toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-19 01:01:08 +00:00
Václav Slavík
052e12db71 removed show_progress argument in some private functions -- was never used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-17 22:12:25 +00:00
Václav Slavík
566bc3285e fixed bug: UseConfig didn't call wxHtmlHelpFrame::OnConfig
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-17 17:19:14 +00:00
Vadim Zeitlin
64d8470859 keyword search should work now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-08 13:59:39 +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
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
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
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