Added wxDataViewBitmapCell

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index a06ac80606a55444bebed43929b21256e2571236..b17b2c1f667ffde06fbb09e6c1ba70f530a8b89b 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1628,6 +1628,23 @@ void wxVariant::operator= (void* value)
     }
 }
 
     }
 }
 

+bool wxVariant::operator== (wxObject* value) const
+{
+    return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue());
+}
+
+bool wxVariant::operator!= (wxObject* value) const
+{
+    return (!((*this) == (void*) value));
+}
+
+void wxVariant::operator= (wxObject* value)
+{
+    if (m_data)
+        delete m_data;
+    m_data = new wxVariantDataWxObjectPtr(value);
+}
+

 #if wxUSE_DATETIME
 bool wxVariant::operator== (const wxDateTime& value) const
 {
 #if wxUSE_DATETIME
 bool wxVariant::operator== (const wxDateTime& value) const
 {


@@ -1894,7 +1911,7 @@ void* wxVariant::GetVoidPtr() const
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 
     return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
 }
 

-wxObject* wxVariant::GetWxObjectPtr()
+wxObject* wxVariant::GetWxObjectPtr() const

 {
     wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
 {
     wxASSERT(wxIsKindOf(m_data, wxVariantDataWxObjectPtr));
     return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();