Commit Graph

80 Commits

Author SHA1 Message Date
Artur Wieczorek
0649b0d028 Use wxGraphicsContext::CreateFromUnknownDC in the printing sample
Creating graphics context for the various flavors of wxDC can be simplified by using this newly introduced API.
2017-01-11 20:32:43 +01:00
Artur Wieczorek
79b60780fe Fix MSVC14 warnings about a shadowed variable in the printing sample.
Just to suppress some harmless warnings.
2016-04-08 18:46:02 +02:00
Artur Wieczorek
c991c659c4 Fixed print preview in printing sample (wxGTK).
Under wxGTK print preview is created on wxMemoryDC and hence wxGraphicsContext should be created also for this kind of wxDC in MyApp::Draw.

Closes #17489.
2016-04-08 18:44:21 +02: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
Paul Cornett
5b4a70247c use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +00:00
Vadim Zeitlin
d66e7af9aa Don't use deprecated wxBOLD, wxNORMAL and similar constants.
Replace them with wxFONTWEIGHT_BOLD, wxFONTSTYLE_NORMAL or wxFONTWEIGHT_NORMAL
and equivalents in the code of the library itself and in the samples.

Also simplify font construction using wxFontInfo where possible to avoid
specifying these constants at all if they are not needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-11 14:25:30 +00:00
Vadim Zeitlin
16ab50d25b Don't draw the segment lines in wxGtkPrinterDC::DrawArc() unless it's filled.
The segments should only be drawn if we're filling the arc, i.e. drawing a
pie, but not if we're just drawing its outline.

Add a test of this to the printing sample.

Closes #15609.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-25 17:38:43 +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
ccb2be5b12 Test PostScript printing in the print sample if it is compiled in.
Just use wxUSE_POSTSCRIPT instead of wxTEST_POSTSCRIPT_IN_MSW and also do it
under all platforms, not just MSW.

See #1244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-09 15:08:21 +00:00
Paul Cornett
0856cb2562 use new pen/brush style names in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-01 22:34:07 +00:00
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00
Vadim Zeitlin
5d4c2acaca Update printing sample to compile again after r68026.
The sample was using Initialize() overload that doesn't exist any longer, use
InitializeWithModality() instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-23 08:02:12 +00:00
Vadim Zeitlin
6aacfc7320 Allow showing the print preview frame non modally.
Still show the print preview app modally by default, i.e. disabling all the
other windows, but also allow disabling only the preview parent or nothing at
all.

Closes #13108.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:27 +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
Vadim Zeitlin
18f42b94df Remove calls to wxApp::SetTopWindow() from the samples and documentation.
It is definitely not necessary to call SetTopWindow() when there is only a
single top level window and it is arguable whether it's useful to do it even
when there are many of them so don't encourage its use in the documentation
and also remove all its occurrences from the samples.

Closes #12816.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:05:14 +00:00
Vadim Zeitlin
3cb332c155 Remove unnecessary mondrian.{ico,xpm} files from samples directory.
Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 17:42:33 +00:00
Jaakko Salli
17c02cc8e6 Make text drawn by wxGraphicsContext slightly less intrusive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-13 08:36:37 +00:00
Jaakko Salli
8371a35340 Added wxGraphicsContext::Create(const wxEnhMetaFileDC& dc) so that wxPrintPreview can work with wxMSW's wxGraphicsContext (closes #12028)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-13 08:22:36 +00:00
Jaakko Salli
a29df06231 Make text printed by wxGraphicsContext shorter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-10 14:16:07 +00:00
Jaakko Salli
a5e40d85a4 Use wxGraphicsContext to draw some text and a rectangle around it (so that GetTextExtent() can be verified to work correctly)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-10 14:14:35 +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
43b2d5e7c3 Put braces around all calls to wxLogFunctions() inside an if statement.
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-20 16:47:54 +00:00
Kevin Ollivier
5f05e51454 Mac -> OSX header change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-13 17:22:31 +00:00
Francesco Montorsi
48ed4a8971 revise all code; do not use many global objects; use wxLog to give errors/messages; put drawing code in a wxApp member; get rid of old code; fix indentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-25 11:54:16 +00:00
Francesco Montorsi
4b905cbcb6 build fix (the sample uses an undocumented function of wxFont)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-03 19:32:23 +00:00
Robert Roebling
0b822969a6 Added new wxGraphicsContext:Create( wxPrinterDC ) instead of wxDC:CreateGraphicsContext
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-28 20:39:57 +00:00
Robert Roebling
0286bbe9b3 wxCairoGraphics need a font event without drawing text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-25 18:53:02 +00:00
Robert Roebling
7e38ae608c Some testing code for wxGraphicsContext printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-25 18:50:27 +00:00
Robert Roebling
da249bc359 First update patch for GTK+ print
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-13 12:23:39 +00:00
Václav Slavík
6f207e6699 compilation fixes for --disable-compat28
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-15 13:01:19 +00:00
Vadim Zeitlin
45e6e6f8ab call OnInit() from all samples to allow using standard command line options with all of them (patch 1623971)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-04 00:34:18 +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
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
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
Robert Roebling
3d7cfc2fe6 Added some more test to the printing sample
EllipticArc, Arc, Spline, Polygon.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-24 15:37:35 +00:00
Julian Smart
70949ed554 25.4 mm to the inch, not 25.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-24 11:44:51 +00:00
Robert Roebling
4843cdfe0f Made gnome printing stuff return wxPRINT_CANCELLED if
it has been canceled.
  Moved the FORCE_LINK code from app.cpp to the sample
    as I cannot find the right place for it. We'd need
    an empty extrya file for ADV lib only for that.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-11 22:16:41 +00:00
Robin Dunn
1db4e8dd8d Use wxTRANSPARENT_BRUSH so the rectangles around the text is not
filled in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-29 01:04:54 +00:00
Włodzimierz Skiba
abc2a4ccec Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-06 17:35:00 +00:00
Robert Roebling
cac7ac30cb Added support for DrawEllipse and pen styles to
GNOME printing. Added test.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 12:50:01 +00:00
Robert Roebling
7b25d8e7bd Adapted printing samples makefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-01 23:07:49 +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
925e9792d3 Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-06 20:54:57 +00:00
Włodzimierz Skiba
8520f1374c Fixes for wxUSE_STATUSBAR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-19 15:36:01 +00:00
Włodzimierz Skiba
8afa4fde3a Warning removal.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 20:02:19 +00:00
Julian Smart
be5a51fb59 More name changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 11:20:37 +00:00
Dimitri Schoolwerth
9134af5b50 made font a non-pointer; code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-11 19:44:06 +00:00
Robert Roebling
77efa6a8fc Minor changes to printing sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-26 12:41:01 +00:00
Mattia Barbon
600683ca05 Fixed all remaining samples/Unicode compilation errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-15 17:25:36 +00:00