Commit Graph

69 Commits

Author SHA1 Message Date
Vadim Zeitlin
9dbf785a99 Work around buggy printer drivers not returning correct DEVMODE size.
Apparently at least one printer driver doesn't report the memory needed by its
own DEVMODE struct correctly, resulting in a crash due to a buffer overflow
when printing using it.

Work around this by allocating slightly more memory than what we really need.

Closes #16274.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-10 16:51:21 +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
691745ab41 Add a public wxModalDialogHook class for intercepting modal dialogs.
Extract wxModalDialogHook from wx/testing.h into its own wx/modalhook.h,
extend it to allow to be notified not only about showing modal dialogs but
also about dismissing them and document it and show its use in the dialogs
sample.

Also replace all the WX_TESTING_SHOW_MODAL_HOOK macros occurrences with
WX_HOOK_MODAL_DIALOG.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-20 13:15:41 +00:00
Vadim Zeitlin
070d639118 No real changes, just fix some typos in comments in wxMSW code.
Closes #14994.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-23 11:44:26 +00:00
Václav Slavík
643e9cf9f6 Add wxTEST_DIALOG for testing of modal dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-01 16:45:11 +00:00
Vadim Zeitlin
017dc06b50 Use wxString::t_str() in calls to Windows API functions in wxMSW.
Use t_str() instead of wx_str() to make the code work correctly in UTF-8 build
in which wx_str() returns a pointer to UTF-8 buffer while we need a wchar_t
pointer for Windows.

Closes #14371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:16:59 +00:00
Vadim Zeitlin
fd76344ecc Don't set PAGESETUPDLG::hDevNames and hDevMode when using PSD_RETURNDEFAULT.
If the page setup dialog is used to retrieve the default information, hDevMode
and hDevNames fields must not be set, otherwise PageSetupDlg() function simply
fails because of incorrect parameters passed to it.

Closes #13928.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 15:45:03 +00:00
Vadim Zeitlin
b98b75cddf Correct handle passed to DocumentProperties() in MSW printing code.
We were passing a pointer to our wrapper struct instead of the pointer stored
inside it (as a HANDLE).

Closes #13861.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 11:32:44 +00:00
Robin Dunn
6c797d8fd1 Initialize the native printer info for ConvertFromNative if it hasn't been done already.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 19:49:02 +00:00
Vadim Zeitlin
af7e24c33e Make wxPORTRAIT and wxLANDSCAPE elements of wxPrintOrientation enum.
Change wxPrintData::SetOrientation() to take wxPrintOrientation instead of
int.

Closes #11393.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-08 16:35:47 +00:00
Julian Smart
7da33e042c Moved WinPrinter from private.h to printdlg.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-28 16:15:34 +00:00
Julian Smart
082e5b9856 Applied patch #11078 - DEVMODE creation in wxWindowsPrintNativeData::TransferFrom plus SetQuality to dpi
by Martin Perktold


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-24 09:54:25 +00:00
Julian Smart
3c46da4231 Added a comment about DMPAPER_USER not always working
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-20 13:08:32 +00:00
Vadim Zeitlin
113f4defc4 correct test for wxDEBUG_LEVEL in last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-15 23:04:46 +00:00
Vadim Zeitlin
d021f94fd6 avoid a warning about unused function in release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-15 21:30:37 +00:00
Vadim Zeitlin
4b6a582bef replace more __WXDEBUG__ occurrences with wxDEBUG_LEVEL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-22 12:53:48 +00:00
Vadim Zeitlin
e408bf5257 add safe wxStrlcpy() function and replaced all wxStrncpy() calls by it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-29 14:41:02 +00:00
Vadim Zeitlin
312242ead1 fix g++ warning about assigning NULL to a non-pointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-28 00:17:55 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:39:52 +00:00
Vadim Zeitlin
bd84061db3 removed hardcoded size of 66 bytes of PRINTDLG struct for mingw32, this breaks printing under Win64; a couple of minor style fixes but no real changes otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-25 14:00:15 +00:00
Vadim Zeitlin
73c64a3a9e compilation fix for ANSI build: use reinterptre_, not static_cast, to convert from BYTE* to char*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-28 10:13:32 +00:00
Vadim Zeitlin
47af39fbf4 ANSI mode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-25 13:33:35 +00:00
Vadim Zeitlin
dca0f65178 more /Wp64 warning fixes: mostly use UINT_PTR instead of UINT and define our WX[WL]PARAM with __w64 if available to avoid hundreds of warnings when casting LPARAMs to pointers/handles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-28 02:22:52 +00:00
Robert Roebling
888dde65f4 DC reorganization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-30 13:48:22 +00:00
Robert Roebling
fa4f4c58ea Correct landscape printing in wxPageSetupDialog
(upport from 2.8)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-17 10:57:14 +00:00
Vadim Zeitlin
c1dc9f8394 removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 11:35:04 +00:00
Vadim Zeitlin
d5eaa19fdf don't set A4 paper size, use the system default instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-17 01:54:48 +00:00
Vadim Zeitlin
fae47b81e8 gcc signed/unsigned comparison fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 23:16:37 +00:00
Julian Smart
781609f290 Applied patch [ 1583316 ] set media source for printing
by d2walter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 17:29:40 +00:00
Julian Smart
f415cab9ef Robert Lang's patch [ 1583183 ] Fixes printing/print preview inconsistencies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-27 13:07:40 +00:00
Vadim Zeitlin
b7cacb43db add IsOk() to all classes having Ok() method (patch 1570985)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 21:56:55 +00:00
Włodzimierz Skiba
57bd4c6031 Include wx/msw/wrap*.h according to pch support (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-07 19:01:45 +00:00
Włodzimierz Skiba
ce5d92e150 Include wx/cmndata.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-25 21:08:11 +00:00
Włodzimierz Skiba
6d50343d87 Include wx/dcprint.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-08 22:34:12 +00:00
Julian Smart
89a3f5c91f Applied patch [ 1345297 ] Crash with MSW wxPrintDialog when pressed OK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 09:53:14 +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
Julian Smart
fde0548028 Patch from Andre Reitz to correct a couple of bugs
1. Error when fetching papersize from dev-mode
   somebody changed
        if {...} else if {...} else {...}
   to:  ............. if {...} else {...}

2. Error when getting bin from devmode:
   - no translation to wxPRINTBIN_... constants when getting from devMode->dmDefaultSource
   - but: translation when setting to devMode->dmDefaultSource


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-18 14:39:54 +00:00
Włodzimierz Skiba
d0ee33f5c6 '[1219035] cleanup: miscellaneous' and minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-13 12:19:33 +00:00
Włodzimierz Skiba
902725eefe Source cleaning inspired by and included in patch '[ 1215450 ] cleanup: unreachable code.'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-06 16:47:04 +00:00
Julian Smart
3168b4c3ae Applied patch [ 1208256 ] Fixes bug #1193626 [wxPrintData asserts on or ignores...]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-30 08:39:23 +00:00
Julian Smart
21c358b270 Added more paper sizes and code that falls back to explicit paper size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-21 11:05:31 +00:00
Włodzimierz Skiba
660296aa90 Wrap <commdlgs.h> as <commctls.h>. Required makefiles rebuilded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-22 19:39:54 +00:00
Włodzimierz Skiba
4e22a1f243 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-03 19:15:38 +00:00
Robert Roebling
aa96f01c02 Add PrivData() field to wxPrintData since MSW's printer
sometimes seem to save data in an extra field. The
    original author of the patch chose to save it in char*
    so I kept that, although void* would probably be correct.
    The patch is against 2.4.2 and the code has been reshuffled
    since then so that the patch had to be redone entirely.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-28 01:51:59 +00:00
Włodzimierz Skiba
c47addef10 wxPoint/Size/Rect() causes the same code with (0,0) initialization and is incomparably more readable and clear.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-16 20:34:34 +00:00
Włodzimierz Skiba
8b5d5223d1 Various cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-11 10:42:05 +00:00
Włodzimierz Skiba
f31a409829 .empty() string decorations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-09 14:19:49 +00:00
Robert Roebling
08680429a2 Made wxPageSetupDialog a pimpl implementation.
Added a few clean-ups.
  Added native GNOME page setup dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-20 14:46:25 +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
Robert Roebling
93c2f401e9 Moved print dialog data conversion code
from cmndata to its msw place.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-31 16:34:02 +00:00