Commit Graph

44 Commits

Author SHA1 Message Date
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
eae48ea12d Make wxHelpControllerBase::SetFrameParameters() title more clear.
Describe it as "title format string" and call it "titleFormat" and not just
"title" because this is what it is.

Closes #14707.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-28 23:48:57 +00:00
Robin Dunn
895c1bc001 Add a ctor that is compatible with the documented wxHelpController API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-07 04:18:11 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00
Vadim Zeitlin
bd45b3e176 Add wxHtmlHelpController::SetShouldPreventAppExit().
Add a method which can be used to indicate that the help window should prevent
the application from exiting and use it in the help sample to prevent it from
closing prematurely.

Closes #13046.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 09:16:14 +00:00
Vadim Zeitlin
b42468496c Compilation fixes in wxHTML for wxUSE_CONFIG==0.
Surround uses of wxConfig with #of wxUSE_CONFIG in wxHTML code.

Closes #11750.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-25 00:03:30 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-09 10:09:52 +00:00
Julian Smart
3ac95ecd61 Corrected accessor names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 09:08:31 +00:00
Julian Smart
f3e156efb0 Renamed helpwin.h/cpp to helpwnd.h/cpp to avoid clash
Added back GetFrame/GetDialog for compatibility and consistency


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 08:59:17 +00:00
Julian Smart
3755cfa64d Moved wxHtmlHelpFrame functionality to wxHtmlHelpWindow to allow
for embedded and modal help


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 13:42:57 +00:00
Julian Smart
3db5226517 Added parent window parameter to wxHelpController constructor
and added SetParentWindow/GetParentWindow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 09:32:10 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
6fb99eb3b7 Semicolon fixes according to Vadim's note about being danger (OW,BCC,MinGW,DMC tested).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 14:04:19 +00:00
Włodzimierz Skiba
6953da0088 Source cleaning: whitespaces, tabs, -1/wxID_ANY, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 19:06:39 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Václav Slavík
69b5cec2b0 applied Otto Wyss' patch to extend wxHelpController::KeywordSearch with mode argument (modified to the point of reimplementation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 17:29:11 +00:00
Václav Slavík
1202890513 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:38:21 +00:00
Václav Slavík
6acba9a719 fixes for moving wxHTML files into their own DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 13:04:05 +00:00
Vadim Zeitlin
22f3361e1c use DECLARE_NO_COPY_CLASS() where applicable (patch 633384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:38:11 +00:00
Václav Slavík
f3d3a0e751 forgot to add wxHtmlHelpController::AddBook(wxFileName) to the headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 21:05:56 +00:00
Julian Smart
5c6bd4a957 Added missing AddBook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 09:15:22 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Gilles Depeyrot
af49c4b8a2 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-31 11:29:13 +00:00
Julian Smart
5152b0e59a Added AddGrab, RemoveGrab, IsGrabbed to wxTopLevelWindowGTK
and AddGrabIfNeeded to wxHtmlHelpController, to assist with
showing the help window from a modal dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-18 21:46:42 +00:00
Vadim Zeitlin
3abf2c720b fixed ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 01:27:19 +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
Václav Slavík
219a5f10c0 added wxHtmlHelpController::GetHelpData and removed SetBookBasePath (you can use GetHelpData() for same effect)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-04 23:52:46 +00:00
Václav Slavík
9749497156 cleanup and reformatting to match indentation style of the rest of wx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 17:57:59 +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
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