Commit Graph

310 Commits

Author SHA1 Message Date
Vadim Zeitlin
91a7f3b04d remove unnecessary (and provoking a warning under IRIX) const qualifier on the return value of a function returning bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-22 21:40:17 +00:00
Dimitri Schoolwerth
dabbc6a5a1 removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-12 23:44:08 +00:00
Kevin Ollivier
5b8f917c30 Making wxUSE_WEBKIT for optionally building wxWebKitCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-04 16:07:28 +00:00
Kevin Ollivier
14f21d6d89 Fixes for wxWebKitCtrl to work with wxNotebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-01 02:53:49 +00:00
Kevin Ollivier
005198fa7d wxWebKit now properly updates after a resize event.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 05:54:28 +00:00
Robin Dunn
3ca7ba7403 Use correct #if for interface/implementation pragma.
detabified


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-24 21:50:00 +00:00
Kevin Ollivier
7eb8c6ee3e Fixes for Unicode build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-24 21:00:07 +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
Włodzimierz Skiba
d53c798cf9 TRUE->true, FALSE->false replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-19 09:39:44 +00:00
Kevin Ollivier
2c990ba6d4 Initial import of wxWebKitCtrl sources and htmlctrl (right now wxWebKit) sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-19 02:20:53 +00:00
Václav Slavík
ca16b7a98e improved HTML tables layout code (patch 911377)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-17 20:47:31 +00:00
Robin Dunn
cc0bffaceb Changed CanApplyParentThemeBackground to ApplyParentThemeBackground
and let the windows set the the background colour themselves (or not)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-05 05:28:21 +00:00
Robin Dunn
bd507486e0 Added CanApplyParentThemeBackground and use it in wxMSW's
wxNotebook::ApplyThemeBackground.  It's in the common base classes so
that someday it's usage can expand to the other platforms as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-04 17:03:55 +00:00
Václav Slavík
632783de61 create wxPrintData instance on demand
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-23 22:38:30 +00:00
Vadim Zeitlin
1562206871 use static_cast<> in event table macros for type safety (patch 843206)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-10 23:46:28 +00:00
Václav Slavík
9ea7b86fc8 prefix symbols with wx, for smaller risk of collision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-01 10:48:30 +00:00
Mattia Barbon
4f44ea367d Add wxRTTI information.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-17 22:16:56 +00:00
Vadim Zeitlin
4bdce112bf resolved conflict (because I forgot to commit before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 20:01:54 +00:00
Dimitri Schoolwerth
5de65c6930 Declaration of CopySelection is bool instead of void.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 19:57:34 +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
5d9d22fe08 accept focus, keyboard can be used for navigation (patch 798098)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-01 20:59:57 +00:00
Václav Slavík
a3bf7524f3 removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:50:53 +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
3d1f191965 reverted two last changes; they both broke compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 19:30:30 +00:00
Václav Slavík
61d457caae compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-03 17:14:39 +00:00
Julian Smart
d2b354f9c9 Printing improvements: GetPageInfo() gets called after the DC has
been set and after OnPreparePrinting() has been called so it can
report the number of pages accurately; doesn't try to set
number of pages in print dialog, in common with other Windows apps;
wxHTML easy printing's preview shows number of pages
correctly; preview scrollbars are set correctly; keyboard navigation
improved


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 20:30:19 +00:00
Vadim Zeitlin
fc7a2a602b undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-22 00:24:07 +00:00
Vadim Zeitlin
46674ada08 reduced compilation dependencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 21:01:58 +00:00
Václav Slavík
ace0fab4f1 remove extra space at top and bottom of the page if present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-17 12:11:10 +00:00
Václav Slavík
67158ef673 removed GetHorizontalConstraints -- no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-16 13:04:37 +00:00
Václav Slavík
8ba2f3ec94 don't break lines in the middle of word
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:28:21 +00:00
Julian Smart
5180055b69 OnIdle -> OnInternalIdle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 17:15:09 +00:00
Mattia Barbon
360b63dd32 Morec ompilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 21:58:01 +00:00
Václav Slavík
b87dd6f51e much better looking selection of justified paragraphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-08 18:44:34 +00:00
Julian Smart
fa10c70ceb Added wxHtmlPrintout::AddFilter so the same filters used for
viewing HTML can be used for printing it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-06 17:52:42 +00:00
Václav Slavík
4460b6c48b fixed compilation of multilib dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-04 18:18:11 +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
d659d703ef made CopySelection() always available (otherwise it wouldn't compile when wxUSE_CLIPBOARD == 0); copy double/triple clicked selection to primary X11 clipboard under Unix as well; minor code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-11 11:34:44 +00:00
Václav Slavík
77bae5e228 use 'I' cursor when over text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-07 23:31:21 +00:00
Václav Slavík
0994d9683e added line selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-05 20:30:56 +00:00
Václav Slavík
31eefb998d doubleclick selects word
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 21:42:34 +00:00
Václav Slavík
1338c59a02 added selecting-while-dragging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-04 18:17:04 +00:00
Václav Slavík
a99798d20c (hopefully) finished subcell selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 23:07:52 +00:00
Václav Slavík
ed9d5d17e1 new rendering customization API for Vadim
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 21:22:08 +00:00
Václav Slavík
169ee861bd subcell selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 13:56:43 +00:00
Vadim Zeitlin
c9c61efbdd compilation warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 23:03:56 +00:00
Václav Slavík
61233023a0 added copying selection to clipboard; fixes to selection making
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-02 20:14:31 +00:00
Václav Slavík
adf2eb2d34 more work on text selection: selecting should work now, but there's no clipboard interaction yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 22:19:15 +00:00
Václav Slavík
6fac75c355 added default ctor and SetSelection to wxHtmlRenderingState
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 13:28:09 +00:00
Vadim Zeitlin
7d96264c68 added consts needed by VC++/BC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 10:25:23 +00:00
Václav Slavík
31d8b4ad24 react on mouse up, not mouse down
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-01 00:10:06 +00:00
Václav Slavík
f65a786ffd preparing wxHtmlWindow for text selection (highlighting works, mouse input and clipboard does not)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-31 21:42:13 +00:00
Julian Smart
a5ae8241de Allow printing objects to be passed a wxWindow, not a wxFrame
(vestigial remains of older wxWin version)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-26 09:55:28 +00:00
Václav Slavík
f2034f1b6e applied HTML pagebreaks patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-12 22:33:51 +00:00
Václav Slavík
4eecf1150d applied patch adding SetFonts to wxHTML printing classes and allowing NULL sizes list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-16 20:30:26 +00:00
Václav Slavík
903972f999 added wxHtmlWindow::LoadFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 23:20:00 +00:00
Václav Slavík
4aa3178674 why the heck should something that reacts on wxID_CLOSE be called OnQuit?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-18 00:03:59 +00:00
Julian Smart
d9b21c9f47 ReDOS-ified project files
Added menubar for wxHTML help viewer on Mac
Added some Mac-specific code for HelpView


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-16 12:26:09 +00:00
Vadim Zeitlin
00e7a427a0 compilation fixes after applying DECLARE_NO_COPY_CLASS() patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 23:46:08 +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
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
35b038b17e wxHtmlBookRecords needs not be wxObject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-16 23:02:24 +00:00
Václav Slavík
8f25531f6f deleted no longer needed resource files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 23:44:38 +00:00
Václav Slavík
07e252a547 root is always hidden -> no icon needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 23:40:28 +00:00
Václav Slavík
5ecdcaa78f rewrote Chris' fix properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-07 21:45:03 +00:00
Julian Smart
1b21409b36 Corrections in light of recent toolbar and other changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-07 18:48:03 +00:00
Julian Smart
fc7995487f Applied patch for Forty, print patch and wxHTML book patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-06 17:50:52 +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
Kendall Bennett
574c939ef1 Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes
this event gets triggered. I don't know what should happen with other OS's
since I am not familiar with how they handle mode changes.

Watcome Version 11 now compiles with wide character support.

Fixed watcom warnings in
	html/htmlwin.h
	imagbmp.h
	listctrl.h
	imagbmp.cpp
	quantize.cpp
	strconv.cpp
	variant.cpp
	dirctrlg.cpp
	treectlg.cpp
	m_style.cpp
	fontenum.cpp
	listctrl.cpp
	ole\dataobj.cpp
	textctrl.cpp
	window.cpp
	xml.cpp

msw/setup.h
	with watcom version 11 it now compiles with wide character support.

xrc/xml.cpp
	fixed memory leak and compile warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-07 18:46:31 +00:00
Václav Slavík
6cc4e6b81a new wxHtmlWindow::OnOpeningURL API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-27 19:03:10 +00:00
Václav Slavík
c44fdc9401 added dummy <style> handler in order to hide CSS code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-24 21:13:38 +00:00
Václav Slavík
04db5c3f8f implemented URLs blocking in wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 23:23:15 +00:00
Vadim Zeitlin
903506828b fixes for the compilation warnings with Sun CC:
1. some fixes for "String literal to char * conversion" warnings (many
   more left in the *.xpm files)
2. fixes for "assignment of function to extern "C" function"
3. a few other miscellaneous ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-09 12:49:12 +00:00
Gilles Depeyrot
a2e9bc18a8 use "..." instead of <...> for wx headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-06 15:40:15 +00:00
Václav Slavík
4f41713093 added two-step creation of wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-27 18:13:53 +00:00
Václav Slavík
2f7adba06f mingw compilation fixc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-02 23:33:08 +00:00
Kendall Bennett
19193a2c85 Mutiple updates from SciTech for wxWindows including the following:
1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-17 22:25:56 +00:00
Václav Slavík
3902989824 added wxHtmlWindow::AppendToPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-14 22:20:05 +00:00
Václav Slavík
f5e6ed7cc8 wxHTML now outputs unrecognized entities verbosely
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-05 22:05:45 +00:00
Václav Slavík
f7b2395841 fixed unimportant typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-04 22:58:47 +00:00
David Webster
d50d561a05 FALSE, not false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-23 18:34:35 +00:00
Václav Slavík
0cecad314c fixed problems with HTML printing w/o using wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-19 22:44:17 +00:00
Václav Slavík
8938133dbc added wxHtmlCell::Get/SetId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 20:07:25 +00:00
Vadim Zeitlin
f6010d8fad implemented and documented wxHtmlWindow::OnCellMouseHover() and OnCellClick()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-31 21:19:23 +00:00
Václav Slavík
79d6c01818 beginnings of HTML4 tables layouter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 23:14:21 +00:00
Václav Slavík
2978621101 wxHtmlEasyPrinting indentation changes + CreatePrintout,DoPrint and DoPreview virtual and protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 18:56:41 +00:00
Václav Slavík
61b50a43aa made some wxHtmlEntitiesParser's methods public -- turned out they are useful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:18:39 +00:00
Václav Slavík
fc1f212528 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 22:38:53 +00:00
Vadim Zeitlin
42f96a884e don't allow TABbing to wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 18:59:57 +00:00
Kendall Bennett
d699f48ba3 Latest updates from SciTech code tree including numerous warning fixes for
the Watcom and other compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 17:50:16 +00:00
Václav Slavík
6c62a62bf7 new wxHtmlParser core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 22:30:22 +00:00
Václav Slavík
5f4cd605aa wxHTML fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 22:54:22 +00:00
Vadim Zeitlin
04dbb6467b removed/replaced include 'wx/wx.h'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 18:48:48 +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
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
Václav Slavík
8bd72d9065 added convenience accessors to wxHtmlTag and modified wxHTML code to use them; improved colours parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 18:07:33 +00:00
Václav Slavík
daa616fca0 new HTML tags parser and entities substitution code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:09:35 +00:00
Kendall Bennett
38caaa61b1 Merged latest changes from SciTech code base into wxWindows CVS Tree.
Includes updates to remove Watcom compiler warnings and the latest
updates to the wxApplet code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-08 19:37:56 +00:00
Václav Slavík
badb78928f fixed typo in pragma implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-08 22:26:58 +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
960ba969f9 1. changed AddSharedProcessor to AddGlobalProcessor
2. Added wxHtmlProcessor::Enable and IsEnabled
3. fixed fatal bug in wxHtmlWindow::Add[Global]Processor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-04 23:54:01 +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
Kendall Bennett
bfb9ee966d Fixed Windows DLL link problems with wxHtmlProcessor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-03 20:34:23 +00:00
Václav Slavík
892aeafc2a 1) some cleanup in wxHtmlWindow, moved private structures out of headers
2) added wxHtmlProcessor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 23:08:47 +00:00
Kendall Bennett
c3952f6524 Fixed wxHTML code in a Watcom Win32 DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 20:55:56 +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
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
Václav Slavík
dad9554b4c indentation fixes; virtual dtor for all platforms, not only MacOS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 17:57:35 +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
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