cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,547 Commits 1 Branch 0 Tags 333 MiB
9d2cef1c69
Commit Graph

137 Commits

Author SHA1 Message Date
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