#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/math.h"
+ #include "wx/crt.h"
#if wxUSE_STREAMS
#include "wx/stream.h"
#endif
#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
*/
wxVariant::wxVariant()
{
- m_data = (wxVariantData*) NULL;
+ m_data = NULL;
}
bool wxVariant::IsNull() const
{
- return (m_data == (wxVariantData*) NULL);
+ return (m_data == NULL);
}
void wxVariant::MakeNull()
wxVariant::wxVariant(const wxVariant& variant)
: wxObject()
{
- m_data = (wxVariantData*) NULL;
+ m_data = NULL;
if (!variant.IsNull())
Ref(variant);
if (IsNull() || variant.IsNull())
return (IsNull() == variant.IsNull());
+ if (GetType() != variant.GetType())
+ return false;
+
return (GetData()->Eq(* variant.GetData()));
}
return (!(*this == variant));
}
-
wxString wxVariant::MakeString() const
{
if (!IsNull())
}
}
+bool wxVariant::Unshare()
+{
+ if ( m_data && m_data->GetRefCount() > 1 )
+ {
+ // note that ref is not going to be destroyed in this case...
+ const wxVariantData* ref = m_data;
+ UnRef();
+
+ // ... so we can still access it
+ m_data = ref->Clone();
+
+ wxASSERT_MSG( (m_data && m_data->GetRefCount() == 1),
+ _T("wxVariant::AllocExclusive() failed.") );
+
+ if (!m_data || m_data->GetRefCount() != 1)
+ return false;
+ else
+ return true;
+ }
+ //else: data is null or ref count is 1, so we are exclusive owners of m_refData anyhow
+ else
+ return true;
+}
+
// Returns a string representing the type of the variant,
// e.g. "string", "bool", "list", "double", "long"
class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
public:
wxVariantDataLong() { m_value = 0; }
wxVariantDataLong(long value) { m_value = value; }
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"); }
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") );
bool wxVariantDataLong::Read(wxString& str)
{
- m_value = wxAtol((const wxChar*) str);
+ m_value = wxAtol(str);
return true;
}
-// wxVariant
+// wxVariant
wxVariant::wxVariant(long val, const wxString& name)
{
class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDoubleData)
public:
wxVariantDoubleData() { m_value = 0.0; }
wxVariantDoubleData(double value) { m_value = value; }
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); }
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") );
bool wxVariantDoubleData::Read(wxString& str)
{
- m_value = wxAtof((const wxChar*) str);
+ m_value = wxAtof(str);
return true;
}
// 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; }
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); }
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") );
bool wxVariantDataBool::Read(wxString& str)
{
- m_value = (wxAtol((const wxChar*) str) != 0);
+ m_value = (wxAtol(str) != 0);
return true;
}
}
}
-#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
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); }
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") );
#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;
}
bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
{
wxFAIL_MSG(wxT("Unimplemented"));
-
+
return false;
}
#endif
{
wxTextOutputStream s(str);
- s.Write8(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;
}
{
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;
}
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_data = new wxVariantDataChar(val);
+ m_name = name;
+}
+
+wxVariant::wxVariant(char val, const wxString& name)
+{
+ m_data = new wxVariantDataChar(val);
+ m_name = name;
+}
+
+wxVariant::wxVariant(wchar_t val, const wxString& name)
{
m_data = new wxVariantDataChar(val);
m_name = name;
}
-bool wxVariant::operator== (wxChar value) const
+bool wxVariant::operator==(const wxUniChar& value) const
{
- char thisValue;
+ 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)
UnRef();
m_data = new wxVariantDataChar(value);
}
+
+ return *this;
}
-wxChar wxVariant::GetChar() const
+wxUniChar wxVariant::GetChar() const
{
- char value;
+ wxUniChar value;
if (Convert(& value))
return value;
else
{
wxFAIL_MSG(wxT("Could not convert to a char"));
- return 0;
+ return wxUniChar(0);
}
}
class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataString)
public:
wxVariantDataString() { }
wxVariantDataString(const wxString& value) { m_value = value; }
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; };
+ 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); }
protected:
wxString m_value;
return true;
}
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-
// wxVariant ****
-
+
wxVariant::wxVariant(const wxString& val, const wxString& name)
{
m_data = new wxVariantDataString(val);
m_name = name;
}
-wxVariant::wxVariant(const wxChar* val, const wxString& name)
+wxVariant::wxVariant(const char* val, const wxString& name)
+{
+ m_data = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
+
+wxVariant::wxVariant(const wchar_t* val, const wxString& name)
+{
+ m_data = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
+
+wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
+{
+ m_data = new wxVariantDataString(val.AsString());
+ m_name = name;
+}
+
+wxVariant::wxVariant(const wxCharBuffer& val, const wxString& name)
+{
+ m_data = new wxVariantDataString(wxString(val));
+ m_name = name;
+}
+
+wxVariant::wxVariant(const wxWCharBuffer& val, const wxString& name)
{
m_data = new wxVariantDataString(wxString(val));
m_name = name;
return (!((*this) == value));
}
-void wxVariant::operator= (const wxString& value)
+wxVariant& wxVariant::operator= (const wxString& value)
{
if (GetType() == wxT("string") &&
m_data->GetRefCount() == 1)
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));
- }
+ return *this;
}
wxString wxVariant::GetString() const
class wxVariantDataWxObjectPtr: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)
public:
wxVariantDataWxObjectPtr() { }
wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
#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;
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;
}
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<void*>(m_value));
return true;
}
wxObject* wxVariant::GetWxObjectPtr() const
{
- wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr));
return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
}
class wxVariantDataVoidPtr: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
public:
wxVariantDataVoidPtr() { }
wxVariantDataVoidPtr(void* value) { m_value = value; }
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); }
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;
void wxVariant::operator= (void* value)
{
- if (GetType() == wxT("void*") &&
- m_data->GetRefCount() == 1)
+ if (GetType() == wxT("void*") && (m_data->GetRefCount() == 1))
{
((wxVariantDataVoidPtr*)GetData())->SetValue(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();
}
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; }
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); }
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") );
bool wxVariantDataDateTime::Write(wxString& str) const
{
- str = m_value.Format();
+ if ( m_value.IsValid() )
+ str = m_value.Format();
+ else
+ str = wxS("Invalid");
return true;
}
bool wxVariantDataDateTime::Read(wxString& str)
{
- if(! m_value.ParseDateTime(str))
+ if ( str == wxS("Invalid") )
+ {
+ m_value = wxInvalidDateTime;
+ return true;
+ }
+
+ if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
return false;
return true;
}
m_name = name;
}
-#if wxUSE_ODBC
-wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
-{
- m_data = new wxVariantDataDateTime(valptr);
- m_name = name;
-}
-
-wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
-{
- m_data = new wxVariantDataDateTime(valptr);
- m_name = name;
-}
-
-wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
-{
- m_data = new wxVariantDataDateTime(valptr);
- m_name = name;
-}
-#endif // wxUSE_ODBC
-
bool wxVariant::operator== (const wxDateTime& value) const
{
wxDateTime thisValue;
}
}
-#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;
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); }
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") );
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
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("list"); };
+ virtual wxString GetType() const { return wxT("list"); }
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);
}
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();
}
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();
}
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();
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;
// 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_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") );
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)
}
}
-wxList& wxVariant::GetList() const
+wxVariantList& wxVariant::GetList() const
{
wxASSERT( (GetType() == wxT("list")) );
- return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
+ return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue();
}
// Make empty list
// 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
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();
// 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;
// Treat a list variant as an array
wxVariant wxVariant::operator[] (size_t idx) const
{
-#if WXWIN_COMPATIBILITY_2_4
- wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
-#else
wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
-#endif
if (GetType() == wxT("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
- return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
- }
-#if WXWIN_COMPATIBILITY_2_4
- else if (GetType() == wxT("stringlist"))
- {
- wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
-
- wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
- wxVariant variant( str );
- return variant;
+ return *(data->GetValue().Item(idx)->GetData());
}
-#endif
return wxNullVariant;
}
wxVariantDataList* data = (wxVariantDataList*) m_data;
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
size_t wxVariant::GetCount() const
{
-#if WXWIN_COMPATIBILITY_2_4
- wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
-#else
wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
-#endif
if (GetType() == wxT("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
return data->GetValue().GetCount();
}
-#if WXWIN_COMPATIBILITY_2_4
- else if (GetType() == wxT("stringlist"))
- {
- wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- return data->GetValue().GetCount();
- }
-#endif
return 0;
}
-#if WXWIN_COMPATIBILITY_2_4
-
-// ----------------------------------------------------------------------------
-// wxVariantDataStringList
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
-{
-DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
-public:
- wxVariantDataStringList() {}
- wxVariantDataStringList(const wxStringList& list) { m_value = list; }
-
- wxStringList& GetValue() const { return (wxStringList&) m_value; }
- void SetValue(const wxStringList& 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("stringlist"); };
-
-protected:
- wxStringList m_value;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData)
-
-void wxVariantDataStringList::SetValue(const wxStringList& value)
-{
- m_value = value;
-}
-
-bool wxVariantDataStringList::Eq(wxVariantData& data) const
-{
- wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
-
- wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
- wxStringList::compatibility_iterator node1 = m_value.GetFirst();
- wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();
- while (node1 && node2)
- {
- wxString str1 ( node1->GetData() );
- wxString str2 ( node2->GetData() );
- if (str1 != str2)
- return false;
- node1 = node1->GetNext();
- node2 = node2->GetNext();
- }
- if (node1 || node2) return false;
- return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Write(wxSTD ostream& str) const
-{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return true;
-}
-#endif
-
-bool wxVariantDataStringList::Write(wxString& str) const
-{
- str.Empty();
- wxStringList::compatibility_iterator node = m_value.GetFirst();
- while (node)
- {
- const wxChar* s = node->GetData();
- if (node != m_value.GetFirst())
- str += wxT(" ");
- str += s;
- node = node->GetNext();
- }
-
- return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
-{
- wxFAIL_MSG(wxT("Unimplemented"));
- // TODO
- return false;
-}
-#endif
-
-bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
-{
- wxFAIL_MSG(wxT("Unimplemented"));
- // TODO
- return false;
-}
-
-#endif //2.4 compat
-
-#if WXWIN_COMPATIBILITY_2_4
-
-wxVariant::wxVariant(const wxStringList& val, const wxString& name)
-{
- m_data = new wxVariantDataStringList(val);
- m_name = name;
-}
-
-bool wxVariant::operator== (const wxStringList& value) const
-{
- wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
-
- wxVariantDataStringList other(value);
- return (GetData()->Eq(other));
-}
-
-bool wxVariant::operator!= (const wxStringList& value) const
-{
- wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
-
- wxVariantDataStringList other(value);
- return !(GetData()->Eq(other));
-}
-
-void wxVariant::operator= (const wxStringList& value)
-{
- if (GetType() == wxT("stringlist") &&
- m_data->GetRefCount() == 1)
- {
- ((wxVariantDataStringList*)GetData())->SetValue(value);
- }
- else
- {
- UnRef();
- m_data = new wxVariantDataStringList(value);
- }
-}
-
-// wxVariant
-
-wxStringList& wxVariant::GetStringList() const
-{
- wxASSERT( (GetType() == wxT("stringlist")) );
-
- return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
-}
-
-#endif
-
// ----------------------------------------------------------------------------
// Type conversion
// ----------------------------------------------------------------------------
*value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
else if (type == wxT("long"))
*value = ((wxVariantDataLong*)GetData())->GetValue();
-#ifdef HAVE_BOOL
else if (type == wxT("bool"))
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
-#endif
else if (type == wxT("string"))
- *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+ *value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
else
return false;
*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());
*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());
else
return false;
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
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();
// Fallback to string conversion
wxString val;
return Convert(&val) &&
- (value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val));
+ (value->ParseDateTime(val.c_str()/*FIXME-UTF8*/) ||
+ value->ParseDate(val.c_str()/*FIXME-UTF8*/) ||
+ value->ParseTime(val.c_str()/*FIXME-UTF8*/));
}
#endif // wxUSE_DATETIME
-
-
-
#endif // wxUSE_VARIANT
projects / wxWidgets.git / blobdiff