adding ContentScaleFactor support to dc - defaulting to 1.0

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 57aba64bb1d84925d12e6a109239292675359905..6bafda604f6d80b78a7e7c5e5d5501b61a68e420 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -37,11 +37,6 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#if defined(__MWERKS__) && __MSL__ >= 0x6000
-namespace std {}
-using namespace std ;
-#endif
-

 #if wxUSE_STREAMS
     #include "wx/txtstrm.h"
 #endif
 #if wxUSE_STREAMS
     #include "wx/txtstrm.h"
 #endif


@@ -206,6 +201,10 @@ wxAnyToVariantRegistration::
     wxPreRegisterAnyToVariant(this);
 }
 
     wxPreRegisterAnyToVariant(this);
 }
 

+wxAnyToVariantRegistration::~wxAnyToVariantRegistration()
+{
+}
+

 wxVariant::wxVariant(const wxAny& any)
     : wxObject()
 {
 wxVariant::wxVariant(const wxAny& any)
     : wxObject()
 {


@@ -221,11 +220,10 @@ wxVariant::wxVariant(const wxAny& any)
 
 wxAny wxVariant::GetAny() const
 {
 
 wxAny wxVariant::GetAny() const
 {

-    wxAny any;
-

     if ( IsNull() )
     if ( IsNull() )

-        return any;
+        return wxAny();

 
 

+    wxAny any;

     wxVariantData* data = GetData();
 
     if ( data->GetAsAny(&any) )
     wxVariantData* data = GetData();
 
     if ( data->GetAsAny(&any) )


@@ -267,18 +265,20 @@ public:
 
     virtual wxString GetType() const { return wxT("long"); }
 
 
     virtual wxString GetType() const { return wxT("long"); }
 

+#if wxUSE_ANY

     // Since wxAny does not have separate type for integers shorter than
     // longlong, we do not usually implement wxVariant->wxAny conversion
     // here (but in wxVariantDataLongLong instead).
     // Since wxAny does not have separate type for integers shorter than
     // longlong, we do not usually implement wxVariant->wxAny conversion
     // here (but in wxVariantDataLongLong instead).

-#ifndef wxLongLong_t
+  #ifndef wxLongLong_t

     DECLARE_WXANY_CONVERSION()
     DECLARE_WXANY_CONVERSION()

-#else
+  #else

     bool GetAsAny(wxAny* any) const
     {
         *any = m_value;
         return true;
     }
     bool GetAsAny(wxAny* any) const
     {
         *any = m_value;
         return true;
     }

-#endif
+  #endif
+#endif // wxUSE_ANY

 
 protected:
     long m_value;
 
 protected:
     long m_value;


@@ -876,6 +876,26 @@ protected:
 
 IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxString, wxVariantDataString)
 
 
 IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxString, wxVariantDataString)
 

+#if wxUSE_ANY
+// This allows converting string literal wxAnys to string variants
+wxVariantData* wxVariantDataFromConstCharPAny(const wxAny& any)
+{
+    return new wxVariantDataString(wxANY_AS(any, const char*));
+}
+
+wxVariantData* wxVariantDataFromConstWchar_tPAny(const wxAny& any)
+{
+    return new wxVariantDataString(wxANY_AS(any, const wchar_t*));
+}
+
+_REGISTER_WXANY_CONVERSION(const char*,
+                           ConstCharP,
+                           wxVariantDataFromConstCharPAny)
+_REGISTER_WXANY_CONVERSION(const wchar_t*,
+                           ConstWchar_tP,
+                           wxVariantDataFromConstWchar_tPAny)
+#endif
+

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


@@ -961,6 +981,20 @@ wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name)
     m_name = name;
 }
 
     m_name = name;
 }
 

+#if wxUSE_STD_STRING
+wxVariant::wxVariant(const std::string& val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxStdWideString& val, const wxString& name)
+{
+    m_refData = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+#endif // wxUSE_STD_STRING
+

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


@@ -1938,8 +1972,6 @@ protected:
 // Convert to/from list of wxAnys
 //
 
 // Convert to/from list of wxAnys
 //
 

-WX_DEFINE_LIST(wxAnyList)
-

 bool wxVariantDataList::GetAsAny(wxAny* any) const
 {
     wxAnyList dst;
 bool wxVariantDataList::GetAsAny(wxAny* any) const
 {
     wxAnyList dst;


@@ -2321,6 +2353,15 @@ bool wxVariant::Convert(wxUniChar* value) const
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
     else if (type == wxT("bool"))
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());

+    else if (type == wxS("string"))
+    {
+        // Also accept strings of length 1
+        const wxString& str = (((wxVariantDataString*)GetData())->GetValue());
+        if ( str.length() == 1 )
+            *value = str[0];
+        else
+            return false;
+    }

     else
         return false;
 
     else
         return false;