Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,479 Commits 1 Branch 330 Tags
92c0fc34c104c8d7c12d6a3b78ea232690fc23f4
Commit Graph

75 Commits

Author SHA1 Message Date
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
Václav Slavík
17473a770a Fix lots of warnings reported by Clang. 
Mostly potentially lossy implicit conversions in headers (long->int). Also dangling else warnings. Struct/class mismatches.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-10 16:41:34 +00:00
Vadim Zeitlin
a3db17b122 Make wxGraphicsContext::GetSize() const. 
Closes #14556.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-08-03 13:05:11 +00:00
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
771563baee Added wxGraphicsContext::CreateMatrix(wxAffineMatrix2D) overload. 
Make it easy to convert generic wxAffineMatrix2D to native wxGraphicsMatrix.

Closes #13188.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-04-03 11:50:19 +00:00
Robin Dunn
6e6f074b45 Delegate wxGraphicsBitmap::ConvertToImage to the renderer so we do not end up with more than one definition of the method when building with both the GDI+ GC and the Cairo GC enabled at the same time. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-10-20 04:49:12 +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
Vadim Zeitlin
08b2d55fdf Added wxGraphicsBitmap::ConvertToImage(). 
Allow to convert wxGraphicsBitmap directly to wxImage, without passing by
wxBitmap.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-10-09 22:07:07 +00:00
Stefan Csomor
8b98275595 removing trailing comma 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-22 15:11:37 +00:00
Vadim Zeitlin
bbd783e0b2 No real changes, just remove trailing commas from enum. 
wxCompositionMode enum had a trailing comma not allowed by C++ 98 (and which
would result in warnings or errors with g++ pedantic switch).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-07-02 10:29:14 +00:00
Vadim Zeitlin
fec4e45897 Add wxCOMPOSITION_INVALID mode and use it to simplify the code. 
Having an invalid element in wxCompositionMode enum allows to directly return
it from TranslateRasterOp() function instead of needing a separate bool
parameter to indicate that a ROP couldn't be translated.

This also incidentally fixes warnings about possibly uninitialized variables
in optimized g++ builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-07-02 10:29:11 +00:00
Stefan Csomor
3399af21d1 adding default interpolation enum 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-06-09 23:05:09 +00:00
Stefan Csomor
a173c81340 fixing test, adding minimal docs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-06-09 21:44:19 +00:00
Stefan Csomor
133cb28b21 adding placeholders for interpolation setting 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-06-09 21:38:08 +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
Stefan Csomor
7d53220e14 fixing constants to be of the expected parameter type (float instead of double) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-14 12:16:42 +00:00
Vadim Zeitlin
2028c33ab5 Add default constructor to wxGraphicsGradientStop. 
It may be convenient to create wxGraphicsGradientStop first and initialize it
later so allow doing this by providing the default argument for constructor
parameters and thus allowing to use it as the default constructor.

See #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-06 13:55:35 +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
Kevin Ollivier
c0e69d720d Forward port of r60190 (wxMSW Cairo support) to trunk. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-11-18 19:05:42 +00:00
Stefan Csomor
9bd36c6c0f adding defaults as wxDC did 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-09 17:34:39 +00:00
Stefan Csomor
2986eb869c adding construction from native bitmaps 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-02 19:45:03 +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
3352145758 fixing typo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-16 10:29:58 +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
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-08 11:45:59 +00:00
Stefan Csomor
02fd8b9b61 fixing infinite recursion for rotated text, introduced in cleanup r57915 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-16 15:31:55 +00:00
Francesco Montorsi
79bd5e982b use #if instead of #ifdef for WX_COMPAT 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-09 12:40:11 +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
3adf5bcf2d fix typo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-08 15:10:54 +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
Stefan Csomor
220d37c864 better guarding when no printing architecture exists (patch from Joel Low) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-31 05:57:56 +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
d974a4945c Made wxCairo graphics code compile again, wxGraphicsBitmap still missing 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-25 13:32:23 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-26 15:06:00 +00:00
Stefan Csomor
1796d3849c merging graphics bitmap additions from Kevin O. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-05 21:10:39 +00:00
Stefan Csomor
3c419e8111 moving things to private headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-18 13:23:26 +00:00
Mart Raudsepp
f07d9b9777 Include defs.h before checking if wxUSE_GRAPHICS_CONTEXT is requested in build. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-12 20:20:21 +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
cc18b1c7af forward port from 2.8 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-09 20:25:57 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Václav Slavík
d45127a543 removed executable bit on files that aren't executables 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-25 14:04:34 +00:00
Vadim Zeitlin
39013ba095 removed extraneous semicolon (bug 1679080) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-12 20:34:46 +00:00