cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,307 Commits 1 Branch 0 Tags 333 MiB
6d56eb5c56
Commit Graph

95 Commits

Author SHA1 Message Date
Václav Slavík
1309ba6c7e implemented (more) correct <pre> handling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-24 22:05:19 +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
Gilles Depeyrot
214b7e74f0 correction for Mac OS X 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-13 09:59:47 +00:00
Gilles Depeyrot
5fde6fcc9b corrections for final release of Mac OS X 
applied patches proposed by Mark Newsam


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-01 20:42:05 +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
Vadim Zeitlin
97ffd370f4 applied patch 403956 (gcc warning fix) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-02-26 10:03:12 +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
Julian Smart
43b06bf976 Fixed memory bug 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-10-18 17:00:01 +00:00
Václav Slavík
1b113a811d added wxHtmlWindow::HistoryCanBack/Forward 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-10-10 22:07:16 +00:00
Václav Slavík
8fd2b35cbe modified wxHtmlHelpFrame to use AssignImageList 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-09-28 22:18:47 +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
Stefan Neis
f5b9cde232 Fixed apparent typo (int->wxWindowID) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-05 18:46:27 +00:00
Václav Slavík
66806a0bf0 fixing memory leaks & mem tracing false alerts 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-02 21:17:25 +00:00
Václav Slavík
5b315dd000 minor visual enhancement of help browser 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-27 00:03:38 +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
69626ba928 removed wxHtmlWindow::OnKeyDown 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-27 00:02:17 +00:00
Václav Slavík
625e60c9d2 wxHtmlHelpFrame enhancements 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-26 00:50:43 +00:00
Václav Slavík
5656c6ef36 added wxHtmlWindow::GetOpenedAnchor 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-26 00:50:29 +00:00
Václav Slavík
0646614dad added more navigation controls to html help frame 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-26 00:49:30 +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
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
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
0b75b49b60 m_LastPage changed to wxChar*, forgot to commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-18 09:36:10 +00:00
Václav Slavík
8eda3cb854 added wxHTML_ALIGN_JUSTIFY 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-18 09:17:58 +00:00
Václav Slavík
5c1bfc5da0 added align=justify support ; also removed relic: GetMaxLineWidth 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-18 09:17:46 +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
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
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
240c2873da index search is case insensitive now; index panel indicates number of displayed items 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-16 00:32:13 +00:00
Václav Slavík
60e87cb1fb optimized wxHtmlContainerCell - now proceeds layouting only when neccessary (will speed-up window resizing of pages with many constant-width tables) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-14 21:41:17 +00:00
Václav Slavík
9bc8fded1b added wxHtmlLinkInfo::GetHtmlCell so that you know where it came from 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-12 08:27:07 +00:00
Václav Slavík
1be096c9f9 added mouse event member into wxHtmlLinkInfo. wxHtmlWindow::OnLinkClicked now takes const wxHtmlLinkInfo& argument and wxHtmlCell::OnMouseClicked takes wxMouseEvent instead of three bools 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-11 23:30:02 +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
Ove Kaaven
ef8b2d9165 Better make it a const reference then. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-03 20:00:44 +00:00
Ove Kaaven
571f8dae5e Make wxColour parameter be passed by reference to inline method, 
so it can be inlined by BC++.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-03 19:57:59 +00:00
Robin Dunn
ffef2bdec9 Added some WXDLLEXPORTs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-28 21:10:49 +00:00
Václav Slavík
599a97e9ab removed wxHtmlParser::GetTempData (internal function, obsoleted) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-24 23:27:46 +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
Václav Slavík
921d0fb195 wxHtmlFontCell now has member wxFont m_Font instead of wxFont* m_Font (preparation for <font face> support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-23 18:14:17 +00:00
Václav Slavík
f0b6a33f4c HTML help: index panel now displays only part of index matching given substring (similar to search panel; ==> 1) faster startup 2) no more problems with incomplete index due to GTK+ limitations). Intelligent behaviour: displays indexes with size <= 100 items in full (= matching empty substring) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-20 12:49:35 +00:00
Václav Slavík
89de9af3cb fixed wxHtmlWindow flicker 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-15 22:39:02 +00:00
Václav Slavík
edbd0635f2 new wxHTML printing code ; parser now supports scaling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-11 21:50:44 +00:00
Václav Slavík
fd72e0b5e2 added bookmarks support (strange thing : red color in wbkdel.bmp is somehow misinterpreted by either wxBitmap or win32 libs and is not displayed correctly :-(( 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-05 19:38:19 +00:00
Václav Slavík
382e6efee4 added bookmarks support 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-05 19:36:20 +00:00
Václav Slavík
d5db80c269 SetTitle method (internal use only) changed to virtual OnSetTitle, added GetOpenedPageTitle 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-28 18:24:57 +00:00
Václav Slavík
83efdf3393 added setup dialog, changed icons names (prefixed with w) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-28 18:19:28 +00:00