systen encoding for mac

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 9ef2f1ae9311db2b6afd7d50792b8c3ad9622816..a697e7557745eab7775ff9f27db02493858826fc 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -9,10 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "variant.h"
 #pragma implementation "variant.h"

-#pragma implementation "time.h"
-#pragma implementation "date.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -30,6 +28,10 @@
     #endif
 #endif
 
     #endif
 #endif
 

+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+using namespace std ;
+#endif
+

 #if wxUSE_STREAMS
 #include "wx/stream.h"
 #include "wx/txtstrm.h"
 #if wxUSE_STREAMS
 #include "wx/stream.h"
 #include "wx/txtstrm.h"


@@ -40,24 +42,15 @@
 
 #include "wx/variant.h"
 
 
 #include "wx/variant.h"
 

-#if wxUSE_TIMEDATE
-IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
-
-wxTime::tFormat    wxTime::ms_Format    = wxTime::wx12h;
-wxTime::tPrecision wxTime::ms_Precision  = wxTime::wxStdMinSec;
-wxChar             wxTime::ms_bufTime[128];
-#endif
-

 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 
 IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
 

-wxVariant WXDLLEXPORT wxNullVariant;
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;

 
 /*
  * wxVariantDataList
  */
 
 
 /*
  * wxVariantDataList
  */
 

-class WXDLLEXPORT wxVariantDataList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataList)
 public:


@@ -101,23 +94,23 @@ wxVariantDataList::~wxVariantDataList()
 void wxVariantDataList::SetValue(const wxList& value)
 {
     Clear();
 void wxVariantDataList::SetValue(const wxList& value)
 {
     Clear();

-    wxNode* node = value.First();
+    wxList::compatibility_iterator node = value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxVariant* var = (wxVariant*) node->Data();
+        wxVariant* var = (wxVariant*) node->GetData();

         m_value.Append(new wxVariant(*var));
         m_value.Append(new wxVariant(*var));

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
 void wxVariantDataList::Clear()
 {
     }
 }
 
 void wxVariantDataList::Clear()
 {

-    wxNode* node = m_value.First();
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxVariant* var = (wxVariant*) node->Data();
+        wxVariant* var = (wxVariant*) node->GetData();

         delete var;
         delete var;

-        node = node->Next();
+        node = node->GetNext();

     }
     m_value.Clear();
 }
     }
     m_value.Clear();
 }


@@ -129,12 +122,12 @@ void wxVariantDataList::Copy(wxVariantData& data)
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
     listData.Clear();
     wxVariantDataList& listData = (wxVariantDataList&) data;
 
     listData.Clear();

-    wxNode* node = m_value.First();
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxVariant* var = (wxVariant*) node->Data();
+        wxVariant* var = (wxVariant*) node->GetData();

         listData.m_value.Append(new wxVariant(*var));
         listData.m_value.Append(new wxVariant(*var));

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -143,16 +136,16 @@ bool wxVariantDataList::Eq(wxVariantData& data) const
     wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
 
     wxVariantDataList& listData = (wxVariantDataList&) data;
     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)
     {
     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;
         if ((*var1) != (*var2))
             return FALSE;

-        node1 = node1->Next();
-        node2 = node2->Next();
+        node1 = node1->GetNext();
+        node2 = node2->GetNext();

     }
     if (node1 || node2) return FALSE;
     return TRUE;
     }
     if (node1 || node2) return FALSE;
     return TRUE;


@@ -171,15 +164,15 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
 bool wxVariantDataList::Write(wxString& str) const
 {
     str = wxT("");
 bool wxVariantDataList::Write(wxString& str) const
 {
     str = wxT("");

-    wxNode* node = m_value.First();
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     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();
           str += wxT(" ");
         wxString str1;
         str += var->MakeString();

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -205,7 +198,7 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
  * wxVariantDataStringList
  */
 
  * wxVariantDataStringList
  */
 

-class WXDLLEXPORT wxVariantDataStringList: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
 public:


@@ -252,16 +245,16 @@ bool wxVariantDataStringList::Eq(wxVariantData& data) const
     wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
 
     wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
     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)
     {
     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;
         if (str1 != str2)
             return FALSE;

-        node1 = node1->Next();
-        node2 = node2->Next();
+        node1 = node1->GetNext();
+        node2 = node2->GetNext();

     }
     if (node1 || node2) return FALSE;
     return TRUE;
     }
     if (node1 || node2) return FALSE;
     return TRUE;


@@ -279,15 +272,15 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {

-    str = wxT("");
-    wxNode* node = m_value.First();
+    str.Empty();
+    wxStringList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxChar* s = (wxChar*) node->Data();
-        if (node != m_value.First())
+        const wxChar* s = node->GetData();
+        if (node != m_value.GetFirst())

           str += wxT(" ");
         str += s;
           str += wxT(" ");
         str += s;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -313,7 +306,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
  * wxVariantDataLong
  */
 
  * wxVariantDataLong
  */
 

-class WXDLLEXPORT wxVariantDataLong: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
 public:


@@ -414,7 +407,7 @@ bool wxVariantDataLong::Read(wxString& str)
  * wxVariantDataReal
  */
 
  * wxVariantDataReal
  */
 

-class WXDLLEXPORT wxVariantDataReal: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataReal: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataReal)
 public:


@@ -515,7 +508,7 @@ bool wxVariantDataReal::Read(wxString& str)
  * wxVariantDataBool
  */
 
  * wxVariantDataBool
  */
 

-class WXDLLEXPORT wxVariantDataBool: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
 public:


@@ -619,7 +612,7 @@ bool wxVariantDataBool::Read(wxString& str)
  * wxVariantDataChar
  */
 
  * wxVariantDataChar
  */
 

-class WXDLLEXPORT wxVariantDataChar: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData

 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:
 {
 DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
 public:


@@ -725,7 +718,7 @@ bool wxVariantDataChar::Read(wxString& str)
 #define wxVariantDataString wxVariantStringData
 #endif
 
 #define wxVariantDataString wxVariantStringData
 #endif
 

-class WXDLLEXPORT wxVariantDataString: public wxVariantData
+class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData

 {
 #if defined(__BORLANDC__) && defined(__WIN16__)
 DECLARE_DYNAMIC_CLASS(wxVariantStringData)
 {
 #if defined(__BORLANDC__) && defined(__WIN16__)
 DECLARE_DYNAMIC_CLASS(wxVariantStringData)


@@ -830,21 +823,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
 #endif
 
 /*
 #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:
 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 void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;


@@ -856,35 +846,37 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
     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:
 
 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;
 }
 
 
     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
 
     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);
 {
     wxString s;
     Write(s);


@@ -893,40 +885,39 @@ bool wxVariantDataTime::Write(wxSTD ostream& str) const
 }
 #endif
 
 }
 #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
     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
 
 {
     // Not implemented
     return FALSE;
 }
 #endif
 

-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))

 {
     // Not implemented
     return FALSE;
 }
 
 /*
 {
     // Not implemented
     return FALSE;
 }
 
 /*

- * wxVariantDataDate
+ * wxVariantDataWxObjectPtr

  */
 
  */
 

-class wxVariantDataDate: public wxVariantData
+class wxVariantDataWxObjectPtr: public wxVariantData

 {
 {

- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
+DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)

 public:
 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;
 
     virtual void Copy(wxVariantData& data);
     virtual bool Eq(wxVariantData& data) const;


@@ -938,120 +929,58 @@ public:
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);
     virtual bool Read(wxSTD istream& str);
 #endif
     virtual bool Read(wxString& str);

-    virtual wxString GetType() const { return wxT("date"); };
-       virtual wxVariantData* Clone() { return new wxVariantDataDate; }
+    virtual wxString GetType() const ;
+    virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }

 
 

+    virtual wxClassInfo* GetValueClassInfo() ; 

 protected:
 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() == wxT("date")), wxT("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;
 }
 
 
     otherData.m_value = m_value;
 }
 

-bool wxVariantDataDate::Eq(wxVariantData& data) const
+bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const

 {
 {

-    wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("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);
 }
 
 
     return (otherData.m_value == m_value);
 }
 

-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Write(wxSTD ostream& str) const
+wxString wxVariantDataWxObjectPtr::GetType() const

 {
 {

-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return TRUE;
-}
-#endif
-
-bool wxVariantDataDate::Write(wxString& str) const
-{
-    str = m_value.FormatDate();
-    return TRUE;
+    wxString returnVal(wxT("wxObject"));
+    if (m_value) {
+        returnVal = m_value->GetClassInfo()->GetClassName();
+    }
+    return returnVal;

 }
 
 }
 

-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str))
+wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()

 {
 {

-    // Not implemented
-    return FALSE;
-}
-#endif
+    wxClassInfo* returnVal=NULL;
+    
+    if (m_value) returnVal = m_value->GetClassInfo(); 

 
 

-bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
-{
-    // Not implemented
-    return FALSE;
+    return returnVal;

 }
 }

-#endif
-  // wxUSE_TIMEDATE

 
 

-/*
- * wxVariantDataVoidPtr
- */
-
-class wxVariantDataVoidPtr: public wxVariantData
-{
-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
-public:
-    wxVariantDataVoidPtr() { }
-    wxVariantDataVoidPtr(void* value) { m_value = value; }
-
-    inline void* GetValue() const { return m_value; }
-    inline void SetValue(void* value) { m_value = value; }
-
-    virtual void Copy(wxVariantData& data);
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-    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; }
-
-protected:
-    void* m_value;
-
-    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
-
-void wxVariantDataVoidPtr::Copy(wxVariantData& data)
-{
-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
-
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
-
-    otherData.m_value = m_value;
-}
-
-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
-
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
+bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const

 {
     wxString s;
     Write(s);
 {
     wxString s;
     Write(s);


@@ -1060,30 +989,33 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
 }
 #endif
 
 }
 #endif
 

-bool wxVariantDataVoidPtr::Write(wxString& str) const
+bool wxVariantDataWxObjectPtr::Write(wxString& str) const

 {
 {

-    str.Printf(wxT("%ld"), (long) m_value);
+    str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value);

     return TRUE;
 }
 
 #if wxUSE_STD_IOSTREAM
     return TRUE;
 }
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))

 {
     // Not implemented
     return FALSE;
 }
 #endif
 
 {
     // Not implemented
     return FALSE;
 }
 #endif
 

-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))

 {
     // Not implemented
     return FALSE;
 }
 
 {
     // Not implemented
     return FALSE;
 }
 

+

 /*
  * wxVariantDataDateTime
  */
 
 /*
  * wxVariantDataDateTime
  */
 

+#if wxUSE_DATETIME
+

 class wxVariantDataDateTime: public wxVariantData
 {
     DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
 class wxVariantDataDateTime: public wxVariantData
 {
     DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)


@@ -1176,6 +1108,8 @@ bool wxVariantDataDateTime::Read(wxString& str)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif // wxUSE_DATETIME
+

 // ----------------------------------------------------------------------------
 // wxVariantDataArrayString
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxVariantDataArrayString
 // ----------------------------------------------------------------------------


@@ -1338,32 +1272,25 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
     m_name = name;
 }
 
     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_name = name;
+   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_name = name;
-}
-#endif
-
-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
-{
-    m_data = new wxVariantDataVoidPtr(val);
-    m_name = name;
+   m_data = new wxVariantDataWxObjectPtr(val);
+   m_name = name;

 }
 
 }
 

+#if wxUSE_DATETIME

 wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {
 wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
 {

-    m_data = new wxVariantDataDateTime(val);
-    m_name = name;
+       m_data = new wxVariantDataDateTime(val);
+       m_name = name;

 }
 }

+#endif // wxUSE_DATETIME    

 
 #if wxUSE_ODBC
 wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
 
 #if wxUSE_ODBC
 wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date


@@ -1678,65 +1605,6 @@ void wxVariant::operator= (const wxList& value)
     }
 }
 
     }
 }
 

-// 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
-{
-    wxTime thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-
-    return value == thisValue;
-}
-
-bool wxVariant::operator!= (const wxTime& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxTime& value)
-{
-    if (GetType() == wxT("time"))
-    {
-        ((wxVariantDataTime*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataTime(value);
-    }
-}
-
-bool wxVariant::operator== (const wxDate& value) const
-{
-    wxDate thisValue;
-    if (!Convert(&thisValue))
-        return FALSE;
-
-    return (value == thisValue);
-}
-
-bool wxVariant::operator!= (const wxDate& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxDate& value)
-{
-    if (GetType() == wxT("date"))
-    {
-        ((wxVariantDataTime*)GetData())->SetValue(value);
-    }
-    else
-    {
-        if (m_data)
-            delete m_data;
-        m_data = new wxVariantDataDate(value);
-    }
-}
-#endif
-

 bool wxVariant::operator== (void* value) const
 {
     return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
 bool wxVariant::operator== (void* value) const
 {
     return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());


@@ -1761,6 +1629,7 @@ void wxVariant::operator= (void* value)
     }
 }
 
     }
 }
 

+#if wxUSE_DATETIME

 bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;
 bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;


@@ -1788,6 +1657,7 @@ void wxVariant::operator= (const wxDateTime& value)
         m_data = new wxVariantDataDateTime(value);
     }
 }
         m_data = new wxVariantDataDateTime(value);
     }
 }

+#endif // wxUSE_DATETIME

 
 #if wxUSE_ODBC
 void wxVariant::operator= (const DATE_STRUCT* value)
 
 #if wxUSE_ODBC
 void wxVariant::operator= (const DATE_STRUCT* value)


@@ -1857,15 +1727,15 @@ wxVariant wxVariant::operator[] (size_t idx) const
     if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
     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;
     }
     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( (const wxChar*) (data->GetValue().Item(idx)->GetData()) ));

         return variant;
     }
     return wxNullVariant;
         return variant;
     }
     return wxNullVariant;


@@ -1879,9 +1749,9 @@ wxVariant& wxVariant::operator[] (size_t idx)
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;
     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
 }
 
 // Return the number of elements in a list


@@ -1892,12 +1762,12 @@ int wxVariant::GetCount() const
     if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
     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;
     }
     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;

-        return data->GetValue().Number();
+        return data->GetValue().GetCount();

     }
     return 0;
 }
     }
     return 0;
 }


@@ -1938,6 +1808,12 @@ bool wxVariant::IsType(const wxString& type) const
     return (GetType() == type);
 }
 
     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
 
 // Value accessors
 double wxVariant::GetReal() const


@@ -1999,31 +1875,6 @@ wxString wxVariant::GetString() const
     return value;
 }
 
     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
-{
-    wxTime value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a time"));
-    }
-
-    return value;
-}
-
-wxDate wxVariant::GetDate() const
-{
-    wxDate value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a date"));
-    }
-
-    return value;
-}
-#endif // wxUSE_TIMEDATE
-

 void* wxVariant::GetVoidPtr() const
 {
     wxASSERT( (GetType() == wxT("void*")) );
 void* wxVariant::GetVoidPtr() const
 {
     wxASSERT( (GetType() == wxT("void*")) );


@@ -2031,6 +1882,13 @@ void* wxVariant::GetVoidPtr() const
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 

+wxObject* wxVariant::GetWxObjectPtr() 
+{
+    wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
+    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
+}
+
+#if wxUSE_DATETIME

 wxDateTime wxVariant::GetDateTime() const
 {
     wxDateTime value;
 wxDateTime wxVariant::GetDateTime() const
 {
     wxDateTime value;


@@ -2041,6 +1899,7 @@ wxDateTime wxVariant::GetDateTime() const
 
     return value;
 }
 
     return value;
 }

+#endif // wxUSE_DATETIME

 
 wxList& wxVariant::GetList() const
 {
 
 wxList& wxVariant::GetList() const
 {


@@ -2083,13 +1942,13 @@ bool wxVariant::Member(const wxVariant& value) const
 {
     wxList& list = GetList();
 
 {
     wxList& list = GetList();
 

-    wxNode* node = list.First();
+    wxList::compatibility_iterator node = list.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxVariant* other = (wxVariant*) node->Data();
+        wxVariant* other = (wxVariant*) node->GetData();

         if (value == *other)
             return TRUE;
         if (value == *other)
             return TRUE;

-        node = node->Next();
+        node = node->GetNext();

     }
     return FALSE;
 }
     }
     return FALSE;
 }


@@ -2099,11 +1958,11 @@ bool wxVariant::Delete(int item)
 {
     wxList& list = GetList();
 
 {
     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") );
+    wxList::compatibility_iterator node = list.Item(item);
+    wxVariant* variant = (wxVariant*) node->GetData();

     delete variant;
     delete variant;

-    delete node;
+    list.Erase(node);

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -2160,9 +2019,9 @@ bool wxVariant::Convert(bool* value) const
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
         val.MakeLower();

-        if (val == wxT("true") || val == wxT("yes"))
+        if (val == wxT("TRUE") || val == wxT("yes"))

             *value = TRUE;
             *value = TRUE;

-        else if (val == wxT("false") || val == wxT("no"))
+        else if (val == wxT("FALSE") || val == wxT("no"))

             *value = FALSE;
         else
             return FALSE;
             *value = FALSE;
         else
             return FALSE;


@@ -2215,42 +2074,18 @@ bool wxVariant::Convert(wxString* value) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-bool wxVariant::Convert(wxTime* value) const
-{
-    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;
-}
-#endif // wxUSE_TIMEDATE
-
+#if wxUSE_DATETIME

 bool wxVariant::Convert(wxDateTime* value) const
 {
     wxString type(GetType());
     if (type == wxT("datetime"))
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
 bool wxVariant::Convert(wxDateTime* value) const
 {
     wxString type(GetType());
     if (type == wxT("datetime"))
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();

-       return TRUE;
-    } 
+        return TRUE;
+    }

     // Fallback to string conversion
     wxString val;
     return Convert(&val) && (value->ParseDate(val));
 }
     // Fallback to string conversion
     wxString val;
     return Convert(&val) && (value->ParseDate(val));
 }

+#endif // wxUSE_DATETIME
+