update button style to include BS_MULTILINE when a multiline label is set

[wxWidgets.git] / src / common / dcsvg.cpp

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 92f539abaf2cc48918ac36f47106fc293987281a..9a94179c2d2687cc0c8c15c789e2e420d091d5e4 100644 (file)
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -15,12 +15,17 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SVG
+
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcscreen.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
 #endif
 
 #include "wx/dcsvg.h"
-#include "wx/image.h"
+#include "wx/wfstream.h"
 
 #define wxSVG_DEBUG FALSE
 // or TRUE to see the calls being executed
@@ -666,7 +671,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
 
 void wxSVGFileDC::write(const wxString &s)
 {
-    const wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
+    const wxCharBuffer buf = s.utf8_str();
     m_outfile->Write(buf, strlen((const char *)buf));
     m_OK = m_outfile->Ok();
 }
@@ -711,3 +716,6 @@ void wxSVGFileDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 #pragma warn .rch
 #pragma warn .ccc
 #endif
+
+#endif // wxUSE_SVG
+