Commit Graph

85 Commits

Author SHA1 Message Date
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
Václav Slavík
d6a1e531a3 wxHTML icons are now prefixed with w so that it does not conflict with app's icon under MSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-28 18:09:16 +00:00
Václav Slavík
5c172c1788 html help : added '?' icon to root node of contents panel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-06 15:40:35 +00:00
Václav Slavík
7512153245 better-looking icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-06 13:38:22 +00:00
Julian Smart
9ffdee8074 Added some makefiles to HTML samples; added help.ico for wxHTML;
make richedit sample compile (but without clipboard ops)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-01 11:27:38 +00:00
Václav Slavík
6836465999 more wxHtmlHelpFrame fixes (didn't store customization correctly, still needs some fixing, will do asap)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-31 22:03:50 +00:00
Václav Slavík
2a0eb92258 fixed bug that caused assertion failure during HTML printing under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-30 21:36:48 +00:00
Ove Kaaven
0e36104428 Well, can't hurt to do some char -> wxChar, though wxHTML may not work
in Unicode mode quite yet...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-29 02:14:51 +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
Václav Slavík
a7a4d01bdb added wxHtmlParser::{Push|Pop}TagHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-27 23:25:45 +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