Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/any.cpp b/src/common/any.cpp
index 451d8395b4deb182ab5a15da15865ea4f20607f8..f866c594485c94e7659f9d5eaf820357990542b7 100644 (file)
--- a/src/common/any.cpp
+++ b/src/common/any.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     07/05/2009
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     07/05/2009

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -152,7 +151,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
         if ( any.GetAs(&ll) )
         {
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit
         if ( any.GetAs(&ll) )
         {
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit

-            //     integer constraint yields more consistent behavior across
+            //     integer constraint yields more consistent behaviour across

             //     builds.
             if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
                 *variant = wxLongLong(ll);
             //     builds.
             if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
                 *variant = wxLongLong(ll);


@@ -374,7 +373,7 @@ bool wxAnyConvertString(const wxString& value,
     else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) )
     {
         double value2;
     else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) )
     {
         double value2;

-        if ( !value.ToDouble(&value2) )
+        if ( !value.ToCDouble(&value2) )

             return false;
         wxAnyValueTypeImplDouble::SetValue(value2, dst);
     }
             return false;
         wxAnyValueTypeImplDouble::SetValue(value2, dst);
     }


@@ -453,7 +452,7 @@ bool wxAnyValueTypeImplDouble::ConvertValue(const wxAnyValueBuffer& src,
     }
     else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
     {
     }
     else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
     {

-        wxString s = wxString::Format(wxS("%.14g"), value);
+        wxString s = wxString::FromCDouble(value, 14);

         wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
     }
     else
         wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
     }
     else


@@ -484,7 +483,9 @@ WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxDateTime>)
 
 class wxAnyNullValue
 {
 
 class wxAnyNullValue
 {

-private:
+protected:
+    // this field is unused, but can't be private to avoid Clang's
+    // "Private field 'm_dummy' is not used" warning

     void*   m_dummy;
 };
 
     void*   m_dummy;
 };