[ 1493802 ] Allow multiple wxComboCtrl::SetPopupControl calls.

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index bbfd8f4688d5a0d7880970ccc1a708c7cc528418..a45b3d7489538d748124165dc78487173cca0447 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        variant.cpp
+// Name:        src/common/variant.cpp

 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "variant.h"
-#endif
-

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


@@ -20,6 +16,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/variant.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+#endif
+

 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>


@@ -34,14 +39,12 @@ using namespace std ;
 #endif
 
 #if wxUSE_STREAMS
 #endif
 
 #if wxUSE_STREAMS

-#include "wx/stream.h"
-#include "wx/txtstrm.h"
+    #include "wx/txtstrm.h"

 #endif
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"
 #endif
 
 #include "wx/string.h"
 #include "wx/tokenzr.h"

-
-#include "wx/variant.h"
+#include "wx/math.h"

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


@@ -59,7 +62,7 @@ public:
     wxVariantDataList(const wxList& list);
     ~wxVariantDataList();
 
     wxVariantDataList(const wxList& list);
     ~wxVariantDataList();
 

-    wxList& GetValue() const { return (wxList&) m_value; }
+    wxList& GetValue() { return m_value; }

     void SetValue(const wxList& value) ;
 
     virtual void Copy(wxVariantData& data);
     void SetValue(const wxList& value) ;
 
     virtual void Copy(wxVariantData& data);


@@ -304,7 +307,7 @@ bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
     return false;
 }
 
     return false;
 }
 

-#endif //2.4 compat 
+#endif //2.4 compat

 
 /*
  * wxVariantDataLong
 
 /*
  * wxVariantDataLong


@@ -458,7 +461,7 @@ bool wxVariantDataReal::Eq(wxVariantData& data) const
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 
 
     wxVariantDataReal& otherData = (wxVariantDataReal&) data;
 

-    return (otherData.m_value == m_value);
+    return wxIsSameDouble(otherData.m_value, m_value);

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -473,7 +476,7 @@ bool wxVariantDataReal::Write(wxSTD ostream& str) const
 
 bool wxVariantDataReal::Write(wxString& str) const
 {
 
 bool wxVariantDataReal::Write(wxString& str) const
 {

-    str.Printf(wxT("%.4f"), m_value);
+    str.Printf(wxT("%.14g"), m_value);

     return true;
 }
 
     return true;
 }
 


@@ -709,7 +712,7 @@ bool wxVariantDataChar::Read(wxInputStream& str)
 
 bool wxVariantDataChar::Read(wxString& str)
 {
 
 bool wxVariantDataChar::Read(wxString& str)
 {

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

     return true;
 }
 
     return true;
 }
 


@@ -800,7 +803,7 @@ bool wxVariantDataString::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
 {
     wxTextInputStream s(str);
 

-    m_value = s.ReadString();
+    m_value = s.ReadLine();

     return true;
 }
 #endif // wxUSE_STREAMS
     return true;
 }
 #endif // wxUSE_STREAMS


@@ -878,7 +881,7 @@ bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {
 
 bool wxVariantDataVoidPtr::Write(wxString& str) const
 {

-    str.Printf(wxT("%ld"), (long) m_value);
+    str.Printf(wxT("%p"), m_value);

     return true;
 }
 
     return true;
 }
 


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

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

     return true;
 }
 
     return true;
 }
 


@@ -1068,7 +1071,7 @@ 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
     return false;
 {
     // Not implemented
     return false;


@@ -1156,7 +1159,7 @@ 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
     return false;
 {
     // Not implemented
     return false;


@@ -1395,8 +1398,8 @@ bool wxVariant::operator== (double value) const
     double thisValue;
     if (!Convert(&thisValue))
         return false;
     double thisValue;
     if (!Convert(&thisValue))
         return false;

-    else
-        return (value == thisValue);
+
+    return wxIsSameDouble(value, thisValue);

 }
 
 bool wxVariant::operator!= (double value) const
 }
 
 bool wxVariant::operator!= (double value) const


@@ -1733,14 +1736,14 @@ 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().GetCount()), wxT("Invalid index for array") );
+        wxASSERT_MSG( (idx < 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;
         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") );
+        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );

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


@@ -1758,13 +1761,13 @@ 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().GetCount()), wxT("Invalid index for array") );
+    wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );

 
     return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
 }
 
 // Return the number of elements in a list
 
     return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
 }
 
 // Return the number of elements in a list

-int wxVariant::GetCount() const
+size_t wxVariant::GetCount() const

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


@@ -1938,7 +1941,7 @@ wxStringList& wxVariant::GetStringList() const
 void wxVariant::NullList()
 {
     SetData(new wxVariantDataList());
 void wxVariant::NullList()
 {
     SetData(new wxVariantDataList());

-};
+}

 
 // Append to list
 void wxVariant::Append(const wxVariant& value)
 
 // Append to list
 void wxVariant::Append(const wxVariant& value)


@@ -1973,11 +1976,11 @@ bool wxVariant::Member(const wxVariant& value) const
 }
 
 // Deletes the nth element of the list
 }
 
 // Deletes the nth element of the list

-bool wxVariant::Delete(int item)
+bool wxVariant::Delete(size_t item)

 {
     wxList& list = GetList();
 
 {
     wxList& list = GetList();
 

-    wxASSERT_MSG( (item < (int) 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();
     delete variant;
     wxList::compatibility_iterator node = list.Item(item);
     wxVariant* variant = (wxVariant*) node->GetData();
     delete variant;


@@ -1994,7 +1997,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;


@@ -2038,9 +2041,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") || val == wxT('1') )

             *value = true;
             *value = true;

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

             *value = false;
         else
             return false;
             *value = false;
         else
             return false;


@@ -2108,4 +2111,3 @@ bool wxVariant::Convert(wxDateTime* value) const
                 (value->ParseDateTime(val) || value->ParseDate(val));
 }
 #endif // wxUSE_DATETIME
                 (value->ParseDateTime(val) || value->ParseDate(val));
 }
 #endif // wxUSE_DATETIME

-