Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,801 Commits 1 Branch 330 Tags
d45bc436954b74745c2f33fdd32b8e813f23431d
Commit Graph

66 Commits

Author SHA1 Message Date
Robert Roebling
d45bc43695 Set the focus to the html display window 
if the help frame comes to the front.
    With this, you can use context sensitive
    help systems without the mouse.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-05-25 09:40:17 +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
Václav Slavík
90d0ab3443 no need to expand the hidden root (in fact, it is forbidden now) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-04-23 22:03:53 +00:00
Václav Slavík
f435c1f030 added wxArtProvider 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-21 23:39:57 +00:00
Václav Slavík
33f71b3cf4 fix HTML browser setup dialog under MSW and make the 'OK' button default 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-17 00:53:17 +00:00
Václav Slavík
e095264892 hide tree root on wxMSW in wxHtmlHelpController 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-16 19:35:47 +00:00
Václav Slavík
00251d9bf7 fixed bug in wxHtmlHelpFrame: didn't show HTML window when navigation panel was off 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-03-08 23:43:11 +00:00
Václav Slavík
5229b11d2c rewrote wxHtmlHelpFrame using sizers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-11 23:47:43 +00:00
Václav Slavík
d65552318c use sunken border for wxHtmlHelpController's font preview 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-10 19:07:57 +00:00
Vadim Zeitlin
295272bdcd more Sun C++ compiler warning fixes: in particular, added an ugly but 
necessary workaround for avoiding warning in the .xpm files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-11 19:33:37 +00:00
Václav Slavík
c7c72b4192 fix for root behavior under MSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-05 23:26:51 +00:00
Václav Slavík
96873b794c use wxTR_HIDE_ROOT in wxHtmlHelpFrame 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-31 00:46:31 +00:00
Robert Roebling
2593f03384 Changed wxTreeCtrl to look Mac-like under Mac 
automatically.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-10 11:21:28 +00:00
Robert Roebling
618a5e382a Applied Greg's patch to tree control and related. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-08-18 13:09:26 +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
Julian Smart
9806a47c30 Various wxMotif fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-07-09 13:14:28 +00:00
Vadim Zeitlin
3379ed3789 tons of fixes for wxGTK/Univ - seems to work, more or less, now 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-07-03 19:38:19 +00:00
Vadim Zeitlin
07b8d7ecc3 1. fixed wxGTK notebook which was completely broken by the merge 
2. added a new file for commno notebook code (nbkbase.cpp)
3. removed 'include "wx/wx.h"' from html files as I got tired of
   recompiling them


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-07-02 18:34:13 +00:00
Václav Slavík
0c55409f3a fixed typo that caused incorrect if there was only one book 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-05-06 22:21:18 +00:00
Václav Slavík
576507e276 added new wxHF_xxxx contants to control wxHtmlHelpFrame's appearance (book icons in contents) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-05-05 18:05:57 +00:00
Kendall Bennett
33ac7e6f01 Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles 
clean with this compiler. Hopefully I did this without breaking other
compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-05-02 19:48:15 +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
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
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
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
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
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
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
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
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
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
ae80f83724 moved bookmarks to Contents panel 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-23 21:47:51 +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
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
3e5296e75d removed some forgotted wxLogDebug calls 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-17 17:19:08 +00:00
Václav Slavík
2686e01b0b search progress bar has smooth gauge under win95 now 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-16 22:55:25 +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
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
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
7618e37465 #ifdef wxUSE_TOOLTIPS around tooltips 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-21 20:27:38 +00:00
Václav Slavík
74cfc36921 stupid typo in wxHTML help options dlg - did not display fixed fonts correctly in preview 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-21 11:17:11 +00:00
Robert Roebling
6f67eafe67 Minor optical changes to toolbar and the help frame's 
options dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-20 20:16:37 +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
6bfd5671b0 removed platform specific #ifdefs around wxComboBox 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-10 21:46:00 +00:00
Robert Roebling
00655497da Minor optical changes to toolbar and wxHelpFrame. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-07 14:54:32 +00:00
Robert Roebling
d984207cc3 Patch for stream.cpp for non-flushable stream, 
Corrected stream corruption for Umgetch()/SeekI() conflict,
  Docs for streams,
  Changed interpreteation og non-standard height in wxCombo,
  Other minor changes,
  Removed library name setting for Debian again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-12-06 16:16:14 +00:00