/////////////////////////////////////////////////////////////////////////////
-// 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"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM
-# include <fstream.h>
-#else
-# include <fstream>
+#include "wx/variant.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/math.h"
+ #if wxUSE_STREAMS
+ #include "wx/stream.h"
+ #endif
+#endif
+
+#if wxUSE_STD_IOSTREAM
+ #if wxUSE_IOSTREAMH
+ #include <fstream.h>
+ #else
+ #include <fstream>
+ #endif
+#endif
+
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
+using namespace std ;
#endif
#if wxUSE_STREAMS
-#include "wx/stream.h"
-#include "wx/txtstrm.h"
+ #include "wx/txtstrm.h"
#endif
#include "wx/string.h"
-#include "wx/variant.h"
+#include "wx/tokenzr.h"
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
-wxVariant WXDLLEXPORT wxNullVariant;
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;
/*
* wxVariantDataList
*/
-class WXDLLEXPORT wxVariantDataList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataList)
public:
wxVariantDataList(const wxList& list);
~wxVariantDataList();
- wxList& GetValue() const { return (wxList&) m_value; }
+ wxList& GetValue() { return m_value; }
void SetValue(const wxList& value) ;
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("list"); };
+ virtual wxString GetType() const { return wxT("list"); };
void Clear();
void wxVariantDataList::SetValue(const wxList& value)
{
Clear();
- wxNode* node = value.First();
+ wxList::compatibility_iterator node = value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
+ wxVariant* var = (wxVariant*) node->GetData();
m_value.Append(new wxVariant(*var));
- node = node->Next();
+ node = node->GetNext();
}
}
void wxVariantDataList::Clear()
{
- wxNode* node = m_value.First();
+ wxList::compatibility_iterator node = m_value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
+ wxVariant* var = (wxVariant*) node->GetData();
delete var;
- node = node->Next();
+ node = node->GetNext();
}
m_value.Clear();
}
void wxVariantDataList::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("list")), T("wxVariantDataList::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Copy: Can't copy to this type of data") );
wxVariantDataList& listData = (wxVariantDataList&) data;
listData.Clear();
- wxNode* node = m_value.First();
+ wxList::compatibility_iterator node = m_value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
+ wxVariant* var = (wxVariant*) node->GetData();
listData.m_value.Append(new wxVariant(*var));
- node = node->Next();
+ node = node->GetNext();
}
}
bool wxVariantDataList::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("list")), T("wxVariantDataList::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
wxVariantDataList& listData = (wxVariantDataList&) data;
- wxNode* node1 = m_value.First();
- wxNode* node2 = listData.GetValue().First();
+ wxList::compatibility_iterator node1 = m_value.GetFirst();
+ wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();
while (node1 && node2)
{
- wxVariant* var1 = (wxVariant*) node1->Data();
- wxVariant* var2 = (wxVariant*) node2->Data();
+ wxVariant* var1 = (wxVariant*) node1->GetData();
+ wxVariant* var2 = (wxVariant*) node2->GetData();
if ((*var1) != (*var2))
- return FALSE;
- node1 = node1->Next();
- node2 = node2->Next();
+ return false;
+ node1 = node1->GetNext();
+ node2 = node2->GetNext();
}
- if (node1 || node2) return FALSE;
- return TRUE;
+ if (node1 || node2) return false;
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Write(ostream& str) const
+bool wxVariantDataList::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
bool wxVariantDataList::Write(wxString& str) const
{
- str = T("");
- wxNode* node = m_value.First();
+ str = wxEmptyString;
+ wxList::compatibility_iterator node = m_value.GetFirst();
while (node)
{
- wxVariant* var = (wxVariant*) node->Data();
- if (node != m_value.First())
- str += T(" ");
+ 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;
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Read(istream& WXUNUSED(str))
+bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return FALSE;
+ return false;
}
#endif
bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return FALSE;
+ return false;
}
+#if WXWIN_COMPATIBILITY_2_4
/*
* wxVariantDataStringList
*/
-class WXDLLEXPORT wxVariantDataStringList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("stringlist"); };
+ virtual wxString GetType() const { return wxT("stringlist"); };
protected:
wxStringList m_value;
void wxVariantDataStringList::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("stringlist")), T("wxVariantDataStringList::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Copy: Can't copy to this type of data") );
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
bool wxVariantDataStringList::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("stringlist")), T("wxVariantDataStringList::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
- wxNode* node1 = m_value.First();
- wxNode* node2 = listData.GetValue().First();
+ wxStringList::compatibility_iterator node1 = m_value.GetFirst();
+ wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();
while (node1 && node2)
{
- wxString str1 ((wxChar*) node1->Data());
- wxString str2 ((wxChar*) node2->Data());
+ wxString str1 ( node1->GetData() );
+ wxString str2 ( node2->GetData() );
if (str1 != str2)
- return FALSE;
- node1 = node1->Next();
- node2 = node2->Next();
+ return false;
+ node1 = node1->GetNext();
+ node2 = node2->GetNext();
}
- if (node1 || node2) return FALSE;
- return TRUE;
+ if (node1 || node2) return false;
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Write(ostream& str) const
+bool wxVariantDataStringList::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
bool wxVariantDataStringList::Write(wxString& str) const
{
- str = T("");
- wxNode* node = m_value.First();
+ str.Empty();
+ wxStringList::compatibility_iterator node = m_value.GetFirst();
while (node)
{
- wxChar* s = (wxChar*) node->Data();
- if (node != m_value.First())
- str += T(" ");
+ const wxChar* s = node->GetData();
+ if (node != m_value.GetFirst())
+ str += wxT(" ");
str += s;
- node = node->Next();
+ node = node->GetNext();
}
- return TRUE;
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
+bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return FALSE;
+ return false;
}
#endif
bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return FALSE;
+ return false;
}
+#endif //2.4 compat
+
/*
* wxVariantDataLong
*/
-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
public:
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
- virtual bool Write(ostream& str) const;
+ 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
- virtual wxString GetType() const { return T("long"); };
+ virtual wxString GetType() const { return wxT("long"); };
protected:
long m_value;
void wxVariantDataLong::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("long")), T("wxVariantDataLong::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Copy: Can't copy to this type of data") );
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
bool wxVariantDataLong::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("long")), T("wxVariantDataLong::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataLong::Write(ostream& str) const
+bool wxVariantDataLong::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
bool wxVariantDataLong::Write(wxString& str) const
{
- str.Printf(T("%ld"), m_value);
- return TRUE;
+ str.Printf(wxT("%ld"), m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataLong::Read(istream& str)
+bool wxVariantDataLong::Read(wxSTD istream& str)
{
str >> m_value;
- return TRUE;
+ return true;
}
#endif
{
wxTextOutputStream s(str);
- s.Write32(m_value);
- return TRUE;
+ s.Write32((size_t)m_value);
+ 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;
+ return true;
}
/*
* wxVariantDataReal
*/
-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
public:
virtual bool Eq(wxVariantData& data) const;
virtual bool Read(wxString& str);
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ 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 T("double"); };
+ virtual wxString GetType() const { return wxT("double"); };
protected:
double m_value;
void wxVariantDataReal::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("double")), T("wxVariantDataReal::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Copy: Can't copy to this type of data") );
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
bool wxVariantDataReal::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("double")), T("wxVariantDataReal::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDataReal::Eq: argument mismatch") );
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
- return (otherData.m_value == m_value);
+ return wxIsSameDouble(otherData.m_value, m_value);
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataReal::Write(ostream& str) const
+bool wxVariantDataReal::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
{
- str.Printf(T("%.4f"), m_value);
- return TRUE;
+ str.Printf(wxT("%.14g"), m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataReal::Read(istream& str)
+bool wxVariantDataReal::Read(wxSTD istream& str)
{
str >> m_value;
- return TRUE;
+ return true;
}
#endif
{
wxTextOutputStream s(str);
s.WriteDouble((double)m_value);
- return TRUE;
+ return true;
}
bool wxVariantDataReal::Read(wxInputStream& str)
{
wxTextInputStream s(str);
m_value = (float)s.ReadDouble();
- return TRUE;
+ return true;
}
#endif // wxUSE_STREAMS
bool wxVariantDataReal::Read(wxString& str)
{
m_value = wxAtof((const wxChar*) str);
- return TRUE;
+ return true;
}
#ifdef HAVE_BOOL
* wxVariantDataBool
*/
-class WXDLLEXPORT wxVariantDataBool: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ 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(istream& str);
+ 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 T("bool"); };
+ virtual wxString GetType() const { return wxT("bool"); };
protected:
bool m_value;
void wxVariantDataBool::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("bool")), T("wxVariantDataBool::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Copy: Can't copy to this type of data") );
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
bool wxVariantDataBool::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("bool")), T("wxVariantDataBool::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataBool::Write(ostream& str) const
+bool wxVariantDataBool::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
bool wxVariantDataBool::Write(wxString& str) const
{
- str.Printf(T("%d"), (int) m_value);
- return TRUE;
+ str.Printf(wxT("%d"), (int) m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataBool::Read(istream& WXUNUSED(str))
+bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(wxT("Unimplemented"));
// str >> (long) m_value;
- return FALSE;
+ return false;
}
#endif
{
wxTextOutputStream s(str);
- s.Write8(m_value);
- return TRUE;
+ s.Write8(m_value);
+ 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;
+ return true;
}
#endif // HAVE_BOOL
* wxVariantDataChar
*/
-class WXDLLEXPORT wxVariantDataChar: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
public:
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
- virtual bool Write(ostream& str) const;
+ virtual bool Read(wxSTD istream& str);
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return T("char"); };
+ virtual wxString GetType() const { return wxT("char"); };
protected:
char m_value;
void wxVariantDataChar::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("char")), T("wxVariantDataChar::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Copy: Can't copy to this type of data") );
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
bool wxVariantDataChar::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("char")), T("wxVariantDataChar::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataChar::Write(ostream& str) const
+bool wxVariantDataChar::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
bool wxVariantDataChar::Write(wxString& str) const
{
- str.Printf(T("%c"), m_value);
- return TRUE;
+ str.Printf(wxT("%c"), m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataChar::Read(istream& WXUNUSED(str))
+bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(wxT("Unimplemented"));
// str >> m_value;
- return FALSE;
+ return false;
}
#endif
wxTextOutputStream s(str);
s.Write8(m_value);
- return TRUE;
+ return true;
}
bool wxVariantDataChar::Read(wxInputStream& str)
wxTextInputStream s(str);
m_value = s.Read8();
- return TRUE;
+ return true;
}
#endif // wxUSE_STREAMS
bool wxVariantDataChar::Read(wxString& str)
{
- m_value = str[(size_t)0];
- return TRUE;
+ m_value = str.ToAscii()[size_t(0)];
+ return true;
}
/*
* wxVariantDataString
*/
-#if defined(__BORLANDC__) && defined(__WIN16__)
-// Change name because of truncation
-#define wxVariantDataString wxVariantStringData
-#endif
-
-class WXDLLEXPORT wxVariantDataString: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
{
-#if defined(__BORLANDC__) && defined(__WIN16__)
-DECLARE_DYNAMIC_CLASS(wxVariantStringData)
-#else
DECLARE_DYNAMIC_CLASS(wxVariantDataString)
-#endif
public:
wxVariantDataString() { }
wxVariantDataString(const wxString& value) { m_value = value; }
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ 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 T("string"); };
+ virtual wxString GetType() const { return wxT("string"); };
protected:
wxString m_value;
void wxVariantDataString::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("string")), T("wxVariantDataString::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Copy: Can't copy to this type of data") );
wxVariantDataString& otherData = (wxVariantDataString&) data;
bool wxVariantDataString::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("string")), T("wxVariantDataString::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
wxVariantDataString& otherData = (wxVariantDataString&) data;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataString::Write(ostream& str) const
+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(istream& str)
+bool wxVariantDataString::Read(wxSTD istream& str)
{
str >> m_value;
- return TRUE;
+ return true;
}
#endif
// 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
+ * wxVariantDataVoidPtr
*/
-#if wxUSE_TIMEDATE
-
-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;
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("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() == T("time")), T("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() == T("time")), T("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(ostream& str) const
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
{
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return TRUE;
+ return true;
}
#endif
-bool wxVariantDataTime::Write(wxString& str) const
+bool wxVariantDataVoidPtr::Write(wxString& str) const
{
- wxChar*s = m_value.FormatTime();
- str = s;
- return TRUE;
+ str.Printf(wxT("%p"), m_value);
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Read(istream& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
#endif
-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
/*
- * wxVariantDataDate
+ * wxVariantDataWxObjectPtr
*/
-class wxVariantDataDate: public wxVariantData
+class wxVariantDataWxObjectPtr: public wxVariantData
{
- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
+DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)
public:
- wxVariantDataDate() { }
- wxVariantDataDate(const wxDate& value) { m_value = value; }
+ wxVariantDataWxObjectPtr() { }
+ wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
- inline wxDate GetValue() const { return m_value; }
- inline void SetValue(const wxDate& value) { m_value = value; }
+ inline wxObject* GetValue() const { return m_value; }
+ inline void SetValue(wxObject* value) { m_value = value; }
virtual void Copy(wxVariantData& data);
virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Write(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("date"); };
- virtual wxVariantData* Clone() { return new wxVariantDataDate; }
+ virtual wxString GetType() const ;
+ virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
+ virtual wxClassInfo* GetValueClassInfo() ;
protected:
- wxDate m_value;
+ wxObject* m_value;
+
+ DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
-void wxVariantDataDate::Copy(wxVariantData& data)
+void wxVariantDataWxObjectPtr::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("date")), T("wxVariantDataDate::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr) ,\
+ wxT("wxVariantDataWxObjectPtr::Copy: Can't copy to this type of data") \
+ );
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+ wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
otherData.m_value = m_value;
}
-bool wxVariantDataDate::Eq(wxVariantData& data) const
+bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("date")), T("wxVariantDataDate::Eq: argument mismatch") );
+ wxASSERT_MSG( wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
+ wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
return (otherData.m_value == m_value);
}
+wxString wxVariantDataWxObjectPtr::GetType() const
+{
+ wxString returnVal(wxT("wxObject"));
+ if (m_value) {
+ returnVal = m_value->GetClassInfo()->GetClassName();
+ }
+ return returnVal;
+}
+
+wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
+{
+ wxClassInfo* returnVal=NULL;
+
+ if (m_value) returnVal = m_value->GetClassInfo();
+
+ return returnVal;
+}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Write(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(), wx_static_cast(void*, m_value));
+ return true;
}
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Read(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
+ * wxVariantDataDateTime
*/
-class wxVariantDataVoidPtr: public wxVariantData
+#if wxUSE_DATETIME
+
+class wxVariantDataDateTime: public wxVariantData
{
-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
-public:
- wxVariantDataVoidPtr() { }
- wxVariantDataVoidPtr(void* value) { m_value = value; }
+ DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
- inline void* GetValue() const { return m_value; }
- inline void SetValue(void* 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, (wxDateTime::wxDateTime_t)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(ostream& str) const;
+ virtual bool Write(wxSTD ostream& str) const;
#endif
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(istream& str);
+ virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("void*"); };
- virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
+ virtual wxString GetType() const { return wxT("datetime"); };
+ virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
protected:
- void* m_value;
+ wxDateTime m_value;
};
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
-void wxVariantDataVoidPtr::Copy(wxVariantData& data)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
+
+void wxVariantDataDateTime::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() == T("void*")), T("wxVariantDataVoidPtr::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") );
- wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+ wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
otherData.m_value = m_value;
}
-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
+
+bool wxVariantDataDateTime::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() == T("void*")), T("wxVariantDataVoidPtr::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
- wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+ wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
return (otherData.m_value == m_value);
}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(ostream& str) const
+bool wxVariantDataDateTime::Write(wxSTD ostream& WXUNUSED(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 wxVariantDataDateTime::Write(wxString& str) const
{
- str.Printf(T("%ld"), (long) m_value);
- return TRUE;
+ str = m_value.Format();
+ return true;
}
+
#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Read(istream& WXUNUSED(str))
+bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return FALSE;
+ return false;
}
#endif
-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+
+bool wxVariantDataDateTime::Read(wxString& str)
+{
+ if(! m_value.ParseDateTime(str))
+ return false;
+ return true;
+}
+
+#endif // wxUSE_DATETIME
+
+// ----------------------------------------------------------------------------
+// wxVariantDataArrayString
+// ----------------------------------------------------------------------------
+
+class wxVariantDataArrayString: public wxVariantData
+{
+public:
+ wxVariantDataArrayString() { }
+ wxVariantDataArrayString(const wxArrayString& 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;
+#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("arrstring"); };
+ virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
+
+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;
+}
+
+
+bool wxVariantDataArrayString::Eq(wxVariantData& data) const
+{
+ wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
+
+ wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
+
+ return otherData.m_value == m_value;
+}
+
+
+#if wxUSE_STD_IOSTREAM
+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 += m_value[n];
+ }
+
+ return true;
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
+{
+ // Not implemented
+ return false;
+}
+#endif
+
+
+bool wxVariantDataArrayString::Read(wxString& str)
+{
+ wxStringTokenizer tk(str, _T(";"));
+ while ( tk.HasMoreTokens() )
+ {
+ m_value.Add(tk.GetNextToken());
+ }
+
+ return true;
}
+
/*
* wxVariant
*/
m_name = name;
}
+#if WXWIN_COMPATIBILITY_2_4
+
wxVariant::wxVariant(const wxStringList& val, const wxString& name)
{
m_data = new wxVariantDataStringList(val);
m_name = name;
}
+#endif
+
wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
{
m_data = new wxVariantDataList(val);
m_name = name;
}
-#if wxUSE_TIMEDATE
-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;
}
-wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date
+wxVariant::wxVariant( wxObject* val, const wxString& name)
{
- m_data = new wxVariantDataDate(val);
+ m_data = new wxVariantDataWxObjectPtr(val);
m_name = name;
}
-#endif
-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
+#if wxUSE_DATETIME
+wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
{
- m_data = new wxVariantDataVoidPtr(val);
+ m_data = new wxVariantDataDateTime(val);
+ m_name = name;
+}
+#endif // wxUSE_DATETIME
+
+#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
+
+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.
{
double thisValue;
if (!Convert(&thisValue))
- return FALSE;
- else
- return (value == thisValue);
+ return false;
+
+ return wxIsSameDouble(value, thisValue);
}
bool wxVariant::operator!= (double value) const
void wxVariant::operator= (double value)
{
- if (GetType() == T("double"))
+ if (GetType() == wxT("double"))
{
((wxVariantDataReal*)GetData())->SetValue(value);
}
{
long thisValue;
if (!Convert(&thisValue))
- return FALSE;
+ return false;
else
return (value == thisValue);
}
void wxVariant::operator= (long value)
{
- if (GetType() == T("long"))
+ if (GetType() == wxT("long"))
{
((wxVariantDataLong*)GetData())->SetValue(value);
}
{
char thisValue;
if (!Convert(&thisValue))
- return FALSE;
+ return false;
else
return (value == thisValue);
}
void wxVariant::operator= (char value)
{
- if (GetType() == T("char"))
+ if (GetType() == wxT("char"))
{
((wxVariantDataChar*)GetData())->SetValue(value);
}
{
bool thisValue;
if (!Convert(&thisValue))
- return FALSE;
+ return false;
else
return (value == thisValue);
}
void wxVariant::operator= (bool value)
{
- if (GetType() == T("bool"))
+ if (GetType() == wxT("bool"))
{
((wxVariantDataBool*)GetData())->SetValue(value);
}
{
wxString thisValue;
if (!Convert(&thisValue))
- return FALSE;
- else
- return (value == thisValue);
+ return false;
+
+ return value == thisValue;
}
bool wxVariant::operator!= (const wxString& value) const
void wxVariant::operator= (const wxString& value)
{
- if (GetType() == T("string"))
+ if (GetType() == wxT("string"))
{
((wxVariantDataString*)GetData())->SetValue(value);
}
void wxVariant::operator= (const wxChar* value)
{
- if (GetType() == T("string"))
+ if (GetType() == wxT("string"))
{
((wxVariantDataString*)GetData())->SetValue(wxString(value));
}
}
}
+#if WXWIN_COMPATIBILITY_2_4
+
bool wxVariant::operator== (const wxStringList& value) const
{
- wxASSERT_MSG( (GetType() == T("stringlist")), T("Invalid type for == operator") );
+ wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
wxVariantDataStringList other(value);
return (m_data->Eq(other));
bool wxVariant::operator!= (const wxStringList& value) const
{
- return (!((*this) == value));
+ wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
+
+ wxVariantDataStringList other(value);
+ return !(m_data->Eq(other));
}
void wxVariant::operator= (const wxStringList& value)
{
- if (GetType() == T("stringlist"))
+ if (GetType() == wxT("stringlist"))
{
((wxVariantDataStringList*)GetData())->SetValue(value);
}
}
}
+#endif
+
bool wxVariant::operator== (const wxList& value) const
{
- wxASSERT_MSG( (GetType() == T("list")), T("Invalid type for == operator") );
+ wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
wxVariantDataList other(value);
return (m_data->Eq(other));
void wxVariant::operator= (const wxList& value)
{
- if (GetType() == T("list"))
+ if (GetType() == wxT("list"))
{
((wxVariantDataList*)GetData())->SetValue(value);
}
}
}
-#if wxUSE_TIMEDATE
-bool wxVariant::operator== (const wxTime& value) const
+bool wxVariant::operator== (void* value) const
{
- wxTime thisValue;
- if (!Convert(&thisValue))
- return FALSE;
- else
- 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() == T("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;
- else
- return (value == thisValue);
+ return false;
+
+ 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() == T("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) == 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 (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() == T("void*"))
+ 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
{
- wxASSERT_MSG( (GetType() == T("list") || GetType() == T("stringlist")), T("Invalid type for array operator") );
+#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() == T("list"))
+ if (GetType() == wxT("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), T("Invalid index for array") );
- return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
+ wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+ return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
}
- else if (GetType() == T("stringlist"))
+#if WXWIN_COMPATIBILITY_2_4
+ else if (GetType() == wxT("stringlist"))
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), T("Invalid index for array") );
+ wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
- wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
+ wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
+ wxVariant variant( str );
return variant;
}
+#endif
return wxNullVariant;
}
// 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() == T("list")), T("Invalid type for array operator") );
+ wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), T("Invalid index for array") );
+ wxASSERT_MSG( (idx < 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
-int wxVariant::GetCount() const
+size_t wxVariant::GetCount() const
{
- wxASSERT_MSG( (GetType() == T("list") || GetType() == T("stringlist")), T("Invalid type for GetCount()") );
+#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() == T("list"))
+ if (GetType() == wxT("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
- return data->GetValue().Number();
+ return data->GetValue().GetCount();
}
- else if (GetType() == T("stringlist"))
+#if WXWIN_COMPATIBILITY_2_4
+ else if (GetType() == wxT("stringlist"))
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- return data->GetValue().Number();
+ return data->GetValue().GetCount();
}
+#endif
return 0;
}
if (GetData()->Write(str))
return str;
}
- return wxString(T(""));
+ return wxEmptyString;
}
// Accessors
// Returns a string representing the type of the variant,
-// e.g. "string", "bool", "stringlist", "list", "double", "long"
+// e.g. "string", "bool", "list", "double", "long"
wxString wxVariant::GetType() const
{
if (IsNull())
- return wxString(T("null"));
+ return wxString(wxT("null"));
else
return m_data->GetType();
}
return (GetType() == type);
}
+bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
+{
+ wxClassInfo* info=m_data->GetValueClassInfo();
+ return info ? info->IsKindOf(type) : false ;
+}
+
// Value accessors
double wxVariant::GetReal() const
return value;
else
{
- wxFAIL_MSG(T("Could not convert to a real number"));
+ wxFAIL_MSG(wxT("Could not convert to a real number"));
return 0.0;
}
}
return value;
else
{
- wxFAIL_MSG(T("Could not convert to an integer"));
+ wxFAIL_MSG(wxT("Could not convert to an integer"));
return 0;
}
}
return value;
else
{
- wxFAIL_MSG(T("Could not convert to a char"));
+ wxFAIL_MSG(wxT("Could not convert to a char"));
return 0;
}
}
return value;
else
{
- wxFAIL_MSG(T("Could not convert to a bool"));
+ wxFAIL_MSG(wxT("Could not convert to a bool"));
return 0;
}
}
wxString wxVariant::GetString() const
{
wxString value;
- if (Convert(& value))
- return value;
- else
+ if (!Convert(& value))
{
- wxFAIL_MSG(T("Could not convert to a string"));
- return wxString("");
+ wxFAIL_MSG(wxT("Could not convert to a string"));
}
+
+ return value;
}
-#if wxUSE_TIMEDATE
-wxTime wxVariant::GetTime() const
+void* wxVariant::GetVoidPtr() const
{
- wxTime value;
- if (Convert(& value))
- return value;
- else
- {
- wxFAIL_MSG(T("Could not convert to a time"));
- return wxTime();
- }
+ wxASSERT( (GetType() == wxT("void*")) );
+
+ return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
-wxDate wxVariant::GetDate() const
+wxObject* wxVariant::GetWxObjectPtr()
{
- wxDate value;
- if (Convert(& value))
- return value;
- else
- {
- wxFAIL_MSG(T("Could not convert to a date"));
- return wxDate();
- }
+ wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
+ return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
}
-#endif
-void* wxVariant::GetVoidPtr() const
+#if wxUSE_DATETIME
+wxDateTime wxVariant::GetDateTime() const
{
- wxASSERT( (GetType() == T("void*")) );
+ wxDateTime value;
+ if (!Convert(& value))
+ {
+ wxFAIL_MSG(wxT("Could not convert to a datetime"));
+ }
- return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
+ return value;
}
+#endif // wxUSE_DATETIME
wxList& wxVariant::GetList() const
{
- wxASSERT( (GetType() == T("list")) );
+ wxASSERT( (GetType() == wxT("list")) );
return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
}
+#if WXWIN_COMPATIBILITY_2_4
+
wxStringList& wxVariant::GetStringList() const
{
- wxASSERT( (GetType() == T("stringlist")) );
+ wxASSERT( (GetType() == wxT("stringlist")) );
return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
}
+#endif
+
+// Make empty list
+void wxVariant::NullList()
+{
+ SetData(new wxVariantDataList());
+}
+
// Append to list
void wxVariant::Append(const wxVariant& value)
{
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();
- wxNode* node = list.First();
+ wxList::compatibility_iterator node = list.GetFirst();
while (node)
{
- wxVariant* other = (wxVariant*) node->Data();
+ wxVariant* other = (wxVariant*) node->GetData();
if (value == *other)
- return TRUE;
- node = node->Next();
+ 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();
- wxASSERT_MSG( (item < list.Number()), T("Invalid index to Delete") );
- wxNode* node = list.Nth(item);
- wxVariant* variant = (wxVariant*) node->Data();
+ wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
+ wxList::compatibility_iterator node = list.Item(item);
+ wxVariant* variant = (wxVariant*) node->GetData();
delete variant;
- delete node;
- return TRUE;
+ list.Erase(node);
+ return true;
}
// Clear list
void wxVariant::ClearList()
{
- if (!IsNull() && (GetType() == T("list")))
+ if (!IsNull() && (GetType() == wxT("list")))
{
((wxVariantDataList*) m_data)->Clear();
}
else
{
- if (GetType() != T("list"))
+ if (!GetType().IsSameAs(wxT("list")))
{
delete m_data;
m_data = NULL;
bool wxVariant::Convert(long* value) const
{
wxString type(GetType());
- if (type == T("double"))
+ if (type == wxT("double"))
*value = (long) (((wxVariantDataReal*)GetData())->GetValue());
- else if (type == T("long"))
+ else if (type == wxT("long"))
*value = ((wxVariantDataLong*)GetData())->GetValue();
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type == wxT("bool"))
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
#endif
- else if (type == T("string"))
+ 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 == T("double"))
+ if (type == wxT("double"))
*value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
- else if (type == T("long"))
+ else if (type == wxT("long"))
*value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type == wxT("bool"))
*value = ((wxVariantDataBool*)GetData())->GetValue();
#endif
- else if (type == T("string"))
+ else if (type == wxT("string"))
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
- if (val == T("true") || val == T("yes"))
- *value = TRUE;
- else if (val == T("false") || val == T("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 == T("double"))
+ if (type == wxT("double"))
*value = ((wxVariantDataReal*)GetData())->GetValue();
- else if (type == T("long"))
+ else if (type == wxT("long"))
*value = (double) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type == wxT("bool"))
*value = (double) (((wxVariantDataBool*)GetData())->GetValue());
#endif
- else if (type == T("string"))
+ else if (type == wxT("string"))
*value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
bool wxVariant::Convert(char* value) const
{
wxString type(GetType());
- if (type == T("char"))
+ if (type == wxT("char"))
*value = ((wxVariantDataChar*)GetData())->GetValue();
- else if (type == T("long"))
+ else if (type == wxT("long"))
*value = (char) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type == wxT("bool"))
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
bool wxVariant::Convert(wxString* value) const
{
*value = MakeString();
- return TRUE;
-}
-
-#if wxUSE_TIMEDATE
-bool wxVariant::Convert(wxTime* value) const
-{
- wxString type(GetType());
- if (type == T("time"))
- *value = ((wxVariantDataTime*)GetData())->GetValue();
- else if (type == T("date"))
- *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
- else
- return FALSE;
-
- return TRUE;
+ return true;
}
-bool wxVariant::Convert(wxDate* value) const
+#if wxUSE_DATETIME
+bool wxVariant::Convert(wxDateTime* value) const
{
wxString type(GetType());
- if (type == T("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->ParseDateTime(val) || value->ParseDate(val));
}
-#endif
- // wxUSE_TIMEDATE
+#endif // wxUSE_DATETIME
projects / wxWidgets.git / blobdiff