Fix for using std streams when std:: conflicts with ::

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 7994a92651673a8e1a81b69a108d01c10d4393c6..ae13b2a4337403e6bc84607db6743d7d2a3b84d2 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -29,6 +29,7 @@
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000

+namespace std {}

 using namespace std ;
 #endif
 
 using namespace std ;
 #endif
 


@@ -44,13 +45,13 @@ using namespace std ;
 
 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:


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

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

     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();


@@ -105,7 +106,7 @@ void wxVariantDataList::SetValue(const wxList& value)
 
 void wxVariantDataList::Clear()
 {
 
 void wxVariantDataList::Clear()
 {

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

     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();


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

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

     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();


@@ -136,19 +137,19 @@ 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.GetFirst();
-    wxNode* node2 = listData.GetValue().GetFirst();
+    wxList::compatibility_iterator node1 = m_value.GetFirst();
+    wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();

     while (node1 && node2)
     {
         wxVariant* var1 = (wxVariant*) node1->GetData();
         wxVariant* var2 = (wxVariant*) node2->GetData();
         if ((*var1) != (*var2))
     while (node1 && node2)
     {
         wxVariant* var1 = (wxVariant*) node1->GetData();
         wxVariant* var2 = (wxVariant*) node2->GetData();
         if ((*var1) != (*var2))

-            return FALSE;
+            return false;

         node1 = node1->GetNext();
         node2 = node2->GetNext();
     }
         node1 = node1->GetNext();
         node2 = node2->GetNext();
     }

-    if (node1 || node2) return FALSE;
-    return TRUE;
+    if (node1 || node2) return false;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -157,14 +158,14 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataList::Write(wxString& str) const
 {
 }
 #endif
 
 bool wxVariantDataList::Write(wxString& str) const
 {

-    str = wxT("");
-    wxNode* node = m_value.GetFirst();
+    str = wxEmptyString;
+    wxList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();
     while (node)
     {
         wxVariant* var = (wxVariant*) node->GetData();


@@ -175,7 +176,7 @@ bool wxVariantDataList::Write(wxString& str) const
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -183,7 +184,7 @@ bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -191,14 +192,15 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO

-    return FALSE;
+    return false;

 }
 }

+#if WXWIN_COMPATIBILITY_2_4

 
 /*
  * wxVariantDataStringList
  */
 
 
 /*
  * wxVariantDataStringList
  */
 

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

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


@@ -245,19 +247,19 @@ 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;

-    wxStringList::Node  *node1 = m_value.GetFirst();
-    wxStringList::Node  *node2 = listData.GetValue().GetFirst();
+    wxStringList::compatibility_iterator node1 = m_value.GetFirst();
+    wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();

     while (node1 && node2)
     {
         wxString str1 ( node1->GetData() );
         wxString str2 ( node2->GetData() );
         if (str1 != str2)
     while (node1 && node2)
     {
         wxString str1 ( node1->GetData() );
         wxString str2 ( node2->GetData() );
         if (str1 != str2)

-            return FALSE;
+            return false;

         node1 = node1->GetNext();
         node2 = node2->GetNext();
     }
         node1 = node1->GetNext();
         node2 = node2->GetNext();
     }

-    if (node1 || node2) return FALSE;
-    return TRUE;
+    if (node1 || node2) return false;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -266,24 +268,24 @@ bool wxVariantDataStringList::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {
     str.Empty();
 }
 #endif
 
 bool wxVariantDataStringList::Write(wxString& str) const
 {
     str.Empty();

-    wxStringList::Node  *node = m_value.GetFirst();
+    wxStringList::compatibility_iterator node = m_value.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxChar* s = node->GetData();
+        const wxChar* s = node->GetData();

         if (node != m_value.GetFirst())
           str += wxT(" ");
         str += s;
         node = node->GetNext();
     }
 
         if (node != m_value.GetFirst())
           str += wxT(" ");
         str += s;
         node = node->GetNext();
     }
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -291,7 +293,7 @@ bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -299,14 +301,16 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO
 {
     wxFAIL_MSG(wxT("Unimplemented"));
     // TODO

-    return FALSE;
+    return false;

 }
 
 }
 

+#endif //2.4 compat
+

 /*
  * wxVariantDataLong
  */
 
 /*
  * wxVariantDataLong
  */
 

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

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


@@ -362,21 +366,21 @@ bool wxVariantDataLong::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataLong::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), m_value);
 }
 #endif
 
 bool wxVariantDataLong::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataLong::Read(wxSTD istream& str)
 {
     str >> m_value;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataLong::Read(wxSTD istream& str)
 {
     str >> m_value;

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -386,28 +390,28 @@ bool wxVariantDataLong::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write32((size_t)m_value);
     wxTextOutputStream s(str);
 
     s.Write32((size_t)m_value);

-    return TRUE;
+    return true;

 }
 
 bool wxVariantDataLong::Read(wxInputStream& str)
 {
    wxTextInputStream s(str);
    m_value = s.Read32();
 }
 
 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);
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataLong::Read(wxString& str)
 {
     m_value = wxAtol((const wxChar*) str);

-    return TRUE;
+    return true;

 }
 
 /*
  * wxVariantDataReal
  */
 
 }
 
 /*
  * wxVariantDataReal
  */
 

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

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


@@ -463,21 +467,21 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataReal::Write(wxString& str) const
 {
     str.Printf(wxT("%.4f"), m_value);
 }
 #endif
 
 bool wxVariantDataReal::Write(wxString& str) const
 {
     str.Printf(wxT("%.4f"), m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataReal::Read(wxSTD istream& str)
 {
     str >> m_value;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataReal::Read(wxSTD istream& str)
 {
     str >> m_value;

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -486,21 +490,21 @@ bool wxVariantDataReal::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
     s.WriteDouble((double)m_value);
 {
     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();
 }
 
 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);
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataReal::Read(wxString& str)
 {
     m_value = wxAtof((const wxChar*) str);

-    return TRUE;
+    return true;

 }
 
 #ifdef HAVE_BOOL
 }
 
 #ifdef HAVE_BOOL


@@ -508,7 +512,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:


@@ -564,14 +568,14 @@ bool wxVariantDataBool::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataBool::Write(wxString& str) const
 {
     str.Printf(wxT("%d"), (int) m_value);
 }
 #endif
 
 bool wxVariantDataBool::Write(wxString& str) const
 {
     str.Printf(wxT("%d"), (int) m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -579,7 +583,7 @@ bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> (long) m_value;

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -589,7 +593,7 @@ bool wxVariantDataBool::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write8(m_value);
     wxTextOutputStream s(str);
 
     s.Write8(m_value);

-    return TRUE;
+    return true;

 }
 
 bool wxVariantDataBool::Read(wxInputStream& str)
 }
 
 bool wxVariantDataBool::Read(wxInputStream& str)


@@ -597,14 +601,14 @@ bool wxVariantDataBool::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8() != 0;
     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);
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataBool::Read(wxString& str)
 {
     m_value = (wxAtol((const wxChar*) str) != 0);

-    return TRUE;
+    return true;

 }
 #endif // HAVE_BOOL
 
 }
 #endif // HAVE_BOOL
 


@@ -612,7 +616,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:


@@ -666,14 +670,14 @@ bool wxVariantDataChar::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
     str.Printf(wxT("%c"), m_value);
 }
 #endif
 
 bool wxVariantDataChar::Write(wxString& str) const
 {
     str.Printf(wxT("%c"), m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -681,7 +685,7 @@ bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> m_value;
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 //    str >> m_value;

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -691,7 +695,7 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
     wxTextOutputStream s(str);
 
     s.Write8(m_value);
     wxTextOutputStream s(str);
 
     s.Write8(m_value);

-    return TRUE;
+    return true;

 }
 
 bool wxVariantDataChar::Read(wxInputStream& str)
 }
 
 bool wxVariantDataChar::Read(wxInputStream& str)


@@ -699,32 +703,23 @@ bool wxVariantDataChar::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.Read8();
     wxTextInputStream s(str);
 
     m_value = s.Read8();

-    return TRUE;
+    return true;

 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {
 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataChar::Read(wxString& str)
 {

-    m_value = str[(size_t)0];
-    return TRUE;
+    m_value = str.ToAscii()[0u];
+    return true;

 }
 
 /*
  * wxVariantDataString
  */
 
 }
 
 /*
  * 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)
 DECLARE_DYNAMIC_CLASS(wxVariantDataString)

-#endif

 public:
     wxVariantDataString() { }
     wxVariantDataString(const wxString& value) { m_value = value; }
 public:
     wxVariantDataString() { }
     wxVariantDataString(const wxString& value) { m_value = value; }


@@ -774,21 +769,21 @@ bool wxVariantDataString::Eq(wxVariantData& data) const
 bool wxVariantDataString::Write(wxSTD ostream& str) const
 {
     str << (const char*) m_value.mb_str();
 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;
 }
 #endif
 
 bool wxVariantDataString::Write(wxString& str) const
 {
     str = m_value;

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataString::Read(wxSTD istream& str)
 {
     str >> m_value;
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataString::Read(wxSTD istream& str)
 {
     str >> m_value;

-    return TRUE;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -798,7 +793,7 @@ bool wxVariantDataString::Write(wxOutputStream& str) const
   // why doesn't wxOutputStream::operator<< take "const wxString&"
     wxTextOutputStream s(str);
     s.WriteString(m_value);
   // why doesn't wxOutputStream::operator<< take "const wxString&"
     wxTextOutputStream s(str);
     s.WriteString(m_value);

-    return TRUE;
+    return true;

 }
 
 bool wxVariantDataString::Read(wxInputStream& str)
 }
 
 bool wxVariantDataString::Read(wxInputStream& str)


@@ -806,21 +801,17 @@ bool wxVariantDataString::Read(wxInputStream& str)
     wxTextInputStream s(str);
 
     m_value = s.ReadString();
     wxTextInputStream s(str);
 
     m_value = s.ReadString();

-    return TRUE;
+    return true;

 }
 #endif // wxUSE_STREAMS
 
 bool wxVariantDataString::Read(wxString& str)
 {
     m_value = str;
 }
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)

-#endif

 
 /*
  * wxVariantDataVoidPtr
 
 /*
  * wxVariantDataVoidPtr


@@ -881,30 +872,135 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();
     wxString s;
     Write(s);
     str << (const char*) s.mb_str();

-    return TRUE;
+    return true;

 }
 #endif
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), (long) m_value);
 }
 #endif
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
     str.Printf(wxT("%ld"), (long) m_value);

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
 }
 
 #if wxUSE_STD_IOSTREAM
 bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented
 }
 #endif
 
 bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
 {
     // Not implemented

-    return FALSE;
+    return false;
+}
+
+/*
+ * wxVariantDataWxObjectPtr
+ */
+
+class wxVariantDataWxObjectPtr: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)
+public:
+    wxVariantDataWxObjectPtr() { }
+    wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
+
+    inline wxObject* GetValue() const { return m_value; }
+    inline void SetValue(wxObject* value) { m_value = value; }
+
+    virtual void Copy(wxVariantData& data);
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#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 ;
+    virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
+
+    virtual wxClassInfo* GetValueClassInfo() ;
+protected:
+    wxObject* m_value;
+
+    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
+
+void wxVariantDataWxObjectPtr::Copy(wxVariantData& data)
+{
+    wxASSERT_MSG(  wxIsKindOf((&data), wxVariantDataWxObjectPtr) ,\
+                   wxT("wxVariantDataWxObjectPtr::Copy: Can't copy to this type of data") \
+                 );
+
+    wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
+
+    otherData.m_value = m_value;
+}
+
+bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG(   wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
+
+    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 wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataWxObjectPtr::Write(wxString& str) const
+{
+    str.Printf(wxT("%s(%ld)"), GetType().c_str(), (long) m_value);
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
+{
+    // Not implemented
+    return false;

 }
 
 }
 

+

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


@@ -925,7 +1021,7 @@ public:
         { 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,
         { 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 ); }
+                        valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }

 #endif //ODBC
 
     inline wxDateTime GetValue() const { return m_value; }
 #endif //ODBC
 
     inline wxDateTime GetValue() const { return m_value; }


@@ -972,10 +1068,10 @@ bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 
 
 #if wxUSE_STD_IOSTREAM
 
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
+bool wxVariantDataDateTime::Write(wxSTD ostream& WXUNUSED(str)) const

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -983,7 +1079,7 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
 bool wxVariantDataDateTime::Write(wxString& str) const
 {
     str = m_value.Format();
 bool wxVariantDataDateTime::Write(wxString& str) const
 {
     str = m_value.Format();

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -991,7 +1087,7 @@ bool wxVariantDataDateTime::Write(wxString& str) const
 bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
 bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -999,8 +1095,8 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 bool wxVariantDataDateTime::Read(wxString& str)
 {
     if(! m_value.ParseDateTime(str))
 bool wxVariantDataDateTime::Read(wxString& str)
 {
     if(! m_value.ParseDateTime(str))

-        return FALSE;
-    return TRUE;
+        return false;
+    return true;

 }
 
 #endif // wxUSE_DATETIME
 }
 
 #endif // wxUSE_DATETIME


@@ -1060,10 +1156,10 @@ bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 
 
 #if wxUSE_STD_IOSTREAM
 
 
 #if wxUSE_STD_IOSTREAM

-bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
+bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const

 {
     // Not implemented
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -1079,7 +1175,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
         str += m_value[n];
     }
 
         str += m_value[n];
     }
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -1087,7 +1183,7 @@ bool wxVariantDataArrayString::Write(wxString& str) const
 bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented
 bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
 {
     // Not implemented

-    return FALSE;
+    return false;

 }
 #endif
 
 }
 #endif
 


@@ -1100,7 +1196,7 @@ bool wxVariantDataArrayString::Read(wxString& str)
         m_value.Add(tk.GetNextToken());
     }
 
         m_value.Add(tk.GetNextToken());
     }
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -1155,18 +1251,42 @@ wxVariant::wxVariant(const wxChar* val, const wxString& name)
     m_name = name;
 }
 
     m_name = name;
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+

 wxVariant::wxVariant(const wxStringList& val, const wxString& name)
 {
     m_data = new wxVariantDataStringList(val);
     m_name = name;
 }
 
 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;
 }
 
 wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 

+wxVariant::wxVariant( void* val, const wxString& name)
+{
+    m_data = new wxVariantDataVoidPtr(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant( wxObject* val, const wxString& name)
+{
+    m_data = new wxVariantDataWxObjectPtr(val);
+    m_name = name;
+}
+
+#if wxUSE_DATETIME
+wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
+{
+    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
 {


@@ -1274,7 +1394,7 @@ bool wxVariant::operator== (double value) const
 {
     double thisValue;
     if (!Convert(&thisValue))
 {
     double thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1302,7 +1422,7 @@ bool wxVariant::operator== (long value) const
 {
     long thisValue;
     if (!Convert(&thisValue))
 {
     long thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1330,7 +1450,7 @@ bool wxVariant::operator== (char value) const
 {
     char thisValue;
     if (!Convert(&thisValue))
 {
     char thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1359,7 +1479,7 @@ bool wxVariant::operator== (bool value) const
 {
     bool thisValue;
     if (!Convert(&thisValue))
 {
     bool thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

     else
         return (value == thisValue);
 }
     else
         return (value == thisValue);
 }


@@ -1388,7 +1508,7 @@ bool wxVariant::operator== (const wxString& value) const
 {
     wxString thisValue;
     if (!Convert(&thisValue))
 {
     wxString thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

 
     return value == thisValue;
 }
 
     return value == thisValue;
 }


@@ -1426,6 +1546,8 @@ void wxVariant::operator= (const wxChar* value)
     }
 }
 
     }
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+

 bool wxVariant::operator== (const wxStringList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
 bool wxVariant::operator== (const wxStringList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );


@@ -1436,7 +1558,10 @@ bool wxVariant::operator== (const wxStringList& value) const
 
 bool wxVariant::operator!= (const wxStringList& value) const
 {
 
 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)
 }
 
 void wxVariant::operator= (const wxStringList& value)


@@ -1453,6 +1578,8 @@ void wxVariant::operator= (const wxStringList& value)
     }
 }
 
     }
 }
 

+#endif
+

 bool wxVariant::operator== (const wxList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 bool wxVariant::operator== (const wxList& value) const
 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );


@@ -1509,7 +1636,7 @@ bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;
     if (!Convert(&thisValue))
 {
     wxDateTime thisValue;
     if (!Convert(&thisValue))

-        return FALSE;
+        return false;

 
     return value.IsEqualTo(thisValue);
 }
 
     return value.IsEqualTo(thisValue);
 }


@@ -1564,7 +1691,7 @@ bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
 {
     wxFAIL_MSG( _T("TODO") );
 
 {
     wxFAIL_MSG( _T("TODO") );
 

-    return FALSE;
+    return false;

 }
 
 bool wxVariant::operator!=(const wxArrayString& value) const
 }
 
 bool wxVariant::operator!=(const wxArrayString& value) const


@@ -1597,7 +1724,11 @@ wxArrayString wxVariant::GetArrayString() const
 // Treat a list variant as an array
 wxVariant wxVariant::operator[] (size_t idx) const
 {
 // Treat a list variant as an array
 wxVariant wxVariant::operator[] (size_t idx) const
 {

+#if WXWIN_COMPATIBILITY_2_4

     wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
     wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );

+#else
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
+#endif

 
     if (GetType() == wxT("list"))
     {
 
     if (GetType() == wxT("list"))
     {


@@ -1605,14 +1736,17 @@ wxVariant wxVariant::operator[] (size_t idx) const
         wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
         return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
     }
         wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
         return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
     }

+#if WXWIN_COMPATIBILITY_2_4

     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
 
     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         wxASSERT_MSG( (idx < (size_t) data->GetValue().GetCount()), wxT("Invalid index for array") );
 

-        wxVariant variant( wxString( (wxChar*) (data->GetValue().Item(idx)->GetData()) ));
+        wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
+        wxVariant variant( str );

         return variant;
     }
         return variant;
     }

+#endif

     return wxNullVariant;
 }
 
     return wxNullVariant;
 }
 


@@ -1632,18 +1766,24 @@ wxVariant& wxVariant::operator[] (size_t idx)
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {
 // Return the number of elements in a list
 int wxVariant::GetCount() const
 {

+#if WXWIN_COMPATIBILITY_2_4

     wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
     wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );

+#else
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
+#endif

 
     if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         return data->GetValue().GetCount();
     }
 
     if (GetType() == wxT("list"))
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         return data->GetValue().GetCount();
     }

+#if WXWIN_COMPATIBILITY_2_4

     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         return data->GetValue().GetCount();
     }
     else if (GetType() == wxT("stringlist"))
     {
         wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
         return data->GetValue().GetCount();
     }

+#endif

     return 0;
 }
 
     return 0;
 }
 


@@ -1655,7 +1795,7 @@ wxString wxVariant::MakeString() const
         if (GetData()->Write(str))
             return str;
     }
         if (GetData()->Write(str))
             return str;
     }

-    return wxString(wxT(""));
+    return wxEmptyString;

 }
 
 // Accessors
 }
 
 // Accessors


@@ -1668,7 +1808,7 @@ void wxVariant::SetData(wxVariantData* data)
 
 
 // Returns a string representing the type of the variant,
 
 
 // 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())
 wxString wxVariant::GetType() const
 {
     if (IsNull())


@@ -1683,6 +1823,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


@@ -1751,6 +1897,12 @@ 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
 {
 #if wxUSE_DATETIME
 wxDateTime wxVariant::GetDateTime() const
 {


@@ -1771,6 +1923,8 @@ wxList& wxVariant::GetList() const
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 
     return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+

 wxStringList& wxVariant::GetStringList() const
 {
     wxASSERT( (GetType() == wxT("stringlist")) );
 wxStringList& wxVariant::GetStringList() const
 {
     wxASSERT( (GetType() == wxT("stringlist")) );


@@ -1778,6 +1932,8 @@ wxStringList& wxVariant::GetStringList() const
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }
 
     return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
 }
 

+#endif
+

 // Make empty list
 void wxVariant::NullList()
 {
 // Make empty list
 void wxVariant::NullList()
 {


@@ -1800,20 +1956,20 @@ void wxVariant::Insert(const wxVariant& value)
     list.Insert(new 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();
 
 bool wxVariant::Member(const wxVariant& value) const
 {
     wxList& list = GetList();
 

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

     while (node)
     {
         wxVariant* other = (wxVariant*) node->GetData();
         if (value == *other)
     while (node)
     {
         wxVariant* other = (wxVariant*) node->GetData();
         if (value == *other)

-            return TRUE;
+            return true;

         node = node->GetNext();
     }
         node = node->GetNext();
     }

-    return FALSE;
+    return false;

 }
 
 // Deletes the nth element of the list
 }
 
 // Deletes the nth element of the list


@@ -1822,11 +1978,11 @@ bool wxVariant::Delete(int item)
     wxList& list = GetList();
 
     wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );
     wxList& list = GetList();
 
     wxASSERT_MSG( (item < (int) list.GetCount()), wxT("Invalid index to Delete") );

-    wxNode* node = list.Item(item);
+    wxList::compatibility_iterator node = list.Item(item);

     wxVariant* variant = (wxVariant*) node->GetData();
     delete variant;
     wxVariant* variant = (wxVariant*) node->GetData();
     delete variant;

-    delete node;
-    return TRUE;
+    list.Erase(node);
+    return true;

 }
 
 // Clear list
 }
 
 // Clear list


@@ -1838,7 +1994,7 @@ void wxVariant::ClearList()
     }
     else
     {
     }
     else
     {

-        if (GetType() != wxT("list"))
+        if (!GetType().IsSameAs(wxT("list")))

         {
             delete m_data;
             m_data = NULL;
         {
             delete m_data;
             m_data = NULL;


@@ -1862,9 +2018,9 @@ bool wxVariant::Convert(long* value) const
     else if (type == wxT("string"))
         *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
     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
 }
 
 bool wxVariant::Convert(bool* value) const


@@ -1882,17 +2038,17 @@ 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"))
-            *value = TRUE;
-        else if (val == wxT("FALSE") || val == wxT("no"))
-            *value = FALSE;
+        if (val == wxT("true") || val == wxT("yes"))
+            *value = true;
+        else if (val == wxT("false") || val == wxT("no"))
+            *value = false;

         else
         else

-            return FALSE;
+            return false;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxVariant::Convert(double* value) const
 }
 
 bool wxVariant::Convert(double* value) const


@@ -1909,9 +2065,9 @@ bool wxVariant::Convert(double* value) const
     else if (type == wxT("string"))
         *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
     else
     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
 }
 
 bool wxVariant::Convert(char* value) const


@@ -1926,15 +2082,15 @@ bool wxVariant::Convert(char* value) const
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
 #endif
     else

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();
 }
 
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_DATETIME
 }
 
 #if wxUSE_DATETIME


@@ -1944,11 +2100,12 @@ bool wxVariant::Convert(wxDateTime* value) const
     if (type == wxT("datetime"))
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();
     if (type == wxT("datetime"))
     {
         *value = ((wxVariantDataDateTime*)GetData())->GetValue();

-        return TRUE;
+        return true;

     }
     // Fallback to string conversion
     wxString val;
     }
     // Fallback to string conversion
     wxString val;

-    return Convert(&val) && (value->ParseDate(val));
+    return Convert(&val) &&
+                (value->ParseDateTime(val) || value->ParseDate(val));

 }
 #endif // wxUSE_DATETIME
 
 }
 #endif // wxUSE_DATETIME