Commit Graph

60 Commits

Author SHA1 Message Date
Robin Dunn
8b180bded6 Enable access to the native bitmap object wrapped by wxGraphicsBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:06:50 +00:00
Vadim Zeitlin
fa378d369f Allow creating wxGraphicsFont without using wxFont.
This is mostly important to allow using wxImage-based wxGraphicsContext
without requiring X server connection under Unix: as wxFont can't be used
without X server, we needed another way to create wxGraphicsFont in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:29 +00:00
Vadim Zeitlin
0a470e5ea5 Allow creating wxGraphicsBitmap and wxGraphicsContext from wxImage.
Provide a way to use wxGraphicsContext to draw on wxImage.

This is implemented internally by drawing on wxGraphicsBitmap which can be now
also created from wxImage.

Add a test of the new functionality to the image sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:22 +00:00
Stefan Csomor
ab332136e4 using higher abstraction to allow for optimized implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 23:23:35 +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
Stefan Csomor
0217cfa537 support generic flag for pixel offsetting, see #11853
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 12:21:37 +00:00
Vadim Zeitlin
b129eaa377 Implement wxGraphicsContext::GetSize() for Cairo.
As the implementation of this method is basically the same for all ports move
it to the base class itself instead of requiring the derived classes to
implement it. Now the derived classes need to fill in m_width and m_height
members instead.

Do fill them when creating wxGraphicsContext in Cairo version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:38:03 +00:00
Stefan Csomor
29188693b3 bracketing msw enhanced metafile usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 11:10:35 +00:00
Vadim Zeitlin
c929ad9141 Correct checks for wxUSE_PRINTING_ARCHITECTURE and wxUSE_ENH_METAFILE.
Compilation fixes for building without one or both of these symbols.

See #12664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:32 +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
Vadim Zeitlin
3784bf308f Correct checks for gradient stop position.
It may be <= 1 in the final version and not < 1.

See #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 00:17:16 +00:00
Vadim Zeitlin
4ee4c7b948 Add support for gradient stops to wxGraphicsContext.
Allow specifying a set of gradient stops instead of just the beginning and
ending colours. Add the new wxGraphicsGradientStop(s) classes and new
wxGraphicsContext::Create{Linear,Radial}GradientBrush() overloads. Also change
the same methods of wxGraphicsRenderer to take wxGraphicsGradientStops instead
of a pair of colours.

Implement the new API for MSW and Cairo. OS X still uses just the two colours
for now.

Closes #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 12:15:11 +00:00
Paul Cornett
00491f99f4 remove unused variables, minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-05 19:45:42 +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
Kevin Ollivier
2fc9c1ea77 Forward port wxGraphicsBitmap cairo implementation, and fix the credit info in measuring.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-20 23:33:55 +00:00
Stefan Csomor
bf02a7f976 switching to compositing operators (fixes #9881), adding layers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-15 16:52:05 +00:00
Francesco Montorsi
94a007ece4 a few more int/wxPolygonFillMode substitutions in wxRegion and wxGraphicsContext code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-08 16:43:56 +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
Vadim Zeitlin
0b7dce5480 fix warnings about hiding virtual wxGraphicsContext::DrawText() overloads by using different names for the implementation functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-13 12:16:39 +00:00
Vadim Zeitlin
caa42c43d0 no changes, just deTABbed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-13 12:04:17 +00:00
Robert Roebling
d9468a20c4 #9876 (GC: added sanity check to wxGraphicsPathData::AddEllipse())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-21 12:21:14 +00:00
Stefan Csomor
6d0d845548 better guarding when no printing architecture exists (patch from Joel Low)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-31 06:57:33 +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
772f15b4d7 Fix linking problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-25 17:20:02 +00:00
Stefan Csomor
9786ef0172 graphics context additions and merging graphics bitmap additions from Kevin O.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-05 21:13:05 +00:00
Stefan Csomor
66bc98cccb moving things to private headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-18 13:23:59 +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
Stefan Csomor
0ad76eea22 cleanup mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-22 14:21:36 +00:00
Vadim Zeitlin
c29bdd5ffe fix unused parameters warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-10 00:46:11 +00:00
Stefan Csomor
fcaea2fab9 forward port from 2.8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-09 20:39:58 +00:00
Robin Dunn
248802d010 Add wxGraphicsMatrix::Get
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-05 23:42:52 +00:00
Stefan Csomor
4280b8797f adding raster op hook to graphics context
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-03 15:23:42 +00:00
Stefan Csomor
773ccc318e adapting to new inheritance of wxMemoryDC (under MSW only at the moment)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-06 09:47:20 +00:00
Stefan Csomor
068eb463a4 adding text with background brush
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 17:41:41 +00:00
Stefan Csomor
ad66794547 adding measuring contexts, streamlining printing code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 07:50:06 +00:00
Robin Dunn
1ea0eb4e3e Add missing wxNullGraphicsPath
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 02:28:15 +00:00
Stefan Csomor
a4e73390a6 moving path and matrix to refcounting as well, switching filling rule default to odd-even as dc.h does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-28 13:46:46 +00:00
Robin Dunn
c907796b33 Add missing Contains overload
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-28 02:59:41 +00:00
Robert Roebling
4f40354afa Compile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-27 18:42:20 +00:00
Stefan Csomor
2c82040626 changing graphics pen, brushes and fonts to be refcounted objects, having no subclasses
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-27 14:21:27 +00:00
Stefan Csomor
59720690df moving rounded rect and ellipse to path class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-26 19:24:18 +00:00
Stefan Csomor
06b9edb712 missing common create functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-26 12:04:48 +00:00
Stefan Csomor
facbe36395 adapted to new renderer, moved wxGCDC into dcgraph.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-26 06:24:20 +00:00
Robin Dunn
bb8204ef82 SetTextColor --> SetTextColour, to be consistent with the rest of the lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-26 01:19:00 +00:00
Robin Dunn
9ed79eee4e Fix the rectangle size when offsetting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-25 06:55:49 +00:00
Stefan Csomor
8ddf8e829a adding wxobject and RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-22 17:52:23 +00:00
Robert Roebling
ddb0ed69a9 Fix warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-21 17:22:07 +00:00
Robin Dunn
7ed14752be more informative FAIL message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-21 01:16:41 +00:00
Vadim Zeitlin
a2d6d21099 fix warnings (double to int conversions and unused variables); removed hard TABs and extra spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-20 23:59:55 +00:00
Stefan Csomor
8bf12709e9 setting a non valid font is permitted, implemented now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-20 19:29:30 +00:00