Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-05 00:00:21 +01:00
Code Issues Releases Wiki Activity

Preliminary changes for wxWidgets 3.0.1

Browse Source 
We can't go to 3.0.1 yet as there are still build issues on
Linux and OSX.  You can get Windows to build, but there's
still some display issues.

These changes should work with wxWidgets 2.8.12 as well, so
we can take our time to get things working properly before
switching over.
This commit is contained in:
lllucius
2014-10-06 08:10:50 +00:00
parent 0933da5b60
commit bdcefb4850
54 changed files with 252 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/xml/XMLWriter.cpp
View File

@@ -124,21 +124,11 @@ void XMLWriter::WriteAttr(const wxString &name, const wxString &value)
XMLEsc(value).c_str()));
}
void XMLWriter::WriteAttr(const wxChar *name, const wxChar *value)
{
WriteAttr(wxString(name), wxString(value));
}
void XMLWriter::WriteAttr(const wxString &name, const wxChar *value)
{
WriteAttr(name, wxString(value));
}
void XMLWriter::WriteAttr(const wxChar *name, const wxString &value)
{
WriteAttr(wxString(name), value);
}
void XMLWriter::WriteAttr(const wxString &name, int value)
{
Write(wxString::Format(wxT(" %s=\"%d\""),
@@ -146,11 +136,6 @@ void XMLWriter::WriteAttr(const wxString &name, int value)
value));
}
void XMLWriter::WriteAttr(const wxChar *name, int value)
{
WriteAttr(wxString(name), value);
}
void XMLWriter::WriteAttr(const wxString &name, bool value)
{
Write(wxString::Format(wxT(" %s=\"%d\""),
@@ -158,11 +143,6 @@ void XMLWriter::WriteAttr(const wxString &name, bool value)
value));
}
void XMLWriter::WriteAttr(const wxChar *name, bool value)
{
WriteAttr(wxString(name), value);
}
void XMLWriter::WriteAttr(const wxString &name, long value)
{
Write(wxString::Format(wxT(" %s=\"%ld\""),
@@ -170,11 +150,6 @@ void XMLWriter::WriteAttr(const wxString &name, long value)
value));
}
void XMLWriter::WriteAttr(const wxChar *name, long value)
{
WriteAttr(wxString(name), value);
}
void XMLWriter::WriteAttr(const wxString &name, long long value)
{
Write(wxString::Format(wxT(" %s=\"%lld\""),
@@ -182,11 +157,6 @@ void XMLWriter::WriteAttr(const wxString &name, long long value)
value));
}
void XMLWriter::WriteAttr(const wxChar *name, long long value)
{
WriteAttr(wxString(name), value);
}
void XMLWriter::WriteAttr(const wxString &name, size_t value)
{
Write(wxString::Format(wxT(" %s=\"%ld\""),
@@ -194,11 +164,6 @@ void XMLWriter::WriteAttr(const wxString &name, size_t value)
value));
}
void XMLWriter::WriteAttr(const wxChar *name, size_t value)
{
WriteAttr(wxString(name), value);
}
void XMLWriter::WriteAttr(const wxString &name, float value, int digits)
{
Write(wxString::Format(wxT(" %s=\"%s\""),
@@ -206,11 +171,6 @@ void XMLWriter::WriteAttr(const wxString &name, float value, int digits)
Internat::ToString(value, digits).c_str()));
}
void XMLWriter::WriteAttr(const wxChar *name, float value, int digits)
{
WriteAttr(wxString(name), value, digits);
}
void XMLWriter::WriteAttr(const wxString &name, double value, int digits)
{
Write(wxString::Format(wxT(" %s=\"%s\""),
@@ -218,11 +178,6 @@ void XMLWriter::WriteAttr(const wxString &name, double value, int digits)
Internat::ToString(value, digits).c_str()));
}
void XMLWriter::WriteAttr(const wxChar *name, double value, int digits)
{
WriteAttr(wxString(name), value, digits);
}
void XMLWriter::WriteData(const wxString &value)
{
int i;
@@ -234,11 +189,6 @@ void XMLWriter::WriteData(const wxString &value)
Write(XMLEsc(value));
}
void XMLWriter::WriteData(const wxChar *value)
{
WriteData(wxString(value));
}
void XMLWriter::WriteSubTree(const wxString &value)
{
if (mInTag) {
@@ -250,16 +200,6 @@ void XMLWriter::WriteSubTree(const wxString &value)
Write(value.c_str());
}
void XMLWriter::WriteSubTree(const wxChar *value)
{
WriteSubTree(wxString(value));
}
void XMLWriter::Write(const wxChar *value)
{
Write(wxString(value));
}
// See http://www.w3.org/TR/REC-xml for reference
wxString XMLWriter::XMLEsc(const wxString & s)
{

13
src/xml/XMLWriter.h
View File

@@ -27,32 +27,19 @@ class AUDACITY_DLL_API XMLWriter {
void EndTag(const wxString &name);
void WriteAttr(const wxString &name, const wxString &value);
void WriteAttr(const wxChar *name, const wxChar *value);
void WriteAttr(const wxString &name, const wxChar *value);
void WriteAttr(const wxChar *name, const wxString &value);
void WriteAttr(const wxString &name, int value);
void WriteAttr(const wxChar *name, int value);
void WriteAttr(const wxString &name, bool value);
void WriteAttr(const wxChar *name, bool value);
void WriteAttr(const wxString &name, long value);
void WriteAttr(const wxChar *name, long value);
void WriteAttr(const wxString &name, long long value);
void WriteAttr(const wxChar *name, long long value);
void WriteAttr(const wxString &name, size_t value);
void WriteAttr(const wxChar *name, size_t value);
void WriteAttr(const wxString &name, float value, int digits = -1);
void WriteAttr(const wxChar *name, float value, int digits = -1);
void WriteAttr(const wxString &name, double value, int digits = -1);
void WriteAttr(const wxChar *name, double value, int digits = -1);
void WriteData(const wxString &value);
void WriteData(const wxChar *value);
void WriteSubTree(const wxString &value);
void WriteSubTree(const wxChar *value);
void Write(const wxChar *data);
virtual void Write(const wxString &data) = 0;