#ifdef __GNUG__
#pragma implementation "variant.h"
-#pragma implementation "time.h"
-#pragma implementation "date.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#endif
#endif
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+using namespace std ;
+#endif
+
#if wxUSE_STREAMS
#include "wx/stream.h"
#include "wx/txtstrm.h"
#endif
#include "wx/string.h"
-#include "wx/variant.h"
+#include "wx/tokenzr.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
+#include "wx/variant.h"
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
void wxVariantDataList::SetValue(const wxList& value)
{
Clear();
- wxNode* node = value.First();
+ wxNode* node = value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
+ wxVariant* var = (wxVariant*) node->GetData();
m_value.Append(new wxVariant(*var));
- node = node->Next();
+ node = node->GetNext();
}
}
void wxVariantDataList::Clear()
{
- wxNode* node = m_value.First();
+ wxNode* node = m_value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
+ wxVariant* var = (wxVariant*) node->GetData();
delete var;
- node = node->Next();
+ node = node->GetNext();
}
m_value.Clear();
}
wxVariantDataList& listData = (wxVariantDataList&) data;
listData.Clear();
- wxNode* node = m_value.First();
+ wxNode* node = m_value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
+ wxVariant* var = (wxVariant*) node->GetData();
listData.m_value.Append(new wxVariant(*var));
- node = node->Next();
+ node = node->GetNext();
}
}
wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
wxVariantDataList& listData = (wxVariantDataList&) data;
- wxNode* node1 = m_value.First();
- wxNode* node2 = listData.GetValue().First();
+ wxNode* node1 = m_value.GetFirst();
+ wxNode* node2 = listData.GetValue().GetFirst();
while (node1 && node2)
{
- wxVariant* var1 = (wxVariant*) node1->Data();
- wxVariant* var2 = (wxVariant*) node2->Data();
+ wxVariant* var1 = (wxVariant*) node1->GetData();
+ wxVariant* var2 = (wxVariant*) node2->GetData();
if ((*var1) != (*var2))
return FALSE;
- node1 = node1->Next();
- node2 = node2->Next();
+ node1 = node1->GetNext();
+ node2 = node2->GetNext();
}
if (node1 || node2) return FALSE;
return TRUE;
bool wxVariantDataList::Write(wxString& str) const
{
str = wxT("");
- wxNode* node = m_value.First();
+ wxNode* node = m_value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
- if (node != m_value.First())
+ wxVariant* var = (wxVariant*) node->GetData();
+ if (node != m_value.GetFirst())
str += wxT(" ");
wxString str1;
str += var->MakeString();
- node = node->Next();
+ node = node->GetNext();
}
return TRUE;
wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
- wxNode* node1 = m_value.First();
- wxNode* node2 = listData.GetValue().First();
+ wxStringList::Node *node1 = m_value.GetFirst();
+ wxStringList::Node *node2 = listData.GetValue().GetFirst();
while (node1 && node2)
{
- wxString str1 ((wxChar*) node1->Data());
- wxString str2 ((wxChar*) node2->Data());
+ wxString str1 ( node1->GetData() );
+ wxString str2 ( node2->GetData() );
if (str1 != str2)
return FALSE;
- node1 = node1->Next();
- node2 = node2->Next();
+ node1 = node1->GetNext();
+ node2 = node2->GetNext();
}
if (node1 || node2) return FALSE;
return TRUE;
bool wxVariantDataStringList::Write(wxString& str) const
{
- str = wxT("");
- wxNode* node = m_value.First();
+ str.Empty();
+ wxStringList::Node *node = m_value.GetFirst();
while (node)
{
- wxChar* s = (wxChar*) node->Data();
- if (node != m_value.First())
+ wxChar* s = node->GetData();
+ if (node != m_value.GetFirst())
str += wxT(" ");
str += s;
- node = node->Next();
+ node = node->GetNext();
}
return TRUE;
{
wxTextOutputStream s(str);
- s.Write8(m_value);
+ s.Write8(m_value);
return TRUE;
}
#endif
/*
- * wxVariantDataTime
+ * wxVariantDataVoidPtr
*/
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-
-class wxVariantDataTime: public wxVariantData
+class wxVariantDataVoidPtr: public wxVariantData
{
- DECLARE_DYNAMIC_CLASS(wxVariantDataTime)
+DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
public:
- wxVariantDataTime() { }
- wxVariantDataTime(const wxTime& value) { m_value = value; }
+ wxVariantDataVoidPtr() { }
+ wxVariantDataVoidPtr(void* value) { m_value = value; }
- inline wxTime GetValue() const { return m_value; }
- inline void SetValue(const wxTime& value) { m_value = value; }
+ inline void* GetValue() const { return m_value; }
+ inline void SetValue(void* value) { m_value = value; }
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("time"); };
- virtual wxVariantData* Clone() { return new wxVariantDataTime; }
+ virtual wxString GetType() const { return wxT("void*"); };
+ virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
protected:
- wxTime m_value;
+ void* m_value;
+
+ DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
-void wxVariantDataTime::Copy(wxVariantData& data)
+void wxVariantDataVoidPtr::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
- wxVariantDataTime& otherData = (wxVariantDataTime&) data;
+ wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
otherData.m_value = m_value;
}
-bool wxVariantDataTime::Eq(wxVariantData& data) const
+bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
- wxVariantDataTime& otherData = (wxVariantDataTime&) data;
+ wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
return (otherData.m_value == m_value);
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Write(wxSTD ostream& str) const
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
}
#endif
-bool wxVariantDataTime::Write(wxString& str) const
+bool wxVariantDataVoidPtr::Write(wxString& str) const
{
- wxChar*s = m_value.FormatTime();
- str = s;
+ str.Printf(wxT("%ld"), (long) m_value);
return TRUE;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
#endif
-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
/*
- * wxVariantDataDate
+ * wxVariantDataDateTime
*/
-class wxVariantDataDate: public wxVariantData
+#if wxUSE_DATETIME
+
+class wxVariantDataDateTime: public wxVariantData
{
- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
-public:
- wxVariantDataDate() { }
- wxVariantDataDate(const wxDate& value) { m_value = value; }
+ DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
- inline wxDate GetValue() const { return m_value; }
- inline void SetValue(const wxDate& value) { m_value = value; }
+public:
+ wxVariantDataDateTime() { }
+ wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
+#if wxUSE_ODBC
+ wxVariantDataDateTime(const TIME_STRUCT* valptr)
+ { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); }
+ wxVariantDataDateTime(const DATE_STRUCT* valptr)
+ { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
+ wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
+ { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
+ valptr->hour, valptr->minute, valptr->second, 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;
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 { return wxT("datetime"); };
+ virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
protected:
- wxDate m_value;
+ wxDateTime m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
-void wxVariantDataDate::Copy(wxVariantData& data)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
+
+void wxVariantDataDateTime::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Copy: Can't copy to this type of data") );
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+ wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
otherData.m_value = m_value;
}
-bool wxVariantDataDate::Eq(wxVariantData& data) const
+
+bool wxVariantDataDateTime::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+ wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
return (otherData.m_value == m_value);
}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Write(wxSTD ostream& str) const
+bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return TRUE;
+ // Not implemented
+ return FALSE;
}
#endif
-bool wxVariantDataDate::Write(wxString& str) const
+
+bool wxVariantDataDateTime::Write(wxString& str) const
{
- str = m_value.FormatDate();
+ str = m_value.Format();
return TRUE;
}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
#endif
-bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
+
+bool wxVariantDataDateTime::Read(wxString& str)
{
- // Not implemented
- return FALSE;
+ if(! m_value.ParseDateTime(str))
+ return FALSE;
+ return TRUE;
}
-#endif
- // wxUSE_TIMEDATE
-/*
- * wxVariantDataVoidPtr
- */
+#endif // wxUSE_DATETIME
-class wxVariantDataVoidPtr: public wxVariantData
+// ----------------------------------------------------------------------------
+// wxVariantDataArrayString
+// ----------------------------------------------------------------------------
+
+class wxVariantDataArrayString: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
public:
- wxVariantDataVoidPtr() { }
- wxVariantDataVoidPtr(void* value) { m_value = value; }
+ wxVariantDataArrayString() { }
+ wxVariantDataArrayString(const wxArrayString& value) { m_value = value; }
- inline void* GetValue() const { return m_value; }
- inline void SetValue(void* value) { m_value = value; }
+ wxArrayString GetValue() const { return m_value; }
+ void SetValue(const wxArrayString& value) { m_value = value; }
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
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("arrstring"); };
+ virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
protected:
- void* m_value;
+ wxArrayString m_value;
+
+ DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
-void wxVariantDataVoidPtr::Copy(wxVariantData& data)
+void wxVariantDataArrayString::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Copy: Can't copy to this type of data") );
- wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+ wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
otherData.m_value = m_value;
}
-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
+
+bool wxVariantDataArrayString::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
+ wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
- wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+ wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
- return (otherData.m_value == m_value);
+ return otherData.m_value == m_value;
}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
+bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return TRUE;
+ // Not implemented
+ return FALSE;
}
#endif
-bool wxVariantDataVoidPtr::Write(wxString& str) const
+
+bool wxVariantDataArrayString::Write(wxString& str) const
{
- str.Printf(wxT("%ld"), (long) m_value);
+ size_t count = m_value.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if ( n )
+ str += _T(';');
+
+ str += m_value[n];
+ }
+
return TRUE;
}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
return FALSE;
}
#endif
-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+
+bool wxVariantDataArrayString::Read(wxString& str)
{
- // Not implemented
- return FALSE;
+ wxStringTokenizer tk(str, _T(";"));
+ while ( tk.HasMoreTokens() )
+ {
+ m_value.Add(tk.GetNextToken());
+ }
+
+ return TRUE;
}
+
/*
* wxVariant
*/
m_name = name;
}
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
+wxVariant::wxVariant( void* val, const wxString& name)
{
- m_data = new wxVariantDataTime(val);
+ m_data = new wxVariantDataVoidPtr(val);
+ m_name = name;
+}
+
+#if wxUSE_ODBC
+wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
+{
+ m_data = new wxVariantDataDateTime(valptr);
m_name = name;
}
-wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date
+wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
{
- m_data = new wxVariantDataDate(val);
+ m_data = new wxVariantDataDateTime(valptr);
m_name = name;
}
-#endif
-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
+wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
{
- m_data = new wxVariantDataVoidPtr(val);
+ m_data = new wxVariantDataDateTime(valptr);
+ m_name = name;
+}
+#endif // wxUSE_ODBC
+
+wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
+{
+ m_data = new wxVariantDataArrayString(val);
m_name = name;
}
wxVariant::wxVariant(const wxVariant& variant)
+ : wxObject()
{
if (!variant.IsNull())
{
delete m_data;
m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
}
-// GetData()->Copy(* variant.GetData());
+
variant.GetData()->Copy(* GetData());
+
+ m_name = variant.m_name;
}
// Assignment using data, e.g.
}
}
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-bool wxVariant::operator== (const wxTime& value) const
+bool wxVariant::operator== (void* value) const
{
- wxTime thisValue;
- if (!Convert(&thisValue))
- return FALSE;
-
- return value == thisValue;
+ return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
}
-bool wxVariant::operator!= (const wxTime& value) const
+bool wxVariant::operator!= (void* value) const
{
- return (!((*this) == value));
+ return (!((*this) == (void*) value));
}
-void wxVariant::operator= (const wxTime& value)
+void wxVariant::operator= (void* value)
{
- if (GetType() == wxT("time"))
+ if (GetType() == wxT("void*"))
{
- ((wxVariantDataTime*)GetData())->SetValue(value);
+ ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
}
else
{
if (m_data)
delete m_data;
- m_data = new wxVariantDataTime(value);
+ m_data = new wxVariantDataVoidPtr(value);
}
}
-bool wxVariant::operator== (const wxDate& value) const
+#if wxUSE_DATETIME
+bool wxVariant::operator== (const wxDateTime& value) const
{
- wxDate thisValue;
+ wxDateTime thisValue;
if (!Convert(&thisValue))
return FALSE;
- return (value == thisValue);
+ return value.IsEqualTo(thisValue);
}
-bool wxVariant::operator!= (const wxDate& value) const
+bool wxVariant::operator!= (const wxDateTime& value) const
{
return (!((*this) == value));
}
-void wxVariant::operator= (const wxDate& value)
+void wxVariant::operator= (const wxDateTime& value)
{
- if (GetType() == wxT("date"))
+ if (GetType() == wxT("datetime"))
{
- ((wxVariantDataTime*)GetData())->SetValue(value);
+ ((wxVariantDataDateTime*)GetData())->SetValue(value);
}
else
{
if (m_data)
delete m_data;
- m_data = new wxVariantDataDate(value);
+ m_data = new wxVariantDataDateTime(value);
}
}
-#endif
+#endif // wxUSE_DATETIME
-bool wxVariant::operator== (void* value) const
+#if wxUSE_ODBC
+void wxVariant::operator= (const DATE_STRUCT* value)
{
- return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
+ if (m_data)
+ delete m_data;
+ m_data = new wxVariantDataDateTime(value);
}
-bool wxVariant::operator!= (void* value) const
+
+void wxVariant::operator= (const TIME_STRUCT* value)
{
- return (!((*this) == (void*) value));
+ if (m_data)
+ delete m_data;
+ m_data = new wxVariantDataDateTime(value);
}
-void wxVariant::operator= (void* value)
+
+void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
{
- if (GetType() == wxT("void*"))
+ if (m_data)
+ delete m_data;
+ m_data = new wxVariantDataDateTime(value);
+}
+
+#endif // wxUSE_ODBC
+
+bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
+{
+ wxFAIL_MSG( _T("TODO") );
+
+ return FALSE;
+}
+
+bool wxVariant::operator!=(const wxArrayString& value) const
+{
+ return !(*this == value);
+}
+
+void wxVariant::operator=(const wxArrayString& value)
+{
+ if (GetType() == wxT("arrstring"))
{
- ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
+ ((wxVariantDataArrayString *)GetData())->SetValue(value);
}
else
{
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataVoidPtr(value);
+ delete m_data;
+ m_data = new wxVariantDataArrayString(value);
}
}
+wxArrayString wxVariant::GetArrayString() const
+{
+ if ( GetType() == wxT("arrstring") )
+ return ((wxVariantDataArrayString *)GetData())->GetValue();
+
+ return wxArrayString();
+}
+
+
// Treat a list variant as an array
wxVariant wxVariant::operator[] (size_t idx) const
{
if (GetType() == wxT("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
- return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
+ return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
}
else if (GetType() == wxT("stringlist"))
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
- wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
+ wxVariant variant( wxString( (wxChar*) (data->GetValue().Item(idx)->GetData()) ));
return variant;
}
return wxNullVariant;
wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), wxT("Invalid index for array") );
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
- return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
+ return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
}
// Return the number of elements in a list
if (GetType() == wxT("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
- return data->GetValue().Number();
+ return data->GetValue().GetCount();
}
else if (GetType() == wxT("stringlist"))
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- return data->GetValue().Number();
+ return data->GetValue().GetCount();
}
return 0;
}
return value;
}
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-wxTime wxVariant::GetTime() const
+void* wxVariant::GetVoidPtr() const
{
- wxTime value;
- if (!Convert(& value))
- {
- wxFAIL_MSG(wxT("Could not convert to a time"));
- }
+ wxASSERT( (GetType() == wxT("void*")) );
- return value;
+ return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
-wxDate wxVariant::GetDate() const
+#if wxUSE_DATETIME
+wxDateTime wxVariant::GetDateTime() const
{
- wxDate value;
+ wxDateTime value;
if (!Convert(& value))
{
- wxFAIL_MSG(wxT("Could not convert to a date"));
+ wxFAIL_MSG(wxT("Could not convert to a datetime"));
}
return value;
}
-#endif // wxUSE_TIMEDATE
-
-void* wxVariant::GetVoidPtr() const
-{
- wxASSERT( (GetType() == wxT("void*")) );
-
- return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
-}
+#endif // wxUSE_DATETIME
wxList& wxVariant::GetList() const
{
return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
}
+// Make empty list
+void wxVariant::NullList()
+{
+ SetData(new wxVariantDataList());
+};
+
// Append to list
void wxVariant::Append(const wxVariant& value)
{
{
wxList& list = GetList();
- wxNode* node = list.First();
+ wxNode* node = list.GetFirst();
while (node)
{
- wxVariant* other = (wxVariant*) node->Data();
+ wxVariant* other = (wxVariant*) node->GetData();
if (value == *other)
return TRUE;
- node = node->Next();
+ node = node->GetNext();
}
return FALSE;
}
{
wxList& list = GetList();
- wxASSERT_MSG( (item < list.Number()), wxT("Invalid index to Delete") );
- wxNode* node = list.Nth(item);
- wxVariant* variant = (wxVariant*) node->Data();
+ wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );
+ wxNode* node = list.Item(item);
+ wxVariant* variant = (wxVariant*) node->GetData();
delete variant;
delete node;
return TRUE;
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
- if (val == wxT("true") || val == wxT("yes"))
+ if (val == wxT("TRUE") || val == wxT("yes"))
*value = TRUE;
- else if (val == wxT("false") || val == wxT("no"))
+ else if (val == wxT("FALSE") || val == wxT("no"))
*value = FALSE;
else
return FALSE;
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_DATETIME
+bool wxVariant::Convert(wxDateTime* value) const
{
wxString type(GetType());
- if (type == wxT("time"))
- *value = ((wxVariantDataTime*)GetData())->GetValue();
- else if (type == wxT("date"))
- *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
- else
- return FALSE;
-
- return TRUE;
-}
-
-bool wxVariant::Convert(wxDate* value) const
-{
- wxString type(GetType());
- if (type == wxT("date"))
- *value = ((wxVariantDataDate*)GetData())->GetValue();
- else
- return FALSE;
-
- return TRUE;
+ if (type == wxT("datetime"))
+ {
+ *value = ((wxVariantDataDateTime*)GetData())->GetValue();
+ return TRUE;
+ }
+ // Fallback to string conversion
+ wxString val;
+ return Convert(&val) && (value->ParseDate(val));
}
-#endif
- // wxUSE_TIMEDATE
+#endif // wxUSE_DATETIME
projects / wxWidgets.git / blobdiff