Commit Graph

837 Commits

Author SHA1 Message Date
Julian Smart
3395d7b48e Use more appropriate border style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 16:44:19 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Vadim Zeitlin
ad7922b8aa Increase the number of index items shown by default in wxHTML.
Consider that small index is up to 1000 items, not up to 100 which is really
too small.

See #10573.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 10:40:17 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:31:32 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +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
Stefan Csomor
d15694e8ca going private with userpane info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-19 08:36:23 +00:00
Stefan Csomor
2275632282 going private for m_peer to give a foundation for better encapsulation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 14:20:12 +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
Stefan Csomor
e8fd252ef8 always skip OnSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 10:57:08 +00:00
Vadim Zeitlin
062aa562d0 Remove stray #pragma implementation.
This #pragma is obsolete and shouldn't be used any more (if it ever had to
be).

See #12927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:16:52 +00:00
Vadim Zeitlin
ab544700d2 Remove long unused wxHTML files.
These files seem to be left overs from the initial cvs import many years ago,
remove them to avoid confusion.

See #12927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:16:46 +00:00
Vadim Zeitlin
3625820490 Fixes for parsing invalid HTML without tag ends.
The code in wxHtmlParser supposed in many places that a '<' character must be
always followed by a '>' one and could create (and sometimes dereference)
invalid iterators if this wasn't the case resulting in asserts from MSVC debug
CRT and possibly crashes.

Fix this by ensuring that only valid iterators are used and add a trivial unit
test for wxHtmlParser which checks that it can parse invalid HTML without
crashing.

Closes #12869.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:55 +00:00
Vadim Zeitlin
48d8ea6d93 No changes, just remove a level of indentation in wxHtmlTagsCache ctor.
Get rid of characters not starting a tag immediately in the beginning of the
loop instead of putting the entire loop body inside an if statement. This
doesn't change anything (this becomes more apparent if the patch is viewed
with "ignore white space changes" option) except making the code easier to
read and modify.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:44 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Vadim Zeitlin
2e49a8074e Don't crash on malformed HTML in wxHTML font tag handler.
Don't try to access the first character of the size parameter value before we
are sure that it is not empty.

Closes #12812.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:36:56 +00:00
Jouk Jansen
a67c2d4161 Include compilation of tests for OpenVMS (part2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 10:54:47 +00:00
Michael Wetherell
948c6134e7 Use wxFS_SEEKABLE flag loading images.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 15:51:09 +00:00
Vadim Zeitlin
ec2c85bf79 Construct paths using wxFileName in wxHTML help.
Use wxFileName instead of more complicated and error-prone manipulations with
strings.

Closes #12602.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:10:05 +00:00
Michael Wetherell
15552854db Fix for wxChm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 11:16:54 +00:00
Michael Wetherell
348a9a6ff2 A couple of fixes for wxChm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 13:09:04 +00:00
Vadim Zeitlin
4267872212 Fix crash in wxWebKitCtrl when using JavaScript.
Ignore the unknown types of the script result, in particular don't crash
trying to dereference an uninitialized pointer if the script didn't return
anything.

Closes #12361.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:24 +00:00
Vadim Zeitlin
34a1414265 Use correct format specifiers in wxString::Printf().
Using %d with size_t argument resulted in asserts, fix it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:03:04 +00:00
Vadim Zeitlin
9899a70bc0 Remove hard limit on number of pages in wxHtmlPrintout.
This seems to be a leftover from an old version in which the page breaks
positions were stored in a fixed size array. As the code uses a dynamic array
now there doesn't seem to be any reason to impose any limit on the number of
pages and some people did run into the old 999 pages limitation apparently.

Closes #11159.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 12:27:18 +00:00
Vadim Zeitlin
88ed20a2fa Propagate wxHtmlWindow layout direction to the wxDC it uses.
While wxHtmlWindow doesn't support mixing LTR and RTL contents we can indeed
try to make it render pure RTL stuff correctly by setting up the wxDC used for
drawing accordingly.

Closes #1988.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:23 +00:00
Vadim Zeitlin
9b35f81e41 Suppress warnings about double to int truncation in wxHTML code.
Actually it's not totally clear if truncation or rounding was intended here
but when in doubt preserve the old code semantics.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-14 11:20:36 +00:00
Vadim Zeitlin
233f573883 Fix file paths in the header comments.
Consistently use only "wx/foo.h" instead of "include/wx/foo.h" ("include" is
always implicit anyhow).

Also use "src/osx" instead of "src/mac" for the files in this directory.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:58 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Jouk Jansen
a9638bb6eb Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-22 08:08:11 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Vadim Zeitlin
f68e16c5fc Add <span> tag and limited support for CSS styles to wxHTML.
Parse "style" attributes of the HTML tags and honour those of them that can be
mapped to the HTML 3 attributes.

Also add a handler for <span> tag.

Closes #10631.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-30 23:12:25 +00:00
Vadim Zeitlin
c14dc5541c Fix PCH-less compilation after recent changes.
Include wx/sizer.h explicitly when not using PCH.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-05 13:53:40 +00:00
Vadim Zeitlin
fc48f78fd0 Notify user less intrusively about overflow when previewing HTML printouts.
We used to show a modal dialog if the page didn't fit horizontally but this
was too intrusive when the user was just previewing the output and not really
printing it. Moreover, the question of the message box ("Print" or "Cancel")
simply didn't make sense in this case.

Fix both problems by not showing this dialog at all when previewing. Instead,
notify the user with a much less intrusive info bar in the preview window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-05 12:20:15 +00:00
Václav Slavík
8d94819c43 Remove wxUSE_WCHAR_T checks.
wxWidgets requires wchar_t for some time now; wx/chartype.h has a check
to fail complation without it. Simplify code by removing now-dead code
for the !wxUSE_WCHAR_T case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-16 10:43:18 +00:00
Václav Slavík
c44a49b852 Use fixed screen DPI of 96 when printing HTML.
Unlike font sizes, which depend on screen resolution because of weird
wxFont API, pixel sizes used elsewhere (and in particular, for images)
shouldn't depend on screen DPI.

This finally makes the output independent of screen size.

Fixes #10942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-29 14:19:06 +00:00
Václav Slavík
5a21001cdd Removed useless wxDisplaySize() calls from wxHtmlPrintout.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-29 14:18:58 +00:00
Paul Cornett
ad4a907bb7 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-29 06:44:16 +00:00
Václav Slavík
fa79415135 wxHTML: Support percentage width in IMG tag.
(Patch #11800 by lpoujoulat) Fixes #11800.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-28 17:55:51 +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
Václav Slavík
a7b2c092b7 Fix wxHtmlWindow to correctly decide whether to show scrollbars.
wxHtmlWindow::CreateLayout()'s algorithm was both naive (not properly
accounting for scrollbar visibility changes during layout) and broken
(incorrectly rounding when computing scroll steps and adding
GetCharHeight() value to the height in an attempt to mitigate the
harm).

This algorithm should properly for scrollbars in all situations.
Rounding is done in such way that the content is fully viewable, while
at the same time not showing scrollbars needlessly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-14 15:27:42 +00:00
Václav Slavík
319106d6e2 Support XHTML &apos; entity.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-19 14:47:20 +00:00
Vadim Zeitlin
d5892339a1 Don't access the first character of a possible empty USEMAP parameter.
This fixes an assert when using debug CRT in VC9.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-18 14:47:25 +00:00
Václav Slavík
8e6c2840b4 Improved handling of anchors in wxHTML: scroll to better position (patch #11406).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-17 20:20:48 +00:00
Kevin Ollivier
eebb8902d9 Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-11 02:12:56 +00:00
Vadim Zeitlin
a3873c6f9c Revert "trivial" change of r61772.
The "slight code simplification" of r61772 broke the code as it could now
crash if dangling m_Cell pointer was used during parsing. Revert it and add a
comment explaining why the code is written in the way it is.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-04 16:15:52 +00:00
Julian Smart
8e494db90c Set the initial size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-10 11:02:01 +00:00
Vadim Zeitlin
1c51fc784d No real changes, just slightly simplify code.
No need to check whether the pointer is NULL before deleting it nor to assign
NULL to it if it's going to be immediately reassigned on the next line.

Closes #11149.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-28 10:43:51 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Vadim Zeitlin
3fff75338a Use stock id instead of duplicating its string label in CheckFit().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-25 16:41:25 +00:00
Vadim Zeitlin
9b95e87cb0 Use Ok/Cancel dialog instead of Yes/No one in CheckFit().
This has the advantage of being able to close the dialog with "Esc" and also allows us to not specify the label for the "Cancel" button at all and use the default one, which is especially important under MSW where the label returned by wxGetStockLabel(wxID_CANCEL) is actually not the same string as is used in the native message boxes (they don't define an accelerator for the cancel button).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-25 16:40:49 +00:00