projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uses src/iodbc headers rather than windows headers to hopefully standardize across...
[wxWidgets.git]
/
src
/
common
/
variant.cpp
diff --git
a/src/common/variant.cpp
b/src/common/variant.cpp
index fdaf53ef994a1f100b3c1f4a7af14a03084811f1..a8ab35073d36e317380553c42afecf6aa4a3173d 100644
(file)
--- a/
src/common/variant.cpp
+++ b/
src/common/variant.cpp
@@
-11,6
+11,8
@@
#ifdef __GNUG__
#pragma implementation "variant.h"
#ifdef __GNUG__
#pragma implementation "variant.h"
+#pragma implementation "time.h"
+#pragma implementation "date.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#endif
// For compilers that support precompilation, includes "wx/wx.h".
@@
-20,16
+22,28
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_IOSTREAMH
-# include <fstream.h>
-#else
-# include <fstream>
+#if wxUSE_STD_IOSTREAM
+ #if wxUSE_IOSTREAMH
+ #include <fstream.h>
+ #else
+ #include <fstream>
+ #endif
#endif
#endif
+#if wxUSE_STREAMS
#include "wx/stream.h"
#include "wx/stream.h"
+#include "wx/txtstrm.h"
+#endif
+
#include "wx/string.h"
#include "wx/variant.h"
#include "wx/string.h"
#include "wx/variant.h"
+IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
+
+wxTime::tFormat wxTime::ms_Format = wxTime::wx12h;
+wxTime::tPrecision wxTime::ms_Precision = wxTime::wxStdMinSec;
+
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
wxVariant WXDLLEXPORT wxNullVariant;
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
wxVariant WXDLLEXPORT wxNullVariant;
@@
-51,11
+65,15
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
virtual bool Read(wxString& str);
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return
"list"
; };
+ virtual wxString GetType() const { return
wxT("list")
; };
void Clear();
void Clear();
@@
-101,7
+119,7
@@
void wxVariantDataList::Clear()
void wxVariantDataList::Copy(wxVariantData& data)
{
void wxVariantDataList::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"list"), "wxVariantDataList::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data")
);
wxVariantDataList& listData = (wxVariantDataList&) data;
wxVariantDataList& listData = (wxVariantDataList&) data;
@@
-117,7
+135,7
@@
void wxVariantDataList::Copy(wxVariantData& data)
bool wxVariantDataList::Eq(wxVariantData& data) const
{
bool wxVariantDataList::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"list"), "wxVariantDataList::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch")
);
wxVariantDataList& listData = (wxVariantDataList&) data;
wxNode* node1 = m_value.First();
wxVariantDataList& listData = (wxVariantDataList&) data;
wxNode* node1 = m_value.First();
@@
-135,23
+153,25
@@
bool wxVariantDataList::Eq(wxVariantData& data) const
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataList::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataList::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataList::Write(wxString& str) const
{
bool wxVariantDataList::Write(wxString& str) const
{
- str =
""
;
+ str =
wxT("")
;
wxNode* node = m_value.First();
while (node)
{
wxVariant* var = (wxVariant*) node->Data();
if (node != m_value.First())
wxNode* node = m_value.First();
while (node)
{
wxVariant* var = (wxVariant*) node->Data();
if (node != m_value.First())
- str +=
" "
;
+ str +=
wxT(" ")
;
wxString str1;
str += var->MakeString();
node = node->Next();
wxString str1;
str += var->MakeString();
node = node->Next();
@@
-160,16
+180,18
@@
bool wxVariantDataList::Write(wxString& str) const
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataList::Read(istream& WXUNUSED(str))
{
bool wxVariantDataList::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(
"Unimplemented"
);
+ wxFAIL_MSG(
wxT("Unimplemented")
);
// TODO
return FALSE;
}
// TODO
return FALSE;
}
+#endif
bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{
- wxFAIL_MSG(
"Unimplemented"
);
+ wxFAIL_MSG(
wxT("Unimplemented")
);
// TODO
return FALSE;
}
// TODO
return FALSE;
}
@@
-190,11
+212,15
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
virtual bool Read(wxString& str);
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return
"stringlist"
; };
+ virtual wxString GetType() const { return
wxT("stringlist")
; };
protected:
wxStringList m_value;
protected:
wxStringList m_value;
@@
-209,7
+235,7
@@
void wxVariantDataStringList::SetValue(const wxStringList& value)
void wxVariantDataStringList::Copy(wxVariantData& data)
{
void wxVariantDataStringList::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"stringlist"), "wxVariantDataStringList::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data")
);
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
@@
-218,15
+244,15
@@
void wxVariantDataStringList::Copy(wxVariantData& data)
bool wxVariantDataStringList::Eq(wxVariantData& data) const
{
bool wxVariantDataStringList::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"stringlist"), "wxVariantDataStringList::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch")
);
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
wxNode* node1 = m_value.First();
wxNode* node2 = listData.GetValue().First();
while (node1 && node2)
{
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
wxNode* node1 = m_value.First();
wxNode* node2 = listData.GetValue().First();
while (node1 && node2)
{
- wxString str1 ((
c
har*) node1->Data());
- wxString str2 ((
c
har*) node2->Data());
+ wxString str1 ((
wxC
har*) node1->Data());
+ wxString str2 ((
wxC
har*) node2->Data());
if (str1 != str2)
return FALSE;
node1 = node1->Next();
if (str1 != str2)
return FALSE;
node1 = node1->Next();
@@
-236,23
+262,25
@@
bool wxVariantDataStringList::Eq(wxVariantData& data) const
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataStringList::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataStringList::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataStringList::Write(wxString& str) const
{
bool wxVariantDataStringList::Write(wxString& str) const
{
- str =
""
;
+ str =
wxT("")
;
wxNode* node = m_value.First();
while (node)
{
wxNode* node = m_value.First();
while (node)
{
-
char* s = (c
har*) node->Data();
+
wxChar* s = (wxC
har*) node->Data();
if (node != m_value.First())
if (node != m_value.First())
- str +=
" "
;
+ str +=
wxT(" ")
;
str += s;
node = node->Next();
}
str += s;
node = node->Next();
}
@@
-260,16
+288,18
@@
bool wxVariantDataStringList::Write(wxString& str) const
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
{
bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(
"Unimplemented"
);
+ wxFAIL_MSG(
wxT("Unimplemented")
);
// TODO
return FALSE;
}
// TODO
return FALSE;
}
+#endif
bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
{
- wxFAIL_MSG(
"Unimplemented"
);
+ wxFAIL_MSG(
wxT("Unimplemented")
);
// TODO
return FALSE;
}
// TODO
return FALSE;
}
@@
-293,15
+323,16
@@
public:
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Write(ostream& str) const;
virtual bool Read(istream& str);
virtual bool Write(ostream& str) const;
-
+#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return
"long"
; };
+ virtual wxString GetType() const { return
wxT("long")
; };
protected:
long m_value;
protected:
long m_value;
@@
-311,7
+342,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
void wxVariantDataLong::Copy(wxVariantData& data)
{
void wxVariantDataLong::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"long"), "wxVariantDataLong::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data")
);
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
@@
-320,50
+351,57
@@
void wxVariantDataLong::Copy(wxVariantData& data)
bool wxVariantDataLong::Eq(wxVariantData& data) const
{
bool wxVariantDataLong::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"long"), "wxVariantDataLong::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch")
);
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
return (otherData.m_value == m_value);
}
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataLong::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataLong::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataLong::Write(wxString& str) const
{
bool wxVariantDataLong::Write(wxString& str) const
{
- str.Printf(
"%ld"
, m_value);
+ str.Printf(
wxT("%ld")
, m_value);
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataLong::Read(istream& str)
{
str >> m_value;
return TRUE;
}
bool wxVariantDataLong::Read(istream& str)
{
str >> m_value;
return TRUE;
}
+#endif
#if wxUSE_STREAMS
bool wxVariantDataLong::Write(wxOutputStream& str) const
{
#if wxUSE_STREAMS
bool wxVariantDataLong::Write(wxOutputStream& str) const
{
- str << m_value;
+ wxTextOutputStream s(str);
+
+ s.Write32((size_t)m_value);
return TRUE;
}
bool wxVariantDataLong::Read(wxInputStream& str)
{
return TRUE;
}
bool wxVariantDataLong::Read(wxInputStream& str)
{
- str >> m_value;
+ wxTextInputStream s(str);
+ m_value = s.Read32();
return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataLong::Read(wxString& str)
{
return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataLong::Read(wxString& str)
{
- m_value =
atol((const c
har*) str);
+ m_value =
wxAtol((const wxC
har*) str);
return TRUE;
}
return TRUE;
}
@@
-384,14
+422,18
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual bool Read(wxString& str);
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual bool Read(wxString& str);
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return
"double"
; };
+ virtual wxString GetType() const { return
wxT("double")
; };
protected:
double m_value;
protected:
double m_value;
@@
-401,7
+443,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData)
void wxVariantDataReal::Copy(wxVariantData& data)
{
void wxVariantDataReal::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"double"), "wxVariantDataReal::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data")
);
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
@@
-410,50
+452,56
@@
void wxVariantDataReal::Copy(wxVariantData& data)
bool wxVariantDataReal::Eq(wxVariantData& data) const
{
bool wxVariantDataReal::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"double"), "wxVariantDataReal::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch")
);
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
return (otherData.m_value == m_value);
}
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataReal::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataReal::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataReal::Write(wxString& str) const
{
bool wxVariantDataReal::Write(wxString& str) const
{
- str.Printf(
"%.4f"
, m_value);
+ str.Printf(
wxT("%.4f")
, m_value);
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataReal::Read(istream& str)
{
str >> m_value;
return TRUE;
}
bool wxVariantDataReal::Read(istream& str)
{
str >> m_value;
return TRUE;
}
+#endif
#if wxUSE_STREAMS
bool wxVariantDataReal::Write(wxOutputStream& str) const
{
#if wxUSE_STREAMS
bool wxVariantDataReal::Write(wxOutputStream& str) const
{
- str << m_value;
+ wxTextOutputStream s(str);
+ s.WriteDouble((double)m_value);
return TRUE;
}
bool wxVariantDataReal::Read(wxInputStream& str)
{
return TRUE;
}
bool wxVariantDataReal::Read(wxInputStream& str)
{
- str >> (float&)m_value;
+ wxTextInputStream s(str);
+ m_value = (float)s.ReadDouble();
return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataReal::Read(wxString& str)
{
return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataReal::Read(wxString& str)
{
- m_value =
atof((const c
har*) str);
+ m_value =
wxAtof((const wxC
har*) str);
return TRUE;
}
return TRUE;
}
@@
-474,15
+522,19
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
virtual bool Read(wxString& str);
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return
"bool"
; };
+ virtual wxString GetType() const { return
wxT("bool")
; };
protected:
bool m_value;
protected:
bool m_value;
@@
-492,7
+544,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
void wxVariantDataBool::Copy(wxVariantData& data)
{
void wxVariantDataBool::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"bool"), "wxVariantDataBool::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data")
);
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
@@
-501,51
+553,59
@@
void wxVariantDataBool::Copy(wxVariantData& data)
bool wxVariantDataBool::Eq(wxVariantData& data) const
{
bool wxVariantDataBool::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"bool"), "wxVariantDataBool::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch")
);
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
return (otherData.m_value == m_value);
}
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataBool::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataBool::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataBool::Write(wxString& str) const
{
bool wxVariantDataBool::Write(wxString& str) const
{
- str.Printf(
"%d"
, (int) m_value);
+ str.Printf(
wxT("%d")
, (int) m_value);
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataBool::Read(istream& WXUNUSED(str))
{
bool wxVariantDataBool::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(
"Unimplemented"
);
+ wxFAIL_MSG(
wxT("Unimplemented")
);
// str >> (long) m_value;
return FALSE;
}
// str >> (long) m_value;
return FALSE;
}
+#endif
#if wxUSE_STREAMS
bool wxVariantDataBool::Write(wxOutputStream& str) const
{
#if wxUSE_STREAMS
bool wxVariantDataBool::Write(wxOutputStream& str) const
{
- str << (char)m_value;
+ wxTextOutputStream s(str);
+
+ s.Write8(m_value);
return TRUE;
}
bool wxVariantDataBool::Read(wxInputStream& str)
{
return TRUE;
}
bool wxVariantDataBool::Read(wxInputStream& str)
{
- str >> (char&)m_value;
+ wxTextInputStream s(str);
+
+ m_value = s.Read8() != 0;
return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataBool::Read(wxString& str)
{
return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataBool::Read(wxString& str)
{
- m_value = (
atol((const c
har*) str) != 0);
+ m_value = (
wxAtol((const wxC
har*) str) != 0);
return TRUE;
}
#endif // HAVE_BOOL
return TRUE;
}
#endif // HAVE_BOOL
@@
-566,15
+626,17
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Write(ostream& str) const;
virtual bool Read(istream& str);
virtual bool Write(ostream& str) const;
+#endif
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return
"char"
; };
+ virtual wxString GetType() const { return
wxT("char")
; };
protected:
char m_value;
protected:
char m_value;
@@
-584,7
+646,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
void wxVariantDataChar::Copy(wxVariantData& data)
{
void wxVariantDataChar::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"char"), "wxVariantDataChar::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data")
);
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
@@
-593,44
+655,52
@@
void wxVariantDataChar::Copy(wxVariantData& data)
bool wxVariantDataChar::Eq(wxVariantData& data) const
{
bool wxVariantDataChar::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"char"), "wxVariantDataChar::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch")
);
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
return (otherData.m_value == m_value);
}
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataChar::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataChar::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataChar::Write(wxString& str) const
{
bool wxVariantDataChar::Write(wxString& str) const
{
- str.Printf(
"%c"
, m_value);
+ str.Printf(
wxT("%c")
, m_value);
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataChar::Read(istream& WXUNUSED(str))
{
bool wxVariantDataChar::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(
"Unimplemented"
);
+ wxFAIL_MSG(
wxT("Unimplemented")
);
// str >> m_value;
return FALSE;
}
// str >> m_value;
return FALSE;
}
+#endif
#if wxUSE_STREAMS
bool wxVariantDataChar::Write(wxOutputStream& str) const
{
#if wxUSE_STREAMS
bool wxVariantDataChar::Write(wxOutputStream& str) const
{
- str << m_value;
+ wxTextOutputStream s(str);
+
+ s.Write8(m_value);
return TRUE;
}
bool wxVariantDataChar::Read(wxInputStream& str)
{
return TRUE;
}
bool wxVariantDataChar::Read(wxInputStream& str)
{
- str >> m_value;
+ wxTextInputStream s(str);
+
+ m_value = s.Read8();
return TRUE;
}
#endif // wxUSE_STREAMS
return TRUE;
}
#endif // wxUSE_STREAMS
@@
-666,15
+736,19
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return
"string"
; };
+ virtual wxString GetType() const { return
wxT("string")
; };
protected:
wxString m_value;
protected:
wxString m_value;
@@
-682,7
+756,7
@@
protected:
void wxVariantDataString::Copy(wxVariantData& data)
{
void wxVariantDataString::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"string"), "wxVariantDataString::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data")
);
wxVariantDataString& otherData = (wxVariantDataString&) data;
wxVariantDataString& otherData = (wxVariantDataString&) data;
@@
-691,18
+765,20
@@
void wxVariantDataString::Copy(wxVariantData& data)
bool wxVariantDataString::Eq(wxVariantData& data) const
{
bool wxVariantDataString::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"string"), "wxVariantDataString::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch")
);
wxVariantDataString& otherData = (wxVariantDataString&) data;
return (otherData.m_value == m_value);
}
wxVariantDataString& otherData = (wxVariantDataString&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataString::Write(ostream& str) const
{
bool wxVariantDataString::Write(ostream& str) const
{
- str << (const char*) m_value;
+ str << (const char*) m_value
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataString::Write(wxString& str) const
{
bool wxVariantDataString::Write(wxString& str) const
{
@@
-710,22
+786,28
@@
bool wxVariantDataString::Write(wxString& str) const
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataString::Read(istream& str)
{
str >> m_value;
return TRUE;
}
bool wxVariantDataString::Read(istream& str)
{
str >> m_value;
return TRUE;
}
+#endif
#if wxUSE_STREAMS
bool wxVariantDataString::Write(wxOutputStream& str) const
{
#if wxUSE_STREAMS
bool wxVariantDataString::Write(wxOutputStream& str) const
{
- str << (const char*) m_value;
+ // why doesn't wxOutputStream::operator<< take "const wxString&"
+ wxTextOutputStream s(str);
+ s.WriteString(m_value);
return TRUE;
}
bool wxVariantDataString::Read(wxInputStream& str)
{
return TRUE;
}
bool wxVariantDataString::Read(wxInputStream& str)
{
- str >> m_value;
+ wxTextInputStream s(str);
+
+ m_value = s.ReadString();
return TRUE;
}
#endif // wxUSE_STREAMS
return TRUE;
}
#endif // wxUSE_STREAMS
@@
-760,11
+842,15
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
virtual bool Read(wxString& str);
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return
"time"
; };
+ virtual wxString GetType() const { return
wxT("time")
; };
virtual wxVariantData* Clone() { return new wxVariantDataTime; }
protected:
virtual wxVariantData* Clone() { return new wxVariantDataTime; }
protected:
@@
-775,7
+861,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
void wxVariantDataTime::Copy(wxVariantData& data)
{
void wxVariantDataTime::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"time"), "wxVariantDataTime::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data")
);
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
@@
-784,33
+870,37
@@
void wxVariantDataTime::Copy(wxVariantData& data)
bool wxVariantDataTime::Eq(wxVariantData& data) const
{
bool wxVariantDataTime::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"time"), "wxVariantDataTime::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch")
);
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
return (otherData.m_value == m_value);
}
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataTime::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataTime::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataTime::Write(wxString& str) const
{
bool wxVariantDataTime::Write(wxString& str) const
{
-
c
har*s = m_value.FormatTime();
+
wxC
har*s = m_value.FormatTime();
str = s;
return TRUE;
}
str = s;
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataTime::Read(istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
bool wxVariantDataTime::Read(istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
+#endif
bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
{
@@
-834,11
+924,15
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
virtual bool Read(wxString& str);
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return
"date"
; };
+ virtual wxString GetType() const { return
wxT("date")
; };
virtual wxVariantData* Clone() { return new wxVariantDataDate; }
protected:
virtual wxVariantData* Clone() { return new wxVariantDataDate; }
protected:
@@
-849,7
+943,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
void wxVariantDataDate::Copy(wxVariantData& data)
{
void wxVariantDataDate::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"date"), "wxVariantDataDate::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data")
);
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
@@
-858,20
+952,22
@@
void wxVariantDataDate::Copy(wxVariantData& data)
bool wxVariantDataDate::Eq(wxVariantData& data) const
{
bool wxVariantDataDate::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"date"), "wxVariantDataDate::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch")
);
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
return (otherData.m_value == m_value);
}
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataDate::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataDate::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataDate::Write(wxString& str) const
{
bool wxVariantDataDate::Write(wxString& str) const
{
@@
-879,11
+975,13
@@
bool wxVariantDataDate::Write(wxString& str) const
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataDate::Read(istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
bool wxVariantDataDate::Read(istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
+#endif
bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
{
@@
-909,11
+1007,15
@@
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Write(ostream& str) const;
virtual bool Write(ostream& str) const;
+#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
virtual bool Read(istream& str);
virtual bool Read(istream& str);
+#endif
virtual bool Read(wxString& str);
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return
"void*"
; };
+ virtual wxString GetType() const { return
wxT("void*")
; };
virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
protected:
virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
protected:
@@
-924,7
+1026,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
void wxVariantDataVoidPtr::Copy(wxVariantData& data)
{
void wxVariantDataVoidPtr::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
"void*"), "wxVariantDataVoidPtr::Copy: Can't copy to this type of data"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data")
);
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
@@
-933,34
+1035,36
@@
void wxVariantDataVoidPtr::Copy(wxVariantData& data)
bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
{
bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
"void*"), "wxVariantDataVoidPtr::Eq: argument mismatch"
);
+ wxASSERT_MSG( (data.GetType() ==
wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch")
);
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
return (otherData.m_value == m_value);
}
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
return (otherData.m_value == m_value);
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataVoidPtr::Write(ostream& str) const
{
wxString s;
Write(s);
bool wxVariantDataVoidPtr::Write(ostream& str) const
{
wxString s;
Write(s);
- str << (const char*) s;
+ str << (const char*) s
.mb_str()
;
return TRUE;
}
return TRUE;
}
+#endif
bool wxVariantDataVoidPtr::Write(wxString& str) const
{
bool wxVariantDataVoidPtr::Write(wxString& str) const
{
- char buf[80];
- sprintf(buf, "%ld", (long) m_value);
- str = buf;
+ str.Printf(wxT("%ld"), (long) m_value);
return TRUE;
}
return TRUE;
}
+#if wxUSE_STD_IOSTREAM
bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
+#endif
bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{
@@
-1013,7
+1117,7
@@
wxVariant::wxVariant(const wxString& val, const wxString& name)
m_name = name;
}
m_name = name;
}
-wxVariant::wxVariant(const
c
har* val, const wxString& name)
+wxVariant::wxVariant(const
wxC
har* val, const wxString& name)
{
m_data = new wxVariantDataString(wxString(val));
m_name = name;
{
m_data = new wxVariantDataString(wxString(val));
m_name = name;
@@
-1141,7
+1245,7
@@
bool wxVariant::operator!= (double value) const
void wxVariant::operator= (double value)
{
void wxVariant::operator= (double value)
{
- if (GetType() ==
"double"
)
+ if (GetType() ==
wxT("double")
)
{
((wxVariantDataReal*)GetData())->SetValue(value);
}
{
((wxVariantDataReal*)GetData())->SetValue(value);
}
@@
-1169,7
+1273,7
@@
bool wxVariant::operator!= (long value) const
void wxVariant::operator= (long value)
{
void wxVariant::operator= (long value)
{
- if (GetType() ==
"long"
)
+ if (GetType() ==
wxT("long")
)
{
((wxVariantDataLong*)GetData())->SetValue(value);
}
{
((wxVariantDataLong*)GetData())->SetValue(value);
}
@@
-1197,7
+1301,7
@@
bool wxVariant::operator!= (char value) const
void wxVariant::operator= (char value)
{
void wxVariant::operator= (char value)
{
- if (GetType() ==
"char"
)
+ if (GetType() ==
wxT("char")
)
{
((wxVariantDataChar*)GetData())->SetValue(value);
}
{
((wxVariantDataChar*)GetData())->SetValue(value);
}
@@
-1226,7
+1330,7
@@
bool wxVariant::operator!= (bool value) const
void wxVariant::operator= (bool value)
{
void wxVariant::operator= (bool value)
{
- if (GetType() ==
"bool"
)
+ if (GetType() ==
wxT("bool")
)
{
((wxVariantDataBool*)GetData())->SetValue(value);
}
{
((wxVariantDataBool*)GetData())->SetValue(value);
}
@@
-1255,7
+1359,7
@@
bool wxVariant::operator!= (const wxString& value) const
void wxVariant::operator= (const wxString& value)
{
void wxVariant::operator= (const wxString& value)
{
- if (GetType() ==
"string"
)
+ if (GetType() ==
wxT("string")
)
{
((wxVariantDataString*)GetData())->SetValue(value);
}
{
((wxVariantDataString*)GetData())->SetValue(value);
}
@@
-1267,9
+1371,9
@@
void wxVariant::operator= (const wxString& value)
}
}
}
}
-void wxVariant::operator= (const
c
har* value)
+void wxVariant::operator= (const
wxC
har* value)
{
{
- if (GetType() ==
"string"
)
+ if (GetType() ==
wxT("string")
)
{
((wxVariantDataString*)GetData())->SetValue(wxString(value));
}
{
((wxVariantDataString*)GetData())->SetValue(wxString(value));
}
@@
-1283,7
+1387,7
@@
void wxVariant::operator= (const char* value)
bool wxVariant::operator== (const wxStringList& value) const
{
bool wxVariant::operator== (const wxStringList& value) const
{
- wxASSERT_MSG( (GetType() ==
"stringlist"), "Invalid type for == operator"
);
+ wxASSERT_MSG( (GetType() ==
wxT("stringlist")), wxT("Invalid type for == operator")
);
wxVariantDataStringList other(value);
return (m_data->Eq(other));
wxVariantDataStringList other(value);
return (m_data->Eq(other));
@@
-1296,7
+1400,7
@@
bool wxVariant::operator!= (const wxStringList& value) const
void wxVariant::operator= (const wxStringList& value)
{
void wxVariant::operator= (const wxStringList& value)
{
- if (GetType() ==
"stringlist"
)
+ if (GetType() ==
wxT("stringlist")
)
{
((wxVariantDataStringList*)GetData())->SetValue(value);
}
{
((wxVariantDataStringList*)GetData())->SetValue(value);
}
@@
-1310,7
+1414,7
@@
void wxVariant::operator= (const wxStringList& value)
bool wxVariant::operator== (const wxList& value) const
{
bool wxVariant::operator== (const wxList& value) const
{
- wxASSERT_MSG( (GetType() ==
"list"), "Invalid type for == operator"
);
+ wxASSERT_MSG( (GetType() ==
wxT("list")), wxT("Invalid type for == operator")
);
wxVariantDataList other(value);
return (m_data->Eq(other));
wxVariantDataList other(value);
return (m_data->Eq(other));
@@
-1323,7
+1427,7
@@
bool wxVariant::operator!= (const wxList& value) const
void wxVariant::operator= (const wxList& value)
{
void wxVariant::operator= (const wxList& value)
{
- if (GetType() ==
"list"
)
+ if (GetType() ==
wxT("list")
)
{
((wxVariantDataList*)GetData())->SetValue(value);
}
{
((wxVariantDataList*)GetData())->SetValue(value);
}
@@
-1352,7
+1456,7
@@
bool wxVariant::operator!= (const wxTime& value) const
void wxVariant::operator= (const wxTime& value)
{
void wxVariant::operator= (const wxTime& value)
{
- if (GetType() ==
"time"
)
+ if (GetType() ==
wxT("time")
)
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
@@
-1380,7
+1484,7
@@
bool wxVariant::operator!= (const wxDate& value) const
void wxVariant::operator= (const wxDate& value)
{
void wxVariant::operator= (const wxDate& value)
{
- if (GetType() ==
"date"
)
+ if (GetType() ==
wxT("date")
)
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
@@
-1405,7
+1509,7
@@
bool wxVariant::operator!= (void* value) const
void wxVariant::operator= (void* value)
{
void wxVariant::operator= (void* value)
{
- if (GetType() ==
"void*"
)
+ if (GetType() ==
wxT("void*")
)
{
((wxVariantDataVoidPtr*)GetData())->SetValue(value);
}
{
((wxVariantDataVoidPtr*)GetData())->SetValue(value);
}
@@
-1420,20
+1524,20
@@
void wxVariant::operator= (void* value)
// Treat a list variant as an array
wxVariant wxVariant::operator[] (size_t idx) const
{
// Treat a list variant as an array
wxVariant wxVariant::operator[] (size_t idx) const
{
- wxASSERT_MSG( (GetType() ==
"list" || GetType() == "stringlist"), "Invalid type for array operator"
);
+ wxASSERT_MSG( (GetType() ==
wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator")
);
- if (GetType() ==
"list"
)
+ if (GetType() ==
wxT("list")
)
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
"Invalid index for array"
);
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
wxT("Invalid index for array")
);
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
- else if (GetType() ==
"stringlist"
)
+ else if (GetType() ==
wxT("stringlist")
)
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
"Invalid index for array"
);
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
wxT("Invalid index for array")
);
- wxVariant variant( wxString( (
c
har*) (data->GetValue().Nth(idx)->Data()) ));
+ wxVariant variant( wxString( (
wxC
har*) (data->GetValue().Nth(idx)->Data()) ));
return variant;
}
return wxNullVariant;
return variant;
}
return wxNullVariant;
@@
-1444,10
+1548,10
@@
wxVariant& wxVariant::operator[] (size_t idx)
// We can't return a reference to a variant for a string list, since the string
// is actually stored as a char*, not a variant.
// We can't return a reference to a variant for a string list, since the string
// is actually stored as a char*, not a variant.
- wxASSERT_MSG( (GetType() ==
"list"), "Invalid type for array operator"
);
+ wxASSERT_MSG( (GetType() ==
wxT("list")), wxT("Invalid type for array operator")
);
wxVariantDataList* data = (wxVariantDataList*) m_data;
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
"Invalid index for array"
);
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
wxT("Invalid index for array")
);
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
@@
-1455,14
+1559,14
@@
wxVariant& wxVariant::operator[] (size_t idx)
// Return the number of elements in a list
int wxVariant::GetCount() const
{
// Return the number of elements in a list
int wxVariant::GetCount() const
{
- wxASSERT_MSG( (GetType() ==
"list" || GetType() == "stringlist"), "Invalid type for GetCount()"
);
+ wxASSERT_MSG( (GetType() ==
wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()")
);
- if (GetType() ==
"list"
)
+ if (GetType() ==
wxT("list")
)
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
return data->GetValue().Number();
}
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
return data->GetValue().Number();
}
- else if (GetType() ==
"stringlist"
)
+ else if (GetType() ==
wxT("stringlist")
)
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
return data->GetValue().Number();
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
return data->GetValue().Number();
@@
-1478,7
+1582,7
@@
wxString wxVariant::MakeString() const
if (GetData()->Write(str))
return str;
}
if (GetData()->Write(str))
return str;
}
- return wxString(
""
);
+ return wxString(
wxT("")
);
}
// Accessors
}
// Accessors
@@
-1495,7
+1599,7
@@
void wxVariant::SetData(wxVariantData* data)
wxString wxVariant::GetType() const
{
if (IsNull())
wxString wxVariant::GetType() const
{
if (IsNull())
- return wxString(
"null"
);
+ return wxString(
wxT("null")
);
else
return m_data->GetType();
}
else
return m_data->GetType();
}
@@
-1515,7
+1619,7
@@
double wxVariant::GetReal() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to a real number"
);
+ wxFAIL_MSG(
wxT("Could not convert to a real number")
);
return 0.0;
}
}
return 0.0;
}
}
@@
-1527,7
+1631,7
@@
long wxVariant::GetInteger() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to an integer"
);
+ wxFAIL_MSG(
wxT("Could not convert to an integer")
);
return 0;
}
}
return 0;
}
}
@@
-1539,7
+1643,7
@@
char wxVariant::GetChar() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to a char"
);
+ wxFAIL_MSG(
wxT("Could not convert to a char")
);
return 0;
}
}
return 0;
}
}
@@
-1551,7
+1655,7
@@
bool wxVariant::GetBool() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to a bool"
);
+ wxFAIL_MSG(
wxT("Could not convert to a bool")
);
return 0;
}
}
return 0;
}
}
@@
-1563,7
+1667,7
@@
wxString wxVariant::GetString() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to a string"
);
+ wxFAIL_MSG(
wxT("Could not convert to a string")
);
return wxString("");
}
}
return wxString("");
}
}
@@
-1576,7
+1680,7
@@
wxTime wxVariant::GetTime() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to a time"
);
+ wxFAIL_MSG(
wxT("Could not convert to a time")
);
return wxTime();
}
}
return wxTime();
}
}
@@
-1588,7
+1692,7
@@
wxDate wxVariant::GetDate() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(
"Could not convert to a date"
);
+ wxFAIL_MSG(
wxT("Could not convert to a date")
);
return wxDate();
}
}
return wxDate();
}
}
@@
-1596,21
+1700,21
@@
wxDate wxVariant::GetDate() const
void* wxVariant::GetVoidPtr() const
{
void* wxVariant::GetVoidPtr() const
{
- wxASSERT( (GetType() ==
"void*"
) );
+ wxASSERT( (GetType() ==
wxT("void*")
) );
return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
wxList& wxVariant::GetList() const
{
return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
wxList& wxVariant::GetList() const
{
- wxASSERT( (GetType() ==
"list"
) );
+ wxASSERT( (GetType() ==
wxT("list")
) );
return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
}
wxStringList& wxVariant::GetStringList() const
{
return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
}
wxStringList& wxVariant::GetStringList() const
{
- wxASSERT( (GetType() ==
"stringlist"
) );
+ wxASSERT( (GetType() ==
wxT("stringlist")
) );
return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
}
return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
}
@@
-1652,7
+1756,7
@@
bool wxVariant::Delete(int item)
{
wxList& list = GetList();
{
wxList& list = GetList();
- wxASSERT_MSG( (item < list.Number()),
"Invalid index to Delete"
);
+ wxASSERT_MSG( (item < list.Number()),
wxT("Invalid index to Delete")
);
wxNode* node = list.Nth(item);
wxVariant* variant = (wxVariant*) node->Data();
delete variant;
wxNode* node = list.Nth(item);
wxVariant* variant = (wxVariant*) node->Data();
delete variant;
@@
-1663,13
+1767,13
@@
bool wxVariant::Delete(int item)
// Clear list
void wxVariant::ClearList()
{
// Clear list
void wxVariant::ClearList()
{
- if (!IsNull() && (GetType() ==
"list"
))
+ if (!IsNull() && (GetType() ==
wxT("list")
))
{
((wxVariantDataList*) m_data)->Clear();
}
else
{
{
((wxVariantDataList*) m_data)->Clear();
}
else
{
- if (GetType() !=
"list"
)
+ if (GetType() !=
wxT("list")
)
{
delete m_data;
m_data = NULL;
{
delete m_data;
m_data = NULL;
@@
-1682,14
+1786,16
@@
void wxVariant::ClearList()
bool wxVariant::Convert(long* value) const
{
wxString type(GetType());
bool wxVariant::Convert(long* value) const
{
wxString type(GetType());
- if (type ==
"double"
)
+ if (type ==
wxT("double")
)
*value = (long) (((wxVariantDataReal*)GetData())->GetValue());
*value = (long) (((wxVariantDataReal*)GetData())->GetValue());
- else if (type ==
"long"
)
+ else if (type ==
wxT("long")
)
*value = ((wxVariantDataLong*)GetData())->GetValue();
*value = ((wxVariantDataLong*)GetData())->GetValue();
- else if (type == "bool")
+#ifdef HAVE_BOOL
+ else if (type == wxT("bool"))
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
- else if (type == "string")
- *value = atol((const char*) ((wxVariantDataString*)GetData())->GetValue());
+#endif
+ else if (type == wxT("string"))
+ *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
return FALSE;
else
return FALSE;
@@
-1699,19
+1805,21
@@
bool wxVariant::Convert(long* value) const
bool wxVariant::Convert(bool* value) const
{
wxString type(GetType());
bool wxVariant::Convert(bool* value) const
{
wxString type(GetType());
- if (type ==
"double"
)
+ if (type ==
wxT("double")
)
*value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
*value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
- else if (type ==
"long"
)
+ else if (type ==
wxT("long")
)
*value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
*value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
- else if (type == "bool")
+#ifdef HAVE_BOOL
+ else if (type == wxT("bool"))
*value = ((wxVariantDataBool*)GetData())->GetValue();
*value = ((wxVariantDataBool*)GetData())->GetValue();
- else if (type == "string")
+#endif
+ else if (type == wxT("string"))
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
- if (val ==
"true" || val == "yes"
)
+ if (val ==
wxT("true") || val == wxT("yes")
)
*value = TRUE;
*value = TRUE;
- else if (val ==
"false" || val == "no"
)
+ else if (val ==
wxT("false") || val == wxT("no")
)
*value = FALSE;
else
return FALSE;
*value = FALSE;
else
return FALSE;
@@
-1725,14
+1833,16
@@
bool wxVariant::Convert(bool* value) const
bool wxVariant::Convert(double* value) const
{
wxString type(GetType());
bool wxVariant::Convert(double* value) const
{
wxString type(GetType());
- if (type ==
"double"
)
+ if (type ==
wxT("double")
)
*value = ((wxVariantDataReal*)GetData())->GetValue();
*value = ((wxVariantDataReal*)GetData())->GetValue();
- else if (type ==
"long"
)
+ else if (type ==
wxT("long")
)
*value = (double) (((wxVariantDataLong*)GetData())->GetValue());
*value = (double) (((wxVariantDataLong*)GetData())->GetValue());
- else if (type == "bool")
+#ifdef HAVE_BOOL
+ else if (type == wxT("bool"))
*value = (double) (((wxVariantDataBool*)GetData())->GetValue());
*value = (double) (((wxVariantDataBool*)GetData())->GetValue());
- else if (type == "string")
- *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue());
+#endif
+ else if (type == wxT("string"))
+ *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
return FALSE;
else
return FALSE;
@@
-1742,12
+1852,14
@@
bool wxVariant::Convert(double* value) const
bool wxVariant::Convert(char* value) const
{
wxString type(GetType());
bool wxVariant::Convert(char* value) const
{
wxString type(GetType());
- if (type ==
"char"
)
+ if (type ==
wxT("char")
)
*value = ((wxVariantDataChar*)GetData())->GetValue();
*value = ((wxVariantDataChar*)GetData())->GetValue();
- else if (type ==
"long"
)
+ else if (type ==
wxT("long")
)
*value = (char) (((wxVariantDataLong*)GetData())->GetValue());
*value = (char) (((wxVariantDataLong*)GetData())->GetValue());
- else if (type == "bool")
+#ifdef HAVE_BOOL
+ else if (type == wxT("bool"))
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
+#endif
else
return FALSE;
else
return FALSE;
@@
-1764,9
+1876,9
@@
bool wxVariant::Convert(wxString* value) const
bool wxVariant::Convert(wxTime* value) const
{
wxString type(GetType());
bool wxVariant::Convert(wxTime* value) const
{
wxString type(GetType());
- if (type ==
"time"
)
+ if (type ==
wxT("time")
)
*value = ((wxVariantDataTime*)GetData())->GetValue();
*value = ((wxVariantDataTime*)GetData())->GetValue();
- else if (type ==
"date"
)
+ else if (type ==
wxT("date")
)
*value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
else
return FALSE;
*value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
else
return FALSE;
@@
-1777,7
+1889,7
@@
bool wxVariant::Convert(wxTime* value) const
bool wxVariant::Convert(wxDate* value) const
{
wxString type(GetType());
bool wxVariant::Convert(wxDate* value) const
{
wxString type(GetType());
- if (type ==
"date"
)
+ if (type ==
wxT("date")
)
*value = ((wxVariantDataDate*)GetData())->GetValue();
else
return FALSE;
*value = ((wxVariantDataDate*)GetData())->GetValue();
else
return FALSE;