Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-10-08 22:17:14 +00:00
parent c06f56dd1a
commit 32742d3d9d
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/richtext/richtextxml.cpp
View File

@@ -579,37 +579,37 @@ wxString wxRichTextXMLHandler::AttributeToXML(const wxString& str)
#if wxRICHTEXT_HAVE_DIRECT_OUTPUT #if wxRICHTEXT_HAVE_DIRECT_OUTPUT
static inline void AddAttribute(wxString& str, const wxChar* name, const int& v) static inline void AddAttribute(wxString& str, const wxString& name, const int& v)
{ {
str << wxT(" ") << name << wxT("=\"") << wxString::Format(wxT("%d"), v) << wxT("\""); str << wxT(" ") << name << wxT("=\"") << wxString::Format(wxT("%d"), v) << wxT("\"");
} }
static inline void AddAttribute(wxString& str, const wxChar* name, const long& v) static inline void AddAttribute(wxString& str, const wxString& name, const long& v)
{ {
str << wxT(" ") << name << wxT("=\"") << wxString::Format(wxT("%ld"), v) << wxT("\""); str << wxT(" ") << name << wxT("=\"") << wxString::Format(wxT("%ld"), v) << wxT("\"");
} }
static inline void AddAttribute(wxString& str, const wxChar* name, const double& v) static inline void AddAttribute(wxString& str, const wxString& name, const double& v)
{ {
str << wxT(" ") << name << wxT("=\"") << wxString::Format(wxT("%.2f"), (float) v) << wxT("\""); str << wxT(" ") << name << wxT("=\"") << wxString::Format(wxT("%.2f"), (float) v) << wxT("\"");
} }
static inline void AddAttribute(wxString& str, const wxChar* name, const wxChar* s) static inline void AddAttribute(wxString& str, const wxString& name, const wxChar* s)
{ {
str << wxT(" ") << name << wxT("=\"") << s << wxT("\""); str << wxT(" ") << name << wxT("=\"") << s << wxT("\"");
} }
static inline void AddAttribute(wxString& str, const wxChar* name, const wxString& s) static inline void AddAttribute(wxString& str, const wxString& name, const wxString& s)
{ {
str << wxT(" ") << name << wxT("=\"") << s << wxT("\""); str << wxT(" ") << name << wxT("=\"") << s << wxT("\"");
} }
static inline void AddAttribute(wxString& str, const wxChar* name, const wxColour& col) static inline void AddAttribute(wxString& str, const wxString& name, const wxColour& col)
{ {
str << wxT(" ") << name << wxT("=\"") << wxT("#") << ColourToHexString(col) << wxT("\""); str << wxT(" ") << name << wxT("=\"") << wxT("#") << ColourToHexString(col) << wxT("\"");
} }
static inline void AddAttribute(wxString& str, const wxChar* name, const wxTextAttrDimension& dim) static inline void AddAttribute(wxString& str, const wxString& name, const wxTextAttrDimension& dim)
{ {
if (dim.IsPresent()) if (dim.IsPresent())
{ {
@@ -620,12 +620,7 @@ static inline void AddAttribute(wxString& str, const wxChar* name, const wxTextA
} }
} }
static inline void AddAttribute(wxString& str, const wxString& name, const wxTextAttrDimension& dim) static inline void AddAttribute(wxString& str, const wxString& rootName, const wxTextAttrDimensions& dims)
{
AddAttribute(str, name.c_str(), dim);
}
static inline void AddAttribute(wxString& str, const wxChar* rootName, const wxTextAttrDimensions& dims)
{ {
if (dims.GetLeft().IsPresent()) if (dims.GetLeft().IsPresent())
AddAttribute(str, rootName + wxString(wxT("-left")), dims.GetLeft()); AddAttribute(str, rootName + wxString(wxT("-left")), dims.GetLeft());
@@ -637,7 +632,7 @@ static inline void AddAttribute(wxString& str, const wxChar* rootName, const wxT
AddAttribute(str, rootName + wxString(wxT("-bottom")), dims.GetBottom()); AddAttribute(str, rootName + wxString(wxT("-bottom")), dims.GetBottom());
} }
static inline void AddAttribute(wxString& str, const wxChar* rootName, const wxTextAttrBorder& border) static inline void AddAttribute(wxString& str, const wxString& rootName, const wxTextAttrBorder& border)
{ {
if (border.HasStyle()) if (border.HasStyle())
AddAttribute(str, rootName + wxString(wxT("-style")), border.GetStyle()); AddAttribute(str, rootName + wxString(wxT("-style")), border.GetStyle());
@@ -647,7 +642,7 @@ static inline void AddAttribute(wxString& str, const wxChar* rootName, const wxT
AddAttribute(str, rootName + wxString(wxT("-width")), border.GetWidth()); AddAttribute(str, rootName + wxString(wxT("-width")), border.GetWidth());
} }
static inline void AddAttribute(wxString& str, const wxChar* rootName, const wxTextAttrBorders& borders) static inline void AddAttribute(wxString& str, const wxString& rootName, const wxTextAttrBorders& borders)
{ {
AddAttribute(str, rootName + wxString(wxT("-left")), borders.GetLeft()); AddAttribute(str, rootName + wxString(wxT("-left")), borders.GetLeft());
AddAttribute(str, rootName + wxString(wxT("-right")), borders.GetRight()); AddAttribute(str, rootName + wxString(wxT("-right")), borders.GetRight());
@@ -660,32 +655,32 @@ static inline void AddAttribute(wxString& str, const wxChar* rootName, const wxT
#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT #if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const int& v) static inline void AddAttribute(wxXmlNode* node, const wxString& name, const int& v)
{ {
node->AddAttribute(name, MakeString(v)); node->AddAttribute(name, MakeString(v));
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const long& v) static inline void AddAttribute(wxXmlNode* node, const wxString& name, const long& v)
{ {
node->AddAttribute(name, MakeString(v)); node->AddAttribute(name, MakeString(v));
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const double& v) static inline void AddAttribute(wxXmlNode* node, const wxString& name, const double& v)
{ {
node->AddAttribute(name, MakeString(v)); node->AddAttribute(name, MakeString(v));
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const wxString& s) static inline void AddAttribute(wxXmlNode* node, const wxString& name, const wxString& s)
{ {
node->AddAttribute(name, s); node->AddAttribute(name, s);
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const wxColour& col) static inline void AddAttribute(wxXmlNode* node, const wxString& name, const wxColour& col)
{ {
node->AddAttribute(name, MakeString(col)); node->AddAttribute(name, MakeString(col));
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const wxTextAttrDimension& dim) static inline void AddAttribute(wxXmlNode* node, const wxString& name, const wxTextAttrDimension& dim)
{ {
if (dim.IsPresent()) if (dim.IsPresent())
{ {
@@ -694,7 +689,7 @@ static inline void AddAttribute(wxXmlNode* node, const wxChar* name, const wxTex
} }
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* rootName, const wxTextAttrDimensions& dims) static inline void AddAttribute(wxXmlNode* node, const wxString& rootName, const wxTextAttrDimensions& dims)
{ {
if (dims.GetLeft().IsPresent()) if (dims.GetLeft().IsPresent())
AddAttribute(node, rootName + wxString(wxT("-left")), dims.GetLeft()); AddAttribute(node, rootName + wxString(wxT("-left")), dims.GetLeft());
@@ -706,7 +701,7 @@ static inline void AddAttribute(wxXmlNode* node, const wxChar* rootName, const w
AddAttribute(node, rootName + wxString(wxT("-bottom")), dims.GetBottom()); AddAttribute(node, rootName + wxString(wxT("-bottom")), dims.GetBottom());
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* rootName, const wxTextAttrBorder& border) static inline void AddAttribute(wxXmlNode* node, const wxString& rootName, const wxTextAttrBorder& border)
{ {
if (border.HasStyle()) if (border.HasStyle())
AddAttribute(node, rootName + wxString(wxT("-style")), border.GetStyle()); AddAttribute(node, rootName + wxString(wxT("-style")), border.GetStyle());
@@ -716,7 +711,7 @@ static inline void AddAttribute(wxXmlNode* node, const wxChar* rootName, const w
AddAttribute(node, rootName + wxString(wxT("-width")), border.GetWidth()); AddAttribute(node, rootName + wxString(wxT("-width")), border.GetWidth());
} }
static inline void AddAttribute(wxXmlNode* node, const wxChar* rootName, const wxTextAttrBorders& borders) static inline void AddAttribute(wxXmlNode* node, const wxString& rootName, const wxTextAttrBorders& borders)
{ {
AddAttribute(node, rootName + wxString(wxT("-left")), borders.GetLeft()); AddAttribute(node, rootName + wxString(wxT("-left")), borders.GetLeft());
AddAttribute(node, rootName + wxString(wxT("-right")), borders.GetRight()); AddAttribute(node, rootName + wxString(wxT("-right")), borders.GetRight());
@@ -2336,9 +2331,10 @@ bool wxRichTextImage::ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler
if (stream.GetSize() > 0) if (stream.GetSize() > 0)
{ {
int size = stream.GetSize(); int size = stream.GetSize();
#ifdef __WXDEBUG__
int size2 = stream.GetOutputStreamBuffer()->GetIntPosition(); int size2 = stream.GetOutputStreamBuffer()->GetIntPosition();
wxASSERT(size == size2); wxASSERT(size == size2);
#endif
unsigned char* data = new unsigned char[size]; unsigned char* data = new unsigned char[size];
stream.CopyTo(data, size); stream.CopyTo(data, size);
strData = wxString((const char*) data, wxConvUTF8, size); strData = wxString((const char*) data, wxConvUTF8, size);