Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,303 Commits 1 Branch 330 Tags
963a1fcd6e013eef52bf87ed99e19d9ab49563ef
Commit Graph

196 Commits

Author SHA1 Message Date
Julian Smart
963a1fcd6e Minor mods 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-26 10:17:58 +00:00
George Tasker
a0b1b91fe6 Fixed BCC compilation warning if wxUSE_HELP was 1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-26 01:12:48 +00:00
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
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
2fa3b70778 wxHTML: fixed bug in tables rendering when rowspan was used 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-03-18 23:34:17 +00:00
Václav Slavík
b076dc01d2 fixed parsing of tags with whitespace around = sign 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-03-09 23:40:36 +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
Václav Slavík
6c5b628eee applied patch #103817 to both branches (HTML printing typo in margins code) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-02-16 18:17:38 +00:00
Julian Smart
7a5e62674f Fixed some warnings (don't know why dialoged Makefile is being committed) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-02-06 14:23:44 +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
b5c01940ac Bitmaps are no longer rescaled to reflect printerPPI/screenPPI ratio. Instead, we change user scale before drawing them and then restore it back. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-01-17 00:31:58 +00:00
David Webster
da4cc40ce0 For some reason VA needs a default ctor for wxHtmlHelpTreeItemData for helpfrm to compile under VA 4.0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-11-15 16:54:08 +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
Václav Slavík
1da7aa8c4a fixed <li><p> paragraph break problem 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-11-05 14:59:08 +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
15db3cf513 fixed bug in parsing incomplete HTML when the very last tag was not closed with > 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-10-06 20:22:26 +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
Václav Slavík
bbda1088f7 fixed bug in wxHtmlWindow: HistoryBack/Forward now correctly preserves last entry's scrolled position 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-09-26 21:54:29 +00:00
Václav Slavík
99397a94d0 yet another fix in wxHtmlParser::DoParsing 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-09-08 22:02:46 +00:00
Václav Slavík
19bcc6049d fixed bug in parsing html strings longer than 1024 chars than does not contain tags 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-09-07 20:55:06 +00:00
Bryan Petty
3ca6a5f046 second merge of the 2.2 branch (RL) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-08-08 06:11:51 +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
Václav Slavík
e81910e077 fixed incorrect use of _() where it should be wxT() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-11 19:31:33 +00:00
Václav Slavík
f5ba273ecd some != NULL checks 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-11 19:31:19 +00:00
Václav Slavík
77611ad4da fixed typo : _ instead of wxT 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-11 10:05:02 +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
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
Vadim Zeitlin
0e8c82331d don't translate wxASSERT_MSG messages 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-09 16:33:49 +00:00
Julian Smart
68be9f090f Added wxDragImage generic implementation and sample; added mask handling to Motif's 
wxImage::ConvertToBitmap


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-01 11:05:49 +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
956ddeca4a fixed divide by zero exception when layouting justified text 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-22 20:09:27 +00:00
Václav Slavík
c1e5e88134 fixed inaccurancy in container layouting with wxHTML_ALIGN_JUSTIFY 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-17 17:09:11 +00:00
Václav Slavík
418d9d6275 fixed typo bug in my last commit that caused image size (-1,-1) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-15 22:07:51 +00:00
Václav Slavík
37a1f3f69b fixed bug in scaling images 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-11 12:08:23 +00:00
Julian Smart
658fb8e6c5 VC++ changes + makeproj additions 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-05 16:09:10 +00:00
Václav Slavík
d13b68d233 fixed bug that caused assertion failure when printing HTML with images 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-02 21:18:31 +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
70aedad68f fixed memory leak (m_PagesHash not deleted) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-29 01:13:12 +00:00
Václav Slavík
34153050fe switched back to old use of DrawBitmap for transparent bitmaps 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-29 01:13:03 +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
fc7dfaf8ee some scrolling&refreshing fixed ; removed wxHtmlWindow::OnKeyDown 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-27 00:02:25 +00:00
Václav Slavík
c5d22514ae yet another help browser visual enhancement 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-27 00:02:10 +00:00
Václav Slavík
096824d758 sets frame title even for pages without <title> tag 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-26 00:50:05 +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
bd00574fd3 added more navigation controls to wxHtmlHelpFrame 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-26 00:49:40 +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
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
Julian Smart
6b82d89473 Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp 
or get assert in DoBlit


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-24 12:24:57 +00:00