Commit Graph

46 Commits

Author SHA1 Message Date
Vadim Zeitlin
e6777e6575 Add wx{Pen,Brush}::Is[Non]Transparent() methods and use them.
Using GetStyle() == wx{PEN,BRUSH}STYLE_TRANSPARENT doesn't work for
uninitialized pen or brush objects so add convenient helpers which do work for
them.

Use the new helper functions everywhere instead of explicitly checking for
style. This makes the code shorter and more clear and also fixes some bugs (at
least those in GTK printing code).

Notice that this patch removes the main reason for explicitly initializing
m_pen and m_brush in wxGTKDCImpl ctor but this initialization still can't be
removed, at least for the latter, as doing this somehow breaks GetPixel(). It
would be nice to understand why and do remove this initialization so that a
newly created DC doesn't have any non-default pen nor brush.

Closes #12522.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:46 +00:00
Dimitri Schoolwerth
b5b208a179 Set svn properties on .cpp files.
Add missing svn:eol-style property to all .cpp files. Also set svn:keywords for .cpp files which don't have that property yet to Id, including src/osx/core/glgrab.cpp for consistency (it doesn't make use of the property).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-17 11:17:55 +00:00
Vadim Zeitlin
1bd122ddfa Replace wxPrintout::SetIsPreview() with SetPreview().
Unlike the old function just indicating whether a printout is being used for
previewing, the new one associates the preview object with it. This can be
useful if we need to access the window used for the preview, for example.

Also remove a bunch of apparently unnecessary SetIsPreview(false) calls as
printing (and not previewing) is already the default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-05 12:19:59 +00:00
Vadim Zeitlin
79d81c45ca Remove GtkPrintOperation preview signal handler.
This handler wasn't doing anything useful as we were always using the default
preview based on an external program, so just remove it completely.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-05 12:19:44 +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
Václav Slavík
197380a09f always return (owned or non-owned, depending on build) wxScopedCharBuffer from utf8_str() and ToUTF8()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-30 18:28:42 +00:00
Francesco Montorsi
89efaf2b65 change generic ints to enums in wxDC (closes #9959)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-08 14:21:53 +00:00
Paul Cornett
fb14d960c3 use simpler method to draw bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-05 07:47:51 +00:00
Francesco Montorsi
6d52ca536a make GetPaperRect() and GetResolution() const functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-15 11:10:34 +00:00
Vadim Zeitlin
d31d30d791 there is no sqrt(int) in standard C++ (although glibc seems to provide it); select sqrt(double) explicitly to fix HP-UX compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-12 14:32:28 +00:00
Jouk Jansen
8cf694d4ea adding variable initialization to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-03 11:42:02 +00:00
Václav Slavík
12ca55868c wxGTK: Fixed printing to use fonts sizes adjustment consistent with wxMSW. In
particular, screen resolution no longer affects text size in printed output
when using wx's map-screen-to-paper approach to printing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-28 09:33:04 +00:00
Václav Slavík
f7b8e3d654 Get rid of gs_cairo; if wxGtkPrint* classes are used, Cairo is guaranteed to be available.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 11:38:31 +00:00
Václav Slavík
fc2bb342ec route all Cairo calls in GTK printing code through gs_cairo (is this still needed?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 09:42:49 +00:00
Václav Slavík
40fcf546f6 added wxGetDisplayPPI() convenience function and wxPrintout::SetPPI*() overloads accepting single wxSize argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 09:35:49 +00:00
Václav Slavík
3e7ea45c59 removed superfluous font size scaling in wxGtkPrinterDCImpl::SetFont()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-09 12:31:44 +00:00
Robert Roebling
eaeb99858d Use cairo_scale() for scaling to full printing resolution, correct transformation in Cairo graphics context for GTK+ printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-30 09:17:04 +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
2b44ffc0e7 Added wxDC::CreateGraphicsContext and implemented it for a few DCs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-25 11:05:16 +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
Vadim Zeitlin
3b118eda4e removed extra default clause accidentally added by last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-05 21:00:10 +00:00
Vadim Zeitlin
1f2a1c3cd7 correct handling of positive quality values (2nd part of patch 1851381)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-05 18:44:36 +00:00
Vadim Zeitlin
23abaeaecd more fixes to handling of the resolution chosen in GTK print dialog (patch 1864504)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-05 18:41:59 +00:00
Vadim Zeitlin
115be92b4f set resolution of print preview from print data (modified patch 1851381)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-03 22:21:04 +00:00
Paul Cornett
380740af5d non-pch build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-01 18:37:08 +00:00
Robert Roebling
fac7f644e2 remove checks for new dc code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-30 20:08:13 +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
4f37154e98 Further wxDC changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-14 14:49:40 +00:00
Robert Roebling
c8ddadff84 More DC changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-13 13:20:15 +00:00
Vadim Zeitlin
e0d1fd7f6e fix more unused parameters warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-29 12:10:48 +00:00
Vadim Zeitlin
30386aeb86 define wxUTF8Buf as the type returned by wxString::utf8_str()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-20 22:52:36 +00:00
Robert Roebling
b0d7707bc4 Use wxPointList instead of wxList in wxDC code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-19 14:53:55 +00:00
Robert Roebling
728ddc45e0 Reduce width and height of drawing ops by one in all vector printing backends
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-24 21:07:20 +00:00
Robert Roebling
90254df808 Rearrange code to fix some problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-18 17:43:17 +00:00
Robert Roebling
b29b9485f6 Correct setting of line width
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-18 17:09:12 +00:00
Paul Cornett
a7060b8cae non-pch build fix, indentation and whitespace cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-13 16:41:28 +00:00
Robert Roebling
5cdcb78775 Third update patch for GTK+ print (correcting my device origin search-and-replace mistake)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-13 12:28:57 +00:00
Robert Roebling
4d1d071dae Second update patch for GTK+ print (DrawBitmap fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-13 12:26:20 +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
Robert Roebling
a931295073 Rewrote scaling for GTK+ print
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-10 21:35:45 +00:00
Robert Roebling
1d9fe50dc9 Patch to use high printer resolution instead of Cairo's 72dpi
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-07 14:05:13 +00:00
Robert Roebling
892434f06f prevent double deletion of cairo lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-07 07:40:38 +00:00
Robert Roebling
0187f0bcf4 wxDC::Clear() shouldn't do anything in printing DCs (I think)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-06 20:30:07 +00:00
Robert Roebling
cf509a9038 Removed run-time dependency on libpangocairo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-06 17:56:09 +00:00
Robert Roebling
d494613ac1 Make use of wxCairoLibrary from within wxGtkPrint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-06 17:24:59 +00:00
Robert Roebling
fa034c4511 Add support for GTK print, modified from patch 1782055
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-05 21:34:08 +00:00