X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bf751e7e901fffb9ba9d850948915e33456524a..4f742042b85eabf8509d00eaa9393ade37396310:/src/common/variant.cpp diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 6892784807..b1c8838981 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -49,11 +49,12 @@ using namespace std ; #include "wx/string.h" #include "wx/tokenzr.h" -IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject) - wxVariant WXDLLIMPEXP_BASE wxNullVariant; +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxVariantList) + /* * wxVariant */ @@ -61,13 +62,13 @@ wxVariant WXDLLIMPEXP_BASE wxNullVariant; IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject) wxVariant::wxVariant() + : wxObject() { - m_data = (wxVariantData*) NULL; } bool wxVariant::IsNull() const { - return (m_data == (wxVariantData*) NULL); + return (m_refData == NULL); } void wxVariant::MakeNull() @@ -83,8 +84,6 @@ void wxVariant::Clear() wxVariant::wxVariant(const wxVariant& variant) : wxObject() { - m_data = (wxVariantData*) NULL; - if (!variant.IsNull()) Ref(variant); @@ -92,14 +91,26 @@ wxVariant::wxVariant(const wxVariant& variant) } wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data + : wxObject() { - m_data = data; + m_refData = data; m_name = name; } wxVariant::~wxVariant() { - UnRef(); +} + +wxObjectRefData *wxVariant::CreateRefData() const +{ + // We cannot create any particular wxVariantData. + wxFAIL_MSG("wxVariant::CreateRefData() cannot be implemented"); + return NULL; +} + +wxObjectRefData *wxVariant::CloneRefData(const wxObjectRefData *data) const +{ + return ((wxVariantData*) data)->Clone(); } // Assignment @@ -113,7 +124,7 @@ void wxVariant::operator= (const wxVariant& variant) void wxVariant::operator= (wxVariantData* variantData) { UnRef(); - m_data = variantData; + m_refData = variantData; } bool wxVariant::operator== (const wxVariant& variant) const @@ -121,6 +132,9 @@ bool wxVariant::operator== (const wxVariant& variant) const if (IsNull() || variant.IsNull()) return (IsNull() == variant.IsNull()); + if (GetType() != variant.GetType()) + return false; + return (GetData()->Eq(* variant.GetData())); } @@ -129,7 +143,6 @@ bool wxVariant::operator!= (const wxVariant& variant) const return (!(*this == variant)); } - wxString wxVariant::MakeString() const { if (!IsNull()) @@ -144,36 +157,17 @@ wxString wxVariant::MakeString() const void wxVariant::SetData(wxVariantData* data) { UnRef(); - m_data = data; + m_refData = data; } -void wxVariant::Ref(const wxVariant& clone) +bool wxVariant::Unshare() { - // nothing to be done - if (m_data == clone.m_data) - return; - - // delete reference to old data - UnRef(); - - // reference new data - if ( clone.m_data ) - { - m_data = clone.m_data; - m_data->m_count++; - } -} - + if ( !m_refData || m_refData->GetRefCount() == 1 ) + return true; -void wxVariant::UnRef() -{ - if ( m_data ) - { - wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") ); + wxObject::UnShare(); - m_data->DecRef(); - m_data = NULL; - } + return (m_refData && m_refData->GetRefCount() == 1); } @@ -206,7 +200,6 @@ bool wxVariant::IsValueKindOf(const wxClassInfo* type) const class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataLong) public: wxVariantDataLong() { m_value = 0; } wxVariantDataLong(long value) { m_value = value; } @@ -227,14 +220,14 @@ public: virtual bool Write(wxOutputStream &str) const; #endif // wxUSE_STREAMS + wxVariantData* Clone() const { return new wxVariantDataLong(m_value); } + virtual wxString GetType() const { return wxT("long"); } protected: long m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData) - bool wxVariantDataLong::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") ); @@ -295,19 +288,19 @@ bool wxVariantDataLong::Read(wxString& str) wxVariant::wxVariant(long val, const wxString& name) { - m_data = new wxVariantDataLong(val); + m_refData = new wxVariantDataLong(val); m_name = name; } wxVariant::wxVariant(int val, const wxString& name) { - m_data = new wxVariantDataLong((long)val); + m_refData = new wxVariantDataLong((long)val); m_name = name; } wxVariant::wxVariant(short val, const wxString& name) { - m_data = new wxVariantDataLong((long)val); + m_refData = new wxVariantDataLong((long)val); m_name = name; } @@ -328,14 +321,14 @@ bool wxVariant::operator!= (long value) const void wxVariant::operator= (long value) { if (GetType() == wxT("long") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataLong*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataLong(value); + m_refData = new wxVariantDataLong(value); } } @@ -357,7 +350,6 @@ long wxVariant::GetLong() const class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDoubleData) public: wxVariantDoubleData() { m_value = 0.0; } wxVariantDoubleData(double value) { m_value = value; } @@ -380,12 +372,11 @@ public: #endif // wxUSE_STREAMS virtual wxString GetType() const { return wxT("double"); } + wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); } protected: double m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDoubleData, wxVariantData) - bool wxVariantDoubleData::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") ); @@ -445,7 +436,7 @@ bool wxVariantDoubleData::Read(wxString& str) wxVariant::wxVariant(double val, const wxString& name) { - m_data = new wxVariantDoubleData(val); + m_refData = new wxVariantDoubleData(val); m_name = name; } @@ -466,14 +457,14 @@ bool wxVariant::operator!= (double value) const void wxVariant::operator= (double value) { if (GetType() == wxT("double") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDoubleData*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDoubleData(value); + m_refData = new wxVariantDoubleData(value); } } @@ -493,11 +484,8 @@ double wxVariant::GetDouble() const // wxVariantBoolData // ----------------------------------------------------------------- -#ifdef HAVE_BOOL - class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataBool) public: wxVariantDataBool() { m_value = 0; } wxVariantDataBool(bool value) { m_value = value; } @@ -520,12 +508,11 @@ public: #endif // wxUSE_STREAMS virtual wxString GetType() const { return wxT("bool"); } + wxVariantData* Clone() const { return new wxVariantDataBool(m_value); } protected: bool m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData) - bool wxVariantDataBool::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") ); @@ -588,7 +575,7 @@ bool wxVariantDataBool::Read(wxString& str) wxVariant::wxVariant(bool val, const wxString& name) { - m_data = new wxVariantDataBool(val); + m_refData = new wxVariantDataBool(val); m_name = name; } @@ -609,14 +596,14 @@ bool wxVariant::operator!= (bool value) const void wxVariant::operator= (bool value) { if (GetType() == wxT("bool") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataBool*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataBool(value); + m_refData = new wxVariantDataBool(value); } } @@ -632,21 +619,18 @@ bool wxVariant::GetBool() const } } -#endif // HAVE_BOOL - // ----------------------------------------------------------------- // wxVariantDataChar // ----------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataChar) public: wxVariantDataChar() { m_value = 0; } - wxVariantDataChar(wxChar value) { m_value = value; } + wxVariantDataChar(const wxUniChar& value) { m_value = value; } - inline wxChar GetValue() const { return m_value; } - inline void SetValue(wxChar value) { m_value = value; } + inline wxUniChar GetValue() const { return m_value; } + inline void SetValue(const wxUniChar& value) { m_value = value; } virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM @@ -660,13 +644,12 @@ public: virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS virtual wxString GetType() const { return wxT("char"); } + wxVariantData* Clone() const { return new wxVariantDataChar(m_value); } protected: - wxChar m_value; + wxUniChar m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData) - bool wxVariantDataChar::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") ); @@ -679,16 +662,14 @@ bool wxVariantDataChar::Eq(wxVariantData& data) const #if wxUSE_STD_IOSTREAM bool wxVariantDataChar::Write(wxSTD ostream& str) const { - wxString s; - Write(s); - str << (const char*) s.mb_str(); + str << wxString(m_value); return true; } #endif bool wxVariantDataChar::Write(wxString& str) const { - str.Printf(wxT("%c"), m_value); + str = m_value; return true; } @@ -706,7 +687,9 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const { wxTextOutputStream s(str); - s << m_value; + // FIXME-UTF8: this should be just "s << m_value;" after removal of + // ANSI build and addition of wxUniChar to wxTextOutputStream: + s << (wxChar)m_value; return true; } @@ -715,7 +698,11 @@ bool wxVariantDataChar::Read(wxInputStream& str) { wxTextInputStream s(str); - s >> m_value; + // FIXME-UTF8: this should be just "s >> m_value;" after removal of + // ANSI build and addition of wxUniChar to wxTextInputStream: + wxChar ch; + s >> ch; + m_value = ch; return true; } @@ -723,53 +710,62 @@ bool wxVariantDataChar::Read(wxInputStream& str) bool wxVariantDataChar::Read(wxString& str) { - m_value = str[size_t(0)]; + m_value = str[0u]; return true; } -wxVariant::wxVariant(wxChar val, const wxString& name) +wxVariant::wxVariant(const wxUniChar& val, const wxString& name) +{ + m_refData = new wxVariantDataChar(val); + m_name = name; +} + +wxVariant::wxVariant(char val, const wxString& name) { - m_data = new wxVariantDataChar(val); + m_refData = new wxVariantDataChar(val); m_name = name; } -bool wxVariant::operator== (wxChar value) const +wxVariant::wxVariant(wchar_t val, const wxString& name) { - wxChar thisValue; + m_refData = new wxVariantDataChar(val); + m_name = name; +} + +bool wxVariant::operator==(const wxUniChar& value) const +{ + wxUniChar thisValue; if (!Convert(&thisValue)) return false; else return (value == thisValue); } -bool wxVariant::operator!= (wxChar value) const -{ - return (!((*this) == value)); -} - -void wxVariant::operator= (wxChar value) +wxVariant& wxVariant::operator=(const wxUniChar& value) { if (GetType() == wxT("char") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataChar*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataChar(value); + m_refData = new wxVariantDataChar(value); } + + return *this; } -wxChar wxVariant::GetChar() const +wxUniChar wxVariant::GetChar() const { - wxChar value; + wxUniChar value; if (Convert(& value)) return value; else { wxFAIL_MSG(wxT("Could not convert to a char")); - return 0; + return wxUniChar(0); } } @@ -779,7 +775,6 @@ wxChar wxVariant::GetChar() const class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataString) public: wxVariantDataString() { } wxVariantDataString(const wxString& value) { m_value = value; } @@ -801,6 +796,7 @@ public: virtual bool Write(wxOutputStream& str) const; #endif // wxUSE_STREAMS virtual wxString GetType() const { return wxT("string"); } + wxVariantData* Clone() const { return new wxVariantDataString(m_value); } protected: wxString m_value; @@ -853,19 +849,41 @@ bool wxVariantDataString::Read(wxString& str) return true; } -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) - // wxVariant **** wxVariant::wxVariant(const wxString& val, const wxString& name) { - m_data = new wxVariantDataString(val); + m_refData = new wxVariantDataString(val); + m_name = name; +} + +wxVariant::wxVariant(const char* val, const wxString& name) +{ + m_refData = new wxVariantDataString(wxString(val)); + m_name = name; +} + +wxVariant::wxVariant(const wchar_t* val, const wxString& name) +{ + m_refData = new wxVariantDataString(wxString(val)); m_name = name; } -wxVariant::wxVariant(const wxChar* val, const wxString& name) +wxVariant::wxVariant(const wxCStrData& val, const wxString& name) { - m_data = new wxVariantDataString(wxString(val)); + m_refData = new wxVariantDataString(val.AsString()); + m_name = name; +} + +wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name) +{ + m_refData = new wxVariantDataString(wxString(val)); + m_name = name; +} + +wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name) +{ + m_refData = new wxVariantDataString(wxString(val)); m_name = name; } @@ -883,32 +901,19 @@ bool wxVariant::operator!= (const wxString& value) const return (!((*this) == value)); } -void wxVariant::operator= (const wxString& value) +wxVariant& wxVariant::operator= (const wxString& value) { if (GetType() == wxT("string") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataString*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataString(value); - } -} - -void wxVariant::operator= (const wxChar* value) -{ - if (GetType() == wxT("string") && - m_data->GetRefCount() == 1) - { - ((wxVariantDataString*)GetData())->SetValue(wxString(value)); - } - else - { - UnRef(); - m_data = new wxVariantDataString(wxString(value)); + m_refData = new wxVariantDataString(value); } + return *this; } wxString wxVariant::GetString() const @@ -928,7 +933,6 @@ wxString wxVariant::GetString() const class wxVariantDataWxObjectPtr: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr) public: wxVariantDataWxObjectPtr() { } wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; } @@ -946,20 +950,17 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const ; - virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; } + virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); } + + virtual wxClassInfo* GetValueClassInfo(); - virtual wxClassInfo* GetValueClassInfo() ; protected: wxObject* m_value; - - DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr) }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData) - bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const { - wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); + wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") ); wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data; @@ -968,10 +969,14 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const wxString wxVariantDataWxObjectPtr::GetType() const { - wxString returnVal(wxT("wxObject")); - if (m_value) { + wxString returnVal(wxT("wxObject*")); + + if (m_value) + { returnVal = m_value->GetClassInfo()->GetClassName(); + returnVal += wxT("*"); } + return returnVal; } @@ -996,7 +1001,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const bool wxVariantDataWxObjectPtr::Write(wxString& str) const { - str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value)); + str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast(m_value)); return true; } @@ -1018,7 +1023,7 @@ bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str)) wxVariant::wxVariant( wxObject* val, const wxString& name) { - m_data = new wxVariantDataWxObjectPtr(val); + m_refData = new wxVariantDataWxObjectPtr(val); m_name = name; } @@ -1035,13 +1040,12 @@ bool wxVariant::operator!= (wxObject* value) const void wxVariant::operator= (wxObject* value) { UnRef(); - m_data = new wxVariantDataWxObjectPtr(value); + m_refData = new wxVariantDataWxObjectPtr(value); } wxObject* wxVariant::GetWxObjectPtr() const { - wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr)); - return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue(); + return (wxObject*) ((wxVariantDataWxObjectPtr*) m_refData)->GetValue(); } // ---------------------------------------------------------------------------- @@ -1050,7 +1054,6 @@ wxObject* wxVariant::GetWxObjectPtr() const class wxVariantDataVoidPtr: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr) public: wxVariantDataVoidPtr() { } wxVariantDataVoidPtr(void* value) { m_value = value; } @@ -1068,19 +1071,15 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("void*"); } - virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; } + virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); } protected: void* m_value; - - DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr) }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData) - bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const { - wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); + wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") ); wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data; @@ -1121,7 +1120,7 @@ bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str)) wxVariant::wxVariant( void* val, const wxString& name) { - m_data = new wxVariantDataVoidPtr(val); + m_refData = new wxVariantDataVoidPtr(val); m_name = name; } @@ -1137,23 +1136,26 @@ bool wxVariant::operator!= (void* value) const void wxVariant::operator= (void* value) { - if (GetType() == wxT("void*") && - m_data->GetRefCount() == 1) + if (GetType() == wxT("void*") && (m_refData->GetRefCount() == 1)) { ((wxVariantDataVoidPtr*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataVoidPtr(value); + m_refData = new wxVariantDataVoidPtr(value); } } void* wxVariant::GetVoidPtr() const { - wxASSERT( (GetType() == wxT("void*")) ); + // handling this specially is convenient when working with COM, see #9873 + if ( IsNull() ) + return NULL; + + wxASSERT( GetType() == wxT("void*") ); - return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue(); + return (void*) ((wxVariantDataVoidPtr*) m_refData)->GetValue(); } // ---------------------------------------------------------------------------- @@ -1164,20 +1166,9 @@ void* wxVariant::GetVoidPtr() const class wxVariantDataDateTime: public wxVariantData { - DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime) - 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; } @@ -1192,15 +1183,13 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("datetime"); } - virtual wxVariantData* Clone() { return new wxVariantDataDateTime; } + virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); } protected: wxDateTime m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData) - bool wxVariantDataDateTime::Eq(wxVariantData& data) const { wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") ); @@ -1224,7 +1213,10 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const bool wxVariantDataDateTime::Write(wxString& str) const { - str = m_value.Format(); + if ( m_value.IsValid() ) + str = m_value.Format(); + else + str = wxS("Invalid"); return true; } @@ -1240,39 +1232,24 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataDateTime::Read(wxString& str) { - if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/)) - return false; - return true; + if ( str == wxS("Invalid") ) + { + m_value = wxInvalidDateTime; + return true; + } + + wxString::const_iterator end; + return m_value.ParseDateTime(str, &end) && end == str.end(); } // wxVariant wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date { - m_data = new wxVariantDataDateTime(val); - m_name = name; -} - -#if wxUSE_ODBC -wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date -{ - m_data = new wxVariantDataDateTime(valptr); + m_refData = new wxVariantDataDateTime(val); 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 - bool wxVariant::operator== (const wxDateTime& value) const { wxDateTime thisValue; @@ -1290,38 +1267,17 @@ bool wxVariant::operator!= (const wxDateTime& value) const void wxVariant::operator= (const wxDateTime& value) { if (GetType() == wxT("datetime") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataDateTime*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataDateTime(value); + m_refData = new wxVariantDataDateTime(value); } } -#if wxUSE_ODBC -void wxVariant::operator= (const DATE_STRUCT* value) -{ - UnRef(); - m_data = new wxVariantDataDateTime(value); -} - -void wxVariant::operator= (const TIME_STRUCT* value) -{ - UnRef(); - m_data = new wxVariantDataDateTime(value); -} - -void wxVariant::operator= (const TIMESTAMP_STRUCT* value) -{ - UnRef(); - m_data = new wxVariantDataDateTime(value); -} - -#endif // wxUSE_ODBC - wxDateTime wxVariant::GetDateTime() const { wxDateTime value; @@ -1358,16 +1314,12 @@ public: #endif virtual bool Read(wxString& str); virtual wxString GetType() const { return wxT("arrstring"); } - virtual wxVariantData* Clone() { return new wxVariantDataArrayString; } + virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); } protected: wxArrayString m_value; - - DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString) }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData) - bool wxVariantDataArrayString::Eq(wxVariantData& data) const { wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") ); @@ -1391,7 +1343,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const for ( size_t n = 0; n < count; n++ ) { if ( n ) - str += _T(';'); + str += wxT(';'); str += m_value[n]; } @@ -1411,7 +1363,7 @@ bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataArrayString::Read(wxString& str) { - wxStringTokenizer tk(str, _T(";")); + wxStringTokenizer tk(str, wxT(";")); while ( tk.HasMoreTokens() ) { m_value.Add(tk.GetNextToken()); @@ -1424,13 +1376,13 @@ bool wxVariantDataArrayString::Read(wxString& str) wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings { - m_data = new wxVariantDataArrayString(val); + m_refData = new wxVariantDataArrayString(val); m_name = name; } bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const { - wxFAIL_MSG( _T("TODO") ); + wxFAIL_MSG( wxT("TODO") ); return false; } @@ -1443,14 +1395,14 @@ bool wxVariant::operator!=(const wxArrayString& value) const void wxVariant::operator=(const wxArrayString& value) { if (GetType() == wxT("arrstring") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataArrayString *)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataArrayString(value); + m_refData = new wxVariantDataArrayString(value); } } @@ -1462,20 +1414,341 @@ wxArrayString wxVariant::GetArrayString() const return wxArrayString(); } +// ---------------------------------------------------------------------------- +// wxVariantDataLongLong +// ---------------------------------------------------------------------------- + +#if wxUSE_LONGLONG + +class WXDLLIMPEXP_BASE wxVariantDataLongLong : public wxVariantData +{ +public: + wxVariantDataLongLong() { m_value = 0; } + wxVariantDataLongLong(wxLongLong value) { m_value = value; } + + wxLongLong GetValue() const { return m_value; } + void SetValue(wxLongLong value) { m_value = value; } + + virtual bool Eq(wxVariantData& data) const; + + virtual bool Read(wxString& str); + virtual bool Write(wxString& str) const; +#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 Write(wxOutputStream &str) const; +#endif // wxUSE_STREAMS + + wxVariantData* Clone() const + { + return new wxVariantDataLongLong(m_value); + } + + virtual wxString GetType() const { return wxS("longlong"); } + +protected: + wxLongLong m_value; +}; + +bool wxVariantDataLongLong::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( (data.GetType() == wxS("longlong")), + "wxVariantDataLongLong::Eq: argument mismatch" ); + + wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data; + + return (otherData.m_value == m_value); +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataLongLong::Write(wxSTD ostream& str) const +{ + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; +} +#endif + +bool wxVariantDataLongLong::Write(wxString& str) const +{ +#ifdef wxLongLong_t + str.Printf(wxS("%lld"), m_value.GetValue()); + return true; +#else + return false; +#endif +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataLongLong::Read(wxSTD istream& WXUNUSED(str)) +{ + wxFAIL_MSG(wxS("Unimplemented")); + return false; +} +#endif + +#if wxUSE_STREAMS +bool wxVariantDataLongLong::Write(wxOutputStream& str) const +{ + wxTextOutputStream s(str); + s.Write32(m_value.GetLo()); + s.Write32(m_value.GetHi()); + return true; +} + +bool wxVariantDataLongLong::Read(wxInputStream& str) +{ + wxTextInputStream s(str); + unsigned long lo = s.Read32(); + long hi = s.Read32(); + m_value = wxLongLong(hi, lo); + return true; +} +#endif // wxUSE_STREAMS + +bool wxVariantDataLongLong::Read(wxString& str) +{ +#ifdef wxLongLong_t + wxLongLong_t value_t; + if ( !str.ToLongLong(&value_t) ) + return false; + m_value = value_t; + return true; +#else + return false; +#endif +} + +// wxVariant + +wxVariant::wxVariant(wxLongLong val, const wxString& name) +{ + m_refData = new wxVariantDataLongLong(val); + m_name = name; +} + +bool wxVariant::operator==(wxLongLong value) const +{ + wxLongLong thisValue; + if ( !Convert(&thisValue) ) + return false; + else + return (value == thisValue); +} + +bool wxVariant::operator!=(wxLongLong value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator=(wxLongLong value) +{ + if ( GetType() == wxS("longlong") && + m_refData->GetRefCount() == 1 ) + { + ((wxVariantDataLongLong*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_refData = new wxVariantDataLongLong(value); + } +} + +wxLongLong wxVariant::GetLongLong() const +{ + wxLongLong value; + if ( Convert(&value) ) + { + return value; + } + else + { + wxFAIL_MSG(wxT("Could not convert to a long long")); + return 0; + } +} + +#endif // wxUSE_LONGLONG + +// ---------------------------------------------------------------------------- +// wxVariantDataULongLong +// ---------------------------------------------------------------------------- + +#if wxUSE_LONGLONG + +class WXDLLIMPEXP_BASE wxVariantDataULongLong : public wxVariantData +{ +public: + wxVariantDataULongLong() { m_value = 0; } + wxVariantDataULongLong(wxULongLong value) { m_value = value; } + + wxULongLong GetValue() const { return m_value; } + void SetValue(wxULongLong value) { m_value = value; } + + virtual bool Eq(wxVariantData& data) const; + + virtual bool Read(wxString& str); + virtual bool Write(wxString& str) const; +#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 Write(wxOutputStream &str) const; +#endif // wxUSE_STREAMS + + wxVariantData* Clone() const + { + return new wxVariantDataULongLong(m_value); + } + + virtual wxString GetType() const { return wxS("ulonglong"); } + +protected: + wxULongLong m_value; +}; + +bool wxVariantDataULongLong::Eq(wxVariantData& data) const +{ + wxASSERT_MSG( (data.GetType() == wxS("ulonglong")), + "wxVariantDataULongLong::Eq: argument mismatch" ); + + wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data; + + return (otherData.m_value == m_value); +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataULongLong::Write(wxSTD ostream& str) const +{ + wxString s; + Write(s); + str << (const char*) s.mb_str(); + return true; +} +#endif + +bool wxVariantDataULongLong::Write(wxString& str) const +{ +#ifdef wxLongLong_t + str.Printf(wxS("%llu"), m_value.GetValue()); + return true; +#else + return false; +#endif +} + +#if wxUSE_STD_IOSTREAM +bool wxVariantDataULongLong::Read(wxSTD istream& WXUNUSED(str)) +{ + wxFAIL_MSG(wxS("Unimplemented")); + return false; +} +#endif + +#if wxUSE_STREAMS +bool wxVariantDataULongLong::Write(wxOutputStream& str) const +{ + wxTextOutputStream s(str); + s.Write32(m_value.GetLo()); + s.Write32(m_value.GetHi()); + return true; +} + +bool wxVariantDataULongLong::Read(wxInputStream& str) +{ + wxTextInputStream s(str); + unsigned long lo = s.Read32(); + long hi = s.Read32(); + m_value = wxULongLong(hi, lo); + return true; +} +#endif // wxUSE_STREAMS + +bool wxVariantDataULongLong::Read(wxString& str) +{ +#ifdef wxLongLong_t + wxULongLong_t value_t; + if ( !str.ToULongLong(&value_t) ) + return false; + m_value = value_t; + return true; +#else + return false; +#endif +} + +// wxVariant + +wxVariant::wxVariant(wxULongLong val, const wxString& name) +{ + m_refData = new wxVariantDataULongLong(val); + m_name = name; +} + +bool wxVariant::operator==(wxULongLong value) const +{ + wxULongLong thisValue; + if ( !Convert(&thisValue) ) + return false; + else + return (value == thisValue); +} + +bool wxVariant::operator!=(wxULongLong value) const +{ + return (!((*this) == value)); +} + +void wxVariant::operator=(wxULongLong value) +{ + if ( GetType() == wxS("ulonglong") && + m_refData->GetRefCount() == 1 ) + { + ((wxVariantDataULongLong*)GetData())->SetValue(value); + } + else + { + UnRef(); + m_refData = new wxVariantDataULongLong(value); + } +} + +wxULongLong wxVariant::GetULongLong() const +{ + wxULongLong value; + if ( Convert(&value) ) + { + return value; + } + else + { + wxFAIL_MSG(wxT("Could not convert to a long long")); + return 0; + } +} + +#endif // wxUSE_LONGLONG + // ---------------------------------------------------------------------------- // wxVariantDataList // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData { -DECLARE_DYNAMIC_CLASS(wxVariantDataList) public: wxVariantDataList() {} - wxVariantDataList(const wxList& list); + wxVariantDataList(const wxVariantList& list); virtual ~wxVariantDataList(); - wxList& GetValue() { return m_value; } - void SetValue(const wxList& value) ; + wxVariantList& GetValue() { return m_value; } + void SetValue(const wxVariantList& value) ; virtual bool Eq(wxVariantData& data) const; #if wxUSE_STD_IOSTREAM @@ -1490,13 +1763,12 @@ public: void Clear(); + wxVariantData* Clone() const { return new wxVariantDataList(m_value); } protected: - wxList m_value; + wxVariantList m_value; }; -IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData) - -wxVariantDataList::wxVariantDataList(const wxList& list) +wxVariantDataList::wxVariantDataList(const wxVariantList& list) { SetValue(list); } @@ -1506,13 +1778,13 @@ wxVariantDataList::~wxVariantDataList() Clear(); } -void wxVariantDataList::SetValue(const wxList& value) +void wxVariantDataList::SetValue(const wxVariantList& value) { Clear(); - wxList::compatibility_iterator node = value.GetFirst(); + wxVariantList::compatibility_iterator node = value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->GetData(); + wxVariant* var = node->GetData(); m_value.Append(new wxVariant(*var)); node = node->GetNext(); } @@ -1520,10 +1792,10 @@ void wxVariantDataList::SetValue(const wxList& value) void wxVariantDataList::Clear() { - wxList::compatibility_iterator node = m_value.GetFirst(); + wxVariantList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->GetData(); + wxVariant* var = node->GetData(); delete var; node = node->GetNext(); } @@ -1535,12 +1807,12 @@ bool wxVariantDataList::Eq(wxVariantData& data) const wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") ); wxVariantDataList& listData = (wxVariantDataList&) data; - wxList::compatibility_iterator node1 = m_value.GetFirst(); - wxList::compatibility_iterator node2 = listData.GetValue().GetFirst(); + wxVariantList::compatibility_iterator node1 = m_value.GetFirst(); + wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst(); while (node1 && node2) { - wxVariant* var1 = (wxVariant*) node1->GetData(); - wxVariant* var2 = (wxVariant*) node2->GetData(); + wxVariant* var1 = node1->GetData(); + wxVariant* var2 = node2->GetData(); if ((*var1) != (*var2)) return false; node1 = node1->GetNext(); @@ -1563,10 +1835,10 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const bool wxVariantDataList::Write(wxString& str) const { str = wxEmptyString; - wxList::compatibility_iterator node = m_value.GetFirst(); + wxVariantList::compatibility_iterator node = m_value.GetFirst(); while (node) { - wxVariant* var = (wxVariant*) node->GetData(); + wxVariant* var = node->GetData(); if (node != m_value.GetFirst()) str += wxT(" "); wxString str1; @@ -1595,13 +1867,13 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str)) // wxVariant -wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants +wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants { - m_data = new wxVariantDataList(val); + m_refData = new wxVariantDataList(val); m_name = name; } -bool wxVariant::operator== (const wxList& value) const +bool wxVariant::operator== (const wxVariantList& value) const { wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") ); @@ -1609,30 +1881,30 @@ bool wxVariant::operator== (const wxList& value) const return (GetData()->Eq(other)); } -bool wxVariant::operator!= (const wxList& value) const +bool wxVariant::operator!= (const wxVariantList& value) const { return (!((*this) == value)); } -void wxVariant::operator= (const wxList& value) +void wxVariant::operator= (const wxVariantList& value) { if (GetType() == wxT("list") && - m_data->GetRefCount() == 1) + m_refData->GetRefCount() == 1) { ((wxVariantDataList*)GetData())->SetValue(value); } else { UnRef(); - m_data = new wxVariantDataList(value); + m_refData = new wxVariantDataList(value); } } -wxList& wxVariant::GetList() const +wxVariantList& wxVariant::GetList() const { wxASSERT( (GetType() == wxT("list")) ); - return (wxList&) ((wxVariantDataList*) m_data)->GetValue(); + return (wxVariantList&) ((wxVariantDataList*) m_refData)->GetValue(); } // Make empty list @@ -1644,7 +1916,7 @@ void wxVariant::NullList() // Append to list void wxVariant::Append(const wxVariant& value) { - wxList& list = GetList(); + wxVariantList& list = GetList(); list.Append(new wxVariant(value)); } @@ -1652,7 +1924,7 @@ void wxVariant::Append(const wxVariant& value) // Insert at front of list void wxVariant::Insert(const wxVariant& value) { - wxList& list = GetList(); + wxVariantList& list = GetList(); list.Insert(new wxVariant(value)); } @@ -1660,12 +1932,12 @@ void wxVariant::Insert(const wxVariant& value) // Returns true if the variant is a member of the list bool wxVariant::Member(const wxVariant& value) const { - wxList& list = GetList(); + wxVariantList& list = GetList(); - wxList::compatibility_iterator node = list.GetFirst(); + wxVariantList::compatibility_iterator node = list.GetFirst(); while (node) { - wxVariant* other = (wxVariant*) node->GetData(); + wxVariant* other = node->GetData(); if (value == *other) return true; node = node->GetNext(); @@ -1676,11 +1948,11 @@ bool wxVariant::Member(const wxVariant& value) const // Deletes the nth element of the list bool wxVariant::Delete(size_t item) { - wxList& list = GetList(); + wxVariantList& list = GetList(); wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") ); - wxList::compatibility_iterator node = list.Item(item); - wxVariant* variant = (wxVariant*) node->GetData(); + wxVariantList::compatibility_iterator node = list.Item(item); + wxVariant* variant = node->GetData(); delete variant; list.Erase(node); return true; @@ -1691,14 +1963,14 @@ void wxVariant::ClearList() { if (!IsNull() && (GetType() == wxT("list"))) { - ((wxVariantDataList*) m_data)->Clear(); + ((wxVariantDataList*) m_refData)->Clear(); } else { if (!GetType().IsSameAs(wxT("list"))) UnRef(); - m_data = new wxVariantDataList; + m_refData = new wxVariantDataList; } } @@ -1709,9 +1981,9 @@ wxVariant wxVariant::operator[] (size_t idx) const if (GetType() == wxT("list")) { - wxVariantDataList* data = (wxVariantDataList*) m_data; + wxVariantDataList* data = (wxVariantDataList*) m_refData; wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); + return *(data->GetValue().Item(idx)->GetData()); } return wxNullVariant; } @@ -1723,10 +1995,10 @@ wxVariant& wxVariant::operator[] (size_t idx) wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") ); - wxVariantDataList* data = (wxVariantDataList*) m_data; + wxVariantDataList* data = (wxVariantDataList*) m_refData; wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") ); - return * (wxVariant*) (data->GetValue().Item(idx)->GetData()); + return * (data->GetValue().Item(idx)->GetData()); } // Return the number of elements in a list @@ -1736,7 +2008,7 @@ size_t wxVariant::GetCount() const if (GetType() == wxT("list")) { - wxVariantDataList* data = (wxVariantDataList*) m_data; + wxVariantDataList* data = (wxVariantDataList*) m_refData; return data->GetValue().GetCount(); } return 0; @@ -1749,16 +2021,32 @@ size_t wxVariant::GetCount() const bool wxVariant::Convert(long* value) const { wxString type(GetType()); - if (type == wxT("double")) + if (type == wxS("double")) *value = (long) (((wxVariantDoubleData*)GetData())->GetValue()); - else if (type == wxT("long")) + else if (type == wxS("long")) *value = ((wxVariantDataLong*)GetData())->GetValue(); -#ifdef HAVE_BOOL - else if (type == wxT("bool")) + else if (type == wxS("bool")) *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); -#endif - else if (type == wxT("string")) + else if (type == wxS("string")) *value = wxAtol(((wxVariantDataString*)GetData())->GetValue()); +#if wxUSE_LONGLONG + else if (type == wxS("longlong")) + { + wxLongLong v = ((wxVariantDataLongLong*)GetData())->GetValue(); + // Don't convert if return value would be vague + if ( v < LONG_MIN || v > LONG_MAX ) + return false; + *value = v.ToLong(); + } + else if (type == wxS("ulonglong")) + { + wxULongLong v = ((wxVariantDataULongLong*)GetData())->GetValue(); + // Don't convert if return value would be vague + if ( v.GetHi() ) + return false; + *value = (long) v.ToULong(); + } +#endif else return false; @@ -1772,10 +2060,8 @@ bool wxVariant::Convert(bool* value) const *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0); else if (type == wxT("long")) *value = (((wxVariantDataLong*)GetData())->GetValue() != 0); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = ((wxVariantDataBool*)GetData())->GetValue(); -#endif else if (type == wxT("string")) { wxString val(((wxVariantDataString*)GetData())->GetValue()); @@ -1800,41 +2086,150 @@ bool wxVariant::Convert(double* value) const *value = ((wxVariantDoubleData*)GetData())->GetValue(); else if (type == wxT("long")) *value = (double) (((wxVariantDataLong*)GetData())->GetValue()); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (double) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else if (type == wxT("string")) *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue()); +#if wxUSE_LONGLONG + else if (type == wxS("longlong")) + { + *value = ((wxVariantDataLongLong*)GetData())->GetValue().ToDouble(); + } + else if (type == wxS("ulonglong")) + { + *value = ((wxVariantDataULongLong*)GetData())->GetValue().ToDouble(); + } +#endif else return false; return true; } -bool wxVariant::Convert(wxChar* value) const +bool wxVariant::Convert(wxUniChar* value) const { wxString type(GetType()); if (type == wxT("char")) *value = ((wxVariantDataChar*)GetData())->GetValue(); else if (type == wxT("long")) *value = (char) (((wxVariantDataLong*)GetData())->GetValue()); -#ifdef HAVE_BOOL else if (type == wxT("bool")) *value = (char) (((wxVariantDataBool*)GetData())->GetValue()); -#endif else return false; return true; } +bool wxVariant::Convert(char* value) const +{ + wxUniChar ch; + if ( !Convert(&ch) ) + return false; + *value = ch; + return true; +} + +bool wxVariant::Convert(wchar_t* value) const +{ + wxUniChar ch; + if ( !Convert(&ch) ) + return false; + *value = ch; + return true; +} + bool wxVariant::Convert(wxString* value) const { *value = MakeString(); return true; } +#if wxUSE_LONGLONG +bool wxVariant::Convert(wxLongLong* value) const +{ + wxString type(GetType()); + if (type == wxS("longlong")) + *value = ((wxVariantDataLongLong*)GetData())->GetValue(); + else if (type == wxS("long")) + *value = ((wxVariantDataLong*)GetData())->GetValue(); + else if (type == wxS("string")) + { + wxString s = ((wxVariantDataString*)GetData())->GetValue(); +#ifdef wxLongLong_t + wxLongLong_t value_t; + if ( !s.ToLongLong(&value_t) ) + return false; + *value = value_t; +#else + long l_value; + if ( !s.ToLong(&l_value) ) + return false; + *value = l_value; +#endif + } + else if (type == wxS("bool")) + *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); + else if (type == wxS("double")) + { + value->Assign(((wxVariantDoubleData*)GetData())->GetValue()); + } + else if (type == wxS("ulonglong")) + *value = ((wxVariantDataULongLong*)GetData())->GetValue(); + else + return false; + + return true; +} + +bool wxVariant::Convert(wxULongLong* value) const +{ + wxString type(GetType()); + if (type == wxS("ulonglong")) + *value = ((wxVariantDataULongLong*)GetData())->GetValue(); + else if (type == wxS("long")) + *value = ((wxVariantDataLong*)GetData())->GetValue(); + else if (type == wxS("string")) + { + wxString s = ((wxVariantDataString*)GetData())->GetValue(); +#ifdef wxLongLong_t + wxULongLong_t value_t; + if ( !s.ToULongLong(&value_t) ) + return false; + *value = value_t; +#else + unsigned long l_value; + if ( !s.ToULong(&l_value) ) + return false; + *value = l_value; +#endif + } + else if (type == wxS("bool")) + *value = (long) (((wxVariantDataBool*)GetData())->GetValue()); + else if (type == wxS("double")) + { + double value_d = ((wxVariantDoubleData*)GetData())->GetValue(); + + if ( value_d < 0.0 ) + return false; + +#ifdef wxLongLong_t + *value = (wxULongLong_t) value_d; +#else + wxLongLong temp; + temp.Assign(value_d); + *value = temp; +#endif + } + else if (type == wxS("longlong")) + *value = ((wxVariantDataLongLong*)GetData())->GetValue(); + else + return false; + + return true; +} +#endif // wxUSE_LONGLONG + #if wxUSE_DATETIME bool wxVariant::Convert(wxDateTime* value) const { @@ -1844,12 +2239,25 @@ bool wxVariant::Convert(wxDateTime* value) const *value = ((wxVariantDataDateTime*)GetData())->GetValue(); return true; } + // Fallback to string conversion wxString val; - return Convert(&val) && - (value->ParseDateTime(val.c_str()/*FIXME-UTF8*/) || - value->ParseDate(val.c_str()/*FIXME-UTF8*/) || - value->ParseTime(val.c_str()/*FIXME-UTF8*/)); + if ( !Convert(&val) ) + return false; + + // Try to parse this as either date and time, only date or only time + // checking that the entire string was parsed + wxString::const_iterator end; + if ( value->ParseDateTime(val, &end) && end == val.end() ) + return true; + + if ( value->ParseDate(val, &end) && end == val.end() ) + return true; + + if ( value->ParseTime(val, &end) && end == val.end() ) + return true; + + return false; } #endif // wxUSE_DATETIME