Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,162 Commits 1 Branch 330 Tags
6a1e3fa232e511751bd94e77eb38e34dd40a3619
Commit Graph

57 Commits

Author SHA1 Message Date
Paul Cornett
86ab6de0c1 Use clear() instead of assignment to wxEmptyString 2018-08-22 09:45:20 -07:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository. 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
 2015-04-23 22:00:35 +04:00
Vadim Zeitlin
8e828674c4 Set wxHtmlHelpFrame title format before creating it. 
This ensures that it's always set before it can be used, fixing assert
introduced in r75748.

Closes #15977.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-17 23:53:15 +00:00
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
9a83f86094 Globally replace _T() with wxT(). 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 20:30:22 +00:00
Vadim Zeitlin
9df05aab59 don't duplicate wxGetTopLevelParent() code in wxHtmlHelpController::FindTopLevelWindow() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-05-04 10:23:52 +00:00
Francesco Montorsi
bd365871aa s/wxSplitPath/wxFileName::SplitPath 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-07 01:47:47 +00:00
Václav Slavík
664d172947 fixed crash in wxHtmlHelpController if the help window is still open 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-13 23:42:57 +00:00
Robin Dunn
18fc605924 Pass the config object into the wxHtmlHelpFrame so it has the config 
info in time to set the position and size of the frame.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-24 01:16:18 +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
ddc80eb4eb Incomplete wxUSE_* warning fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-24 17:49:56 +00:00
Włodzimierz Skiba
d1da887276 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord/wxNOT_FOUND, TRUE/true, FALSE/false. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-27 19:15:07 +00:00
Włodzimierz Skiba
132a592877 No warning with wxUSE_BUSYINFO turned off. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-06-11 19:02:44 +00:00
Julian Smart
e7d9c39867 Reverted config/resource name change 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-26 10:49:43 +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
Julian Smart
7e521b01c3 Added UpdateSize to wxSplitterWindow, to allow an app 
to force pane resizing _before_ showing the window.
Added a call to UpdateSize from helpfrm.cpp. Without
this, the flicker is horrible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-25 13:14:54 +00:00
Václav Slavík
3527f29c87 added .chm support for Unix (Markus Sinner) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-10-07 20:15:27 +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
14f355c2b5 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:46:53 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-10 19:55:12 +00:00
Julian Smart
0222a60b34 Use path separator, not "/" 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-12-28 22:58:12 +00:00
Václav Slavík
fcf77487ed added wxHtmlHelpController::AddBook(wxFileName) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-12-08 20:30:42 +00:00
Vadim Zeitlin
c010d6a985 compilation fix for wxGTK (missing header) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-13 11:45:56 +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
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
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
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
Vadim Zeitlin
f38bcae5bf fixed compilation after wxTipWindow base class change, added wxUSE_TIPWINDOW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-01 03:18:24 +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
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
Julian Smart
963a1fcd6e Minor mods 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-26 10:17:58 +00:00
George Tasker
a0b1b91fe6 Fixed BCC compilation warning if wxUSE_HELP was 1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-04-26 01:12:48 +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
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
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
e81910e077 fixed incorrect use of _() where it should be wxT() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-11 19:31:33 +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