X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dfe6069995ce68904ea619fb6a60fa0cfecddc9..3ca1bf5add01419ba173f0567b060fdd9fd605f9:/src/common/variant.cpp?ds=sidebyside diff --git a/src/common/variant.cpp b/src/common/variant.cpp index defe41807f..79f7c116a7 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,6 +28,10 @@ #endif #endif +#if defined(__MWERKS__) && __MSL__ >= 0x6000 +using namespace std ; +#endif + #if wxUSE_STREAMS #include "wx/stream.h" #include "wx/txtstrm.h" @@ -40,24 +42,15 @@ #include "wx/variant.h" -#if wxUSE_TIMEDATE -IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject) - -wxTime::tFormat wxTime::ms_Format = wxTime::wx12h; -wxTime::tPrecision wxTime::ms_Precision = wxTime::wxStdMinSec; -wxChar wxTime::ms_bufTime[128]; -#endif - 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: @@ -101,23 +94,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(); } @@ -129,12 +122,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(); } } @@ -143,16 +136,16 @@ 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(); + node1 = node1->GetNext(); + node2 = node2->GetNext(); } if (node1 || node2) return FALSE; return TRUE; @@ -171,15 +164,15 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const 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; @@ -205,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: @@ -252,16 +245,16 @@ 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(); + node1 = node1->GetNext(); + node2 = node2->GetNext(); } if (node1 || node2) return FALSE; return TRUE; @@ -279,15 +272,15 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const 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; @@ -313,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: @@ -414,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: @@ -515,7 +508,7 @@ bool wxVariantDataReal::Read(wxString& str) * wxVariantDataBool */ -class WXDLLEXPORT wxVariantDataBool: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: @@ -619,7 +612,7 @@ bool wxVariantDataBool::Read(wxString& str) * wxVariantDataChar */ -class WXDLLEXPORT wxVariantDataChar: public wxVariantData +class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: @@ -720,18 +713,9 @@ bool wxVariantDataChar::Read(wxString& str) * 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; } @@ -823,28 +807,21 @@ 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 */ -// 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; @@ -856,35 +833,37 @@ public: 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(wxSTD ostream& str) const +bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const { wxString s; Write(s); @@ -893,40 +872,39 @@ bool wxVariantDataTime::Write(wxSTD ostream& str) const } #endif -bool wxVariantDataTime::Write(wxString& str) const +bool wxVariantDataVoidPtr::Write(wxString& str) const { - wxChar*s = m_value.FormatTime(); - str = s; + str.Printf(wxT("%ld"), (long) m_value); return TRUE; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str)) +bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return FALSE; } #endif -bool wxVariantDataTime::Read(wxString& WXUNUSED(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; @@ -938,118 +916,58 @@ public: 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); } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataDate::Write(wxSTD ostream& str) const -{ - wxString s; - Write(s); - str << (const char*) s.mb_str(); - return TRUE; -} -#endif - -bool wxVariantDataDate::Write(wxString& str) const +wxString wxVariantDataWxObjectPtr::GetType() const { - str = m_value.FormatDate(); - return TRUE; + wxString returnVal(wxT("wxObject")); + if (m_value) { + returnVal = m_value->GetClassInfo()->GetClassName(); + } + return returnVal; } -#if wxUSE_STD_IOSTREAM -bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str)) +wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo() { - // Not implemented - return FALSE; -} -#endif + wxClassInfo* returnVal=NULL; + + if (m_value) returnVal = m_value->GetClassInfo(); -bool wxVariantDataDate::Read(wxString& WXUNUSED(str)) -{ - // Not implemented - return FALSE; + return returnVal; } -#endif - // wxUSE_TIMEDATE - -/* - * wxVariantDataVoidPtr - */ - -class wxVariantDataVoidPtr: public wxVariantData -{ -DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) -public: - wxVariantDataVoidPtr() { } - wxVariantDataVoidPtr(void* 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(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("void*"); }; - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } - -protected: - void* m_value; -}; - -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) - -void wxVariantDataVoidPtr::Copy(wxVariantData& data) -{ - wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") ); - - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; - - otherData.m_value = m_value; -} - -bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const -{ - wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); - - wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; - - return (otherData.m_value == m_value); -} - -#if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const +bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const { wxString s; Write(s); @@ -1058,30 +976,33 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const } #endif -bool wxVariantDataVoidPtr::Write(wxString& str) const +bool wxVariantDataWxObjectPtr::Write(wxString& str) const { - str.Printf(wxT("%ld"), (long) m_value); + str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value); return TRUE; } #if wxUSE_STD_IOSTREAM -bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str)) +bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str)) { // Not implemented return FALSE; } #endif -bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) +bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) { // Not implemented return FALSE; } + /* * wxVariantDataDateTime */ +#if wxUSE_DATETIME + class wxVariantDataDateTime: public wxVariantData { DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime) @@ -1174,6 +1095,8 @@ bool wxVariantDataDateTime::Read(wxString& str) return TRUE; } +#endif // wxUSE_DATETIME + // ---------------------------------------------------------------------------- // wxVariantDataArrayString // ---------------------------------------------------------------------------- @@ -1336,32 +1259,25 @@ 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 -{ - m_data = new wxVariantDataTime(val); - m_name = name; -} - -wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date +wxVariant::wxVariant( void* val, const wxString& name) { - m_data = new wxVariantDataDate(val); - m_name = name; + m_data = new wxVariantDataVoidPtr(val); + m_name = name; } -#endif -wxVariant::wxVariant(void* val, const wxString& name) // Void ptr +wxVariant::wxVariant( wxObject* val, const wxString& name) { - m_data = new wxVariantDataVoidPtr(val); - m_name = 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; + m_data = new wxVariantDataDateTime(val); + m_name = name; } +#endif // wxUSE_DATETIME #if wxUSE_ODBC wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date @@ -1676,65 +1592,6 @@ 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 -{ - wxTime thisValue; - if (!Convert(&thisValue)) - return FALSE; - - return value == thisValue; -} - -bool wxVariant::operator!= (const wxTime& value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (const wxTime& value) -{ - if (GetType() == wxT("time")) - { - ((wxVariantDataTime*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataTime(value); - } -} - -bool wxVariant::operator== (const wxDate& value) const -{ - wxDate thisValue; - if (!Convert(&thisValue)) - return FALSE; - - return (value == thisValue); -} - -bool wxVariant::operator!= (const wxDate& value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (const wxDate& value) -{ - if (GetType() == wxT("date")) - { - ((wxVariantDataTime*)GetData())->SetValue(value); - } - else - { - if (m_data) - delete m_data; - m_data = new wxVariantDataDate(value); - } -} -#endif - bool wxVariant::operator== (void* value) const { return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue()); @@ -1759,6 +1616,7 @@ void wxVariant::operator= (void* value) } } +#if wxUSE_DATETIME bool wxVariant::operator== (const wxDateTime& value) const { wxDateTime thisValue; @@ -1786,6 +1644,7 @@ void wxVariant::operator= (const wxDateTime& value) m_data = new wxVariantDataDateTime(value); } } +#endif // wxUSE_DATETIME #if wxUSE_ODBC void wxVariant::operator= (const DATE_STRUCT* value) @@ -1855,15 +1714,15 @@ 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()) )); + wxVariant variant( wxString( (const wxChar*) (data->GetValue().Item(idx)->GetData()) )); return variant; } return wxNullVariant; @@ -1877,9 +1736,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 @@ -1890,12 +1749,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; } @@ -1936,6 +1795,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 @@ -1997,31 +1862,6 @@ 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 -{ - wxTime value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a time")); - } - - return value; -} - -wxDate wxVariant::GetDate() const -{ - wxDate value; - if (!Convert(& value)) - { - wxFAIL_MSG(wxT("Could not convert to a date")); - } - - return value; -} -#endif // wxUSE_TIMEDATE - void* wxVariant::GetVoidPtr() const { wxASSERT( (GetType() == wxT("void*")) ); @@ -2029,6 +1869,13 @@ void* wxVariant::GetVoidPtr() const return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); } +wxObject* wxVariant::GetWxObjectPtr() +{ + wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr)); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); +} + +#if wxUSE_DATETIME wxDateTime wxVariant::GetDateTime() const { wxDateTime value; @@ -2039,6 +1886,7 @@ wxDateTime wxVariant::GetDateTime() const return value; } +#endif // wxUSE_DATETIME wxList& wxVariant::GetList() const { @@ -2081,13 +1929,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; } @@ -2097,11 +1945,11 @@ 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; + list.Erase(node); return TRUE; } @@ -2213,40 +2061,18 @@ bool wxVariant::Convert(wxString* value) const 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; -} - -bool wxVariant::Convert(wxDate* value) const -{ - wxString type(GetType()); - if (type == wxT("date")) - *value = ((wxVariantDataDate*)GetData())->GetValue(); - else - return FALSE; - - return TRUE; -} -#endif // wxUSE_TIMEDATE - +#if wxUSE_DATETIME bool wxVariant::Convert(wxDateTime* value) const { wxString type(GetType()); if (type == wxT("datetime")) + { *value = ((wxVariantDataDateTime*)GetData())->GetValue(); - else - return FALSE; - - return TRUE; + return TRUE; + } + // Fallback to string conversion + wxString val; + return Convert(&val) && (value->ParseDate(val)); } +#endif // wxUSE_DATETIME +