Restore fixes needed for wxRenderer functions to work with wxGCDC.

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index c7a0e1b3ba5fb06a729cbf2e5754777b5794b093..6d67625a5f8a5a0d36d819fe8079d6af7e487f93 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -53,7 +53,7 @@ wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxVariantList);
+WX_DEFINE_LIST(wxVariantList)

 
 /*
  * wxVariant
 
 /*
  * wxVariant


@@ -63,12 +63,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
 
 wxVariant::wxVariant()
 {
 
 wxVariant::wxVariant()
 {

-    m_data = (wxVariantData*) NULL;
+    m_data = NULL;

 }
 
 bool wxVariant::IsNull() const
 {
 }
 
 bool wxVariant::IsNull() const
 {

-     return (m_data == (wxVariantData*) NULL);
+     return (m_data == NULL);

 }
 
 void wxVariant::MakeNull()
 }
 
 void wxVariant::MakeNull()


@@ -84,7 +84,7 @@ void wxVariant::Clear()
 wxVariant::wxVariant(const wxVariant& variant)
     : wxObject()
 {
 wxVariant::wxVariant(const wxVariant& variant)
     : wxObject()
 {

-    m_data = (wxVariantData*) NULL;
+    m_data = NULL;

 
     if (!variant.IsNull())
         Ref(variant);
 
     if (!variant.IsNull())
         Ref(variant);


@@ -122,6 +122,9 @@ bool wxVariant::operator== (const wxVariant& variant) const
     if (IsNull() || variant.IsNull())
         return (IsNull() == variant.IsNull());
 
     if (IsNull() || variant.IsNull())
         return (IsNull() == variant.IsNull());
 

+    if (GetType() != variant.GetType())
+        return false;
+

     return (GetData()->Eq(* variant.GetData()));
 }
 
     return (GetData()->Eq(* variant.GetData()));
 }
 


@@ -130,7 +133,6 @@ bool wxVariant::operator!= (const wxVariant& variant) const
     return (!(*this == variant));
 }
 
     return (!(*this == variant));
 }
 

-

 wxString wxVariant::MakeString() const
 {
     if (!IsNull())
 wxString wxVariant::MakeString() const
 {
     if (!IsNull())


@@ -177,6 +179,30 @@ void wxVariant::UnRef()
     }
 }
 
     }
 }
 

+bool wxVariant::Unshare()
+{
+    if ( m_data && m_data->GetRefCount() > 1 )
+    {
+        // note that ref is not going to be destroyed in this case...
+        const wxVariantData* ref = m_data;
+        UnRef();
+
+        // ... so we can still access it
+        m_data = ref->Clone();
+
+        wxASSERT_MSG( (m_data && m_data->GetRefCount() == 1),
+                  _T("wxVariant::AllocExclusive() failed.") );
+
+        if (!m_data || m_data->GetRefCount() != 1)
+            return false;
+        else
+            return true;
+    }
+    //else: data is null or ref count is 1, so we are exclusive owners of m_refData anyhow
+    else
+        return true;
+}
+

 
 // Returns a string representing the type of the variant,
 // e.g. "string", "bool", "list", "double", "long"
 
 // Returns a string representing the type of the variant,
 // e.g. "string", "bool", "list", "double", "long"


@@ -227,6 +253,8 @@ public:
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 
     virtual bool Write(wxOutputStream &str) const;
 #endif // wxUSE_STREAMS
 

+    wxVariantData* Clone() const { return new wxVariantDataLong(m_value); }
+

     virtual wxString GetType() const { return wxT("long"); }
 
 protected:
     virtual wxString GetType() const { return wxT("long"); }
 
 protected:


@@ -377,6 +405,7 @@ public:
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("double"); }
 
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("double"); }
 

+    wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); }

 protected:
     double m_value;
 };
 protected:
     double m_value;
 };


@@ -488,8 +517,6 @@ double wxVariant::GetDouble() const
 // wxVariantBoolData
 // -----------------------------------------------------------------
 
 // wxVariantBoolData
 // -----------------------------------------------------------------
 

-#ifdef HAVE_BOOL
-

 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
 public:
 class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
 {
 public:


@@ -514,6 +541,7 @@ public:
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("bool"); }
 
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("bool"); }
 

+    wxVariantData* Clone() const { return new wxVariantDataBool(m_value); }

 protected:
     bool m_value;
 };
 protected:
     bool m_value;
 };


@@ -624,8 +652,6 @@ bool wxVariant::GetBool() const
     }
 }
 
     }
 }
 

-#endif // HAVE_BOOL
-

 // -----------------------------------------------------------------
 // wxVariantDataChar
 // -----------------------------------------------------------------
 // -----------------------------------------------------------------
 // wxVariantDataChar
 // -----------------------------------------------------------------


@@ -651,6 +677,7 @@ public:
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("char"); }
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("char"); }

+    wxVariantData* Clone() const { return new wxVariantDataChar(m_value); }

 
 protected:
     wxUniChar m_value;
 
 protected:
     wxUniChar m_value;


@@ -802,6 +829,7 @@ public:
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("string"); }
     virtual bool Write(wxOutputStream& str) const;
 #endif // wxUSE_STREAMS
     virtual wxString GetType() const { return wxT("string"); }

+    wxVariantData* Clone() const { return new wxVariantDataString(m_value); }

 
 protected:
     wxString m_value;
 
 protected:
     wxString m_value;


@@ -955,10 +983,10 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const ;
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const ;

-    virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); }

 
     virtual wxClassInfo* GetValueClassInfo();
 
     virtual wxClassInfo* GetValueClassInfo();

-    
+

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


@@ -975,13 +1003,13 @@ bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
 wxString wxVariantDataWxObjectPtr::GetType() const
 {
     wxString returnVal(wxT("wxObject*"));
 wxString wxVariantDataWxObjectPtr::GetType() const
 {
     wxString returnVal(wxT("wxObject*"));

-    
+

     if (m_value)
     {
         returnVal = m_value->GetClassInfo()->GetClassName();
         returnVal += wxT("*");
     }
     if (m_value)
     {
         returnVal = m_value->GetClassInfo()->GetClassName();
         returnVal += wxT("*");
     }

-    
+

     return returnVal;
 }
 
     return returnVal;
 }
 


@@ -1006,7 +1034,7 @@ bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {
 
 bool wxVariantDataWxObjectPtr::Write(wxString& str) const
 {

-    str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value));
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast<void*>(m_value));

     return true;
 }
 
     return true;
 }
 


@@ -1076,7 +1104,7 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("void*"); }
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("void*"); }

-    virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }

 
 protected:
     void* m_value;
 
 protected:
     void* m_value;


@@ -1170,15 +1198,6 @@ class wxVariantDataDateTime: public wxVariantData
 public:
     wxVariantDataDateTime() { }
     wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
 public:
     wxVariantDataDateTime() { }
     wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }

-#if wxUSE_ODBC
-    wxVariantDataDateTime(const TIME_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); }
-    wxVariantDataDateTime(const DATE_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
-    wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
-                        valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }
-#endif //ODBC

 
     inline wxDateTime GetValue() const { return m_value; }
     inline void SetValue(const wxDateTime& value) { m_value = value; }
 
     inline wxDateTime GetValue() const { return m_value; }
     inline void SetValue(const wxDateTime& value) { m_value = value; }


@@ -1193,7 +1212,7 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("datetime"); }
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("datetime"); }

-    virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }

 
 protected:
     wxDateTime m_value;
 
 protected:
     wxDateTime m_value;


@@ -1223,7 +1242,10 @@ bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
 
 bool wxVariantDataDateTime::Write(wxString& str) const
 {
 
 bool wxVariantDataDateTime::Write(wxString& str) const
 {

-    str = m_value.Format();
+    if ( m_value.IsValid() )
+        str = m_value.Format();
+    else
+        str = wxS("Invalid");

     return true;
 }
 
     return true;
 }
 


@@ -1239,6 +1261,12 @@ bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
 
 bool wxVariantDataDateTime::Read(wxString& str)
 {
 
 bool wxVariantDataDateTime::Read(wxString& str)
 {

+    if ( str == wxS("Invalid") )
+    {
+        m_value = wxInvalidDateTime;
+        return true;
+    }
+

     if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
         return false;
     return true;
     if(! m_value.ParseDateTime(str.c_str()/*FIXME-UTF8*/))
         return false;
     return true;


@@ -1252,26 +1280,6 @@ wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
     m_name = name;
 }
 
     m_name = name;
 }
 

-#if wxUSE_ODBC
-wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-#endif // wxUSE_ODBC
-

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


@@ -1300,27 +1308,6 @@ void wxVariant::operator= (const wxDateTime& value)
     }
 }
 
     }
 }
 

-#if wxUSE_ODBC
-void wxVariant::operator= (const DATE_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-void wxVariant::operator= (const TIME_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-#endif // wxUSE_ODBC
-

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


@@ -1357,7 +1344,7 @@ public:
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("arrstring"); }
 #endif
     virtual bool Read(wxString& str);
     virtual wxString GetType() const { return wxT("arrstring"); }

-    virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
+    virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }

 
 protected:
     wxArrayString m_value;
 
 protected:
     wxArrayString m_value;


@@ -1484,6 +1471,7 @@ public:
 
     void Clear();
 
 
     void Clear();
 

+    wxVariantData* Clone() const { return new wxVariantDataList(m_value); }

 protected:
     wxVariantList  m_value;
 };
 protected:
     wxVariantList  m_value;
 };


@@ -1745,10 +1733,8 @@ bool wxVariant::Convert(long* value) const
         *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
     else if (type == wxT("long"))
         *value = ((wxVariantDataLong*)GetData())->GetValue();
         *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
     else if (type == wxT("long"))
         *value = ((wxVariantDataLong*)GetData())->GetValue();

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());

-#endif

     else if (type == wxT("string"))
         *value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
     else
     else if (type == wxT("string"))
         *value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
     else


@@ -1764,10 +1750,8 @@ bool wxVariant::Convert(bool* value) const
         *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
     else if (type == wxT("long"))
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
         *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
     else if (type == wxT("long"))
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = ((wxVariantDataBool*)GetData())->GetValue();
     else if (type == wxT("bool"))
         *value = ((wxVariantDataBool*)GetData())->GetValue();

-#endif

     else if (type == wxT("string"))
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
     else if (type == wxT("string"))
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());


@@ -1792,10 +1776,8 @@ bool wxVariant::Convert(double* value) const
         *value = ((wxVariantDoubleData*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
         *value = ((wxVariantDoubleData*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());

-#endif

     else if (type == wxT("string"))
         *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
     else
     else if (type == wxT("string"))
         *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
     else


@@ -1811,10 +1793,8 @@ bool wxVariant::Convert(wxUniChar* value) const
         *value = ((wxVariantDataChar*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
         *value = ((wxVariantDataChar*)GetData())->GetValue();
     else if (type == wxT("long"))
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());

-#ifdef HAVE_BOOL

     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());

-#endif

     else
         return false;
 
     else
         return false;