X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0a302dcba6d7f6828f221f7341ee8a8cbcd8e96..439ddeba9dcb2bb020ba70da81dab76746dc0081:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 39ced009bf..a697e75577 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -6,10 +6,10 @@ // Created: 10/09/98 // RCS-ID: $Id$ // Copyright: (c) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "variant.h" #endif @@ -17,31 +17,40 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#if wxUSE_IOSTREAMH -# include -#else -# include -# ifdef _MSC_VER - using namespace std; -# endif +#if wxUSE_STD_IOSTREAM + #if wxUSE_IOSTREAMH + #include + #else + #include + #endif +#endif + +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +using namespace std ; #endif +#if wxUSE_STREAMS #include "wx/stream.h" +#include "wx/txtstrm.h" +#endif + #include "wx/string.h" +#include "wx/tokenzr.h" + #include "wx/variant.h" IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) -wxVariant wxNullVariant; +wxVariant WXDLLIMPEXP_BASE wxNullVariant; /* * wxVariantDataList */ -class WXDLLEXPORT wxVariantDataList: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataList) public: @@ -54,11 +63,15 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return "list"; }; + virtual wxString GetType() const { return wxT("list"); }; void Clear(); @@ -81,98 +94,102 @@ wxVariantDataList::~wxVariantDataList() void wxVariantDataList::SetValue(const wxList& value) { Clear(); - wxNode* node = value.First(); + wxList::compatibility_iterator node = value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); + wxVariant* var = (wxVariant*) node->GetData(); m_value.Append(new wxVariant(*var)); - node = node->Next(); + node = node->GetNext(); } } void wxVariantDataList::Clear() { - wxNode* node = m_value.First(); + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); + wxVariant* var = (wxVariant*) node->GetData(); delete var; - node = node->Next(); + node = node->GetNext(); } m_value.Clear(); } 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; listData.Clear(); - wxNode* node = m_value.First(); + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); + wxVariant* var = (wxVariant*) node->GetData(); listData.m_value.Append(new wxVariant(*var)); - node = node->Next(); + node = node->GetNext(); } } 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(); - wxNode* node2 = listData.GetValue().First(); + wxList::compatibility_iterator node1 = m_value.GetFirst(); + wxList::compatibility_iterator node2 = listData.GetValue().GetFirst(); while (node1 && node2) { - wxVariant* var1 = (wxVariant*) node1->Data(); - wxVariant* var2 = (wxVariant*) node2->Data(); + wxVariant* var1 = (wxVariant*) node1->GetData(); + wxVariant* var2 = (wxVariant*) node2->GetData(); if ((*var1) != (*var2)) return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); + node1 = node1->GetNext(); + node2 = node2->GetNext(); } if (node1 || node2) return FALSE; return TRUE; } -bool wxVariantDataList::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; + str << (const char*) s.mb_str(); return TRUE; } +#endif bool wxVariantDataList::Write(wxString& str) const { - str = ""; - wxNode* node = m_value.First(); + str = wxT(""); + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); - if (node != m_value.First()) - str += " "; + wxVariant* var = (wxVariant*) node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); wxString str1; str += var->MakeString(); - node = node->Next(); + node = node->GetNext(); } return TRUE; } -bool wxVariantDataList::Read(istream& WXUNUSED(str)) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { - wxFAIL_MSG("Unimplemented"); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } +#endif bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { - wxFAIL_MSG("Unimplemented"); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } @@ -181,7 +198,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) * wxVariantDataStringList */ -class WXDLLEXPORT wxVariantDataStringList: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataStringList) public: @@ -193,11 +210,15 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return "stringlist"; }; + virtual wxString GetType() const { return wxT("stringlist"); }; protected: wxStringList m_value; @@ -212,7 +233,7 @@ void wxVariantDataStringList::SetValue(const wxStringList& value) 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; @@ -221,58 +242,62 @@ void wxVariantDataStringList::Copy(wxVariantData& data) 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(); + wxStringList::compatibility_iterator node1 = m_value.GetFirst(); + wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst(); while (node1 && node2) { - wxString str1 ((char*) node1->Data()); - wxString str2 ((char*) node2->Data()); + wxString str1 ( node1->GetData() ); + wxString str2 ( node2->GetData() ); if (str1 != str2) return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); + node1 = node1->GetNext(); + node2 = node2->GetNext(); } if (node1 || node2) return FALSE; return TRUE; } -bool wxVariantDataStringList::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataStringList::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; + str << (const char*) s.mb_str(); return TRUE; } +#endif bool wxVariantDataStringList::Write(wxString& str) const { - str = ""; - wxNode* node = m_value.First(); + str.Empty(); + wxStringList::compatibility_iterator node = m_value.GetFirst(); while (node) { - char* s = (char*) node->Data(); - if (node != m_value.First()) - str += " "; + const wxChar* s = node->GetData(); + if (node != m_value.GetFirst()) + str += wxT(" "); str += s; - node = node->Next(); + node = node->GetNext(); } return TRUE; } -bool wxVariantDataStringList::Read(istream& WXUNUSED(str)) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) { - wxFAIL_MSG("Unimplemented"); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } +#endif bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { - wxFAIL_MSG("Unimplemented"); + wxFAIL_MSG(wxT("Unimplemented")); // TODO return FALSE; } @@ -281,7 +306,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) * wxVariantDataLong */ -class WXDLLEXPORT wxVariantDataLong: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataLong) public: @@ -293,13 +318,19 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; + + virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; - virtual bool Write(wxOutputStream &str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); + virtual bool Write(wxSTD ostream& str) const; +#endif +#if wxUSE_STREAMS virtual bool Read(wxInputStream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "long"; }; + virtual bool Write(wxOutputStream &str) const; +#endif // wxUSE_STREAMS + + virtual wxString GetType() const { return wxT("long"); }; protected: long m_value; @@ -309,7 +340,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData) 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; @@ -318,48 +349,57 @@ void wxVariantDataLong::Copy(wxVariantData& data) 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); } -bool wxVariantDataLong::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataLong::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; + str << (const char*) s.mb_str(); return TRUE; } +#endif -bool wxVariantDataLong::Write(wxOutputStream& str) const +bool wxVariantDataLong::Write(wxString& str) const { - str << m_value; + str.Printf(wxT("%ld"), m_value); return TRUE; } -bool wxVariantDataLong::Write(wxString& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataLong::Read(wxSTD istream& str) { - str.Printf("%ld", m_value); + str >> m_value; return TRUE; } +#endif -bool wxVariantDataLong::Read(istream& str) +#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) { - str >> m_value; + wxTextInputStream s(str); + m_value = s.Read32(); return TRUE; } +#endif // wxUSE_STREAMS bool wxVariantDataLong::Read(wxString& str) { - m_value = atol((const char*) str); + m_value = wxAtol((const wxChar*) str); return TRUE; } @@ -367,7 +407,7 @@ bool wxVariantDataLong::Read(wxString& str) * wxVariantDataReal */ -class WXDLLEXPORT wxVariantDataReal: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataReal) public: @@ -379,13 +419,19 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; + virtual bool Read(wxString& str); +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Write(wxOutputStream &str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif +#if wxUSE_STREAMS virtual bool Read(wxInputStream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "double"; }; + virtual bool Write(wxOutputStream &str) const; +#endif // wxUSE_STREAMS + virtual wxString GetType() const { return wxT("double"); }; protected: double m_value; @@ -395,7 +441,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData) 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; @@ -404,56 +450,65 @@ void wxVariantDataReal::Copy(wxVariantData& data) 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); } -bool wxVariantDataReal::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataReal::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; + str << (const char*) s.mb_str(); return TRUE; } +#endif -bool wxVariantDataReal::Write(wxOutputStream& str) const +bool wxVariantDataReal::Write(wxString& str) const { - str << m_value; + str.Printf(wxT("%.4f"), m_value); return TRUE; } -bool wxVariantDataReal::Write(wxString& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataReal::Read(wxSTD istream& str) { - str.Printf("%.4f", m_value); + str >> m_value; return TRUE; } +#endif -bool wxVariantDataReal::Read(istream& str) +#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) { - str >> (float&)m_value; + wxTextInputStream s(str); + m_value = (float)s.ReadDouble(); return TRUE; } +#endif // wxUSE_STREAMS bool wxVariantDataReal::Read(wxString& str) { - m_value = atof((const char*) str); + m_value = wxAtof((const wxChar*) str); return TRUE; } +#ifdef HAVE_BOOL /* * wxVariantDataBool */ -class WXDLLEXPORT wxVariantDataBool: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: @@ -465,13 +520,19 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; - virtual bool Write(wxOutputStream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); - virtual bool Read(wxInputStream& str); virtual bool Read(wxString& str); - virtual wxString GetType() const { return "bool"; }; +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif +#if wxUSE_STREAMS + virtual bool Read(wxInputStream& str); + virtual bool Write(wxOutputStream& str) const; +#endif // wxUSE_STREAMS + virtual wxString GetType() const { return wxT("bool"); }; protected: bool m_value; @@ -481,7 +542,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData) 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; @@ -490,57 +551,68 @@ void wxVariantDataBool::Copy(wxVariantData& data) 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); } -bool wxVariantDataBool::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataBool::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; - return TRUE; -} - -bool wxVariantDataBool::Write(wxOutputStream& str) const -{ - str << (char)m_value; + str << (const char*) s.mb_str(); return TRUE; } +#endif bool wxVariantDataBool::Write(wxString& str) const { - str.Printf("%d", (int) m_value); + str.Printf(wxT("%d"), (int) m_value); return TRUE; } -bool wxVariantDataBool::Read(istream& WXUNUSED(str)) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str)) { - wxFAIL_MSG("Unimplemented"); + wxFAIL_MSG(wxT("Unimplemented")); // str >> (long) m_value; return FALSE; } +#endif + +#if wxUSE_STREAMS +bool wxVariantDataBool::Write(wxOutputStream& str) const +{ + wxTextOutputStream s(str); + + s.Write8(m_value); + 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) { - m_value = (atol((const char*) str) != 0); + m_value = (wxAtol((const wxChar*) str) != 0); return TRUE; } +#endif // HAVE_BOOL /* * wxVariantDataChar */ -class WXDLLEXPORT wxVariantDataChar: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: @@ -552,13 +624,17 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; - virtual bool Write(wxOutputStream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); + virtual bool Write(wxSTD ostream& str) const; +#endif + virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STREAMS virtual bool Read(wxInputStream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "char"; }; + virtual bool Write(wxOutputStream& str) const; +#endif // wxUSE_STREAMS + virtual wxString GetType() const { return wxT("char"); }; protected: char m_value; @@ -568,7 +644,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData) 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; @@ -577,45 +653,55 @@ void wxVariantDataChar::Copy(wxVariantData& data) 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); } -bool wxVariantDataChar::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataChar::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; - return TRUE; -} - -bool wxVariantDataChar::Write(wxOutputStream& str) const -{ - str << m_value; + str << (const char*) s.mb_str(); return TRUE; } +#endif bool wxVariantDataChar::Write(wxString& str) const { - str.Printf("%c", m_value); + str.Printf(wxT("%c"), m_value); return TRUE; } -bool wxVariantDataChar::Read(istream& WXUNUSED(str)) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { - wxFAIL_MSG("Unimplemented"); + wxFAIL_MSG(wxT("Unimplemented")); // str >> m_value; return FALSE; } +#endif + +#if wxUSE_STREAMS +bool wxVariantDataChar::Write(wxOutputStream& str) const +{ + wxTextOutputStream s(str); + + s.Write8(m_value); + return TRUE; +} bool wxVariantDataChar::Read(wxInputStream& str) { - str >> m_value; + wxTextInputStream s(str); + + m_value = s.Read8(); return TRUE; } +#endif // wxUSE_STREAMS bool wxVariantDataChar::Read(wxString& str) { @@ -627,9 +713,18 @@ bool wxVariantDataChar::Read(wxString& str) * wxVariantDataString */ -class WXDLLEXPORT wxVariantDataString: public wxVariantData +#if defined(__BORLANDC__) && defined(__WIN16__) +// Change name because of truncation +#define wxVariantDataString wxVariantStringData +#endif + +class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData { +#if defined(__BORLANDC__) && defined(__WIN16__) +DECLARE_DYNAMIC_CLASS(wxVariantStringData) +#else DECLARE_DYNAMIC_CLASS(wxVariantDataString) +#endif public: wxVariantDataString() { } wxVariantDataString(const wxString& value) { m_value = value; } @@ -639,13 +734,19 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; - virtual bool Write(wxOutputStream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif + virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif +#if wxUSE_STREAMS virtual bool Read(wxInputStream& str); - virtual bool Read(wxString& str); - virtual wxString GetType() const { return "string"; }; + virtual bool Write(wxOutputStream& str) const; +#endif // wxUSE_STREAMS + virtual wxString GetType() const { return wxT("string"); }; protected: wxString m_value; @@ -653,7 +754,7 @@ protected: 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; @@ -662,42 +763,52 @@ void wxVariantDataString::Copy(wxVariantData& data) 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); } -bool wxVariantDataString::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataString::Write(wxSTD ostream& str) const { - str << (const char*) m_value; + str << (const char*) m_value.mb_str(); return TRUE; } +#endif -bool wxVariantDataString::Write(wxOutputStream& str) const +bool wxVariantDataString::Write(wxString& str) const { - str << (const char*) m_value; + str = m_value; return TRUE; } -bool wxVariantDataString::Write(wxString& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataString::Read(wxSTD istream& str) { - str = m_value; + str >> m_value; return TRUE; } +#endif -bool wxVariantDataString::Read(istream& str) +#if wxUSE_STREAMS +bool wxVariantDataString::Write(wxOutputStream& str) const { - str >> m_value; + // why doesn't wxOutputStream::operator<< take "const wxString&" + wxTextOutputStream s(str); + s.WriteString(m_value); return TRUE; } bool wxVariantDataString::Read(wxInputStream& str) { - str >> m_value; + wxTextInputStream s(str); + + m_value = s.ReadString(); return TRUE; } +#endif // wxUSE_STREAMS bool wxVariantDataString::Read(wxString& str) { @@ -705,233 +816,398 @@ bool wxVariantDataString::Read(wxString& str) return TRUE; } +#if defined(__BORLANDC__) && defined(__WIN16__) +IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData) +#else IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) +#endif /* - * wxVariantDataTime + * wxVariantDataVoidPtr */ -#if wxUSE_TIMEDATE - -class wxVariantDataTime: public wxVariantData +class wxVariantDataVoidPtr: public wxVariantData { - DECLARE_DYNAMIC_CLASS(wxVariantDataTime) +DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) public: - wxVariantDataTime() { } - wxVariantDataTime(const wxTime& value) { m_value = value; } + wxVariantDataVoidPtr() { } + wxVariantDataVoidPtr(void* value) { m_value = value; } - inline wxTime GetValue() const { return m_value; } - inline void SetValue(const wxTime& value) { m_value = value; } + inline void* GetValue() const { return m_value; } + inline void SetValue(void* value) { m_value = value; } virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return "time"; }; - virtual wxVariantData* Clone() { return new wxVariantDataTime; } + virtual wxString GetType() const { return wxT("void*"); }; + virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } protected: - wxTime m_value; + void* m_value; + + DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr) }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData) +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) -void wxVariantDataTime::Copy(wxVariantData& data) +void wxVariantDataVoidPtr::Copy(wxVariantData& data) { - wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::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") ); - wxVariantDataTime& otherData = (wxVariantDataTime&) data; + wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; otherData.m_value = m_value; } -bool wxVariantDataTime::Eq(wxVariantData& data) const +bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == "time"), "wxVariantDataTime::Eq: argument mismatch" ); + wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); - wxVariantDataTime& otherData = (wxVariantDataTime&) data; + wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; return (otherData.m_value == m_value); } -bool wxVariantDataTime::Write(ostream& str) const +#if wxUSE_STD_IOSTREAM +bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; + str << (const char*) s.mb_str(); return TRUE; } +#endif -bool wxVariantDataTime::Write(wxString& str) const +bool wxVariantDataVoidPtr::Write(wxString& str) const { - char*s = m_value.FormatTime(); - str = s; + str.Printf(wxT("%ld"), (long) m_value); return TRUE; } -bool wxVariantDataTime::Read(istream& str) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return FALSE; } +#endif -bool wxVariantDataTime::Read(wxString& str) +bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) { // Not implemented return FALSE; } /* - * wxVariantDataDate + * wxVariantDataWxObjectPtr */ -class wxVariantDataDate: public wxVariantData +class wxVariantDataWxObjectPtr: public wxVariantData { - DECLARE_DYNAMIC_CLASS(wxVariantDataDate) +DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr) public: - wxVariantDataDate() { } - wxVariantDataDate(const wxDate& value) { m_value = value; } + wxVariantDataWxObjectPtr() { } + wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; } - inline wxDate GetValue() const { return m_value; } - inline void SetValue(const wxDate& value) { m_value = value; } + inline wxObject* GetValue() const { return m_value; } + inline void SetValue(wxObject* value) { m_value = value; } virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return "date"; }; - virtual wxVariantData* Clone() { return new wxVariantDataDate; } + virtual wxString GetType() const ; + virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; } + virtual wxClassInfo* GetValueClassInfo() ; protected: - wxDate m_value; + wxObject* m_value; + + DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr) }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData) +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData) -void wxVariantDataDate::Copy(wxVariantData& data) +void wxVariantDataWxObjectPtr::Copy(wxVariantData& data) { - wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Copy: Can't copy to this type of data" ); + wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr) ,\ + wxT("wxVariantDataWxObjectPtr::Copy: Can't copy to this type of data") \ + ); - wxVariantDataDate& otherData = (wxVariantDataDate&) data; + wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; otherData.m_value = m_value; } -bool wxVariantDataDate::Eq(wxVariantData& data) const +bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == "date"), "wxVariantDataDate::Eq: argument mismatch" ); + wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); - wxVariantDataDate& otherData = (wxVariantDataDate&) data; + wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; return (otherData.m_value == m_value); } -bool wxVariantDataDate::Write(ostream& str) const +wxString wxVariantDataWxObjectPtr::GetType() const +{ + wxString returnVal(wxT("wxObject")); + if (m_value) { + returnVal = m_value->GetClassInfo()->GetClassName(); + } + return returnVal; +} + +wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo() +{ + wxClassInfo* returnVal=NULL; + + if (m_value) returnVal = m_value->GetClassInfo(); + + return returnVal; +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const { wxString s; Write(s); - str << (const char*) s; + str << (const char*) s.mb_str(); return TRUE; } +#endif -bool wxVariantDataDate::Write(wxString& str) const +bool wxVariantDataWxObjectPtr::Write(wxString& str) const { - str = m_value.FormatDate(); + str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value); return TRUE; } -bool wxVariantDataDate::Read(istream& str) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return FALSE; } +#endif -bool wxVariantDataDate::Read(wxString& str) +bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) { // Not implemented return FALSE; } -#endif - // wxUSE_TIMEDATE + /* - * wxVariantDataVoidPtr + * wxVariantDataDateTime */ -class wxVariantDataVoidPtr: public wxVariantData +#if wxUSE_DATETIME + +class wxVariantDataDateTime: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) -public: - wxVariantDataVoidPtr() { } - wxVariantDataVoidPtr(void* value) { m_value = value; } + DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime) - inline void* GetValue() const { return m_value; } - inline void SetValue(void* value) { m_value = value; } +public: + wxVariantDataDateTime() { } + wxVariantDataDateTime(const wxDateTime& value) { m_value = value; } +#if wxUSE_ODBC + wxVariantDataDateTime(const TIME_STRUCT* valptr) + { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); } + wxVariantDataDateTime(const DATE_STRUCT* valptr) + { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); } + wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr) + { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year, + valptr->hour, valptr->minute, valptr->second, valptr->fraction ); } +#endif //ODBC + + inline wxDateTime GetValue() const { return m_value; } + inline void SetValue(const wxDateTime& value) { m_value = value; } virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; - virtual bool Write(ostream& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif virtual bool Write(wxString& str) const; - virtual bool Read(istream& str); +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return "void*"; }; - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } + virtual wxString GetType() const { return wxT("datetime"); }; + virtual wxVariantData* Clone() { return new wxVariantDataDateTime; } protected: - void* m_value; + wxDateTime m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) -void wxVariantDataVoidPtr::Copy(wxVariantData& data) +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData) + +void wxVariantDataDateTime::Copy(wxVariantData& data) { - wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::Copy: Can't copy to this type of data" ); + wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") ); - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; + wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; otherData.m_value = m_value; } -bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const + +bool wxVariantDataDateTime::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == "void*"), "wxVariantDataVoidPtr::Eq: argument mismatch" ); + wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") ); - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; + wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data; return (otherData.m_value == m_value); } -bool wxVariantDataVoidPtr::Write(ostream& str) const + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataDateTime::Write(wxSTD ostream& str) const { - wxString s; - Write(s); - str << (const char*) s; + // Not implemented + return FALSE; +} +#endif + + +bool wxVariantDataDateTime::Write(wxString& str) const +{ + str = m_value.Format(); return TRUE; } -bool wxVariantDataVoidPtr::Write(wxString& str) const + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) { - char buf[80]; - sprintf(buf, "%ld", (long) m_value); - str = buf; + // Not implemented + return FALSE; +} +#endif + + +bool wxVariantDataDateTime::Read(wxString& str) +{ + if(! m_value.ParseDateTime(str)) + return FALSE; return TRUE; } -bool wxVariantDataVoidPtr::Read(istream& str) +#endif // wxUSE_DATETIME + +// ---------------------------------------------------------------------------- +// wxVariantDataArrayString +// ---------------------------------------------------------------------------- + +class wxVariantDataArrayString: public wxVariantData +{ +public: + wxVariantDataArrayString() { } + wxVariantDataArrayString(const wxArrayString& value) { m_value = value; } + + wxArrayString GetValue() const { return m_value; } + void SetValue(const wxArrayString& value) { m_value = value; } + + virtual void Copy(wxVariantData& data); + virtual bool Eq(wxVariantData& data) const; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const; +#endif + virtual bool Write(wxString& str) const; +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str); +#endif + virtual bool Read(wxString& str); + virtual wxString GetType() const { return wxT("arrstring"); }; + virtual wxVariantData* Clone() { return new wxVariantDataArrayString; } + +protected: + wxArrayString m_value; + + DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData) + +void wxVariantDataArrayString::Copy(wxVariantData& data) +{ + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Copy: Can't copy to this type of data") ); + + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + + otherData.m_value = m_value; +} + + +bool wxVariantDataArrayString::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); + + wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data; + + return otherData.m_value == m_value; +} + + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Write(wxSTD ostream& str) const { // Not implemented return FALSE; } +#endif + + +bool wxVariantDataArrayString::Write(wxString& str) const +{ + size_t count = m_value.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + if ( n ) + str += _T(';'); + + str += m_value[n]; + } + + return TRUE; +} + -bool wxVariantDataVoidPtr::Read(wxString& str) +#if wxUSE_STD_IOSTREAM +bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return FALSE; } +#endif + + +bool wxVariantDataArrayString::Read(wxString& str) +{ + wxStringTokenizer tk(str, _T(";")); + while ( tk.HasMoreTokens() ) + { + m_value.Add(tk.GetNextToken()); + } + + return TRUE; +} + /* @@ -944,7 +1220,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) wxVariant::wxVariant() { m_data = (wxVariantData*) NULL; - m_name = wxEmptyString; } wxVariant::wxVariant(double val, const wxString& name) @@ -959,11 +1234,13 @@ wxVariant::wxVariant(long val, const wxString& name) m_name = name; } +#ifdef HAVE_BOOL wxVariant::wxVariant(bool val, const wxString& name) { m_data = new wxVariantDataBool(val); m_name = name; } +#endif wxVariant::wxVariant(char val, const wxString& name) { @@ -977,7 +1254,7 @@ wxVariant::wxVariant(const wxString& val, const wxString& name) m_name = name; } -wxVariant::wxVariant(const char* val, const wxString& name) +wxVariant::wxVariant(const wxChar* val, const wxString& name) { m_data = new wxVariantDataString(wxString(val)); m_name = name; @@ -995,27 +1272,54 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant m_name = name; } -#if wxUSE_TIMEDATE -wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time +wxVariant::wxVariant( void* val, const wxString& name) { - m_data = new wxVariantDataTime(val); + m_data = new wxVariantDataVoidPtr(val); + m_name = name; +} + +wxVariant::wxVariant( wxObject* val, const wxString& name) +{ + m_data = new wxVariantDataWxObjectPtr(val); + m_name = name; +} + +#if wxUSE_DATETIME +wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date +{ + m_data = new wxVariantDataDateTime(val); + m_name = name; +} +#endif // wxUSE_DATETIME + +#if wxUSE_ODBC +wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date +{ + m_data = new wxVariantDataDateTime(valptr); m_name = name; } -wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date +wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date { - m_data = new wxVariantDataDate(val); + m_data = new wxVariantDataDateTime(valptr); m_name = name; } -#endif -wxVariant::wxVariant(void* val, const wxString& name) // Void ptr +wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date { - m_data = new wxVariantDataVoidPtr(val); + m_data = new wxVariantDataDateTime(valptr); + m_name = name; +} +#endif // wxUSE_ODBC + +wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings +{ + m_data = new wxVariantDataArrayString(val); m_name = name; } wxVariant::wxVariant(const wxVariant& variant) + : wxObject() { if (!variant.IsNull()) { @@ -1062,8 +1366,10 @@ void wxVariant::operator= (const wxVariant& variant) delete m_data; m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject(); } -// GetData()->Copy(* variant.GetData()); + variant.GetData()->Copy(* GetData()); + + m_name = variant.m_name; } // Assignment using data, e.g. @@ -1105,7 +1411,7 @@ bool wxVariant::operator!= (double value) const void wxVariant::operator= (double value) { - if (GetType() == "double") + if (GetType() == wxT("double")) { ((wxVariantDataReal*)GetData())->SetValue(value); } @@ -1133,7 +1439,7 @@ bool wxVariant::operator!= (long value) const void wxVariant::operator= (long value) { - if (GetType() == "long") + if (GetType() == wxT("long")) { ((wxVariantDataLong*)GetData())->SetValue(value); } @@ -1161,7 +1467,7 @@ bool wxVariant::operator!= (char value) const void wxVariant::operator= (char value) { - if (GetType() == "char") + if (GetType() == wxT("char")) { ((wxVariantDataChar*)GetData())->SetValue(value); } @@ -1173,6 +1479,7 @@ void wxVariant::operator= (char value) } } +#ifdef HAVE_BOOL bool wxVariant::operator== (bool value) const { bool thisValue; @@ -1189,7 +1496,7 @@ bool wxVariant::operator!= (bool value) const void wxVariant::operator= (bool value) { - if (GetType() == "bool") + if (GetType() == wxT("bool")) { ((wxVariantDataBool*)GetData())->SetValue(value); } @@ -1200,14 +1507,15 @@ void wxVariant::operator= (bool value) m_data = new wxVariantDataBool(value); } } +#endif // HAVE_BOOL bool wxVariant::operator== (const wxString& value) const { wxString thisValue; if (!Convert(&thisValue)) return FALSE; - else - return (value == thisValue); + + return value == thisValue; } bool wxVariant::operator!= (const wxString& value) const @@ -1217,7 +1525,7 @@ bool wxVariant::operator!= (const wxString& value) const void wxVariant::operator= (const wxString& value) { - if (GetType() == "string") + if (GetType() == wxT("string")) { ((wxVariantDataString*)GetData())->SetValue(value); } @@ -1229,9 +1537,9 @@ void wxVariant::operator= (const wxString& value) } } -void wxVariant::operator= (const char* value) +void wxVariant::operator= (const wxChar* value) { - if (GetType() == "string") + if (GetType() == wxT("string")) { ((wxVariantDataString*)GetData())->SetValue(wxString(value)); } @@ -1245,7 +1553,7 @@ void wxVariant::operator= (const char* value) 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)); @@ -1258,7 +1566,7 @@ bool wxVariant::operator!= (const wxStringList& value) const void wxVariant::operator= (const wxStringList& value) { - if (GetType() == "stringlist") + if (GetType() == wxT("stringlist")) { ((wxVariantDataStringList*)GetData())->SetValue(value); } @@ -1272,7 +1580,7 @@ void wxVariant::operator= (const wxStringList& value) 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)); @@ -1285,7 +1593,7 @@ bool wxVariant::operator!= (const wxList& value) const void wxVariant::operator= (const wxList& value) { - if (GetType() == "list") + if (GetType() == wxT("list")) { ((wxVariantDataList*)GetData())->SetValue(value); } @@ -1297,105 +1605,137 @@ void wxVariant::operator= (const wxList& value) } } -#if wxUSE_TIMEDATE -bool wxVariant::operator== (const wxTime& value) const +bool wxVariant::operator== (void* value) const { - wxTime thisValue; - if (!Convert(&thisValue)) - return FALSE; - else - return (value == thisValue); + return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); } -bool wxVariant::operator!= (const wxTime& value) const +bool wxVariant::operator!= (void* value) const { - return (!((*this) == value)); + return (!((*this) == (void*) value)); } -void wxVariant::operator= (const wxTime& value) +void wxVariant::operator= (void* value) { - if (GetType() == "time") + if (GetType() == wxT("void*")) { - ((wxVariantDataTime*)GetData())->SetValue(value); + ((wxVariantDataVoidPtr*)GetData())->SetValue(value); } else { if (m_data) delete m_data; - m_data = new wxVariantDataTime(value); + m_data = new wxVariantDataVoidPtr(value); } } -bool wxVariant::operator== (const wxDate& value) const +#if wxUSE_DATETIME +bool wxVariant::operator== (const wxDateTime& value) const { - wxDate thisValue; + wxDateTime thisValue; if (!Convert(&thisValue)) return FALSE; - else - return (value == thisValue); + + return value.IsEqualTo(thisValue); } -bool wxVariant::operator!= (const wxDate& value) const +bool wxVariant::operator!= (const wxDateTime& value) const { return (!((*this) == value)); } -void wxVariant::operator= (const wxDate& value) +void wxVariant::operator= (const wxDateTime& value) { - if (GetType() == "date") + if (GetType() == wxT("datetime")) { - ((wxVariantDataTime*)GetData())->SetValue(value); + ((wxVariantDataDateTime*)GetData())->SetValue(value); } else { if (m_data) delete m_data; - m_data = new wxVariantDataDate(value); + m_data = new wxVariantDataDateTime(value); } } -#endif +#endif // wxUSE_DATETIME -bool wxVariant::operator== (void* value) const +#if wxUSE_ODBC +void wxVariant::operator= (const DATE_STRUCT* value) { - return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); + if (m_data) + delete m_data; + m_data = new wxVariantDataDateTime(value); } -bool wxVariant::operator!= (void* value) const + +void wxVariant::operator= (const TIME_STRUCT* value) { - return (!((*this) == value)); + if (m_data) + delete m_data; + m_data = new wxVariantDataDateTime(value); } -void wxVariant::operator= (void* value) + +void wxVariant::operator= (const TIMESTAMP_STRUCT* value) { - if (GetType() == "void*") + if (m_data) + delete m_data; + m_data = new wxVariantDataDateTime(value); +} + +#endif // wxUSE_ODBC + +bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const +{ + wxFAIL_MSG( _T("TODO") ); + + return FALSE; +} + +bool wxVariant::operator!=(const wxArrayString& value) const +{ + return !(*this == value); +} + +void wxVariant::operator=(const wxArrayString& value) +{ + if (GetType() == wxT("arrstring")) { - ((wxVariantDataVoidPtr*)GetData())->SetValue(value); + ((wxVariantDataArrayString *)GetData())->SetValue(value); } else { - if (m_data) - delete m_data; - m_data = new wxVariantDataVoidPtr(value); + delete m_data; + m_data = new wxVariantDataArrayString(value); } } +wxArrayString wxVariant::GetArrayString() const +{ + if ( GetType() == wxT("arrstring") ) + return ((wxVariantDataArrayString *)GetData())->GetValue(); + + return wxArrayString(); +} + + // 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; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" ); - return * (wxVariant*) (data->GetValue().Nth(idx)->Data()); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); + return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); } - else if (GetType() == "stringlist") + else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" ); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); - wxVariant variant( wxString( (char*) (data->GetValue().Nth(idx)->Data()) )); + wxVariant variant( wxString( (const wxChar*) (data->GetValue().Item(idx)->GetData()) )); return variant; } return wxNullVariant; @@ -1406,28 +1746,28 @@ 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. - 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; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), "Invalid index for array" ); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Nth(idx)->Data()); + return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); } // 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(); + return data->GetValue().GetCount(); } - else if (GetType() == "stringlist") + else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - return data->GetValue().Number(); + return data->GetValue().GetCount(); } return 0; } @@ -1440,7 +1780,7 @@ wxString wxVariant::MakeString() const if (GetData()->Write(str)) return str; } - return wxString(""); + return wxString(wxT("")); } // Accessors @@ -1457,7 +1797,7 @@ void wxVariant::SetData(wxVariantData* data) wxString wxVariant::GetType() const { if (IsNull()) - return wxString("null"); + return wxString(wxT("null")); else return m_data->GetType(); } @@ -1468,6 +1808,12 @@ bool wxVariant::IsType(const wxString& type) const return (GetType() == type); } +bool wxVariant::IsValueKindOf(const wxClassInfo* type) const +{ + wxClassInfo* info=m_data->GetValueClassInfo(); + return info ? info->IsKindOf(type) : false ; +} + // Value accessors double wxVariant::GetReal() const @@ -1477,7 +1823,7 @@ double wxVariant::GetReal() const 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; } } @@ -1489,7 +1835,7 @@ long wxVariant::GetInteger() const return value; else { - wxFAIL_MSG("Could not convert to an integer"); + wxFAIL_MSG(wxT("Could not convert to an integer")); return 0; } } @@ -1501,7 +1847,7 @@ char wxVariant::GetChar() const return value; else { - wxFAIL_MSG("Could not convert to a char"); + wxFAIL_MSG(wxT("Could not convert to a char")); return 0; } } @@ -1513,7 +1859,7 @@ bool wxVariant::GetBool() const return value; else { - wxFAIL_MSG("Could not convert to a bool"); + wxFAIL_MSG(wxT("Could not convert to a bool")); return 0; } } @@ -1521,62 +1867,60 @@ bool wxVariant::GetBool() const wxString wxVariant::GetString() const { wxString value; - if (Convert(& value)) - return value; - else + if (!Convert(& value)) { - wxFAIL_MSG("Could not convert to a string"); - return wxString(""); + wxFAIL_MSG(wxT("Could not convert to a string")); } + + return value; } -#if wxUSE_TIMEDATE -wxTime wxVariant::GetTime() const +void* wxVariant::GetVoidPtr() const { - wxTime value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG("Could not convert to a time"); - return wxTime(); - } + wxASSERT( (GetType() == wxT("void*")) ); + + return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); } -wxDate wxVariant::GetDate() const +wxObject* wxVariant::GetWxObjectPtr() { - wxDate value; - if (Convert(& value)) - return value; - else - { - wxFAIL_MSG("Could not convert to a date"); - return wxDate(); - } + wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); } -#endif -void* wxVariant::GetVoidPtr() const +#if wxUSE_DATETIME +wxDateTime wxVariant::GetDateTime() const { - wxASSERT( (GetType() == "void*") ); + wxDateTime value; + if (!Convert(& value)) + { + wxFAIL_MSG(wxT("Could not convert to a datetime")); + } - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); + return value; } +#endif // wxUSE_DATETIME wxList& wxVariant::GetList() const { - wxASSERT( (GetType() == "list") ); + wxASSERT( (GetType() == wxT("list")) ); return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); } wxStringList& wxVariant::GetStringList() const { - wxASSERT( (GetType() == "stringlist") ); + wxASSERT( (GetType() == wxT("stringlist")) ); return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } +// Make empty list +void wxVariant::NullList() +{ + SetData(new wxVariantDataList()); +}; + // Append to list void wxVariant::Append(const wxVariant& value) { @@ -1598,13 +1942,13 @@ bool wxVariant::Member(const wxVariant& value) const { wxList& list = GetList(); - wxNode* node = list.First(); + wxList::compatibility_iterator node = list.GetFirst(); while (node) { - wxVariant* other = (wxVariant*) node->Data(); + wxVariant* other = (wxVariant*) node->GetData(); if (value == *other) return TRUE; - node = node->Next(); + node = node->GetNext(); } return FALSE; } @@ -1614,24 +1958,24 @@ bool wxVariant::Delete(int item) { wxList& list = GetList(); - wxASSERT_MSG( (item < list.Number()), "Invalid index to Delete" ); - wxNode* node = list.Nth(item); - wxVariant* variant = (wxVariant*) node->Data(); + wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") ); + wxList::compatibility_iterator node = list.Item(item); + wxVariant* variant = (wxVariant*) node->GetData(); delete variant; - delete node; + list.Erase(node); return TRUE; } // Clear list void wxVariant::ClearList() { - if (!IsNull() && (GetType() == "list")) + if (!IsNull() && (GetType() == wxT("list"))) { ((wxVariantDataList*) m_data)->Clear(); } else { - if (GetType() != "list") + if (GetType() != wxT("list")) { delete m_data; m_data = NULL; @@ -1644,14 +1988,16 @@ void wxVariant::ClearList() bool wxVariant::Convert(long* value) const { wxString type(GetType()); - if (type == "double") + if (type == wxT("double")) *value = (long) (((wxVariantDataReal*)GetData())->GetValue()); - else if (type == "long") + else if (type == wxT("long")) *value = ((wxVariantDataLong*)GetData())->GetValue(); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *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; @@ -1661,19 +2007,21 @@ bool wxVariant::Convert(long* value) const bool wxVariant::Convert(bool* value) const { wxString type(GetType()); - if (type == "double") + if (type == wxT("double")) *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0); - else if (type == "long") + else if (type == wxT("long")) *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *value = ((wxVariantDataBool*)GetData())->GetValue(); - else if (type == "string") +#endif + else if (type == wxT("string")) { wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); - if (val == "true" || val == "yes") + if (val == wxT("TRUE") || val == wxT("yes")) *value = TRUE; - else if (val == "false" || val == "no") + else if (val == wxT("FALSE") || val == wxT("no")) *value = FALSE; else return FALSE; @@ -1687,14 +2035,16 @@ bool wxVariant::Convert(bool* value) const bool wxVariant::Convert(double* value) const { wxString type(GetType()); - if (type == "double") + if (type == wxT("double")) *value = ((wxVariantDataReal*)GetData())->GetValue(); - else if (type == "long") + else if (type == wxT("long")) *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *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; @@ -1704,12 +2054,14 @@ bool wxVariant::Convert(double* value) const bool wxVariant::Convert(char* value) const { wxString type(GetType()); - if (type == "char") + if (type == wxT("char")) *value = ((wxVariantDataChar*)GetData())->GetValue(); - else if (type == "long") + else if (type == wxT("long")) *value = (char) (((wxVariantDataLong*)GetData())->GetValue()); - else if (type == "bool") +#ifdef HAVE_BOOL + else if (type == wxT("bool")) *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); +#endif else return FALSE; @@ -1722,29 +2074,18 @@ bool wxVariant::Convert(wxString* value) const return TRUE; } -#if wxUSE_TIMEDATE -bool wxVariant::Convert(wxTime* value) const +#if wxUSE_DATETIME +bool wxVariant::Convert(wxDateTime* value) const { wxString type(GetType()); - if (type == "time") - *value = ((wxVariantDataTime*)GetData())->GetValue(); - else if (type == "date") - *value = wxTime(((wxVariantDataDate*)GetData())->GetValue()); - else - return FALSE; - - return TRUE; + if (type == wxT("datetime")) + { + *value = ((wxVariantDataDateTime*)GetData())->GetValue(); + return TRUE; + } + // Fallback to string conversion + wxString val; + return Convert(&val) && (value->ParseDate(val)); } +#endif // wxUSE_DATETIME -bool wxVariant::Convert(wxDate* value) const -{ - wxString type(GetType()); - if (type == "date") - *value = ((wxVariantDataDate*)GetData())->GetValue(); - else - return FALSE; - - return TRUE; -} -#endif - // wxUSE_TIMEDATE