/////////////////////////////////////////////////////////////////////////////
-// Name: variant.cpp
+// Name: src/common/variant.cpp
// Purpose: wxVariant class, container for any type
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "variant.h"
-#pragma implementation "time.h"
-#pragma implementation "date.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/variant.h"
+
+#if wxUSE_VARIANT
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/math.h"
+ #include "wx/crt.h"
+ #if wxUSE_STREAMS
+ #include "wx/stream.h"
+ #endif
+#endif
+
#if wxUSE_STD_IOSTREAM
#if wxUSE_IOSTREAMH
#include <fstream.h>
#endif
#if wxUSE_STREAMS
-#include "wx/stream.h"
-#include "wx/txtstrm.h"
+ #include "wx/txtstrm.h"
#endif
#include "wx/string.h"
#include "wx/tokenzr.h"
-#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
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;
-IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
-wxVariant WXDLLEXPORT wxNullVariant;
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxVariantList)
/*
- * wxVariantDataList
+ * wxVariant
*/
-class WXDLLEXPORT wxVariantDataList: public wxVariantData
+IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
+
+wxVariant::wxVariant()
+ : wxObject()
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataList)
-public:
- wxVariantDataList() {}
- wxVariantDataList(const wxList& list);
- ~wxVariantDataList();
+}
- wxList& GetValue() const { return (wxList&) m_value; }
- void SetValue(const wxList& value) ;
+bool wxVariant::IsNull() const
+{
+ return (m_refData == NULL);
+}
- 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("list"); };
+void wxVariant::MakeNull()
+{
+ UnRef();
+}
- void Clear();
+void wxVariant::Clear()
+{
+ m_name = wxEmptyString;
+}
-protected:
- wxList m_value;
-};
+wxVariant::wxVariant(const wxVariant& variant)
+ : wxObject()
+{
+ if (!variant.IsNull())
+ Ref(variant);
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData)
+ m_name = variant.m_name;
+}
-wxVariantDataList::wxVariantDataList(const wxList& list)
+wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
+ : wxObject()
{
- SetValue(list);
+ m_refData = data;
+ m_name = name;
}
-wxVariantDataList::~wxVariantDataList()
+wxVariant::~wxVariant()
{
- Clear();
}
-void wxVariantDataList::SetValue(const wxList& value)
+wxObjectRefData *wxVariant::CreateRefData() const
{
- Clear();
- wxNode* node = value.First();
- while (node)
- {
- wxVariant* var = (wxVariant*) node->Data();
- m_value.Append(new wxVariant(*var));
- node = node->Next();
- }
+ // We cannot create any particular wxVariantData.
+ wxFAIL_MSG("wxVariant::CreateRefData() cannot be implemented");
+ return NULL;
}
-void wxVariantDataList::Clear()
+wxObjectRefData *wxVariant::CloneRefData(const wxObjectRefData *data) const
{
- wxNode* node = m_value.First();
- while (node)
- {
- wxVariant* var = (wxVariant*) node->Data();
- delete var;
- node = node->Next();
- }
- m_value.Clear();
+ return ((wxVariantData*) data)->Clone();
}
-void wxVariantDataList::Copy(wxVariantData& data)
+// Assignment
+void wxVariant::operator= (const wxVariant& variant)
{
- wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data") );
-
- wxVariantDataList& listData = (wxVariantDataList&) data;
+ Ref(variant);
+ m_name = variant.m_name;
+}
- listData.Clear();
- wxNode* node = m_value.First();
- while (node)
- {
- wxVariant* var = (wxVariant*) node->Data();
- listData.m_value.Append(new wxVariant(*var));
- node = node->Next();
- }
+// myVariant = new wxStringVariantData("hello")
+void wxVariant::operator= (wxVariantData* variantData)
+{
+ UnRef();
+ m_refData = variantData;
}
-bool wxVariantDataList::Eq(wxVariantData& data) const
+bool wxVariant::operator== (const wxVariant& variant) const
{
- wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
+ if (IsNull() || variant.IsNull())
+ return (IsNull() == variant.IsNull());
- wxVariantDataList& listData = (wxVariantDataList&) data;
- wxNode* node1 = m_value.First();
- wxNode* node2 = listData.GetValue().First();
- while (node1 && node2)
- {
- wxVariant* var1 = (wxVariant*) node1->Data();
- wxVariant* var2 = (wxVariant*) node2->Data();
- if ((*var1) != (*var2))
- return FALSE;
- node1 = node1->Next();
- node2 = node2->Next();
- }
- if (node1 || node2) return FALSE;
- return TRUE;
+ if (GetType() != variant.GetType())
+ return false;
+
+ return (GetData()->Eq(* variant.GetData()));
}
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Write(wxSTD ostream& str) const
+bool wxVariant::operator!= (const wxVariant& variant) const
{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return TRUE;
+ return (!(*this == variant));
}
-#endif
-bool wxVariantDataList::Write(wxString& str) const
+wxString wxVariant::MakeString() const
{
- str = wxT("");
- wxNode* node = m_value.First();
- while (node)
+ if (!IsNull())
{
- wxVariant* var = (wxVariant*) node->Data();
- if (node != m_value.First())
- str += wxT(" ");
- wxString str1;
- str += var->MakeString();
- node = node->Next();
+ wxString str;
+ if (GetData()->Write(str))
+ return str;
}
-
- return TRUE;
+ return wxEmptyString;
}
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
+void wxVariant::SetData(wxVariantData* data)
{
- wxFAIL_MSG(wxT("Unimplemented"));
- // TODO
- return FALSE;
+ UnRef();
+ m_refData = data;
}
-#endif
-bool wxVariantDataList::Read(wxString& WXUNUSED(str))
+bool wxVariant::Unshare()
{
- wxFAIL_MSG(wxT("Unimplemented"));
- // TODO
- return FALSE;
-}
-
-/*
- * wxVariantDataStringList
- */
+ if ( !m_refData || m_refData->GetRefCount() == 1 )
+ return true;
-class WXDLLEXPORT wxVariantDataStringList: public wxVariantData
-{
-DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
-public:
- wxVariantDataStringList() {}
- wxVariantDataStringList(const wxStringList& list) { m_value = list; }
+ wxObject::UnShare();
- wxStringList& GetValue() const { return (wxStringList&) m_value; }
- void SetValue(const wxStringList& value);
+ return (m_refData && m_refData->GetRefCount() == 1);
+}
- 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("stringlist"); };
-protected:
- wxStringList m_value;
-};
+// Returns a string representing the type of the variant,
+// e.g. "string", "bool", "list", "double", "long"
+wxString wxVariant::GetType() const
+{
+ if (IsNull())
+ return wxString(wxT("null"));
+ else
+ return GetData()->GetType();
+}
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData)
-void wxVariantDataStringList::SetValue(const wxStringList& value)
+bool wxVariant::IsType(const wxString& type) const
{
- m_value = value;
+ return (GetType() == type);
}
-void wxVariantDataStringList::Copy(wxVariantData& data)
+bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
{
- wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") );
+ wxClassInfo* info=GetData()->GetValueClassInfo();
+ return info ? info->IsKindOf(type) : false ;
+}
- wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
+// -----------------------------------------------------------------
+// wxVariant <-> wxAny conversion code
+// -----------------------------------------------------------------
- listData.m_value = m_value ;
-}
+#if wxUSE_ANY
-bool wxVariantDataStringList::Eq(wxVariantData& data) const
+wxAnyToVariantRegistration::
+ wxAnyToVariantRegistration(wxVariantDataFactory factory)
+ : m_factory(factory)
{
- wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
-
- wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
- wxNode* node1 = m_value.First();
- wxNode* node2 = listData.GetValue().First();
- while (node1 && node2)
- {
- wxString str1 ((wxChar*) node1->Data());
- wxString str2 ((wxChar*) node2->Data());
- if (str1 != str2)
- return FALSE;
- node1 = node1->Next();
- node2 = node2->Next();
- }
- if (node1 || node2) return FALSE;
- return TRUE;
+ wxPreRegisterAnyToVariant(this);
}
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Write(wxSTD ostream& str) const
+wxAnyToVariantRegistration::~wxAnyToVariantRegistration()
{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return TRUE;
}
-#endif
-bool wxVariantDataStringList::Write(wxString& str) const
+wxVariant::wxVariant(const wxAny& any)
+ : wxObject()
{
- str = wxT("");
- wxNode* node = m_value.First();
- while (node)
+ wxVariant variant;
+ if ( !any.GetAs(&variant) )
{
- wxChar* s = (wxChar*) node->Data();
- if (node != m_value.First())
- str += wxT(" ");
- str += s;
- node = node->Next();
+ wxFAIL_MSG("wxAny of this type cannot be converted to wxVariant");
+ return;
}
- return TRUE;
+ *this = variant;
}
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
+wxAny wxVariant::GetAny() const
{
- wxFAIL_MSG(wxT("Unimplemented"));
- // TODO
- return FALSE;
-}
-#endif
+ if ( IsNull() )
+ return wxAny();
-bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
-{
- wxFAIL_MSG(wxT("Unimplemented"));
- // TODO
- return FALSE;
+ wxAny any;
+ wxVariantData* data = GetData();
+
+ if ( data->GetAsAny(&any) )
+ return any;
+
+ // If everything else fails, wrap the whole wxVariantData
+ return wxAny(data);
}
-/*
- * wxVariantDataLong
- */
+#endif // wxUSE_ANY
+
+// -----------------------------------------------------------------
+// wxVariantDataLong
+// -----------------------------------------------------------------
-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
public:
wxVariantDataLong() { m_value = 0; }
wxVariantDataLong(long value) { m_value = value; }
inline long GetValue() const { return m_value; }
inline void SetValue(long value) { m_value = value; }
- virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual bool Read(wxString& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("long"); };
+ wxVariantData* Clone() const { return new wxVariantDataLong(m_value); }
+
+ virtual wxString GetType() const { return wxT("long"); }
+
+#if wxUSE_ANY
+ // Since wxAny does not have separate type for integers shorter than
+ // longlong, we do not usually implement wxVariant->wxAny conversion
+ // here (but in wxVariantDataLongLong instead).
+ #ifndef wxLongLong_t
+ DECLARE_WXANY_CONVERSION()
+ #else
+ bool GetAsAny(wxAny* any) const
+ {
+ *any = m_value;
+ return true;
+ }
+ #endif
+#endif // wxUSE_ANY
protected:
long m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
-
-void wxVariantDataLong::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data") );
-
- wxVariantDataLong& otherData = (wxVariantDataLong&) data;
-
- otherData.m_value = m_value;
-}
+#ifndef wxLongLong_t
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(long, wxVariantDataLong)
+#endif
bool wxVariantDataLong::Eq(wxVariantData& data) 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(wxSTD istream& str)
{
str >> m_value;
- return TRUE;
+ return true;
}
#endif
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;
+ m_value = wxAtol(str);
+ return true;
}
-/*
- * wxVariantDataReal
- */
+// wxVariant
+
+wxVariant::wxVariant(long val, const wxString& name)
+{
+ m_refData = new wxVariantDataLong(val);
+ m_name = name;
+}
+
+wxVariant::wxVariant(int val, const wxString& name)
+{
+ m_refData = new wxVariantDataLong((long)val);
+ m_name = name;
+}
+
+wxVariant::wxVariant(short val, const wxString& name)
+{
+ m_refData = new wxVariantDataLong((long)val);
+ m_name = name;
+}
-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+bool wxVariant::operator== (long value) const
+{
+ long thisValue;
+ if (!Convert(&thisValue))
+ return false;
+ else
+ return (value == thisValue);
+}
+
+bool wxVariant::operator!= (long value) const
+{
+ return (!((*this) == value));
+}
+
+void wxVariant::operator= (long value)
+{
+ if (GetType() == wxT("long") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDataLong*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataLong(value);
+ }
+}
+
+long wxVariant::GetLong() const
+{
+ long value;
+ if (Convert(& value))
+ return value;
+ else
+ {
+ wxFAIL_MSG(wxT("Could not convert to a long"));
+ return 0;
+ }
+}
+
+// -----------------------------------------------------------------
+// wxVariantDoubleData
+// -----------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
public:
- wxVariantDataReal() { m_value = 0.0; }
- wxVariantDataReal(double value) { m_value = value; }
+ wxVariantDoubleData() { m_value = 0.0; }
+ wxVariantDoubleData(double value) { m_value = value; }
inline double GetValue() const { return m_value; }
inline void SetValue(double value) { m_value = value; }
- virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual bool Read(wxString& str);
#if wxUSE_STD_IOSTREAM
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("double"); };
+ virtual wxString GetType() const { return wxT("double"); }
+ wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); }
+
+ DECLARE_WXANY_CONVERSION()
protected:
double m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData)
-
-void wxVariantDataReal::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") );
-
- wxVariantDataReal& otherData = (wxVariantDataReal&) data;
-
- otherData.m_value = m_value;
-}
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(double, wxVariantDoubleData)
-bool wxVariantDataReal::Eq(wxVariantData& data) const
+bool wxVariantDoubleData::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") );
- wxVariantDataReal& otherData = (wxVariantDataReal&) data;
+ wxVariantDoubleData& otherData = (wxVariantDoubleData&) data;
- return (otherData.m_value == m_value);
+ return wxIsSameDouble(otherData.m_value, m_value);
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataReal::Write(wxSTD ostream& str) const
+bool wxVariantDoubleData::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
+bool wxVariantDoubleData::Write(wxString& str) const
{
- str.Printf(wxT("%.4f"), m_value);
- return TRUE;
+ str.Printf(wxT("%.14g"), m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataReal::Read(wxSTD istream& str)
+bool wxVariantDoubleData::Read(wxSTD istream& str)
{
str >> m_value;
- return TRUE;
+ return true;
}
#endif
#if wxUSE_STREAMS
-bool wxVariantDataReal::Write(wxOutputStream& str) const
+bool wxVariantDoubleData::Write(wxOutputStream& str) const
{
wxTextOutputStream s(str);
s.WriteDouble((double)m_value);
- return TRUE;
+ return true;
}
-bool wxVariantDataReal::Read(wxInputStream& str)
+bool wxVariantDoubleData::Read(wxInputStream& str)
{
wxTextInputStream s(str);
m_value = (float)s.ReadDouble();
- return TRUE;
+ return true;
}
#endif // wxUSE_STREAMS
-bool wxVariantDataReal::Read(wxString& str)
+bool wxVariantDoubleData::Read(wxString& str)
{
- m_value = wxAtof((const wxChar*) str);
- return TRUE;
+ m_value = wxAtof(str);
+ return true;
}
-#ifdef HAVE_BOOL
-/*
- * wxVariantDataBool
- */
+// wxVariant double code
-class WXDLLEXPORT wxVariantDataBool: public wxVariantData
+wxVariant::wxVariant(double val, const wxString& name)
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
-public:
- wxVariantDataBool() { m_value = 0; }
- wxVariantDataBool(bool value) { m_value = value; }
+ m_refData = new wxVariantDoubleData(val);
+ m_name = name;
+}
- inline bool GetValue() const { return m_value; }
- inline void SetValue(bool value) { m_value = value; }
+bool wxVariant::operator== (double value) const
+{
+ double thisValue;
+ if (!Convert(&thisValue))
+ return false;
- 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;
- virtual bool Read(wxString& str);
-#if wxUSE_STD_IOSTREAM
- virtual bool Read(wxSTD istream& str);
-#endif
+ return wxIsSameDouble(value, thisValue);
+}
+
+bool wxVariant::operator!= (double value) const
+{
+ return (!((*this) == value));
+}
+
+void wxVariant::operator= (double value)
+{
+ if (GetType() == wxT("double") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDoubleData*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDoubleData(value);
+ }
+}
+
+double wxVariant::GetDouble() const
+{
+ double value;
+ if (Convert(& value))
+ return value;
+ else
+ {
+ wxFAIL_MSG(wxT("Could not convert to a double number"));
+ return 0.0;
+ }
+}
+
+// -----------------------------------------------------------------
+// wxVariantBoolData
+// -----------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
+{
+public:
+ wxVariantDataBool() { m_value = 0; }
+ wxVariantDataBool(bool value) { m_value = value; }
+
+ inline bool GetValue() const { return m_value; }
+ inline void SetValue(bool value) { m_value = value; }
+
+ virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+ 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(wxSTD istream& str);
+#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("bool"); };
+ virtual wxString GetType() const { return wxT("bool"); }
+ wxVariantData* Clone() const { return new wxVariantDataBool(m_value); }
+
+ DECLARE_WXANY_CONVERSION()
protected:
bool m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
-
-void wxVariantDataBool::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data") );
-
- wxVariantDataBool& otherData = (wxVariantDataBool&) data;
-
- otherData.m_value = m_value;
-}
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(bool, wxVariantDataBool)
bool wxVariantDataBool::Eq(wxVariantData& data) 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
{
wxFAIL_MSG(wxT("Unimplemented"));
// str >> (long) m_value;
- return FALSE;
+ return false;
}
#endif
wxTextOutputStream s(str);
s.Write8(m_value);
- return TRUE;
+ return true;
}
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;
+ m_value = (wxAtol(str) != 0);
+ return true;
}
-#endif // HAVE_BOOL
-/*
- * wxVariantDataChar
- */
+// wxVariant ****
+
+wxVariant::wxVariant(bool val, const wxString& name)
+{
+ m_refData = new wxVariantDataBool(val);
+ m_name = name;
+}
+
+bool wxVariant::operator== (bool value) const
+{
+ bool thisValue;
+ if (!Convert(&thisValue))
+ return false;
+ else
+ return (value == thisValue);
+}
+
+bool wxVariant::operator!= (bool value) const
+{
+ return (!((*this) == value));
+}
+
+void wxVariant::operator= (bool value)
+{
+ if (GetType() == wxT("bool") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDataBool*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataBool(value);
+ }
+}
+
+bool wxVariant::GetBool() const
+{
+ bool value;
+ if (Convert(& value))
+ return value;
+ else
+ {
+ wxFAIL_MSG(wxT("Could not convert to a bool"));
+ return 0;
+ }
+}
+
+// -----------------------------------------------------------------
+// wxVariantDataChar
+// -----------------------------------------------------------------
-class WXDLLEXPORT wxVariantDataChar: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
public:
wxVariantDataChar() { m_value = 0; }
- wxVariantDataChar(char value) { m_value = value; }
+ wxVariantDataChar(const wxUniChar& value) { m_value = value; }
- inline char GetValue() const { return m_value; }
- inline void SetValue(char value) { m_value = value; }
+ inline wxUniChar GetValue() const { return m_value; }
+ inline void SetValue(const wxUniChar& value) { m_value = value; }
- virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
virtual bool Read(wxSTD istream& str);
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("char"); };
+ virtual wxString GetType() const { return wxT("char"); }
+ wxVariantData* Clone() const { return new wxVariantDataChar(m_value); }
+ DECLARE_WXANY_CONVERSION()
protected:
- char m_value;
+ wxUniChar m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
-
-void wxVariantDataChar::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data") );
-
- wxVariantDataChar& otherData = (wxVariantDataChar&) data;
-
- otherData.m_value = m_value;
-}
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxUniChar, wxVariantDataChar)
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();
- return TRUE;
+ str << wxString(m_value);
+ return true;
}
#endif
bool wxVariantDataChar::Write(wxString& str) const
{
- str.Printf(wxT("%c"), m_value);
- return TRUE;
+ str = m_value;
+ return true;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
{
wxFAIL_MSG(wxT("Unimplemented"));
-// str >> m_value;
- return FALSE;
+
+ return false;
}
#endif
{
wxTextOutputStream s(str);
- s.Write8(m_value);
- return TRUE;
+ // 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;
}
bool wxVariantDataChar::Read(wxInputStream& str)
{
wxTextInputStream s(str);
- m_value = s.Read8();
- return TRUE;
+ // 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;
}
#endif // wxUSE_STREAMS
bool wxVariantDataChar::Read(wxString& str)
{
- m_value = str[(size_t)0];
- return TRUE;
+ m_value = str[0u];
+ return true;
}
-/*
- * wxVariantDataString
- */
+wxVariant::wxVariant(const wxUniChar& val, const wxString& name)
+{
+ m_refData = new wxVariantDataChar(val);
+ m_name = name;
+}
-#if defined(__BORLANDC__) && defined(__WIN16__)
-// Change name because of truncation
-#define wxVariantDataString wxVariantStringData
-#endif
+wxVariant::wxVariant(char val, const wxString& name)
+{
+ m_refData = new wxVariantDataChar(val);
+ m_name = name;
+}
-class WXDLLEXPORT wxVariantDataString: public wxVariantData
+wxVariant::wxVariant(wchar_t val, const wxString& name)
+{
+ 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);
+}
+
+wxVariant& wxVariant::operator=(const wxUniChar& value)
+{
+ if (GetType() == wxT("char") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDataChar*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataChar(value);
+ }
+
+ return *this;
+}
+
+wxUniChar wxVariant::GetChar() const
+{
+ wxUniChar value;
+ if (Convert(& value))
+ return value;
+ else
+ {
+ wxFAIL_MSG(wxT("Could not convert to a char"));
+ return wxUniChar(0);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataString
+// ----------------------------------------------------------------------------
+
+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; }
inline wxString GetValue() const { return m_value; }
inline void SetValue(const wxString& 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;
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(wxSTD istream& str);
+ virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("string"); };
+ virtual wxString GetType() const { return wxT("string"); }
+ wxVariantData* Clone() const { return new wxVariantDataString(m_value); }
+ DECLARE_WXANY_CONVERSION()
protected:
wxString m_value;
};
-void wxVariantDataString::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data") );
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxString, wxVariantDataString)
- wxVariantDataString& otherData = (wxVariantDataString&) data;
+#if wxUSE_ANY
+// This allows converting string literal wxAnys to string variants
+wxVariantData* wxVariantDataFromConstCharPAny(const wxAny& any)
+{
+ return new wxVariantDataString(wxANY_AS(any, const char*));
+}
- otherData.m_value = m_value;
+wxVariantData* wxVariantDataFromConstWchar_tPAny(const wxAny& any)
+{
+ return new wxVariantDataString(wxANY_AS(any, const wchar_t*));
}
+_REGISTER_WXANY_CONVERSION(const char*,
+ ConstCharP,
+ wxVariantDataFromConstCharPAny)
+_REGISTER_WXANY_CONVERSION(const wchar_t*,
+ ConstWchar_tP,
+ wxVariantDataFromConstWchar_tPAny)
+#endif
+
bool wxVariantDataString::Eq(wxVariantData& data) const
{
wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
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(wxSTD istream& str)
-{
- str >> m_value;
- return TRUE;
-}
-#endif
-
#if wxUSE_STREAMS
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)
{
wxTextInputStream s(str);
- m_value = s.ReadString();
- return TRUE;
+ m_value = s.ReadLine();
+ 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
- */
-
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+// wxVariant ****
-class wxVariantDataTime: public wxVariantData
+wxVariant::wxVariant(const wxString& val, const wxString& name)
{
- DECLARE_DYNAMIC_CLASS(wxVariantDataTime)
-public:
- wxVariantDataTime() { }
- wxVariantDataTime(const wxTime& value) { m_value = value; }
-
- inline wxTime GetValue() const { return m_value; }
- inline void SetValue(const wxTime& 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("time"); };
- virtual wxVariantData* Clone() { return new wxVariantDataTime; }
-
-protected:
- wxTime m_value;
-};
+ m_refData = new wxVariantDataString(val);
+ m_name = name;
+}
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
+wxVariant::wxVariant(const char* val, const wxString& name)
+{
+ m_refData = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
-void wxVariantDataTime::Copy(wxVariantData& data)
+wxVariant::wxVariant(const wchar_t* val, const wxString& name)
{
- wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data") );
+ m_refData = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
- wxVariantDataTime& otherData = (wxVariantDataTime&) data;
+wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
+{
+ m_refData = new wxVariantDataString(val.AsString());
+ m_name = name;
+}
- otherData.m_value = m_value;
+wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name)
+{
+ m_refData = new wxVariantDataString(wxString(val));
+ m_name = name;
}
-bool wxVariantDataTime::Eq(wxVariantData& data) const
+wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name)
{
- wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch") );
+ m_refData = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
- wxVariantDataTime& otherData = (wxVariantDataTime&) data;
+#if wxUSE_STD_STRING
+wxVariant::wxVariant(const std::string& val, const wxString& name)
+{
+ m_refData = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
- return (otherData.m_value == m_value);
+wxVariant::wxVariant(const wxStdWideString& val, const wxString& name)
+{
+ m_refData = new wxVariantDataString(wxString(val));
+ m_name = name;
}
+#endif // wxUSE_STD_STRING
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Write(wxSTD ostream& str) const
+bool wxVariant::operator== (const wxString& value) const
{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return TRUE;
+ wxString thisValue;
+ if (!Convert(&thisValue))
+ return false;
+
+ return value == thisValue;
}
-#endif
-bool wxVariantDataTime::Write(wxString& str) const
+bool wxVariant::operator!= (const wxString& value) const
{
- wxChar*s = m_value.FormatTime();
- str = s;
- return TRUE;
+ return (!((*this) == value));
}
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str))
+wxVariant& wxVariant::operator= (const wxString& value)
{
- // Not implemented
- return FALSE;
+ if (GetType() == wxT("string") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDataString*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataString(value);
+ }
+ return *this;
}
-#endif
-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
+wxString wxVariant::GetString() const
{
- // Not implemented
- return FALSE;
+ wxString value;
+ if (!Convert(& value))
+ {
+ wxFAIL_MSG(wxT("Could not convert to a string"));
+ }
+
+ return value;
}
-/*
- * wxVariantDataDate
- */
+// ----------------------------------------------------------------------------
+// wxVariantDataWxObjectPtr
+// ----------------------------------------------------------------------------
-class wxVariantDataDate: public wxVariantData
+class wxVariantDataWxObjectPtr: public wxVariantData
{
- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
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(wxSTD ostream& str) const;
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() const { return new wxVariantDataWxObjectPtr(m_value); }
+ virtual wxClassInfo* GetValueClassInfo();
+
+ DECLARE_WXANY_CONVERSION()
protected:
- wxDate m_value;
+ wxObject* m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxObject*, wxVariantDataWxObjectPtr)
-void wxVariantDataDate::Copy(wxVariantData& data)
+bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+ wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
- otherData.m_value = m_value;
+ return (otherData.m_value == m_value);
}
-bool wxVariantDataDate::Eq(wxVariantData& data) const
+wxString wxVariantDataWxObjectPtr::GetType() const
{
- wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch") );
+ wxString returnVal(wxT("wxObject*"));
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+ if (m_value)
+ {
+ returnVal = m_value->GetClassInfo()->GetClassName();
+ returnVal += wxT("*");
+ }
- return (otherData.m_value == m_value);
+ return returnVal;
+}
+
+wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
+{
+ wxClassInfo* returnVal=NULL;
+
+ if (m_value) returnVal = m_value->GetClassInfo();
+
+ return returnVal;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Write(wxSTD 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(%p)"), GetType().c_str(), static_cast<void*>(m_value));
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Read(wxSTD 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
- */
+// wxVariant
-class wxVariantDataVoidPtr: public wxVariantData
+wxVariant::wxVariant( wxObject* val, const wxString& name)
+{
+ m_refData = new wxVariantDataWxObjectPtr(val);
+ m_name = name;
+}
+
+bool wxVariant::operator== (wxObject* value) const
+{
+ return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue());
+}
+
+bool wxVariant::operator!= (wxObject* value) const
+{
+ return (!((*this) == (wxObject*) value));
+}
+
+void wxVariant::operator= (wxObject* value)
+{
+ UnRef();
+ m_refData = new wxVariantDataWxObjectPtr(value);
+}
+
+wxObject* wxVariant::GetWxObjectPtr() const
+{
+ return (wxObject*) ((wxVariantDataWxObjectPtr*) m_refData)->GetValue();
+}
+
+// ----------------------------------------------------------------------------
+// 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;
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("void*"); }
+ virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }
+ DECLARE_WXANY_CONVERSION()
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;
-}
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(void*, wxVariantDataVoidPtr)
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;
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
bool wxVariantDataVoidPtr::Write(wxString& str) const
{
- str.Printf(wxT("%ld"), (long) m_value);
- return TRUE;
+ str.Printf(wxT("%p"), m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
#endif
bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
-/*
- * wxVariantDataDateTime
- */
+// wxVariant
-class wxVariantDataDateTime: public wxVariantData
+wxVariant::wxVariant( void* val, const wxString& name)
+{
+ m_refData = new wxVariantDataVoidPtr(val);
+ m_name = name;
+}
+
+bool wxVariant::operator== (void* value) const
+{
+ return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
+}
+
+bool wxVariant::operator!= (void* value) const
+{
+ return (!((*this) == (void*) value));
+}
+
+void wxVariant::operator= (void* value)
+{
+ if (GetType() == wxT("void*") && (m_refData->GetRefCount() == 1))
+ {
+ ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataVoidPtr(value);
+ }
+}
+
+void* wxVariant::GetVoidPtr() const
{
- DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
+ // handling this specially is convenient when working with COM, see #9873
+ if ( IsNull() )
+ return NULL;
+
+ wxASSERT( GetType() == wxT("void*") );
+
+ return (void*) ((wxVariantDataVoidPtr*) m_refData)->GetValue();
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataDateTime
+// ----------------------------------------------------------------------------
+#if wxUSE_DATETIME
+
+class wxVariantDataDateTime: public wxVariantData
+{
public:
wxVariantDataDateTime() { }
wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
-#if wxUSE_ODBC
- wxVariantDataDateTime(const TIME_STRUCT* valptr)
- { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); }
- wxVariantDataDateTime(const DATE_STRUCT* valptr)
- { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
- wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
- { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
- valptr->hour, valptr->minute, valptr->second, valptr->fraction ); }
-#endif //ODBC
inline wxDateTime GetValue() const { return m_value; }
inline void SetValue(const wxDateTime& value) { m_value = value; }
- virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const;
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("datetime"); };
- virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
+ virtual wxString GetType() const { return wxT("datetime"); }
+ virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }
+ DECLARE_WXANY_CONVERSION()
protected:
wxDateTime m_value;
};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
-
-void wxVariantDataDateTime::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") );
-
- wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
-
- otherData.m_value = m_value;
-}
-
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxDateTime, wxVariantDataDateTime)
bool wxVariantDataDateTime::Eq(wxVariantData& data) const
{
#if wxUSE_STD_IOSTREAM
bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
{
- // Not implemented
- return FALSE;
+ wxString value;
+ Write( value );
+ str << value.c_str();
+ return true;
}
#endif
bool wxVariantDataDateTime::Write(wxString& str) const
{
- str = m_value.Format();
- return TRUE;
+ if ( m_value.IsValid() )
+ str = m_value.Format();
+ else
+ str = wxS("Invalid");
+ return true;
}
bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
#endif
bool wxVariantDataDateTime::Read(wxString& str)
{
- if(! m_value.ParseDateTime(str))
- 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_refData = new wxVariantDataDateTime(val);
+ m_name = name;
+}
+
+bool wxVariant::operator== (const wxDateTime& value) const
+{
+ wxDateTime thisValue;
+ if (!Convert(&thisValue))
+ return false;
+
+ return value.IsEqualTo(thisValue);
+}
+
+bool wxVariant::operator!= (const wxDateTime& value) const
+{
+ return (!((*this) == value));
+}
+
+void wxVariant::operator= (const wxDateTime& value)
+{
+ if (GetType() == wxT("datetime") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDataDateTime*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataDateTime(value);
+ }
+}
+
+wxDateTime wxVariant::GetDateTime() const
+{
+ wxDateTime value;
+ if (!Convert(& value))
+ {
+ wxFAIL_MSG(wxT("Could not convert to a datetime"));
+ }
+
+ return value;
}
+#endif // wxUSE_DATETIME
+
// ----------------------------------------------------------------------------
// wxVariantDataArrayString
// ----------------------------------------------------------------------------
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;
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; }
+ virtual wxString GetType() const { return wxT("arrstring"); }
+ virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }
+ DECLARE_WXANY_CONVERSION()
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;
-}
-
+IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxArrayString, wxVariantDataArrayString)
bool wxVariantDataArrayString::Eq(wxVariantData& data) const
{
return otherData.m_value == m_value;
}
-
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
+bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(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 += wxT(';');
str += m_value[n];
}
- return TRUE;
+ return true;
}
bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
#endif
bool wxVariantDataArrayString::Read(wxString& str)
{
- wxStringTokenizer tk(str, _T(";"));
+ wxStringTokenizer tk(str, wxT(";"));
while ( tk.HasMoreTokens() )
{
m_value.Add(tk.GetNextToken());
}
- return TRUE;
+ return true;
}
+// wxVariant
+wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
+{
+ m_refData = new wxVariantDataArrayString(val);
+ m_name = name;
+}
-/*
- * wxVariant
- */
+bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
+{
+ wxFAIL_MSG( wxT("TODO") );
-IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
+ return false;
+}
-// Construction & destruction
-wxVariant::wxVariant()
+bool wxVariant::operator!=(const wxArrayString& value) const
{
- m_data = (wxVariantData*) NULL;
+ return !(*this == value);
}
-wxVariant::wxVariant(double val, const wxString& name)
+void wxVariant::operator=(const wxArrayString& value)
{
- m_data = new wxVariantDataReal(val);
- m_name = name;
+ if (GetType() == wxT("arrstring") &&
+ m_refData->GetRefCount() == 1)
+ {
+ ((wxVariantDataArrayString *)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataArrayString(value);
+ }
}
-wxVariant::wxVariant(long val, const wxString& name)
+wxArrayString wxVariant::GetArrayString() const
{
- m_data = new wxVariantDataLong(val);
- m_name = name;
+ if ( GetType() == wxT("arrstring") )
+ return ((wxVariantDataArrayString *)GetData())->GetValue();
+
+ return wxArrayString();
}
-#ifdef HAVE_BOOL
-wxVariant::wxVariant(bool val, const wxString& name)
+// ----------------------------------------------------------------------------
+// wxVariantDataLongLong
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LONGLONG
+
+class WXDLLIMPEXP_BASE wxVariantDataLongLong : public wxVariantData
{
- m_data = new wxVariantDataBool(val);
- m_name = name;
-}
+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
-wxVariant::wxVariant(char val, const wxString& name)
-{
- m_data = new wxVariantDataChar(val);
- m_name = name;
-}
+ wxVariantData* Clone() const
+ {
+ return new wxVariantDataLongLong(m_value);
+ }
-wxVariant::wxVariant(const wxString& val, const wxString& name)
+ virtual wxString GetType() const { return wxS("longlong"); }
+
+ DECLARE_WXANY_CONVERSION()
+protected:
+ wxLongLong m_value;
+};
+
+//
+// wxLongLong type requires customized wxAny conversion code
+//
+#if wxUSE_ANY
+#ifdef wxLongLong_t
+
+bool wxVariantDataLongLong::GetAsAny(wxAny* any) const
{
- m_data = new wxVariantDataString(val);
- m_name = name;
+ *any = m_value.GetValue();
+ return true;
}
-wxVariant::wxVariant(const wxChar* val, const wxString& name)
+wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any)
{
- m_data = new wxVariantDataString(wxString(val));
- m_name = name;
+ return new wxVariantDataLongLong(wxANY_AS(any, wxLongLong_t));
}
-wxVariant::wxVariant(const wxStringList& val, const wxString& name)
+REGISTER_WXANY_CONVERSION(wxLongLong_t, wxVariantDataLongLong)
+
+#else // if !defined(wxLongLong_t)
+
+bool wxVariantDataLongLong::GetAsAny(wxAny* any) const
{
- m_data = new wxVariantDataStringList(val);
- m_name = name;
+ *any = m_value;
+ return true;
}
-wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
+wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any)
{
- m_data = new wxVariantDataList(val);
- m_name = name;
+ return new wxVariantDataLongLong(wxANY_AS(any, wxLongLong));
}
-// 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
+REGISTER_WXANY_CONVERSION(wxLongLong, wxVariantDataLongLong)
+
+#endif // defined(wxLongLong_t)/!defined(wxLongLong_t)
+#endif // wxUSE_ANY
+
+bool wxVariantDataLongLong::Eq(wxVariantData& data) const
{
- m_data = new wxVariantDataTime(val);
- m_name = name;
+ wxASSERT_MSG( (data.GetType() == wxS("longlong")),
+ "wxVariantDataLongLong::Eq: argument mismatch" );
+
+ wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;
+
+ return (otherData.m_value == m_value);
}
-wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataLongLong::Write(wxSTD ostream& str) const
{
- m_data = new wxVariantDataDate(val);
- m_name = name;
+ wxString s;
+ Write(s);
+ str << (const char*) s.mb_str();
+ return true;
}
#endif
-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
+bool wxVariantDataLongLong::Write(wxString& str) const
{
- m_data = new wxVariantDataVoidPtr(val);
- m_name = name;
+#ifdef wxLongLong_t
+ str.Printf(wxS("%lld"), m_value.GetValue());
+ return true;
+#else
+ return false;
+#endif
}
-wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataLongLong::Read(wxSTD istream& WXUNUSED(str))
{
- m_data = new wxVariantDataDateTime(val);
- m_name = name;
+ wxFAIL_MSG(wxS("Unimplemented"));
+ return false;
}
+#endif
-#if wxUSE_ODBC
-wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
+#if wxUSE_STREAMS
+bool wxVariantDataLongLong::Write(wxOutputStream& str) const
{
- m_data = new wxVariantDataDateTime(valptr);
- m_name = name;
+ wxTextOutputStream s(str);
+ s.Write32(m_value.GetLo());
+ s.Write32(m_value.GetHi());
+ return true;
}
-wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
+bool wxVariantDataLongLong::Read(wxInputStream& str)
{
- m_data = new wxVariantDataDateTime(valptr);
- m_name = name;
+ wxTextInputStream s(str);
+ unsigned long lo = s.Read32();
+ long hi = s.Read32();
+ m_value = wxLongLong(hi, lo);
+ return true;
}
+#endif // wxUSE_STREAMS
-wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
+bool wxVariantDataLongLong::Read(wxString& str)
{
- m_data = new wxVariantDataDateTime(valptr);
- m_name = name;
+#ifdef wxLongLong_t
+ wxLongLong_t value_t;
+ if ( !str.ToLongLong(&value_t) )
+ return false;
+ m_value = value_t;
+ return true;
+#else
+ return false;
+#endif
}
-#endif // wxUSE_ODBC
-wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
+// wxVariant
+
+wxVariant::wxVariant(wxLongLong val, const wxString& name)
{
- m_data = new wxVariantDataArrayString(val);
+ m_refData = new wxVariantDataLongLong(val);
m_name = name;
}
-wxVariant::wxVariant(const wxVariant& variant)
+bool wxVariant::operator==(wxLongLong value) const
{
- if (!variant.IsNull())
- {
- m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
- variant.m_data->Copy(*m_data);
- }
+ wxLongLong thisValue;
+ if ( !Convert(&thisValue) )
+ return false;
else
- m_data = (wxVariantData*) NULL;
- m_name = variant.m_name;
-}
-
-wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
-{
- m_data = data;
- m_name = name;
+ return (value == thisValue);
}
-wxVariant::~wxVariant()
+bool wxVariant::operator!=(wxLongLong value) const
{
- delete m_data;
+ return (!((*this) == value));
}
-
-// Make NULL (i.e. delete the data)
-void wxVariant::MakeNull()
+void wxVariant::operator=(wxLongLong value)
{
- delete m_data;
- m_data = NULL;
+ if ( GetType() == wxS("longlong") &&
+ m_refData->GetRefCount() == 1 )
+ {
+ ((wxVariantDataLongLong*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataLongLong(value);
+ }
}
-// Generic operators
-// Assignment
-void wxVariant::operator= (const wxVariant& variant)
+wxLongLong wxVariant::GetLongLong() const
{
- if (variant.IsNull())
+ wxLongLong value;
+ if ( Convert(&value) )
{
- MakeNull();
- return;
+ return value;
}
-
- if (IsNull() || (GetType() != variant.GetType()))
+ else
{
- if (m_data)
- delete m_data;
- m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
+ wxFAIL_MSG(wxT("Could not convert to a long long"));
+ return 0;
}
-// GetData()->Copy(* variant.GetData());
- variant.GetData()->Copy(* GetData());
}
-// Assignment using data, e.g.
-// myVariant = new wxStringVariantData("hello")
-void wxVariant::operator= (wxVariantData* variantData)
-{
- MakeNull();
- m_data = variantData;
-}
+#endif // wxUSE_LONGLONG
-bool wxVariant::operator== (const wxVariant& variant) const
-{
- if (IsNull() || variant.IsNull())
- return (IsNull() == variant.IsNull());
+// ----------------------------------------------------------------------------
+// wxVariantDataULongLong
+// ----------------------------------------------------------------------------
- return (GetData()->Eq(* variant.GetData()));
-}
+#if wxUSE_LONGLONG
-bool wxVariant::operator!= (const wxVariant& variant) const
+class WXDLLIMPEXP_BASE wxVariantDataULongLong : public wxVariantData
{
- return (!(*this == variant));
-}
+public:
+ wxVariantDataULongLong() { m_value = 0; }
+ wxVariantDataULongLong(wxULongLong value) { m_value = value; }
+ wxULongLong GetValue() const { return m_value; }
+ void SetValue(wxULongLong value) { m_value = value; }
-// Specific operators
-bool wxVariant::operator== (double value) const
-{
- double thisValue;
- if (!Convert(&thisValue))
- return FALSE;
- else
- return (value == thisValue);
-}
+ virtual bool Eq(wxVariantData& data) const;
-bool wxVariant::operator!= (double value) const
-{
- return (!((*this) == value));
-}
+ 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
-void wxVariant::operator= (double value)
-{
- if (GetType() == wxT("double"))
+ wxVariantData* Clone() const
{
- ((wxVariantDataReal*)GetData())->SetValue(value);
+ return new wxVariantDataULongLong(m_value);
}
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataReal(value);
- }
-}
-bool wxVariant::operator== (long value) const
-{
- long thisValue;
- if (!Convert(&thisValue))
- return FALSE;
- else
- return (value == thisValue);
-}
+ virtual wxString GetType() const { return wxS("ulonglong"); }
-bool wxVariant::operator!= (long value) const
-{
- return (!((*this) == value));
-}
+ DECLARE_WXANY_CONVERSION()
+protected:
+ wxULongLong m_value;
+};
-void wxVariant::operator= (long value)
-{
- if (GetType() == wxT("long"))
- {
- ((wxVariantDataLong*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataLong(value);
- }
-}
+//
+// wxULongLong type requires customized wxAny conversion code
+//
+#if wxUSE_ANY
+#ifdef wxLongLong_t
-bool wxVariant::operator== (char value) const
+bool wxVariantDataULongLong::GetAsAny(wxAny* any) const
{
- char thisValue;
- if (!Convert(&thisValue))
- return FALSE;
- else
- return (value == thisValue);
+ *any = m_value.GetValue();
+ return true;
}
-bool wxVariant::operator!= (char value) const
+wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any)
{
- return (!((*this) == value));
+ return new wxVariantDataULongLong(wxANY_AS(any, wxULongLong_t));
}
-void wxVariant::operator= (char value)
-{
- if (GetType() == wxT("char"))
- {
- ((wxVariantDataChar*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataChar(value);
- }
-}
+REGISTER_WXANY_CONVERSION(wxULongLong_t, wxVariantDataULongLong)
-#ifdef HAVE_BOOL
-bool wxVariant::operator== (bool value) const
-{
- bool thisValue;
- if (!Convert(&thisValue))
- return FALSE;
- else
- return (value == thisValue);
-}
+#else // if !defined(wxLongLong_t)
-bool wxVariant::operator!= (bool value) const
+bool wxVariantDataULongLong::GetAsAny(wxAny* any) const
{
- return (!((*this) == value));
+ *any = m_value;
+ return true;
}
-void wxVariant::operator= (bool value)
+wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any)
{
- if (GetType() == wxT("bool"))
- {
- ((wxVariantDataBool*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataBool(value);
- }
+ return new wxVariantDataULongLong(wxANY_AS(any, wxULongLong));
}
-#endif // HAVE_BOOL
-bool wxVariant::operator== (const wxString& value) const
-{
- wxString thisValue;
- if (!Convert(&thisValue))
- return FALSE;
+REGISTER_WXANY_CONVERSION(wxULongLong, wxVariantDataULongLong)
- return value == thisValue;
-}
+#endif // defined(wxLongLong_t)/!defined(wxLongLong_t)
+#endif // wxUSE_ANY
-bool wxVariant::operator!= (const wxString& value) const
-{
- return (!((*this) == value));
-}
-void wxVariant::operator= (const wxString& value)
+bool wxVariantDataULongLong::Eq(wxVariantData& data) const
{
- if (GetType() == wxT("string"))
- {
- ((wxVariantDataString*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataString(value);
- }
-}
-
-void wxVariant::operator= (const wxChar* value)
-{
- if (GetType() == wxT("string"))
- {
- ((wxVariantDataString*)GetData())->SetValue(wxString(value));
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataString(wxString(value));
- }
-}
+ wxASSERT_MSG( (data.GetType() == wxS("ulonglong")),
+ "wxVariantDataULongLong::Eq: argument mismatch" );
-bool wxVariant::operator== (const wxStringList& value) const
-{
- wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
+ wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;
- wxVariantDataStringList other(value);
- return (m_data->Eq(other));
+ return (otherData.m_value == m_value);
}
-bool wxVariant::operator!= (const wxStringList& value) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataULongLong::Write(wxSTD ostream& str) const
{
- return (!((*this) == value));
+ wxString s;
+ Write(s);
+ str << (const char*) s.mb_str();
+ return true;
}
+#endif
-void wxVariant::operator= (const wxStringList& value)
+bool wxVariantDataULongLong::Write(wxString& str) const
{
- if (GetType() == wxT("stringlist"))
- {
- ((wxVariantDataStringList*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataStringList(value);
- }
+#ifdef wxLongLong_t
+ str.Printf(wxS("%llu"), m_value.GetValue());
+ return true;
+#else
+ return false;
+#endif
}
-bool wxVariant::operator== (const wxList& value) const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataULongLong::Read(wxSTD istream& WXUNUSED(str))
{
- wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
-
- wxVariantDataList other(value);
- return (m_data->Eq(other));
+ wxFAIL_MSG(wxS("Unimplemented"));
+ return false;
}
+#endif
-bool wxVariant::operator!= (const wxList& value) const
+#if wxUSE_STREAMS
+bool wxVariantDataULongLong::Write(wxOutputStream& str) const
{
- return (!((*this) == value));
+ wxTextOutputStream s(str);
+ s.Write32(m_value.GetLo());
+ s.Write32(m_value.GetHi());
+ return true;
}
-void wxVariant::operator= (const wxList& value)
+bool wxVariantDataULongLong::Read(wxInputStream& str)
{
- if (GetType() == wxT("list"))
- {
- ((wxVariantDataList*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataList(value);
- }
+ wxTextInputStream s(str);
+ unsigned long lo = s.Read32();
+ long hi = s.Read32();
+ m_value = wxULongLong(hi, lo);
+ return true;
}
+#endif // wxUSE_STREAMS
-// 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 wxVariantDataULongLong::Read(wxString& str)
{
- wxTime thisValue;
- if (!Convert(&thisValue))
- return FALSE;
-
- return value == thisValue;
+#ifdef wxLongLong_t
+ wxULongLong_t value_t;
+ if ( !str.ToULongLong(&value_t) )
+ return false;
+ m_value = value_t;
+ return true;
+#else
+ return false;
+#endif
}
-bool wxVariant::operator!= (const wxTime& value) const
-{
- return (!((*this) == value));
-}
+// wxVariant
-void wxVariant::operator= (const wxTime& value)
+wxVariant::wxVariant(wxULongLong val, const wxString& name)
{
- if (GetType() == wxT("time"))
- {
- ((wxVariantDataTime*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataTime(value);
- }
+ m_refData = new wxVariantDataULongLong(val);
+ m_name = name;
}
-bool wxVariant::operator== (const wxDate& value) const
+bool wxVariant::operator==(wxULongLong value) const
{
- wxDate thisValue;
- if (!Convert(&thisValue))
- return FALSE;
-
- return (value == thisValue);
+ wxULongLong thisValue;
+ if ( !Convert(&thisValue) )
+ return false;
+ else
+ return (value == thisValue);
}
-bool wxVariant::operator!= (const wxDate& value) const
+bool wxVariant::operator!=(wxULongLong value) const
{
return (!((*this) == value));
}
-void wxVariant::operator= (const wxDate& value)
+void wxVariant::operator=(wxULongLong value)
{
- if (GetType() == wxT("date"))
+ if ( GetType() == wxS("ulonglong") &&
+ m_refData->GetRefCount() == 1 )
{
- ((wxVariantDataTime*)GetData())->SetValue(value);
+ ((wxVariantDataULongLong*)GetData())->SetValue(value);
}
else
{
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataDate(value);
+ UnRef();
+ m_refData = new wxVariantDataULongLong(value);
}
}
-#endif
-
-bool wxVariant::operator== (void* value) const
-{
- return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
-}
-bool wxVariant::operator!= (void* value) const
+wxULongLong wxVariant::GetULongLong() const
{
- return (!((*this) == (void*) value));
-}
-
-void wxVariant::operator= (void* value)
-{
- if (GetType() == wxT("void*"))
+ wxULongLong value;
+ if ( Convert(&value) )
{
- ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
+ return value;
}
else
{
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataVoidPtr(value);
+ wxFAIL_MSG(wxT("Could not convert to a long long"));
+ return 0;
}
}
-bool wxVariant::operator== (const wxDateTime& value) const
-{
- wxDateTime thisValue;
- if (!Convert(&thisValue))
- return FALSE;
+#endif // wxUSE_LONGLONG
- return value.IsEqualTo(thisValue);
-}
-
-bool wxVariant::operator!= (const wxDateTime& value) const
-{
- return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxDateTime& value)
-{
- if (GetType() == wxT("datetime"))
- {
- ((wxVariantDataDateTime*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataDateTime(value);
- }
-}
+// ----------------------------------------------------------------------------
+// wxVariantDataList
+// ----------------------------------------------------------------------------
-#if wxUSE_ODBC
-void wxVariant::operator= (const DATE_STRUCT* value)
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
{
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataDateTime(value);
-}
+public:
+ wxVariantDataList() {}
+ wxVariantDataList(const wxVariantList& list);
+ virtual ~wxVariantDataList();
+ wxVariantList& GetValue() { return m_value; }
+ void SetValue(const wxVariantList& value) ;
-void wxVariant::operator= (const TIME_STRUCT* value)
-{
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataDateTime(value);
-}
-
+ 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("list"); }
-void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
-{
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataDateTime(value);
-}
+ void Clear();
-#endif // wxUSE_ODBC
+ wxVariantData* Clone() const { return new wxVariantDataList(m_value); }
-bool wxVariant::operator==(const wxArrayString& value) const
-{
- wxFAIL_MSG( _T("TODO") );
+ DECLARE_WXANY_CONVERSION()
+protected:
+ wxVariantList m_value;
+};
- return FALSE;
-}
+#if wxUSE_ANY
-bool wxVariant::operator!=(const wxArrayString& value) const
-{
- return !(*this == value);
-}
+//
+// Convert to/from list of wxAnys
+//
-void wxVariant::operator=(const wxArrayString& value)
+bool wxVariantDataList::GetAsAny(wxAny* any) const
{
- if (GetType() == wxT("arrstring"))
- {
- ((wxVariantDataArrayString *)GetData())->SetValue(value);
- }
- else
+ wxAnyList dst;
+ wxVariantList::compatibility_iterator node = m_value.GetFirst();
+ while (node)
{
- delete m_data;
- m_data = new wxVariantDataArrayString(value);
+ wxVariant* pVar = node->GetData();
+ dst.push_back(new wxAny(((const wxVariant&)*pVar)));
+ node = node->GetNext();
}
-}
-
-wxArrayString wxVariant::GetArrayString() const
-{
- if ( GetType() == wxT("arrstring") )
- return ((wxVariantDataArrayString *)GetData())->GetValue();
- return wxArrayString();
+ *any = dst;
+ return true;
}
-
-// Treat a list variant as an array
-wxVariant wxVariant::operator[] (size_t idx) const
+wxVariantData* wxVariantDataList::VariantDataFactory(const wxAny& any)
{
- wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
-
- if (GetType() == wxT("list"))
+ wxAnyList src = wxANY_AS(any, wxAnyList);
+ wxVariantList dst;
+ wxAnyList::compatibility_iterator node = src.GetFirst();
+ while (node)
{
- 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());
+ wxAny* pAny = node->GetData();
+ dst.push_back(new wxVariant(*pAny));
+ node = node->GetNext();
}
- else if (GetType() == wxT("stringlist"))
- {
- wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
- wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
- return variant;
- }
- return wxNullVariant;
+ return new wxVariantDataList(dst);
}
-wxVariant& wxVariant::operator[] (size_t idx)
-{
- // We can't return a reference to a variant for a string list, since the string
- // is actually stored as a char*, not a variant.
-
- wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
+REGISTER_WXANY_CONVERSION(wxAnyList, wxVariantDataList)
- wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
+#endif // wxUSE_ANY
- return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
+wxVariantDataList::wxVariantDataList(const wxVariantList& list)
+{
+ SetValue(list);
}
-// Return the number of elements in a list
-int wxVariant::GetCount() const
+wxVariantDataList::~wxVariantDataList()
{
- wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
-
- if (GetType() == wxT("list"))
- {
- wxVariantDataList* data = (wxVariantDataList*) m_data;
- return data->GetValue().Number();
- }
- else if (GetType() == wxT("stringlist"))
- {
- wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- return data->GetValue().Number();
- }
- return 0;
+ Clear();
}
-wxString wxVariant::MakeString() const
+void wxVariantDataList::SetValue(const wxVariantList& value)
{
- if (!IsNull())
+ Clear();
+ wxVariantList::compatibility_iterator node = value.GetFirst();
+ while (node)
{
- wxString str;
- if (GetData()->Write(str))
- return str;
+ wxVariant* var = node->GetData();
+ m_value.Append(new wxVariant(*var));
+ node = node->GetNext();
}
- return wxString(wxT(""));
-}
-
-// Accessors
-
-void wxVariant::SetData(wxVariantData* data)
-{
- if (m_data) delete m_data;
- m_data = data;
}
-
-// Returns a string representing the type of the variant,
-// e.g. "string", "bool", "stringlist", "list", "double", "long"
-wxString wxVariant::GetType() const
+void wxVariantDataList::Clear()
{
- if (IsNull())
- return wxString(wxT("null"));
- else
- return m_data->GetType();
+ wxVariantList::compatibility_iterator node = m_value.GetFirst();
+ while (node)
+ {
+ wxVariant* var = node->GetData();
+ delete var;
+ node = node->GetNext();
+ }
+ m_value.Clear();
}
-
-bool wxVariant::IsType(const wxString& type) const
+bool wxVariantDataList::Eq(wxVariantData& data) const
{
- return (GetType() == type);
-}
-
+ wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
-// Value accessors
-double wxVariant::GetReal() const
-{
- double value;
- if (Convert(& value))
- return value;
- else
+ wxVariantDataList& listData = (wxVariantDataList&) data;
+ wxVariantList::compatibility_iterator node1 = m_value.GetFirst();
+ wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst();
+ while (node1 && node2)
{
- wxFAIL_MSG(wxT("Could not convert to a real number"));
- return 0.0;
+ wxVariant* var1 = node1->GetData();
+ wxVariant* var2 = node2->GetData();
+ if ((*var1) != (*var2))
+ return false;
+ node1 = node1->GetNext();
+ node2 = node2->GetNext();
}
+ if (node1 || node2) return false;
+ return true;
}
-long wxVariant::GetInteger() const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataList::Write(wxSTD ostream& str) const
{
- long value;
- if (Convert(& value))
- return value;
- else
- {
- wxFAIL_MSG(wxT("Could not convert to an integer"));
- return 0;
- }
+ wxString s;
+ Write(s);
+ str << (const char*) s.mb_str();
+ return true;
}
+#endif
-char wxVariant::GetChar() const
+bool wxVariantDataList::Write(wxString& str) const
{
- char value;
- if (Convert(& value))
- return value;
- else
+ str = wxEmptyString;
+ wxVariantList::compatibility_iterator node = m_value.GetFirst();
+ while (node)
{
- wxFAIL_MSG(wxT("Could not convert to a char"));
- return 0;
+ wxVariant* var = node->GetData();
+ if (node != m_value.GetFirst())
+ str += wxT(" ");
+ wxString str1;
+ str += var->MakeString();
+ node = node->GetNext();
}
+
+ return true;
}
-bool wxVariant::GetBool() const
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
{
- bool value;
- if (Convert(& value))
- return value;
- else
- {
- wxFAIL_MSG(wxT("Could not convert to a bool"));
- return 0;
- }
+ wxFAIL_MSG(wxT("Unimplemented"));
+ // TODO
+ return false;
}
+#endif
-wxString wxVariant::GetString() const
+bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{
- wxString value;
- if (!Convert(& value))
- {
- wxFAIL_MSG(wxT("Could not convert to a string"));
- }
-
- return value;
+ wxFAIL_MSG(wxT("Unimplemented"));
+ // TODO
+ return false;
}
-// 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"));
- }
+// wxVariant
- return value;
+wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants
+{
+ m_refData = new wxVariantDataList(val);
+ m_name = name;
}
-wxDate wxVariant::GetDate() const
+bool wxVariant::operator== (const wxVariantList& value) const
{
- wxDate value;
- if (!Convert(& value))
- {
- wxFAIL_MSG(wxT("Could not convert to a date"));
- }
+ wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
- return value;
+ wxVariantDataList other(value);
+ return (GetData()->Eq(other));
}
-#endif // wxUSE_TIMEDATE
-void* wxVariant::GetVoidPtr() const
+bool wxVariant::operator!= (const wxVariantList& value) const
{
- wxASSERT( (GetType() == wxT("void*")) );
-
- return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
+ return (!((*this) == value));
}
-wxDateTime wxVariant::GetDateTime() const
+void wxVariant::operator= (const wxVariantList& value)
{
- wxDateTime value;
- if (!Convert(& value))
+ if (GetType() == wxT("list") &&
+ m_refData->GetRefCount() == 1)
{
- wxFAIL_MSG(wxT("Could not convert to a datetime"));
+ ((wxVariantDataList*)GetData())->SetValue(value);
+ }
+ else
+ {
+ UnRef();
+ m_refData = new wxVariantDataList(value);
}
-
- return 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();
}
-wxStringList& wxVariant::GetStringList() const
+// Make empty list
+void wxVariant::NullList()
{
- wxASSERT( (GetType() == wxT("stringlist")) );
-
- return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
+ SetData(new wxVariantDataList());
}
// Append to list
void wxVariant::Append(const wxVariant& value)
{
- wxList& list = GetList();
+ wxVariantList& list = GetList();
list.Append(new wxVariant(value));
}
// Insert at front of list
void wxVariant::Insert(const wxVariant& value)
{
- wxList& list = GetList();
+ wxVariantList& list = GetList();
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();
+ wxVariantList& list = GetList();
- wxNode* node = list.First();
+ wxVariantList::compatibility_iterator node = list.GetFirst();
while (node)
{
- wxVariant* other = (wxVariant*) node->Data();
+ wxVariant* other = 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
-bool wxVariant::Delete(int item)
+bool wxVariant::Delete(size_t item)
{
- wxList& list = GetList();
+ wxVariantList& 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 < list.GetCount()), wxT("Invalid index to Delete") );
+ wxVariantList::compatibility_iterator node = list.Item(item);
+ wxVariant* variant = node->GetData();
delete variant;
- delete node;
- return TRUE;
+ list.Erase(node);
+ return true;
}
// Clear list
{
if (!IsNull() && (GetType() == wxT("list")))
{
- ((wxVariantDataList*) m_data)->Clear();
+ ((wxVariantDataList*) m_refData)->Clear();
}
else
{
- if (GetType() != wxT("list"))
- {
- delete m_data;
- m_data = NULL;
- }
- m_data = new wxVariantDataList;
+ if (!GetType().IsSameAs(wxT("list")))
+ UnRef();
+
+ m_refData = new wxVariantDataList;
+ }
+}
+
+// Treat a list variant as an array
+wxVariant wxVariant::operator[] (size_t idx) const
+{
+ wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
+
+ if (GetType() == wxT("list"))
+ {
+ wxVariantDataList* data = (wxVariantDataList*) m_refData;
+ wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+ return *(data->GetValue().Item(idx)->GetData());
+ }
+ return wxNullVariant;
+}
+
+wxVariant& wxVariant::operator[] (size_t idx)
+{
+ // We can't return a reference to a variant for a string list, since the string
+ // is actually stored as a char*, not a variant.
+
+ wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
+
+ wxVariantDataList* data = (wxVariantDataList*) m_refData;
+ wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+
+ return * (data->GetValue().Item(idx)->GetData());
+}
+
+// Return the number of elements in a list
+size_t wxVariant::GetCount() const
+{
+ wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
+
+ if (GetType() == wxT("list"))
+ {
+ wxVariantDataList* data = (wxVariantDataList*) m_refData;
+ return data->GetValue().GetCount();
}
+ return 0;
}
+// ----------------------------------------------------------------------------
// Type conversion
+// ----------------------------------------------------------------------------
+
bool wxVariant::Convert(long* value) const
{
wxString type(GetType());
- if (type == wxT("double"))
- *value = (long) (((wxVariantDataReal*)GetData())->GetValue());
- else if (type == wxT("long"))
+ if (type == wxS("double"))
+ *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
+ 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());
+ 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 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
{
wxString type(GetType());
if (type == wxT("double"))
- *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
+ *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());
val.MakeLower();
- if (val == wxT("true") || val == wxT("yes"))
- *value = TRUE;
- else if (val == wxT("false") || val == wxT("no"))
- *value = FALSE;
+ if (val == wxT("true") || val == wxT("yes") || val == wxT('1') )
+ *value = true;
+ else if (val == wxT("false") || val == wxT("no") || val == wxT('0') )
+ *value = false;
else
- return FALSE;
+ return false;
}
else
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
bool wxVariant::Convert(double* value) const
{
wxString type(GetType());
if (type == wxT("double"))
- *value = ((wxVariantDataReal*)GetData())->GetValue();
+ *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((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+ *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 false;
- return TRUE;
+ return true;
}
-bool wxVariant::Convert(char* 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 if (type == wxS("string"))
+ {
+ // Also accept strings of length 1
+ const wxString& str = (((wxVariantDataString*)GetData())->GetValue());
+ if ( str.length() == 1 )
+ *value = str[0];
+ else
+ return false;
+ }
else
- return FALSE;
+ return false;
- return TRUE;
+ 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;
+ 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
+#if wxUSE_LONGLONG
+bool wxVariant::Convert(wxLongLong* value) const
{
wxString type(GetType());
- if (type == wxT("time"))
- *value = ((wxVariantDataTime*)GetData())->GetValue();
- else if (type == wxT("date"))
- *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
+ 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 false;
- return TRUE;
+ return true;
}
-bool wxVariant::Convert(wxDate* value) const
+bool wxVariant::Convert(wxULongLong* value) const
{
wxString type(GetType());
- if (type == wxT("date"))
- *value = ((wxVariantDataDate*)GetData())->GetValue();
+ 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 false;
- return TRUE;
+ return true;
}
-#endif // wxUSE_TIMEDATE
+#endif // wxUSE_LONGLONG
+#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;
+ }
+
+ // Fallback to string conversion
+ wxString val;
+ 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;
- 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
+
+#endif // wxUSE_VARIANT
projects / wxWidgets.git / blobdiff