same as r57054 in 2.8

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 5e6c73258c16535b402332ba3ae8f2ab9a9999e0..15781af016d53e8c34344bd25c9deb52257ea746 100644 (file)
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -26,6 +26,7 @@
 
 #include "wx/dcsvg.h"
 #include "wx/wfstream.h"
 
 #include "wx/dcsvg.h"
 #include "wx/wfstream.h"

+#include "wx/filename.h"

 
 #define wxSVG_DEBUG FALSE
 // or TRUE to see the calls being executed
 
 #define wxSVG_DEBUG FALSE
 // or TRUE to see the calls being executed


@@ -657,6 +658,10 @@ void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoor
 //save it
     bool bPNG_OK = myBitmap.SaveFile(sPNG,wxBITMAP_TYPE_PNG);
 
 //save it
     bool bPNG_OK = myBitmap.SaveFile(sPNG,wxBITMAP_TYPE_PNG);
 

+// reference the bitmap from the SVG doc
+// only use filename & ext
+    sPNG = sPNG.AfterLast(wxFileName::GetPathSeparator());
+

 // refrence the bitmap from the SVG doc
     int w = myBitmap.GetWidth();
     int h = myBitmap.GetHeight();
 // refrence the bitmap from the SVG doc
     int w = myBitmap.GetWidth();
     int h = myBitmap.GetHeight();