X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..6b5403c8d65be699529995d221c3119f1da353c8:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index a0c5b4bdab..6df6999ab1 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -9,10 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "variant.h" -#pragma implementation "time.h" -#pragma implementation "date.h" #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -30,32 +28,30 @@ #endif #endif +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +namespace std {} +using namespace std ; +#endif + #if wxUSE_STREAMS #include "wx/stream.h" #include "wx/txtstrm.h" #endif #include "wx/string.h" -#include "wx/variant.h" - -#if wxUSE_TIMEDATE -IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject) +#include "wx/tokenzr.h" -wxTime::tFormat wxTime::ms_Format = wxTime::wx12h; -wxTime::tPrecision wxTime::ms_Precision = wxTime::wxStdMinSec; -wxChar wxTime::ms_bufTime[128]; -#endif +#include "wx/variant.h" IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) -wxVariant WXDLLEXPORT wxNullVariant; +wxVariant WXDLLIMPEXP_BASE wxNullVariant; /* * wxVariantDataList */ -class WXDLLEXPORT wxVariantDataList: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataList) public: @@ -69,11 +65,11 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("list"); }; @@ -99,23 +95,23 @@ 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(); } @@ -127,12 +123,12 @@ void wxVariantDataList::Copy(wxVariantData& 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(); } } @@ -141,54 +137,54 @@ bool wxVariantDataList::Eq(wxVariantData& data) const 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(); + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } - if (node1 || node2) return FALSE; - return TRUE; + if (node1 || node2) return false; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Write(ostream& str) const +bool wxVariantDataList::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataList::Write(wxString& str) const { str = wxT(""); - wxNode* node = m_value.First(); + wxList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->Data(); - if (node != m_value.First()) + 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; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataList::Read(istream& WXUNUSED(str)) +bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } #endif @@ -196,14 +192,14 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } /* * wxVariantDataStringList */ -class WXDLLEXPORT wxVariantDataStringList: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataStringList) public: @@ -216,11 +212,11 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("stringlist"); }; @@ -250,53 +246,53 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const 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 ((wxChar*) node1->Data()); - wxString str2 ((wxChar*) node2->Data()); + wxString str1 ( node1->GetData() ); + wxString str2 ( node2->GetData() ); if (str1 != str2) - return FALSE; - node1 = node1->Next(); - node2 = node2->Next(); + return false; + node1 = node1->GetNext(); + node2 = node2->GetNext(); } - if (node1 || node2) return FALSE; - return TRUE; + if (node1 || node2) return false; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataStringList::Write(ostream& str) const +bool wxVariantDataStringList::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataStringList::Write(wxString& str) const { - str = wxT(""); - wxNode* node = m_value.First(); + str.Empty(); + wxStringList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxChar* s = (wxChar*) node->Data(); - if (node != m_value.First()) + const wxChar* s = node->GetData(); + if (node != m_value.GetFirst()) str += wxT(" "); str += s; - node = node->Next(); + node = node->GetNext(); } - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataStringList::Read(istream& WXUNUSED(str)) +bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } #endif @@ -304,14 +300,14 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // TODO - return FALSE; + return false; } /* * wxVariantDataLong */ -class WXDLLEXPORT wxVariantDataLong: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataLong) public: @@ -327,8 +323,8 @@ public: 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(wxSTD istream& str); + virtual bool Write(wxSTD ostream& str) const; #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); @@ -362,26 +358,26 @@ bool wxVariantDataLong::Eq(wxVariantData& data) const } #if wxUSE_STD_IOSTREAM -bool wxVariantDataLong::Write(ostream& str) const +bool wxVariantDataLong::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataLong::Write(wxString& str) const { str.Printf(wxT("%ld"), m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataLong::Read(istream& str) +bool wxVariantDataLong::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } #endif @@ -391,28 +387,28 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write32((size_t)m_value); - return TRUE; + return true; } bool wxVariantDataLong::Read(wxInputStream& str) { wxTextInputStream s(str); m_value = s.Read32(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataLong::Read(wxString& str) { m_value = wxAtol((const wxChar*) str); - return TRUE; + return true; } /* * wxVariantDataReal */ -class WXDLLEXPORT wxVariantDataReal: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataReal) public: @@ -426,11 +422,11 @@ public: virtual bool Eq(wxVariantData& data) const; virtual bool Read(wxString& str); #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); @@ -463,26 +459,26 @@ bool wxVariantDataReal::Eq(wxVariantData& data) const } #if wxUSE_STD_IOSTREAM -bool wxVariantDataReal::Write(ostream& str) const +bool wxVariantDataReal::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataReal::Write(wxString& str) const { str.Printf(wxT("%.4f"), m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataReal::Read(istream& str) +bool wxVariantDataReal::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } #endif @@ -491,21 +487,21 @@ bool wxVariantDataReal::Write(wxOutputStream& str) const { wxTextOutputStream s(str); s.WriteDouble((double)m_value); - return TRUE; + return true; } bool wxVariantDataReal::Read(wxInputStream& str) { wxTextInputStream s(str); m_value = (float)s.ReadDouble(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataReal::Read(wxString& str) { m_value = wxAtof((const wxChar*) str); - return TRUE; + return true; } #ifdef HAVE_BOOL @@ -513,7 +509,7 @@ bool wxVariantDataReal::Read(wxString& str) * wxVariantDataBool */ -class WXDLLEXPORT wxVariantDataBool: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: @@ -526,12 +522,12 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; virtual bool Read(wxString& str); #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); @@ -564,27 +560,27 @@ bool wxVariantDataBool::Eq(wxVariantData& data) const } #if wxUSE_STD_IOSTREAM -bool wxVariantDataBool::Write(ostream& str) const +bool wxVariantDataBool::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataBool::Write(wxString& str) const { str.Printf(wxT("%d"), (int) m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataBool::Read(istream& WXUNUSED(str)) +bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // str >> (long) m_value; - return FALSE; + return false; } #endif @@ -593,8 +589,8 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const { wxTextOutputStream s(str); - s.Write8(m_value); - return TRUE; + s.Write8(m_value); + return true; } bool wxVariantDataBool::Read(wxInputStream& str) @@ -602,14 +598,14 @@ bool wxVariantDataBool::Read(wxInputStream& str) wxTextInputStream s(str); m_value = s.Read8() != 0; - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataBool::Read(wxString& str) { m_value = (wxAtol((const wxChar*) str) != 0); - return TRUE; + return true; } #endif // HAVE_BOOL @@ -617,7 +613,7 @@ bool wxVariantDataBool::Read(wxString& str) * wxVariantDataChar */ -class WXDLLEXPORT wxVariantDataChar: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: @@ -630,8 +626,8 @@ public: 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(wxSTD istream& str); + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; @@ -666,27 +662,27 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const } #if wxUSE_STD_IOSTREAM -bool wxVariantDataChar::Write(ostream& str) const +bool wxVariantDataChar::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataChar::Write(wxString& str) const { str.Printf(wxT("%c"), m_value); - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataChar::Read(istream& WXUNUSED(str)) +bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); // str >> m_value; - return FALSE; + return false; } #endif @@ -696,7 +692,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const wxTextOutputStream s(str); s.Write8(m_value); - return TRUE; + return true; } bool wxVariantDataChar::Read(wxInputStream& str) @@ -704,32 +700,23 @@ bool wxVariantDataChar::Read(wxInputStream& str) wxTextInputStream s(str); m_value = s.Read8(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataChar::Read(wxString& str) { - m_value = str[(size_t)0]; - return TRUE; + m_value = str.ToAscii()[0u]; + return true; } /* * wxVariantDataString */ -#if defined(__BORLANDC__) && defined(__WIN16__) -// Change name because of truncation -#define wxVariantDataString wxVariantStringData -#endif - -class WXDLLEXPORT wxVariantDataString: public wxVariantData +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; } @@ -740,12 +727,12 @@ public: virtual void Copy(wxVariantData& data); virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Read(wxString& str); virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif #if wxUSE_STREAMS virtual bool Read(wxInputStream& str); @@ -776,24 +763,24 @@ bool wxVariantDataString::Eq(wxVariantData& data) const } #if wxUSE_STD_IOSTREAM -bool wxVariantDataString::Write(ostream& str) const +bool wxVariantDataString::Write(wxSTD ostream& str) const { str << (const char*) m_value.mb_str(); - return TRUE; + return true; } #endif bool wxVariantDataString::Write(wxString& str) const { str = m_value; - return TRUE; + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataString::Read(istream& str) +bool wxVariantDataString::Read(wxSTD istream& str) { str >> m_value; - return TRUE; + return true; } #endif @@ -803,7 +790,7 @@ bool wxVariantDataString::Write(wxOutputStream& str) const // why doesn't wxOutputStream::operator<< take "const wxString&" wxTextOutputStream s(str); s.WriteString(m_value); - return TRUE; + return true; } bool wxVariantDataString::Read(wxInputStream& str) @@ -811,270 +798,404 @@ bool wxVariantDataString::Read(wxInputStream& str) wxTextInputStream s(str); m_value = s.ReadString(); - return TRUE; + return true; } #endif // wxUSE_STREAMS bool wxVariantDataString::Read(wxString& str) { m_value = str; - return TRUE; + return true; } -#if defined(__BORLANDC__) && defined(__WIN16__) -IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData) -#else IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) -#endif /* - * wxVariantDataTime + * wxVariantDataVoidPtr */ -// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled -#if wxUSE_TIMEDATE && !defined(__WATCOMC__) - -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; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("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() == wxT("time")), wxT("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() == wxT("time")), wxT("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); } #if wxUSE_STD_IOSTREAM -bool wxVariantDataTime::Write(ostream& str) const +bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif -bool wxVariantDataTime::Write(wxString& str) const +bool wxVariantDataVoidPtr::Write(wxString& str) const { - wxChar*s = m_value.FormatTime(); - str = s; - return TRUE; + str.Printf(wxT("%ld"), (long) m_value); + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataTime::Read(istream& WXUNUSED(str)) +bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif -bool wxVariantDataTime::Read(wxString& WXUNUSED(str)) +bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) { // Not implemented - return FALSE; + 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; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("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() == wxT("date")), wxT("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() == wxT("date")), wxT("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); } +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 wxVariantDataDate::Write(ostream& str) const +bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const { wxString s; Write(s); str << (const char*) s.mb_str(); - return TRUE; + return true; } #endif -bool wxVariantDataDate::Write(wxString& str) const +bool wxVariantDataWxObjectPtr::Write(wxString& str) const { - str = m_value.FormatDate(); - return TRUE; + str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value); + return true; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataDate::Read(istream& WXUNUSED(str)) +bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif -bool wxVariantDataDate::Read(wxString& WXUNUSED(str)) +bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) { // Not implemented - return FALSE; + 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, (wxDateTime::wxDateTime_t)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; #if wxUSE_STD_IOSTREAM - virtual bool Write(ostream& str) const; + virtual bool Write(wxSTD ostream& str) const; #endif virtual bool Write(wxString& str) const; #if wxUSE_STD_IOSTREAM - virtual bool Read(istream& str); + virtual bool Read(wxSTD istream& str); #endif virtual bool Read(wxString& str); - virtual wxString GetType() const { return wxT("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() == wxT("void*")), wxT("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() == wxT("void*")), wxT("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); } + #if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Write(ostream& str) const +bool wxVariantDataDateTime::Write(wxSTD ostream& str) const { - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return TRUE; + // Not implemented + return false; } #endif -bool wxVariantDataVoidPtr::Write(wxString& str) const + +bool wxVariantDataDateTime::Write(wxString& str) const { - str.Printf(wxT("%ld"), (long) m_value); - return TRUE; + str = m_value.Format(); + return true; } + #if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str)) +bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented - return FALSE; + return false; } #endif -bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) + +bool wxVariantDataDateTime::Read(wxString& str) +{ + if(! m_value.ParseDateTime(str)) + return false; + return true; +} + +#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; + 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; +} + + +#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; +} + /* @@ -1139,28 +1260,54 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant m_name = name; } -// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled -#if wxUSE_TIMEDATE && !defined(__WATCOMC__) -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(const wxDate& val, const wxString& name) // Date +wxVariant::wxVariant( wxObject* val, const wxString& name) { - m_data = new wxVariantDataDate(val); + m_data = new wxVariantDataWxObjectPtr(val); m_name = name; } -#endif -wxVariant::wxVariant(void* val, const wxString& name) // Void ptr +#if wxUSE_DATETIME +wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date { - m_data = new wxVariantDataVoidPtr(val); + 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 TIMESTAMP_STRUCT* valptr, const wxString& name) // Date +{ + m_data = new wxVariantDataDateTime(valptr); + m_name = name; +} + +wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date +{ + 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()) { @@ -1207,8 +1354,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. @@ -1238,7 +1387,7 @@ bool wxVariant::operator== (double value) const { double thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1266,7 +1415,7 @@ bool wxVariant::operator== (long value) const { long thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1294,7 +1443,7 @@ bool wxVariant::operator== (char value) const { char thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1323,7 +1472,7 @@ bool wxVariant::operator== (bool value) const { bool thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; else return (value == thisValue); } @@ -1352,7 +1501,7 @@ bool wxVariant::operator== (const wxString& value) const { wxString thisValue; if (!Convert(&thisValue)) - return FALSE; + return false; return value == thisValue; } @@ -1444,89 +1593,120 @@ void wxVariant::operator= (const wxList& value) } } -// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled -#if wxUSE_TIMEDATE && !defined(__WATCOMC__) -bool wxVariant::operator== (const wxTime& value) const +bool wxVariant::operator== (void* value) const { - wxTime thisValue; - if (!Convert(&thisValue)) - return FALSE; - - 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() == wxT("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; + return false; - 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() == wxT("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) == (void*) 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() == wxT("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 { @@ -1535,15 +1715,16 @@ wxVariant wxVariant::operator[] (size_t idx) const if (GetType() == wxT("list")) { wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("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() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") ); + wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") ); - wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) )); + wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ); + wxVariant variant( str ); return variant; } return wxNullVariant; @@ -1557,9 +1738,9 @@ wxVariant& wxVariant::operator[] (size_t idx) wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") ); wxVariantDataList* data = (wxVariantDataList*) m_data; - wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("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 @@ -1570,12 +1751,12 @@ int wxVariant::GetCount() const if (GetType() == wxT("list")) { wxVariantDataList* data = (wxVariantDataList*) m_data; - return data->GetValue().Number(); + return data->GetValue().GetCount(); } else if (GetType() == wxT("stringlist")) { wxVariantDataStringList* data = (wxVariantDataStringList*) m_data; - return data->GetValue().Number(); + return data->GetValue().GetCount(); } return 0; } @@ -1616,6 +1797,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 @@ -1677,37 +1864,31 @@ wxString wxVariant::GetString() const return value; } -// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled -#if wxUSE_TIMEDATE && !defined(__WATCOMC__) -wxTime wxVariant::GetTime() const +void* wxVariant::GetVoidPtr() const { - wxTime value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a time")); - } + wxASSERT( (GetType() == wxT("void*")) ); - return value; + return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); +} + +wxObject* wxVariant::GetWxObjectPtr() +{ + wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); } -wxDate wxVariant::GetDate() const +#if wxUSE_DATETIME +wxDateTime wxVariant::GetDateTime() const { - wxDate value; + wxDateTime value; if (!Convert(& value)) { - wxFAIL_MSG(wxT("Could not convert to a date")); + wxFAIL_MSG(wxT("Could not convert to a datetime")); } return value; } -#endif // wxUSE_TIMEDATE - -void* wxVariant::GetVoidPtr() const -{ - wxASSERT( (GetType() == wxT("void*")) ); - - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); -} +#endif // wxUSE_DATETIME wxList& wxVariant::GetList() const { @@ -1723,6 +1904,12 @@ wxStringList& wxVariant::GetStringList() const return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue(); } +// Make empty list +void wxVariant::NullList() +{ + SetData(new wxVariantDataList()); +}; + // Append to list void wxVariant::Append(const wxVariant& value) { @@ -1739,20 +1926,20 @@ void wxVariant::Insert(const wxVariant& value) list.Insert(new wxVariant(value)); } -// Returns TRUE if the variant is a member of the list +// Returns true if the variant is a member of the list 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(); + return true; + node = node->GetNext(); } - return FALSE; + return false; } // Deletes the nth element of the list @@ -1760,12 +1947,12 @@ bool wxVariant::Delete(int item) { wxList& list = GetList(); - wxASSERT_MSG( (item < list.Number()), wxT("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; - return TRUE; + list.Erase(node); + return true; } // Clear list @@ -1801,9 +1988,9 @@ bool wxVariant::Convert(long* value) const else if (type == wxT("string")) *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(bool* value) const @@ -1822,16 +2009,16 @@ bool wxVariant::Convert(bool* value) const wxString val(((wxVariantDataString*)GetData())->GetValue()); val.MakeLower(); if (val == wxT("true") || val == wxT("yes")) - *value = TRUE; + *value = true; else if (val == wxT("false") || val == wxT("no")) - *value = FALSE; + *value = false; else - return FALSE; + return false; } else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(double* value) const @@ -1848,9 +2035,9 @@ bool wxVariant::Convert(double* value) const else if (type == wxT("string")) *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue()); else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(char* value) const @@ -1865,42 +2052,29 @@ bool wxVariant::Convert(char* value) const *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); #endif else - return FALSE; + return false; - return TRUE; + return true; } bool wxVariant::Convert(wxString* value) const { *value = MakeString(); - return TRUE; -} - -// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled -#if wxUSE_TIMEDATE && !defined(__WATCOMC__) -bool wxVariant::Convert(wxTime* value) const -{ - wxString type(GetType()); - if (type == wxT("time")) - *value = ((wxVariantDataTime*)GetData())->GetValue(); - else if (type == wxT("date")) - *value = wxTime(((wxVariantDataDate*)GetData())->GetValue()); - else - return FALSE; - - return TRUE; + return true; } -bool wxVariant::Convert(wxDate* value) const +#if wxUSE_DATETIME +bool wxVariant::Convert(wxDateTime* value) const { wxString type(GetType()); - if (type == wxT("date")) - *value = ((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_TIMEDATE +#endif // wxUSE_DATETIME