Commit Graph

92 Commits

Author SHA1 Message Date
Vadim Zeitlin
5d9dd2c6e1 No changes, just remove unused variable from wxSVGFileDCImpl.
sWarn was never used, drop it.

See #14462.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-24 23:39:55 +00:00
Vadim Zeitlin
66815259f5 Fix text origin and bounding box computations in wxSVGFileDC.
Text origin was calculated incorrectly for the rotated text and the bounding
box was wrong even in non-rotated case.

Fix this by using correct definition of the text anchor according to the SVG
specification and add a test to the svg sample demonstrating this.

Closes #14489.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-15 23:19:35 +00:00
Vadim Zeitlin
c9848e6318 No real changes, just slightly simplify wxSVGFileDCImpl code.
Move m_graphics_changed check inside NewGraphics() itself instead of checking
whether it's true each time before calling it, it is better to both test the
flag and reset it inside this function rather than do the first part in the
caller and the second one in the callee.

Also rename the function to NewGraphicsIfNeeded() to make its meaning more
clear.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-15 23:19:11 +00:00
Vadim Zeitlin
007d2de3c4 Handle colours with alpha channel correctly in wxSVGFileDC.
wxColour::GetAsString(wxC2S_HTML_SYNTAX) doesn't accept colours with alpha
channel as alpha is not representable in HTML syntax, so avoid calling this
function with such colours, remove the alpha component in the caller before
using it instead.

Also slightly simplify wxBrushString() and wxPenString() functions code in
wxSVGFileDC implementation.

Closes #13214.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 22:27: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
Vadim Zeitlin
b2a1c6f51b No real changes, just some more minor cleanup in wxSVGFileDC.
Harmonize spaces, remove unnecessary semicolons, remove useless return
statements from void functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:38:04 +00:00
Vadim Zeitlin
af58e08750 Remove wxSVG_DEBUG from wxSVGFileDC.
Remove the weird wxSVG_DEBUG which could apparently be used to trace the code
execution by triggering asserts in all functions. This is really not the right
way to implement tracing and seems pretty useless, just remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:38:02 +00:00
Vadim Zeitlin
85675f1019 Clean up of string operations in wxSVGFileDC code.
Use operator+=() instead of "s = s + ...".

See #13086.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:58 +00:00
Vadim Zeitlin
403695b323 Add support for alpha channel in colours in wxSVGFileDC.
Use stroke-opacity and fill-opacity SVG attributes to handle pens and brushes
created from colours with alpha channel in wxSVGFileDC.

Closes #13086.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:54 +00:00
Vadim Zeitlin
b72ed64277 No changes, just merge some strings in wxSVGFileDC.
Concatenate string literals at compile-time instead of run-time.

See #13086.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:50 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00
Vadim Zeitlin
1f4d7e441c No changes, just clean up wxSVGFileDC code a little.
Use literal strings instead of macros such as "newline", "space" and
"semicolon" and also use wxColour::GetAsString() instead of reimplementing it.

Closes #13037.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 23:25:58 +00:00
Vadim Zeitlin
caef3ffacc Produce correct SVG files in all locales.
Using wxSVGFileDC in locales using comma as decimal separator resulted in
invalid SVG files being created as a decimal period should always be used in
them.

Fix this by replacing "%g" format specification with wxString::FromCDouble()
call (wrapped in a convenient NumStr() helper function).

Closes #12008.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:43 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +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
Francesco Montorsi
13cfc51d63 only formatting changes. s/FALSE/false and s/TRUE/true; remove excessive empty lines; remove TABs; s/ ;/;
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-05 19:12:41 +00:00
Chris Elliott
fd5ed78ca0 cast both ints to doubles for the X and Y scale factors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-17 14:21:57 +00:00
Chris Elliott
ddabd45b61 same as r57054 in 2.8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-16 21:46:21 +00:00
Chris Elliott
053025ac94 same as r57053 in 2.8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-16 21:26:55 +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
Robert Roebling
78cededfdc remove test for new dc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-30 20:00:19 +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
Václav Slavík
79d8d561d6 don't add new PNG handler instance every time wxSVGFileImplDC::DoDrawBitmap() is called, do it only if the handler isn't installed yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-22 13:39:26 +00:00
Robert Roebling
d8416992be reorganized wxSVGFileDC code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-24 09:30:24 +00:00
Vadim Zeitlin
98c389845f non-PCH compilation fix after latest change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-12 00:12:51 +00:00
Vadim Zeitlin
b0fc907f70 added wxUSE_SVG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-11 20:52:41 +00:00
Vadim Zeitlin
8e10778e0e cleanup: indentation, line length, don't include unneeded headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-11 20:42:37 +00:00
Václav Slavík
6243633c63 fixed wxSVGFileDC::write() to output UTF-8 even in ANSI build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-11 20:00:52 +00:00
Robert Roebling
04ab8b6ddf Moved all the coordinate system calculation to wxDCBase
and thus removed all the duplicated code in all wxDC
   classes.
  Problematic is that wxSVGFileDC and wxPostscriptDC inherit
   from wxDC and therefore include platform specific code
   (also before this change) so I chose to override all
   SetLogicalOrigin() etc. methods in these classes and
   call their wxDCBase methods thereby circumventing the
   platform dependent code.
  I'm afraid the Mac code will require updating, too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-02 11:05:45 +00:00
Robert Roebling
621b83d9b3 Made device to logical and vv conversion methods
virtual and implement them like any other method
    in the wxDC classes, not only in the their files
    but somehow belonging to the wxDCBase class.
  This is required for plugging in differnt DC backends
    with different conversions.
  Ideally (and absolutely possible ) all these methods
    should be removed and just the one in wxDCBase
    should stay using values set in the various
    derived classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-01 21:28:29 +00:00
Vadim Zeitlin
c94f845b16 changed wxDC::GetTextExtent() and related methods to take const wxFont pointer, for consistency with wxWindow::GetTextExtent() and because it generally doesn't need a non-const font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-25 01:49:47 +00:00
Chris Elliott
781a8d7f3e add const to avoid hiding warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-20 11:03:28 +00:00
Václav Slavík
1bb592b878 removed spurious semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-09 06:50:28 +00:00
Robin Dunn
18cea8715a Patch from FM with more bakefile tweaks and etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 18:26:59 +00:00
Robin Dunn
54429bb380 Bakefile and other changes for new locations of STC and wxSVGFileDC.
Remove old files in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 06:27:23 +00:00
Włodzimierz Skiba
3454ecd508 math.h/PI integration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-13 20:10:59 +00:00
Chris Elliott
fb88ba480b SF patch 1067466
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 14:54:38 +00:00
Chris Elliott
216db41f96 sf patch #806451
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-15 12:28:11 +00:00
Mattia Barbon
a2a6aef2bf Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 20:50:11 +00:00
Julian Smart
85b88942cc Applied patch [ 778625 ] wxSVGFileDC and UNICODE build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 10:05:32 +00:00
Chris Elliott
1a55595e69 fix contrib makefile for watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-10 21:55:23 +00:00
Chris Elliott
cdf3a589b2 wxSVGDC class test sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-19 09:16:19 +00:00