Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,610 Commits 1 Branch 330 Tags
846f4568e5599a964ee04b186a263cd07b959d2f
Commit Graph

85 Commits

Author SHA1 Message Date
Vadim Zeitlin
846f4568e5 Fix infinite loop in wxHtmlEasyPrinting page break code. 
The code didn't handle cells higher than the page height correctly and entered
an infinite loop when trying to adjust page breaks in their presence, e.g.
when trying to print a very tall image.

Closes #13935.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-07 13:02:32 +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
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
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
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
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
Vadim Zeitlin
39dfe3d454 Add a period to the sentence end. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-25 16:40:42 +00:00
Vadim Zeitlin
f7f068364f compare wxMessageDialog::ShowModal() return value with wxID_YES, not wxYES (closes #10789) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-05-13 08:41:44 +00:00
Vadim Zeitlin
7ff1542d27 fix g++ warnings for float->int conversions 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-31 09:18:42 +00:00
Vadim Zeitlin
4209475ced detect horizontal overflow in wxHtmlPrintout and warn the user about it 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-26 13:37:37 +00:00
Václav Slavík
131fc12022 added asserts to check correct order of wxHtmlDCRenderer methods calls 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-21 16:43:22 +00:00
Vadim Zeitlin
e822d1bd5f fix more Borland release build warnings about unused variable/code without effect 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-20 10:30:49 +00:00
Václav Slavík
26fba7b2a3 apply Stefan's fix for wxHtmlDCRenderer clipping 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-12 16:03:17 +00:00
Václav Slavík
9f7e7edb78 fixed SetUserScale() calls to use correct scale on Y axis 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-16 08:10:06 +00:00
Václav Slavík
7258d99573 Changed wxHTML default font size for printing to be 12pt regardless 
of the platform; this font shouldn't depend on toolkit's default
GUI font (introduced in 2.8, now reverting to pre-2.8 correct
behaviour).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-04 22:34:09 +00:00
Paul Cornett
04ee05f92a fix a huge number of build errors 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-17 18:26:00 +00:00
Robert Roebling
9695c53a92 Ok -> IsOk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-14 13:15:07 +00:00
Julian Smart
806f9e8330 Avoid crash if user aborts the print 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-08-29 16:41:01 +00:00
Vadim Zeitlin
b4a980f4f5 don't use obsolete functions (mostly copystring() and Count()), remove their documentation (patch 1697956) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-11 00:23:19 +00:00
Vadim Zeitlin
a1d5a2937a corrected message about page number overflow 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-01-07 19:58:48 +00:00
Vadim Zeitlin
a863333e37 fixed off by 2 error in HasPage() (patch 1562871) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-04 22:58:23 +00:00
Włodzimierz Skiba
02761f6cd4 Include wx/module.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-31 19:31:43 +00:00
Vadim Zeitlin
766571a703 add @DATE@, @TIME@ and @TITLE@ macros to HTML printing (extended/modified patch 1528679) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-29 20:45:13 +00:00
Vadim Zeitlin
fc4c80b8c0 fix for the last printf format warning fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-14 10:33:06 +00:00
Vadim Zeitlin
3b6da0a258 printf format spec warning fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-04 14:51:10 +00:00
Paul Cornett
706e740f50 build fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 06:53:31 +00:00
Vadim Zeitlin
fd0bab4353 use dynamic array for the page breaks positions (patch 1483976) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-28 22:56:28 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
da80ae712a Include wx/dc.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-05 22:58:39 +00:00
Włodzimierz Skiba
93763ad5ba wx/wxprec.h already includes wx/defs.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-18 08:11:26 +00:00
Václav Slavík
bc55e31bdc 1. added abstract interface to wxHtmlWindow for use by wxHtmlWinParser and implemented it for wxHtmlListBox 
2. used the above to implement clickable links support in wxHtmlListBox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-13 22:08:28 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-24 21:43:15 +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
Václav Slavík
4ac725a3b3 renamed Render's argument to not obfuscate its meaning 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-27 22:40:05 +00:00
Václav Slavík
2a2e4f4afa reverted Robert's over-optimisation, correct fix coming soon 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-25 08:32:49 +00:00
Robert Roebling
58bd6224ac Changed the way invisble HTML cells are NOT 
drawn so that no clipping is required.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-24 20:28:19 +00:00
Robert Roebling
b45dfd0a8b Moved the wxPageSetupDialogData <-> native conversion 
code for MSW to the appropriate file in src/msw/printdlg.cpp
  Removed the now obsolete printer setup dialog code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-31 23:43:41 +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
Václav Slavík
10e5c7eaa0 replaced NormalizeFontSizes with SetStandardFonts 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-24 09:55:10 +00:00
Václav Slavík
72b1ad5c2e accept files in wxHtmlEasyPrinting::{Print,Preview}File, not only URLs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-15 21:38:26 +00:00
Robin Dunn
7acd36259b Added NormalizeFontSizes which will set the html font sizes based on 
the size of a system font.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-05 23:59:44 +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
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
999836aaca warning fixes for BCC and OW (heavily modified patch 819146) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-10-16 10:28:15 +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
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