Add missing wxT().

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 65fbed6a4f7d0b735336609d6a3c812ddace194f..8f3344671fd24303edd38004f34efaca964553bc 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -49,11 +49,12 @@ using namespace std ;
 #include "wx/string.h"
 #include "wx/tokenzr.h"
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
 

-IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
-

 wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 
 wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxVariantList)
+

 /*
  * wxVariant
  */
 /*
  * wxVariant
  */


@@ -206,7 +207,6 @@ bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
 
 class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataLong)

 public:
     wxVariantDataLong() { m_value = 0; }
     wxVariantDataLong(long value) { m_value = value; }
 public:
     wxVariantDataLong() { m_value = 0; }
     wxVariantDataLong(long value) { m_value = value; }


@@ -233,8 +233,6 @@ protected:
     long m_value;
 };
 
     long m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
-

 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );
 bool wxVariantDataLong::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );


@@ -357,7 +355,6 @@ long wxVariant::GetLong() const
 
 class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDoubleData)

 public:
     wxVariantDoubleData() { m_value = 0.0; }
     wxVariantDoubleData(double value) { m_value = value; }
 public:
     wxVariantDoubleData() { m_value = 0.0; }
     wxVariantDoubleData(double value) { m_value = value; }


@@ -384,8 +381,6 @@ protected:
     double m_value;
 };
 
     double m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDoubleData, wxVariantData)
-

 bool wxVariantDoubleData::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") );
 bool wxVariantDoubleData::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") );


@@ -497,7 +492,6 @@ double wxVariant::GetDouble() const
 
 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataBool)

 public:
     wxVariantDataBool() { m_value = 0; }
     wxVariantDataBool(bool value) { m_value = value; }
 public:
     wxVariantDataBool() { m_value = 0; }
     wxVariantDataBool(bool value) { m_value = value; }


@@ -524,8 +518,6 @@ protected:
     bool m_value;
 };
 
     bool m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
-

 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );
 bool wxVariantDataBool::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );


@@ -640,7 +632,6 @@ bool wxVariant::GetBool() const
 
 class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataChar)

 public:
     wxVariantDataChar() { m_value = 0; }
     wxVariantDataChar(const wxUniChar& value) { m_value = value; }
 public:
     wxVariantDataChar() { m_value = 0; }
     wxVariantDataChar(const wxUniChar& value) { m_value = value; }


@@ -665,8 +656,6 @@ protected:
     wxUniChar m_value;
 };
 
     wxUniChar m_value;
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
-

 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );
 bool wxVariantDataChar::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );


@@ -792,7 +781,6 @@ wxUniChar wxVariant::GetChar() const
 
 class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataString)

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


@@ -866,8 +854,6 @@ bool wxVariantDataString::Read(wxString& str)
     return true;
 }
 
     return true;
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
-

 // wxVariant ****
 
 wxVariant::wxVariant(const wxString& val, const wxString& name)
 // wxVariant ****
 
 wxVariant::wxVariant(const wxString& val, const wxString& name)


@@ -952,7 +938,6 @@ wxString wxVariant::GetString() const
 
 class wxVariantDataWxObjectPtr: public wxVariantData
 {
 
 class wxVariantDataWxObjectPtr: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)

 public:
     wxVariantDataWxObjectPtr() { }
     wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
 public:
     wxVariantDataWxObjectPtr() { }
     wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }


@@ -972,18 +957,15 @@ public:
     virtual wxString GetType() const ;
     virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
 
     virtual wxString GetType() const ;
     virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
 

-    virtual wxClassInfo* GetValueClassInfo() ;
+    virtual wxClassInfo* GetValueClassInfo();
+    

 protected:
     wxObject* m_value;
 protected:
     wxObject* m_value;

-
-    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
-

 bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 {
 bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG(   wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
+    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );

 
     wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
 
 
     wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
 


@@ -992,10 +974,14 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 
 wxString wxVariantDataWxObjectPtr::GetType() const
 {
 
 wxString wxVariantDataWxObjectPtr::GetType() const
 {

-    wxString returnVal(wxT("wxObject"));
-    if (m_value) {
+    wxString returnVal(wxT("wxObject*"));
+    
+    if (m_value)
+    {

         returnVal = m_value->GetClassInfo()->GetClassName();
         returnVal = m_value->GetClassInfo()->GetClassName();

+        returnVal += wxT("*");

     }
     }

+    

     return returnVal;
 }
 
     return returnVal;
 }
 


@@ -1064,7 +1050,6 @@ void wxVariant::operator= (wxObject* value)
 
 wxObject* wxVariant::GetWxObjectPtr() const
 {
 
 wxObject* wxVariant::GetWxObjectPtr() const
 {

-    wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr));

     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
 }
 
     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
 }
 


@@ -1074,7 +1059,6 @@ wxObject* wxVariant::GetWxObjectPtr() const
 
 class wxVariantDataVoidPtr: public wxVariantData
 {
 
 class wxVariantDataVoidPtr: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)

 public:
     wxVariantDataVoidPtr() { }
     wxVariantDataVoidPtr(void* value) { m_value = value; }
 public:
     wxVariantDataVoidPtr() { }
     wxVariantDataVoidPtr(void* value) { m_value = value; }


@@ -1096,15 +1080,11 @@ public:
 
 protected:
     void* m_value;
 
 protected:
     void* m_value;

-
-    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
-

 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {
 bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
+    wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );

 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 
 
     wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
 


@@ -1161,8 +1141,7 @@ bool wxVariant::operator!= (void* value) const
 
 void wxVariant::operator= (void* value)
 {
 
 void wxVariant::operator= (void* value)
 {

-    if (GetType() == wxT("void*") &&
-        m_data->GetRefCount() == 1)
+    if (GetType() == wxT("void*") && (m_data->GetRefCount() == 1))

     {
         ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
     }
     {
         ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
     }


@@ -1188,8 +1167,6 @@ void* wxVariant::GetVoidPtr() const
 
 class wxVariantDataDateTime: public wxVariantData
 {
 
 class wxVariantDataDateTime: public wxVariantData
 {

-    DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
-

 public:
     wxVariantDataDateTime() { }
     wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
 public:
     wxVariantDataDateTime() { }
     wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }


@@ -1223,8 +1200,6 @@ protected:
 };
 
 
 };
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
-

 bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
 bool wxVariantDataDateTime::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );


@@ -1386,12 +1361,8 @@ public:
 
 protected:
     wxArrayString m_value;
 
 protected:
     wxArrayString m_value;

-
-    DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
-

 bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
 bool wxVariantDataArrayString::Eq(wxVariantData& data) const
 {
     wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );


@@ -1492,14 +1463,13 @@ wxArrayString wxVariant::GetArrayString() const
 
 class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {
 
 class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
 {

-DECLARE_DYNAMIC_CLASS(wxVariantDataList)

 public:
     wxVariantDataList() {}
 public:
     wxVariantDataList() {}

-    wxVariantDataList(const wxList& list);
+    wxVariantDataList(const wxVariantList& list);

     virtual ~wxVariantDataList();
 
     virtual ~wxVariantDataList();
 

-    wxList& GetValue() { return m_value; }
-    void SetValue(const wxList& value) ;
+    wxVariantList& GetValue() { return m_value; }
+    void SetValue(const wxVariantList& value) ;

 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM
 
     virtual bool Eq(wxVariantData& data) const;
 #if wxUSE_STD_IOSTREAM


@@ -1515,12 +1485,10 @@ public:
     void Clear();
 
 protected:
     void Clear();
 
 protected:

-    wxList  m_value;
+    wxVariantList  m_value;

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData)
-
-wxVariantDataList::wxVariantDataList(const wxList& list)
+wxVariantDataList::wxVariantDataList(const wxVariantList& list)

 {
     SetValue(list);
 }
 {
     SetValue(list);
 }


@@ -1530,13 +1498,13 @@ wxVariantDataList::~wxVariantDataList()
     Clear();
 }
 
     Clear();
 }
 

-void wxVariantDataList::SetValue(const wxList& value)
+void wxVariantDataList::SetValue(const wxVariantList& value)

 {
     Clear();
 {
     Clear();

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

     while (node)
     {
     while (node)
     {

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

         m_value.Append(new wxVariant(*var));
         node = node->GetNext();
     }
         m_value.Append(new wxVariant(*var));
         node = node->GetNext();
     }


@@ -1544,10 +1512,10 @@ void wxVariantDataList::SetValue(const wxList& value)
 
 void wxVariantDataList::Clear()
 {
 
 void wxVariantDataList::Clear()
 {

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

     while (node)
     {
     while (node)
     {

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

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


@@ -1559,12 +1527,12 @@ 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;

-    wxList::compatibility_iterator node1 = m_value.GetFirst();
-    wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();
+    wxVariantList::compatibility_iterator node1 = m_value.GetFirst();
+    wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst();

     while (node1 && node2)
     {
     while (node1 && node2)
     {

-        wxVariant* var1 = (wxVariant*) node1->GetData();
-        wxVariant* var2 = (wxVariant*) node2->GetData();
+        wxVariant* var1 = node1->GetData();
+        wxVariant* var2 = node2->GetData();

         if ((*var1) != (*var2))
             return false;
         node1 = node1->GetNext();
         if ((*var1) != (*var2))
             return false;
         node1 = node1->GetNext();


@@ -1587,10 +1555,10 @@ bool wxVariantDataList::Write(wxSTD ostream& str) const
 bool wxVariantDataList::Write(wxString& str) const
 {
     str = wxEmptyString;
 bool wxVariantDataList::Write(wxString& str) const
 {
     str = wxEmptyString;

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

     while (node)
     {
     while (node)
     {

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

         if (node != m_value.GetFirst())
           str += wxT(" ");
         wxString str1;
         if (node != m_value.GetFirst())
           str += wxT(" ");
         wxString str1;


@@ -1619,13 +1587,13 @@ bool wxVariantDataList::Read(wxString& WXUNUSED(str))
 
 // wxVariant
 
 
 // wxVariant
 

-wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
+wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants

 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 
 {
     m_data = new wxVariantDataList(val);
     m_name = name;
 }
 

-bool wxVariant::operator== (const wxList& value) const
+bool wxVariant::operator== (const wxVariantList& value) const

 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 
 {
     wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
 


@@ -1633,12 +1601,12 @@ bool wxVariant::operator== (const wxList& value) const
     return (GetData()->Eq(other));
 }
 
     return (GetData()->Eq(other));
 }
 

-bool wxVariant::operator!= (const wxList& value) const
+bool wxVariant::operator!= (const wxVariantList& value) const

 {
     return (!((*this) == value));
 }
 
 {
     return (!((*this) == value));
 }
 

-void wxVariant::operator= (const wxList& value)
+void wxVariant::operator= (const wxVariantList& value)

 {
     if (GetType() == wxT("list") &&
         m_data->GetRefCount() == 1)
 {
     if (GetType() == wxT("list") &&
         m_data->GetRefCount() == 1)


@@ -1652,11 +1620,11 @@ void wxVariant::operator= (const wxList& value)
     }
 }
 
     }
 }
 

-wxList& wxVariant::GetList() const
+wxVariantList& wxVariant::GetList() const

 {
     wxASSERT( (GetType() == wxT("list")) );
 
 {
     wxASSERT( (GetType() == wxT("list")) );
 

-    return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
+    return (wxVariantList&) ((wxVariantDataList*) m_data)->GetValue();

 }
 
 // Make empty list
 }
 
 // Make empty list


@@ -1668,7 +1636,7 @@ void wxVariant::NullList()
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 {
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 {

-    wxList& list = GetList();
+    wxVariantList& list = GetList();

 
     list.Append(new wxVariant(value));
 }
 
     list.Append(new wxVariant(value));
 }


@@ -1676,7 +1644,7 @@ void wxVariant::Append(const wxVariant& value)
 // Insert at front of list
 void wxVariant::Insert(const wxVariant& value)
 {
 // Insert at front of list
 void wxVariant::Insert(const wxVariant& value)
 {

-    wxList& list = GetList();
+    wxVariantList& list = GetList();

 
     list.Insert(new wxVariant(value));
 }
 
     list.Insert(new wxVariant(value));
 }


@@ -1684,12 +1652,12 @@ void wxVariant::Insert(const wxVariant& value)
 // Returns true if the variant is a member of the list
 bool wxVariant::Member(const wxVariant& value) const
 {
 // Returns true if the variant is a member of the list
 bool wxVariant::Member(const wxVariant& value) const
 {

-    wxList& list = GetList();
+    wxVariantList& list = GetList();

 
 

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

     while (node)
     {
     while (node)
     {

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

         if (value == *other)
             return true;
         node = node->GetNext();
         if (value == *other)
             return true;
         node = node->GetNext();


@@ -1700,11 +1668,11 @@ bool wxVariant::Member(const wxVariant& value) const
 // Deletes the nth element of the list
 bool wxVariant::Delete(size_t item)
 {
 // Deletes the nth element of the list
 bool wxVariant::Delete(size_t item)
 {

-    wxList& list = GetList();
+    wxVariantList& list = GetList();

 
     wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
 
     wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );

-    wxList::compatibility_iterator node = list.Item(item);
-    wxVariant* variant = (wxVariant*) node->GetData();
+    wxVariantList::compatibility_iterator node = list.Item(item);
+    wxVariant* variant = node->GetData();

     delete variant;
     list.Erase(node);
     return true;
     delete variant;
     list.Erase(node);
     return true;


@@ -1735,7 +1703,7 @@ wxVariant wxVariant::operator[] (size_t idx) const
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
     {
         wxVariantDataList* data = (wxVariantDataList*) m_data;
         wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );

-        return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+        return *(data->GetValue().Item(idx)->GetData());

     }
     return wxNullVariant;
 }
     }
     return wxNullVariant;
 }


@@ -1750,7 +1718,7 @@ wxVariant& wxVariant::operator[] (size_t idx)
     wxVariantDataList* data = (wxVariantDataList*) m_data;
     wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
 
     wxVariantDataList* data = (wxVariantDataList*) m_data;
     wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
 

-    return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+    return * (data->GetValue().Item(idx)->GetData());

 }
 
 // Return the number of elements in a list
 }
 
 // Return the number of elements in a list